forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

linux-postmarketos-qcom-msm8994: upgrade to 6.3.0-rc5 (MR 3875)

Browse source 
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
This commit is contained in:
Petr Vorel 2023-03-24 20:24:02 +01:00 committed by Oliver Smith
parent ea980f84f9
commit 73a8aec0cc
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
10 changed files with 602 additions and 341 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
device/testing/linux-postmarketos-qcom-msm8994/0001-arm64-dts-msm8992-bullhead-add-memory-hole-region.patch
View file

@ -1,50 +0,0 @@
From 84293ca9d95654e74f657c87f7c997d7a4665398 Mon Sep 17 00:00:00 2001
From: Dominik Kobinski <dominikkobinski314@gmail.com>
Date: Sun, 11 Dec 2022 11:05:01 +0100
Subject: [PATCH 1/3] arm64: dts: msm8992-bullhead: add memory hole region
Add region for memory hole present on bullhead in order to
fix a reboot issue on recent kernels
Reported-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Dominik Kobinski <dominikkobinski314@gmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221211100501.82323-1-dominikkobinski314@gmail.com
[ qcom tree commit 22c7e1a0fa45cd7d028d6b4117161fd0e3427fe0 ]
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 71e373b11de9..37bcbbc67be5 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -2,6 +2,7 @@
/* Copyright (c) 2015, LGE Inc. All rights reserved.
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
* Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
+ * Copyright (c) 2022, Dominik Kobinski <dominikkobinski314@gmail.com>
*/
/dts-v1/;
@@ -50,6 +51,11 @@ cont_splash_mem: memory@3400000 {
reg = <0 0x03400000 0 0x1200000>;
no-map;
};
+
+ removed_region: reserved@5000000 {
+ reg = <0 0x05000000 0 0x2200000>;
+ no-map;
+ };
};
};
--
2.39.0

51
device/testing/linux-postmarketos-qcom-msm8994/0001-arm64-dts-msm8994-angler-Fix-cont_splash_mem-mapping.patch Normal file
View file

@ -0,0 +1,51 @@
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

75
device/testing/linux-postmarketos-qcom-msm8994/0002-arm64-dts-msm8994-angler-removed-clash-with-smem_reg.patch Normal file
View file

@ -0,0 +1,75 @@
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

55
device/testing/linux-postmarketos-qcom-msm8994/0002-arm64-dts-qcom-msm8992-bullhead-Fix-cont_splash_mem-.patch
View file

