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
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From c0b27adfc300a9ee3f4e0075c443b1f17ce8c7c8 Mon Sep 17 00:00:00 2001
|
|
From: Petr Vorel <petr.vorel@gmail.com>
|
|
Date: Tue, 31 Jan 2023 12:26:37 +0100
|
|
Subject: [PATCH 1/3] arm64: dts: msm8994-angler: Fix cont_splash_mem mapping
|
|
|
|
Angler's cont_splash_mem mapping is shorter in downstream [1],
|
|
therefore 380cd3a34b7f was wrong. Obviously also 0e5ded926f2a was wrong
|
|
(workaround which fixed booting at the time).
|
|
|
|
This fixes error:
|
|
[ 0.000000] memory@3401000 (0x0000000003401000--0x0000000005601000) overlaps with tzapp@4800000 (0x0000000004800000--0x0000000006100000)
|
|
|
|
[1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm64/boot/dts/huawei/huawei_msm8994_angler_row_vn1/huawei-fingerprint.dtsi#16
|
|
|
|
Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
|
|
Fixes: 0e5ded926f2a ("arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem")
|
|
Link: https://lore.kernel.org/linux-arm-msm/20230131200414.24373-2-pvorel@suse.cz/
|
|
|
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
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 7b0f62144c3e..59b9ed78cf0c 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
|
|
@@ -2,7 +2,7 @@
|
|
/*
|
|
* Copyright (c) 2015, Huawei Inc. All rights reserved.
|
|
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
|
|
- * Copyright (c) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
|
|
+ * Copyright (c) 2021-2023, Petr Vorel <petr.vorel@gmail.com>
|
|
*/
|
|
|
|
/dts-v1/;
|
|
@@ -31,6 +31,11 @@ reserved-memory {
|
|
#size-cells = <2>;
|
|
ranges;
|
|
|
|
+ cont_splash_mem: memory@3401000 {
|
|
+ reg = <0 0x03401000 0 0x1000000>;
|
|
+ no-map;
|
|
+ };
|
|
+
|
|
tzapp_mem: tzapp@4800000 {
|
|
reg = <0 0x04800000 0 0x1900000>;
|
|
no-map;
|
|
--
|
|
2.39.2
|
|
|