73a8aec0cc
Angler and Bullhead support is in early stage other msm899{2,4} does not
use the package yet => safe to use rc kernels to get closer to
qcom/for-next git tree.
Kernel 6.2 and 6.3 got few memory map fixes for angler and bullhead.
* Added 3 not yet merged patches for angler:
- add regulators
- memory overlap fixes
- proper cont_splash_mem setup
* Removed 0004-arm64-dts-qcom-msm8992-Don-t-use-sfpb-mutex.patch
(already applied and backported to 6.1 stable), thus renumber the
following patch.
* config
- Enable zram with lzo-rle, add pmb:kconfigcheck-zram (fixes warning:
zramctl: /dev/zram0: failed to set algorithm: Invalid argument)
- Enable crc32, lz4hc, zstd.
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[ci:skip-build]: already built successfully in CI
75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
From a109ba3734561f75ec9e65141c64e965c77df5c0 Mon Sep 17 00:00:00 2001
|
|
From: Petr Vorel <petr.vorel@gmail.com>
|
|
Date: Tue, 31 Jan 2023 13:17:48 +0100
|
|
Subject: [PATCH 2/3] arm64: dts: msm8994-angler: removed clash with
|
|
smem_region
|
|
|
|
This fixes memory overlap error:
|
|
[ 0.000000] reserved@6300000 (0x0000000006300000--0x0000000007000000) overlaps with smem_region@6a00000 (0x0000000006a00000--0x0000000006c00000)
|
|
|
|
smem_region is the same as in downstream (qcom,smem) [1], therefore
|
|
split reserved memory into two sections on either side of smem_region.
|
|
|
|
Not adding labels as it's not expected to be used.
|
|
|
|
[1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm/boot/dts/qcom/msm8994.dtsi#948
|
|
|
|
Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
|
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
|
Link: https://lore.kernel.org/linux-arm-msm/20230131200414.24373-3-pvorel@suse.cz/
|
|
---
|
|
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 5 -----
|
|
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 4 ++--
|
|
arch/arm64/boot/dts/qcom/msm8994.dtsi | 5 +++++
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
index cd77dcb55872..b8f2a01bcb96 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
@@ -60,11 +60,6 @@ reserved@5000000 {
|
|
reg = <0x0 0x05000000 0x0 0x1a00000>;
|
|
no-map;
|
|
};
|
|
-
|
|
- reserved@6c00000 {
|
|
- reg = <0x0 0x06c00000 0x0 0x400000>;
|
|
- no-map;
|
|
- };
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
index 59b9ed78cf0c..29e79ae0849d 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
@@ -41,8 +41,8 @@ tzapp_mem: tzapp@4800000 {
|
|
no-map;
|
|
};
|
|
|
|
- removed_region: reserved@6300000 {
|
|
- reg = <0 0x06300000 0 0xD00000>;
|
|
+ reserved@6300000 {
|
|
+ reg = <0 0x06300000 0 0x700000>;
|
|
no-map;
|
|
};
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
|
|
index 9ff9d35496d2..24c3fced8df7 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
|
|
@@ -228,6 +228,11 @@ adsp_mem: memory@c9400000 {
|
|
reg = <0 0xc9400000 0 0x3f00000>;
|
|
no-map;
|
|
};
|
|
+
|
|
+ reserved@6c00000 {
|
|
+ reg = <0 0x06c00000 0 0x400000>;
|
|
+ no-map;
|
|
+ };
|
|
};
|
|
|
|
smd {
|
|
--
|
|
2.39.2
|
|
|