Patch "arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlaps with the SMEM and MPSS memory regions" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlaps with the SMEM and MPSS memory regions

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-qcom-msm8992-lg-bullhead-correct-memory-ov.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 840075c5ff6dd221aa98980560cc051279047bc5
Author: Jamie Douglass <jamiemdouglass@xxxxxxxxx>
Date:   Thu Feb 2 16:48:19 2023 +1100

    arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlaps with the SMEM and MPSS memory regions
    
    [ Upstream commit d44106883d74992343710f18c4aaae937c7cefab ]
    
    The memory region reserved by a previous commit (see fixes tag below)
    overlaps with the SMEM and MPSS memory regions, causing error messages in
    dmesg:
            OF: reserved mem: OVERLAP DETECTED!
            reserved@5000000 (0x0000000005000000--0x0000000007200000)
            overlaps with smem_region@6a00000
            (0x0000000006a00000--0x0000000006c00000)
    
            OF: reserved mem: OVERLAP DETECTED!
            reserved@6c00000 (0x0000000006c00000--0x0000000007200000)
            overlaps with memory@7000000
            (0x0000000007000000--0x000000000ca00000)
    
    This patch resolves both of these by splitting the previously reserved
    memory region into two sections either side of the SMEM region and by
    cutting off the second memory region to 0x7000000.
    
    Fixes: 22c7e1a0fa45 ("arm64: dts: msm8992-bullhead: add memory hole region")
    Signed-off-by: Jamie Douglass <jamiemdouglass@xxxxxxxxx>
    Reviewed-by: Petr Vorel <pvorel@xxxxxxx>
    Tested-by: Petr Vorel <pvorel@xxxxxxx>
    Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
    Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230202054819.16079-1-jamiemdouglass@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 84ba740cb957b..60fcb024c8879 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -55,8 +55,13 @@ cont_splash_mem: memory@3400000 {
 			no-map;
 		};
 
-		removed_region: reserved@5000000 {
-			reg = <0 0x05000000 0 0x2200000>;
+		reserved@5000000 {
+			reg = <0x0 0x05000000 0x0 0x1a00000>;
+			no-map;
+		};
+
+		reserved@6c00000 {
+			reg = <0x0 0x06c00000 0x0 0x400000>;
 			no-map;
 		};
 	};