devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC
@ 2022-12-26 18:54 Petr Vorel
  2022-12-26 18:54 ` [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size Petr Vorel
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Petr Vorel @ 2022-12-26 18:54 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Petr Vorel, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Dominik Kobinski, devicetree

From: Petr Vorel <petr.vorel@gmail.com>

Petr Vorel (3):
  arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size
  arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
  [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem

 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

-- 
2.39.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size
  2022-12-26 18:54 [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Petr Vorel
@ 2022-12-26 18:54 ` Petr Vorel
  2022-12-27 11:25   ` Konrad Dybcio
  2022-12-26 18:54 ` [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem Petr Vorel
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Petr Vorel @ 2022-12-26 18:54 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Petr Vorel, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Dominik Kobinski, devicetree

From: Petr Vorel <petr.vorel@gmail.com>

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

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

I'm sorry for introducing a regression.

Kind regards,
Petr

 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 79de9cc395c4..123ec67fb385 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -2,7 +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) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
  * Copyright (c) 2022, Dominik Kobinski <dominikkobinski314@gmail.com>
  */
 
@@ -49,7 +49,7 @@ ramoops@1ff00000 {
 		};
 
 		cont_splash_mem: memory@3400000 {
-			reg = <0 0x03400000 0 0x1200000>;
+			reg = <0 0x03400000 0 0xc00000>;
 			no-map;
 		};
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
  2022-12-26 18:54 [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Petr Vorel
  2022-12-26 18:54 ` [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size Petr Vorel
@ 2022-12-26 18:54 ` Petr Vorel
  2022-12-27 11:25   ` Konrad Dybcio
  2022-12-26 18:54 ` [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem Petr Vorel
  2023-01-18 23:55 ` (subset) [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Bjorn Andersson
  3 siblings, 1 reply; 8+ messages in thread
From: Petr Vorel @ 2022-12-26 18:54 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Petr Vorel, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Dominik Kobinski, devicetree

From: Petr Vorel <petr.vorel@gmail.com>

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")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 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 123ec67fb385..4bceb362a5c0 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -15,6 +15,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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem
  2022-12-26 18:54 [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Petr Vorel
  2022-12-26 18:54 ` [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size Petr Vorel
  2022-12-26 18:54 ` [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem Petr Vorel
@ 2022-12-26 18:54 ` Petr Vorel
  2022-12-27 11:29   ` Konrad Dybcio
  2023-01-18 23:55 ` (subset) [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Bjorn Andersson
  3 siblings, 1 reply; 8+ messages in thread
From: Petr Vorel @ 2022-12-26 18:54 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Petr Vorel, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Dominik Kobinski, devicetree

From: Petr Vorel <petr.vorel@gmail.com>

smem_region has a different region on downstream than on msm8994, it's
defined as 150 MiB [1]:

[    0.000000] Linux version 3.10.73-g65a266a (buildkite-agent@lineageos-buildkite) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Mon Feb 24 10:43:08 UTC 2020
[    0.000000] CPU: AArch64 Processor [410fd033] revision 3
[    0.000000] Machine: LGE MSM8992 BULLHEAD rev-1.01
[    0.000000] cma: Found secure_region@0, memory base 0x0000000000000000, size 150 MiB, limit 0x0000000000000000
[    0.000000] cma: Found qsecom_region@0, memory base 0x0000000000000000, size 4 MiB, limit 0x0000000000000000
[    0.000000] cma: Found audio_region@0, memory base 0x0000000000000000, size 4 MiB, limit 0x0000000000000000
[    0.000000] cma: Found removed_regions@0, memory base 0x0000000000000000, size 34 MiB, limit 0x0000000000000000
[    0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000000000000, size 12 MiB, limit 0x0000000000000000
[    0.000000] cma: Found peripheral_region@0, memory base 0x0000000000000000, size 28 MiB, limit 0x0000000000000000
[    0.000000] cma: Found modem_region@0, memory base 0x0000000000000000, size 100 MiB, limit 0x0000000000000000
[    0.000000] cma: Found ramoops_region@1ff00000, memory base 0x0000000000000000, size 0 MiB, limit 0x0000000000000000
[    0.000000] cma: CMA: reserved 152 MiB at 0x0000000000000000 for secure_mem
[    0.000000] cma: CMA: reserved 4 MiB at 0x0000000000000000 for qseecom_mem
[    0.000000] cma: CMA: reserved 4 MiB at 0x0000000000000000 for audio_mem
[    0.000000] cma: CMA: reserved 34 MiB at 0x0000000000000000 for memory_hole
[    0.000000] cma: CMA: reserved 12 MiB at 0x0000000000000000 for cont_splash_mem
[    0.000000] cma: CMA: reserved 28 MiB at 0x0000000000000000 for peripheral_mem
[    0.000000] cma: CMA: reserved 100 MiB at 0x0000000000000000 for modem_mem
[    0.000000] cma: CMA: reserved 0 MiB at 0x0000000000000000 for ramoops_mem
[    0.000000] cma: CMA: reserved 16 MiB at 0x0000000000000000 for default region
[    0.000000] PERCPU: Embedded 15 pages/cpu @0000000000000000 s38912 r0 d22528 u61440

But that conflicts with cont_splash_mem and cont_splash_mem:

[    0.000000] Linux version 6.1.1 (pevik@dell5510) (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for De2
[    0.000000] Machine model: LG Nexus 5X rev 1.01
...
[    0.000000] OF: fdt: Reserved memory: failed to reserve memory for node 'smem_region@0': base 0x0000000000000000, size 150 MiB
[    0.000000] OF: reserved mem: OVERLAP DETECTED!
[    0.000000] smem_region@0 (0x0000000000000000--0x0000000009600000) overlaps with memory@3400000 (0x0000000003400000--0x000000000400000)
[    0.000000] OF: reserved mem: OVERLAP DETECTED!
[    0.000000] reserved@5000000 (0x0000000005000000--0x0000000007200000) overlaps with memory@7000000 (0x0000000007000000--0x000000000ca0)

1) Obviously there are more memory to be fixed, e.g. modem_mem, but
fundamental is to find out whether such a big mapping should be really
used. If yes, what is the trick downstream uses, that it allows
overlapped memory? Or memory is not really overlapping and I cannot
trust the reported value? What base and size should I define then?

Angler downstream defines crazy values for secure_mem as well [2]:
[    0.000000] cma: Found secure_region@0, memory base 0x0000000000000000, size 300 MiB, limit 0xffffffffffffffff

But then in mainline is defined just 2 MiB at 106 MiB:

    smem_mem: smem_region@6a00000 {
	    reg = <0 0x06a00000 0 0x200000>;
	    no-map;
    };

=> should I use just 2 MiB region? But at what base?

2) Is mpss_mem equivalent of downstream modem_mem [3]?

Kind regards,
Petr

[1] https://android.googlesource.com/kernel/msm.git/+/refs/tags/android-7.0.0_r0.17/arch/arm/boot/dts/qcom/msm8992.dtsi#278
[2] https://android.googlesource.com/kernel/msm.git/+/refs/tags/android-7.0.0_r0.17/arch/arm/boot/dts/qcom/msm8994.dtsi#272
[3] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#148

Not-Yet-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 4bceb362a5c0..fb4879b4acbe 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -12,8 +12,9 @@
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 
-/* cont_splash_mem has different memory mapping */
+/* different memory mapping */
 /delete-node/ &cont_splash_mem;
+/delete-node/ &smem_mem;
 
 /* disabled on downstream, conflicts with cont_splash_mem */
 /delete-node/ &dfps_data_mem;
@@ -60,6 +61,11 @@ removed_region: reserved@5000000 {
 			reg = <0 0x05000000 0 0x2200000>;
 			no-map;
 		};
+
+		smem_mem: smem_region@0 {
+			reg = <0 0 0 0x9600000>;
+			no-map;
+		};
 	};
 };
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size
  2022-12-26 18:54 ` [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size Petr Vorel
@ 2022-12-27 11:25   ` Konrad Dybcio
  0 siblings, 0 replies; 8+ messages in thread
From: Konrad Dybcio @ 2022-12-27 11:25 UTC (permalink / raw)
  To: Petr Vorel, linux-arm-msm
  Cc: Petr Vorel, Andy Gross, Bjorn Andersson, Dominik Kobinski,
	devicetree



On 26.12.2022 19:54, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> 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
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
> Hi,
> 
> I'm sorry for introducing a regression.
> 
> Kind regards,
> Petr
> 
>  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 79de9cc395c4..123ec67fb385 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> @@ -2,7 +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) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
>   * Copyright (c) 2022, Dominik Kobinski <dominikkobinski314@gmail.com>
>   */
>  
> @@ -49,7 +49,7 @@ ramoops@1ff00000 {
>  		};
>  
>  		cont_splash_mem: memory@3400000 {
> -			reg = <0 0x03400000 0 0x1200000>;
> +			reg = <0 0x03400000 0 0xc00000>;
>  			no-map;
>  		};
>  

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
  2022-12-26 18:54 ` [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem Petr Vorel
@ 2022-12-27 11:25   ` Konrad Dybcio
  0 siblings, 0 replies; 8+ messages in thread
From: Konrad Dybcio @ 2022-12-27 11:25 UTC (permalink / raw)
  To: Petr Vorel, linux-arm-msm
  Cc: Petr Vorel, Andy Gross, Bjorn Andersson, Dominik Kobinski,
	devicetree



On 26.12.2022 19:54, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> 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")
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  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 123ec67fb385..4bceb362a5c0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> @@ -15,6 +15,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";

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem
  2022-12-26 18:54 ` [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem Petr Vorel
@ 2022-12-27 11:29   ` Konrad Dybcio
  0 siblings, 0 replies; 8+ messages in thread
From: Konrad Dybcio @ 2022-12-27 11:29 UTC (permalink / raw)
  To: Petr Vorel, linux-arm-msm
  Cc: Petr Vorel, Andy Gross, Bjorn Andersson, Dominik Kobinski,
	devicetree



On 26.12.2022 19:54, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> smem_region has a different region on downstream than on msm8994, it's
> defined as 150 MiB [1]:
> 
> [    0.000000] Linux version 3.10.73-g65a266a (buildkite-agent@lineageos-buildkite) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Mon Feb 24 10:43:08 UTC 2020
> [    0.000000] CPU: AArch64 Processor [410fd033] revision 3
> [    0.000000] Machine: LGE MSM8992 BULLHEAD rev-1.01
> [    0.000000] cma: Found secure_region@0, memory base 0x0000000000000000, size 150 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found qsecom_region@0, memory base 0x0000000000000000, size 4 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found audio_region@0, memory base 0x0000000000000000, size 4 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found removed_regions@0, memory base 0x0000000000000000, size 34 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000000000000, size 12 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found peripheral_region@0, memory base 0x0000000000000000, size 28 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found modem_region@0, memory base 0x0000000000000000, size 100 MiB, limit 0x0000000000000000
> [    0.000000] cma: Found ramoops_region@1ff00000, memory base 0x0000000000000000, size 0 MiB, limit 0x0000000000000000
> [    0.000000] cma: CMA: reserved 152 MiB at 0x0000000000000000 for secure_mem
> [    0.000000] cma: CMA: reserved 4 MiB at 0x0000000000000000 for qseecom_mem
> [    0.000000] cma: CMA: reserved 4 MiB at 0x0000000000000000 for audio_mem
> [    0.000000] cma: CMA: reserved 34 MiB at 0x0000000000000000 for memory_hole
> [    0.000000] cma: CMA: reserved 12 MiB at 0x0000000000000000 for cont_splash_mem
> [    0.000000] cma: CMA: reserved 28 MiB at 0x0000000000000000 for peripheral_mem
> [    0.000000] cma: CMA: reserved 100 MiB at 0x0000000000000000 for modem_mem
> [    0.000000] cma: CMA: reserved 0 MiB at 0x0000000000000000 for ramoops_mem
> [    0.000000] cma: CMA: reserved 16 MiB at 0x0000000000000000 for default region
> [    0.000000] PERCPU: Embedded 15 pages/cpu @0000000000000000 s38912 r0 d22528 u61440
> 
> But that conflicts with cont_splash_mem and cont_splash_mem:
> 
> [    0.000000] Linux version 6.1.1 (pevik@dell5510) (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for De2
> [    0.000000] Machine model: LG Nexus 5X rev 1.01
> ...
> [    0.000000] OF: fdt: Reserved memory: failed to reserve memory for node 'smem_region@0': base 0x0000000000000000, size 150 MiB
> [    0.000000] OF: reserved mem: OVERLAP DETECTED!
> [    0.000000] smem_region@0 (0x0000000000000000--0x0000000009600000) overlaps with memory@3400000 (0x0000000003400000--0x000000000400000)
> [    0.000000] OF: reserved mem: OVERLAP DETECTED!
> [    0.000000] reserved@5000000 (0x0000000005000000--0x0000000007200000) overlaps with memory@7000000 (0x0000000007000000--0x000000000ca0)
> 
> 1) Obviously there are more memory to be fixed, e.g. modem_mem, but
> fundamental is to find out whether such a big mapping should be really
> used. If yes, what is the trick downstream uses, that it allows
> overlapped memory? Or memory is not really overlapping and I cannot
> trust the reported value? What base and size should I define then?
> 
> Angler downstream defines crazy values for secure_mem as well [2]:
> [    0.000000] cma: Found secure_region@0, memory base 0x0000000000000000, size 300 MiB, limit 0xffffffffffffffff
> 
> But then in mainline is defined just 2 MiB at 106 MiB:
> 
>     smem_mem: smem_region@6a00000 {
> 	    reg = <0 0x06a00000 0 0x200000>;
> 	    no-map;
>     };
> 
> => should I use just 2 MiB region? But at what base?
> 
> 2) Is mpss_mem equivalent of downstream modem_mem [3]?
> 
> Kind regards,
> Petr
> 
> [1] https://android.googlesource.com/kernel/msm.git/+/refs/tags/android-7.0.0_r0.17/arch/arm/boot/dts/qcom/msm8992.dtsi#278
> [2] https://android.googlesource.com/kernel/msm.git/+/refs/tags/android-7.0.0_r0.17/arch/arm/boot/dts/qcom/msm8994.dtsi#272
> [3] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#148
> 
> Not-Yet-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
smem is not device-specific. secure_mem is a bunch of PIL+maybe
TZAPP memory regions, it's really a mess downstream..

