diff mbox series

arm64: dts: msm8994-angler: fix the memory map

Message ID 20221230194845.57780-1-dominikkobinski314@gmail.com (mailing list archive)
State Accepted
Headers show
Series arm64: dts: msm8994-angler: fix the memory map | expand

Commit Message

Dominik Kobinski Dec. 30, 2022, 7:48 p.m. UTC
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.

Reported-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Dominik Kobinski <dominikkobinski314@gmail.com>
---
 .../qcom/msm8994-huawei-angler-rev-101.dts    | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Comments

Petr Vorel Jan. 1, 2023, 7:07 p.m. UTC | #1
Hi all,

Reviewed-by: Petr Vorel <petr.vorel@gmail.com>

Thanks for this fix, LGTM. Angler is now looks to be stable, I do more
testing next week.

You also fixed cont_splash_mem. My commit 0e5ded926f2a ("arm64: dts:
qcom: msm8994-angler: Disable cont_splash_mem")
was based on LineageOS kernel, which hides memory. I should have known
this and searched more :).

Kind regards,
Petr
Bjorn Andersson Jan. 10, 2023, 4:17 p.m. UTC | #2
On Fri, 30 Dec 2022 20:48:45 +0100, Dominik Kobinski wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] arm64: dts: msm8994-angler: fix the memory map
      commit: 380cd3a34b7f9825a60ccb045611af9cb4533b70

Best regards,
diff mbox series

Patch

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..108bac7d22f1 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 {