Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3a85899c-522c-1a0e-14db-ddc02a985e2c@linaro.org>
Date:   Sun, 16 Oct 2022 07:47:49 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.2
Subject: Re: [PATCH 5.10] arm64: dts: qcom: sc7180-trogdor: Fixup modem memory
 region
To:     Stephen Boyd <swboyd@chromium.org>, stable@vger.kernel.org
Cc:     Sibi Sankar <sibis@codeaurora.org>, linux-kernel@vger.kernel.org,
        patches@lists.linux.dev, Evan Green <evgreen@chromium.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>
References: <20221014215302.3905135-1-swboyd@chromium.org>
Content-Language: en-US
From:   Alex Elder <elder@linaro.org>
In-Reply-To: <20221014215302.3905135-1-swboyd@chromium.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/14/22 4:53 PM, Stephen Boyd wrote:
> From: Sibi Sankar <sibis@codeaurora.org>
> 
> commit ef9a5d188d663753e73a3c8e8910ceab8e9305c4 upstream.

When you re-send you can add this if you like:

Acked-by: Alex Elder <elder@linaro.org>

> The modem firmware memory requirements vary between 32M/140M on
> no-lte/lte skus respectively, so fixup the modem memory region
> to reflect the requirements.
> 
> Reviewed-by: Evan Green <evgreen@chromium.org>
> Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
> Link: https://lore.kernel.org/r/1602786476-27833-1-git-send-email-sibis@codeaurora.org
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> 
> This fixes boot of the modem on trogdor boards with the DTS from 5.10.y
> stable tree. Without this patch I run into memory assignment errors and
> then the modem fails to boot.
> 
>   arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 4 ++++
>   arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi         | 2 +-
>   2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi
> index 44956e3165a1..469aad4e5948 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi
> @@ -9,6 +9,10 @@ &ap_sar_sensor {
>   	label = "proximity-wifi-lte";
>   };
>   
> +&mpss_mem {
> +	reg = <0x0 0x86000000 0x0 0x8c00000>;
> +};
> +
>   &remoteproc_mpss {
>   	firmware-name = "qcom/sc7180-trogdor/modem/mba.mbn",
>   			"qcom/sc7180-trogdor/modem/qdsp6sw.mbn";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 5b2a616c6257..cb2c47f13a8a 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -39,7 +39,7 @@ atf_mem: memory@80b00000 {
>   		};
>   
>   		mpss_mem: memory@86000000 {
> -			reg = <0x0 0x86000000 0x0 0x8c00000>;
> +			reg = <0x0 0x86000000 0x0 0x2000000>;
>   			no-map;
>   		};
>   
> 
> base-commit: 014862eecf03f58066a957027dde73cbecdf4395