@ -1,55 +0,0 @@
From 6772ce5fca7dad8c73c522ecac44ce1b16e4955c Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Mon, 26 Dec 2022 17:44:59 +0100
Subject: [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem
size
Original google firmware reports 12 MiB:
[ 0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000003400000, size 12 MiB, limit 0xffffffffffffffff
which is actually 12*1024*1024 = 0xc00000.
This matches the aosp source [1]:
&cont_splash_mem {
reg = <0 0x03400000 0 0xc00000>;
};
Fixes: 3cb6a271f4b0 ("arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping")
Fixes: 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994")
[1] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#141
Link: https://lore.kernel.org/linux-arm-msm/20221226185440.440968-2-pevik@seznam.cz/
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 37bcbbc67be5..97f109cf8240 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2015, LGE Inc. All rights reserved.
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
+ * Copyright (c) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
* Copyright (c) 2022, Dominik Kobinski <dominikkobinski314@gmail.com>
*/
@@ -48,7 +48,7 @@ ramoops@1ff00000 {
};
cont_splash_mem: memory@3400000 {
- reg = <0 0x03400000 0 0x1200000>;
+ reg = <0 0x03400000 0 0xc00000>;
no-map;
};
--
2.39.0

42
device/testing/linux-postmarketos-qcom-msm8994/0003-arm64-dts-qcom-msm8992-bullhead-Disable-dfps_data_me.patch
View file

@ -1,42 +0,0 @@
From ffa4a69f5fd6ca803b208d819432b5dcf6f14cf8 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Mon, 26 Dec 2022 19:54:39 +0100
Subject: [PATCH 3/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
It's disabled on downstream [1] thus not shown on downstream dmesg.
Removing it fixes warnings on v6.1:
[ 0.000000] OF: reserved mem: OVERLAP DETECTED!
[ 0.000000] dfps_data_mem@3400000 (0x0000000003400000--0x0000000003401000) overlaps with memory@3400000 (0x0000000003400000--0x0000000004600000)
[1] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#137
Fixes: 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994")
Link: https://lore.kernel.org/linux-arm-msm/20221226185440.440968-3-pevik@seznam.cz/
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 97f109cf8240..49f30efdbe65 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -14,6 +14,9 @@
/* cont_splash_mem has different memory mapping */
/delete-node/ &cont_splash_mem;
+/* disabled on downstream, conflicts with cont_splash_mem */
+/delete-node/ &dfps_data_mem;
+
/ {
model = "LG Nexus 5X";
compatible = "lg,bullhead", "qcom,msm8992";
--
2.39.0

292
device/testing/linux-postmarketos-qcom-msm8994/0003-arm64-dts-qcom-msm8994-huawei-angler-Add-regulators.patch Normal file
View file

@ -0,0 +1,292 @@
From fd07e34ae290cb020bf35d72b469511ed1adc1c3 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Thu, 27 Jan 2022 00:26:54 +0100
Subject: [PATCH 3/3] arm64: dts: qcom: msm8994-huawei-angler: Add regulators
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Link: https://lore.kernel.org/linux-arm-msm/20230203122118.15219-1-pvorel@suse.cz/
---
.../qcom/msm8994-huawei-angler-rev-101.dts | 267 ++++++++++++++++++
1 file changed, 267 insertions(+)
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 29e79ae0849d..cdd6f58efdf0 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
@@ -59,6 +59,273 @@ &tlmm {
gpio-reserved-ranges = <85 4>;
};
+&rpm_requests {
+ pm8994_regulators: regulators-0 {
+ compatible = "qcom,rpm-pm8994-regulators";
+
+ vdd_l1-supply = <&pm8994_s1>;
+ vdd_l2_26_28-supply = <&pm8994_s3>;
+ vdd_l3_11-supply = <&pm8994_s3>;
+ vdd_l4_27_31-supply = <&pm8994_s3>;
+ vdd_l5_7-supply = <&pm8994_s3>;
+ vdd_l6_12_32-supply = <&pm8994_s5>;
+ vdd_l8_16_30-supply = <&vph_pwr>;
+ vdd_l9_10_18_22-supply = <&vph_pwr>;
+ vdd_l13_19_23_24-supply = <&vph_pwr>;
+ vdd_l14_15-supply = <&pm8994_s5>;
+ vdd_l17_29-supply = <&vph_pwr>;
+ vdd_l20_21-supply = <&vph_pwr>;
+ vdd_l25-supply = <&pm8994_s5>;
+ vdd_lvs1_2-supply = <&pm8994_s4>;
+
+ /* S1, S2, S6 and S12 are managed by RPMPD */
+
+ pm8994_s1: s1 {
+ regulator-min-microvolt = <1025000>;
+ regulator-max-microvolt = <1025000>;
+ };
+
+ pm8994_s2: s2 {
+ /* TODO */
+ };
+
+ pm8994_s3: s3 {
+ regulator-min-microvolt = <1300000>;
+ regulator-max-microvolt = <1300000>;
+ };
+
+ pm8994_s4: s4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-allow-set-load;
+ regulator-system-load = <325000>;
+ };
+
+ pm8994_s5: s5 {
+ regulator-min-microvolt = <2150000>;
+ regulator-max-microvolt = <2150000>;
+ };
+
+ pm8994_s7: s7 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ };
+
+ /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
+ /*
+ * TODO: pm8994_s8 and pm8994_s11 (pm8994_s9 and pm8994_s11 are missing)
+ spm-regulator@2900 {
+ phandle = <0x193>;
+ linux,phandle = <0x193>;
+ qcom,cpu-num = <0x00>;
+ regulator-max-microvolt = <0x120160>;
+ regulator-min-microvolt = <0xaae60>;
+ regulator-name = "pm8994_s8";
+ reg = <0x2900 0x100>;
+ compatible = "qcom,spm-regulator";
+ };
+
+ spm-regulator@3200 {
+ phandle = <0x195>;
+ linux,phandle = <0x195>;
+ qcom,cpu-num = <0x04>;
+ regulator-max-microvolt = <0x12b128>;
+ regulator-min-microvolt = <0xaae60>;
+ regulator-name = "pm8994_s11";
+ reg = <0x3200 0x100>;
+ compatible = "qcom,spm-regulator";
+ };
+ */
+
+ pm8994_l1: l1 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ };
+
+ pm8994_l2: l2 {
+ regulator-min-microvolt = <1250000>;
+ regulator-max-microvolt = <1250000>;
+ };
+
+ pm8994_l3: l3 {
+ regulator-min-microvolt = <1250000>;
+ regulator-max-microvolt = <1250000>;
+ };
+
+ pm8994_l4: l4 {
+ regulator-min-microvolt = <1225000>;
+ regulator-max-microvolt = <1225000>;
+ };
+
+ /* L5 is inaccessible from RPM */
+
+ pm8994_l6: l6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ /* L7 is inaccessible from RPM */
+
+ pm8994_l8: l8 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l9: l9 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l10: l10 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l11: l11 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+
+ pm8994_l12: l12 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l13: l13 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm8994_l14: l14 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l15: l15 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ pm8994_l16: l16 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2700000>;
+ };
+
+ pm8994_l17: l17 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2800000>;
+ };
+
+ pm8994_l18: l18 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <2850000>;
+ regulator-always-on;
+ };
+
+ pm8994_l19: l19 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
+ pm8994_l20: l20 {
+ regulator-min-microvolt = <2950000>;
+ regulator-max-microvolt = <2950000>;
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-allow-set-load;
+ regulator-system-load = <570000>;
+ /*
+ * TODO: downstream
+ * qcom,init-current = <0x2ee>;
+ */
+ };
+
+ pm8994_l21: l21 {
+ regulator-min-microvolt = <2950000>;
+ regulator-max-microvolt = <2950000>;
+ regulator-always-on;
+ };
+
+ pm8994_l22: l22 {
+ regulator-min-microvolt = <3100000>;
+ regulator-max-microvolt = <3100000>;
+ };
+
+ pm8994_l23: l23 {
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ };
+
+ pm8994_l24: l24 {
+ regulator-min-microvolt = <3075000>;
+ regulator-max-microvolt = <3150000>;
+ };
+
+ pm8994_l25: l25 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+
+ pm8994_l26: l26 {
+ regulator-min-microvolt = <987500>;
+ regulator-max-microvolt = <987500>;
+ };
+
+ pm8994_l27: l27 {
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ };
+
+ pm8994_l28: l28 {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-boot-on;
+ /*
+ * TODO: downstream
+ * qcom,init-current = <0x2d>;
+ */
+ };
+
+ pm8994_l29: l29 {
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <2800000>;
+ };
+
+ pm8994_l30: l30 {
+ regulator-min-microvolt = <1850000>;
+ regulator-max-microvolt = <1850000>;
+ };
+
+ pm8994_l31: l31 {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-boot-on;
+ /*
+ * TODO: downstream
+ * qcom,init-current = <50>;
+ */
+ };
+
+ pm8994_l32: l32 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+ };
+
+ pmi8994_regulators: regulators-1 {
+ compatible = "qcom,rpm-pmi8994-regulators";
+
+ vdd_s1-supply = <&vph_pwr>;
+ vdd_bst_byp-supply = <&vph_pwr>;
+
+ pmi8994_s1: s1 {};
+
+ /* S2 & S3 - VDD_GFX */
+
+ pmi8994_bby: boost-bypass {};
+ };
+};
+
&sdhc1 {
status = "okay";
mmc-hs400-1_8v;
--
2.39.2

37
device/testing/linux-postmarketos-qcom-msm8994/0004-arm64-dts-qcom-msm8992-Don-t-use-sfpb-mutex.patch
View file

@ -1,37 +0,0 @@
From a6cc7a18ed349af3a38b1f5cf307d5808e1420e3 Mon Sep 17 00:00:00 2001
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Mon, 19 Dec 2022 14:19:17 +0100
Subject: [PATCH 4/4] arm64: dts: qcom: msm8992: Don't use sfpb mutex
MSM8992 uses the same mutex hardware as MSM8994. This was wrong
from the start, but never presented as an issue until the sfpb
compatible was given different driver data.
Fixes: 6a6d1978f9c0 ("arm64: dts: msm8992 SoC and LG Bullhead (Nexus 5X) support")
Reported-by: Eugene Lepshy <fekz115@gmail.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/linux-arm-msm/20221219131918.446587-1-konrad.dybcio@linaro.org/
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
index 750643763a76..f4be09fc1b15 100644
--- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
@@ -36,10 +36,6 @@ &rpmcc {
compatible = "qcom,rpmcc-msm8992", "qcom,rpmcc";
};
-&tcsr_mutex {
- compatible = "qcom,sfpb-mutex";
-};
-
&timer {
interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
--
2.39.0

59
device/testing/linux-postmarketos-qcom-msm8994/0005-arm64-dts-msm8994-angler-fix-the-memory-map.patch
View file

@ -1,59 +0,0 @@
From b1ebf79b9cf764bb735be0d801e44ac797855670 Mon Sep 17 00:00:00 2001
From: Dominik Kobinski <dominikkobinski314@gmail.com>
Date: Fri, 30 Dec 2022 20:48:45 +0100
Subject: [PATCH 5/5] arm64: dts: msm8994-angler: fix the memory map
Add reserved regions for memory hole and tz app mem to prevent
rebooting. Also enable cont_splash_mem, it is the same as the
generic 8994 one.
Link: https://lore.kernel.org/linux-arm-msm/20221230194845.57780-1-dominikkobinski314@gmail.com/
Reported-by: Petr Vorel <petr.vorel@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Dominik Kobinski <dominikkobinski314@gmail.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
.../qcom/msm8994-huawei-angler-rev-101.dts | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
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 dbfbb77e9ff5..7e2c0dcc11ab 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
@@ -8,9 +8,6 @@
#include "msm8994.dtsi"
-/* Angler's firmware does not report where the memory is allocated */
-/delete-node/ &cont_splash_mem;
-
/ {
model = "Huawei Nexus 6P";
compatible = "huawei,angler", "qcom,msm8994";
@@ -27,6 +24,22 @@ aliases {
chosen {
stdout-path = "serial0:115200n8";
};
+
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ tzapp_mem: tzapp@4800000 {
+ reg = <0 0x04800000 0 0x1900000>;
+ no-map;
+ };
+
+ removed_region: reserved@6300000 {
+ reg = <0 0x06300000 0 0xD00000>;
+ no-map;
+ };
+ };
};
&blsp1_uart2 {
--
2.39.0

35
device/testing/linux-postmarketos-qcom-msm8994/APKBUILD
View file

@ -3,9 +3,9 @@
_flavor="postmarketos-qcom-msm8994"
pkgname=linux-$_flavor
pkgver=6.1.2
pkgver=6.3_rc5
pkgrel=1
pkgdesc="Kernel mainline Qualcomm MSM8994 and MSM8992 devices"
pkgdesc="Mainline kernel for Qualcomm MSM8994/MSM8992 devices"
arch="aarch64"
_carch="arm64"
url="https://kernel.org"
@ -13,6 +13,7 @@ license="GPL-2.0-only"
options="!strip !check !tracedeps
pmb:cross-native
pmb:kconfigcheck-nftables
pmb:kconfigcheck-zram
"
makedepends="
bison
@ -21,23 +22,17 @@ makedepends="
openssl-dev
perl
postmarketos-installkernel
xz
"
case $pkgver in
*.*.*) _kernver=${pkgver%.0};;
*.*) _kernver=$pkgver;;
esac
_tag=${pkgver//_/-}
source="
https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
https://git.kernel.org/torvalds/t/linux-$_tag.tar.gz
config-$_flavor.$arch
0001-arm64-dts-msm8992-bullhead-add-memory-hole-region.patch
0002-arm64-dts-qcom-msm8992-bullhead-Fix-cont_splash_mem-.patch
0003-arm64-dts-qcom-msm8992-bullhead-Disable-dfps_data_me.patch
0004-arm64-dts-qcom-msm8992-Don-t-use-sfpb-mutex.patch
0005-arm64-dts-msm8994-angler-fix-the-memory-map.patch
0001-arm64-dts-msm8994-angler-Fix-cont_splash_mem-mapping.patch
0002-arm64-dts-msm8994-angler-removed-clash-with-smem_reg.patch
0003-arm64-dts-qcom-msm8994-huawei-angler-Add-regulators.patch
"
builddir="$srcdir/linux-$_kernver"
builddir="$srcdir/linux-${_tag#v}"
prepare() {
default_prepare
@ -65,11 +60,9 @@ package() {
}
sha512sums="
a906c15b1eb4f3015b1d9a0e6a321b5a399e77ccd0127cb8caabbe7cb337e77a85a432bac4763ab5448d86dd319441eef865aad41939ca1f796663c2b52170e6 linux-6.1.2.tar.xz
4191f3ffd3ca9a4c5e3986e57ca31d69d811045b91cb357957bd2d794b9cfb88fbbd9c6597cbd04aae74e5015d61c8344b4f20962cafbdb72a7dea94b05a26a9 config-postmarketos-qcom-msm8994.aarch64
878a48bff265b91e7970c84d3d8dc38753fdc15d7412db9000c2974989fa8fefc312bab0abd442365f83e7af27e2eb712d7f6abc41ab9c20fbe9f4e4419a9a94 0001-arm64-dts-msm8992-bullhead-add-memory-hole-region.patch
901fcae7ae813ea0a4d301283f423cd84696c7200075170c0385027955daa5796cd658cbb34d3d65053b50867638d78acb86913666f6ea48c5c59bb6e68f70d1 0002-arm64-dts-qcom-msm8992-bullhead-Fix-cont_splash_mem-.patch
6d06b1770dd8471fcc4c4fb1f37707833f3d1da1d8a2a58ca311c73dcbedb8ecdf2e8e52512a90676bd7a0a328585023aa8b94feeb4b0bafd75ca57cd1d637a1 0003-arm64-dts-qcom-msm8992-bullhead-Disable-dfps_data_me.patch
293b85417ffecfe59ae0955a98eb2232f98f676bcc4cc0743df9b4f945d8059a17bb09714e5abccc93e2858b13a0006e154c4f5efaecde0c544a31170671fb73 0004-arm64-dts-qcom-msm8992-Don-t-use-sfpb-mutex.patch
645a22550864f9f98798ff7334eef654537a113e0e6988282a68909d7d78e7a7122fb11cf12b6c44aff23d3c51964113d39fd1e387809c6d1576f5dd237d4b0d 0005-arm64-dts-msm8994-angler-fix-the-memory-map.patch
84f8b612268a2f6d47e35afc06865db3a779c7877ab2fde8a70e219093c113fb82d10cddf042f2600522659d7f86c5daa1ee622a72baeaba74de55b374093221 linux-6.3-rc5.tar.gz
9b896642fb33669c387b6707fef50c9e680f0a290916a1a619a72b8c4c3f7dc0f0b1f63e7c5bc998e3862bd47e5a1e9411c4ea92fc49907de1250c1eab17fa4e config-postmarketos-qcom-msm8994.aarch64
29573678c82723821e3522a649158137dfc49e61b78c6319a4c6bc97cfe0d98fdc994d2271934beb223da11bd0cdb085bf5422454287575c28ed06c47ea63f68 0001-arm64-dts-msm8994-angler-Fix-cont_splash_mem-mapping.patch
ca46f96560b14044b88791e04e49b7cff59f1217a5e7e8f56092f624c24707b30edfc3d862098599a784a8695558a1b67ff964789188f26518a1496377de7632 0002-arm64-dts-msm8994-angler-removed-clash-with-smem_reg.patch
4dc3de184eac5cfb593a308278e3a5ab27f5e94b5dec8b288c053070f788fdb8d8fad8628b5a996701eacc11b1015999b99f8d279b207e214dd0e63f97cfb4d6 0003-arm64-dts-qcom-msm8994-huawei-angler-Add-regulators.patch
"

247
device/testing/linux-postmarketos-qcom-msm8994/config-postmarketos-qcom-msm8994.aarch64
View file

File diff suppressed because it is too large Load diff