On 2.02.2023 06:48, Jamie Douglass wrote:
> 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>
>
> ---
> v1 -> v2: Added detail about second memory overlap and fixed commit to commit
> message
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 9 +++++++--
> 1 file changed, 7 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..5e375ea73c79 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> @@ -53,8 +53,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;
> };
> };