Look here:
https://android.googlesource.com/kernel/msm/+/43154bfee910f2efd0ff0d60e6b1c25192367ab9/arch/arm/boot/dts/qcom/msm8992.dtsi#2173

Konrad
>  arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> index 4bceb362a5c0..fb4879b4acbe 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> @@ -12,8 +12,9 @@
>  #include "pm8994.dtsi"
>  #include "pmi8994.dtsi"
>  
> -/* cont_splash_mem has different memory mapping */
> +/* different memory mapping */
>  /delete-node/ &cont_splash_mem;
> +/delete-node/ &smem_mem;
>  
>  /* disabled on downstream, conflicts with cont_splash_mem */
>  /delete-node/ &dfps_data_mem;
> @@ -60,6 +61,11 @@ removed_region: reserved@5000000 {
>  			reg = <0 0x05000000 0 0x2200000>;
>  			no-map;
>  		};
> +
> +		smem_mem: smem_region@0 {
> +			reg = <0 0 0 0x9600000>;
> +			no-map;
> +		};
>  	};
>  };
>  

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: (subset) [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC
  2022-12-26 18:54 [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Petr Vorel
                   ` (2 preceding siblings ...)
  2022-12-26 18:54 ` [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem Petr Vorel
@ 2023-01-18 23:55 ` Bjorn Andersson
  3 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2023-01-18 23:55 UTC (permalink / raw)
  To: linux-arm-msm, pevik
  Cc: dominikkobinski314, devicetree, petr.vorel, Konrad Dybcio,
	Andy Gross

On Mon, 26 Dec 2022 19:54:37 +0100, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> Petr Vorel (3):
>   arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size
>   arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
>   [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size
      commit: 26a91359aea4d89e7d3646d806eed0f3755b74bd
[2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
      commit: 4dee5aa44b924036511a744ceb3abb1ceeb96bb6

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-01-18 23:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-26 18:54 [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Petr Vorel
2022-12-26 18:54 ` [PATCH 1/3] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem size Petr Vorel
2022-12-27 11:25   ` Konrad Dybcio
2022-12-26 18:54 ` [PATCH 2/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem Petr Vorel
2022-12-27 11:25   ` Konrad Dybcio
2022-12-26 18:54 ` [PATCH 3/3] [RFC] arm64: dts: qcom: msm8992-bullhead: Fix smem_region, mpss_mem Petr Vorel
2022-12-27 11:29   ` Konrad Dybcio
2023-01-18 23:55 ` (subset) [PATCH 0/3] msm8992-bullhead: 2 DTS fixes + 1 RFC Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).