[2/3] arm64: dts: qcom: msm8994: fix duplicated @6c00000 reserved memory
Commit Message
Reserved memory @6c00000 is defined in MSM8994 DTSI and few boards:
Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/hole2@6c00000)
Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/memory@6c00000)
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 +
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 +
arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
Comments
On 20.04.2023 20:07, Krzysztof Kozlowski wrote:
> Reserved memory @6c00000 is defined in MSM8994 DTSI and few boards:
>
> Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/hole2@6c00000)
> Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/memory@6c00000)
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
I only see the downstream entry for this specific address on the
Lumia UEFIs, not in Xiaomi or Sony downstreams.. I'll investigate
a bit more including booting downstream and checking dmesg,
maybe it's reserved dynamically..
Konrad
> arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 +
> arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 +
> arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +-
> 3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
> index fcca1ba94da6..501e05efbef4 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
> @@ -15,6 +15,7 @@
> /delete-node/ &audio_mem;
> /delete-node/ &mpss_mem;
> /delete-node/ &peripheral_region;
> +/delete-node/ &res_hyp_mem;
> /delete-node/ &rmtfs_mem;
>
> / {
> diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
> index 2861bcdf87b7..cbc84459a5ae 100644
> --- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
> @@ -23,6 +23,7 @@
> /delete-node/ &mba_mem;
> /delete-node/ &mpss_mem;
> /delete-node/ &peripheral_region;
> +/delete-node/ &res_hyp_mem;
> /delete-node/ &rmtfs_mem;
> /delete-node/ &smem_mem;
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
> index 5a7923d7c62a..405778d92b43 100644
> --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
> @@ -231,7 +231,7 @@ adsp_mem: memory@c9400000 {
> no-map;
> };
>
> - reserved@6c00000 {
> + res_hyp_mem: reserved@6c00000 {
> reg = <0 0x06c00000 0 0x400000>;
> no-map;
> };
@@ -15,6 +15,7 @@
/delete-node/ &audio_mem;
/delete-node/ &mpss_mem;
/delete-node/ &peripheral_region;
+/delete-node/ &res_hyp_mem;
/delete-node/ &rmtfs_mem;
/ {
@@ -23,6 +23,7 @@
/delete-node/ &mba_mem;
/delete-node/ &mpss_mem;
/delete-node/ &peripheral_region;
+/delete-node/ &res_hyp_mem;
/delete-node/ &rmtfs_mem;
/delete-node/ &smem_mem;
@@ -231,7 +231,7 @@ adsp_mem: memory@c9400000 {
no-map;
};
- reserved@6c00000 {
+ res_hyp_mem: reserved@6c00000 {
reg = <0 0x06c00000 0 0x400000>;
no-map;
};