On 04.09.24 20:26, Fabien Parent wrote:
> Commit 22e4e43484c4 ("arm64: dts: qcom: msm8939: Use mboxes
> properties for APCS") broke the boot on msm8939 platforms.
>
> The issue comes from the SMD driver failing to request the mbox
> channel because of circular dependencies:
> 1. rpm -> apcs1_mbox -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm.
> 2. rpm -> apcs1_mbox -> gcc -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm
> 3. rpm -> apcs1_mbox -> apcs2 -> gcc -> rpmcc (RPM_SMD_XO_CLK_SRC) -> rpm
>
> To fix this issue let's switch back to using the deprecated
> qcom,ipc property for the RPM node.
>
> Fixes: 22e4e43484c4 ("arm64: dts: qcom: msm8939: Use mboxes properties for APCS")
> Signed-off-by: Fabien Parent <fabien.parent@xxxxxxxxxx>
> ---
Lo! Bjorn, I noticed this regression fix is sitting in a for-next branch
for more than 4 weeks now. Is there a reason, did it fall through the
cracks, or will it head towards mainline any time soon?
Ciao, Thorsten
> arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
> index 46d9480cd464..39405713329b 100644
> --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
> @@ -248,7 +248,7 @@ rpm: remoteproc {
>
> smd-edge {
> interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
> - mboxes = <&apcs1_mbox 0>;
> + qcom,ipc = <&apcs1_mbox 8 0>;
> qcom,smd-edge = <15>;
>
> rpm_requests: rpm-requests {
>
> ---
> base-commit: d8abb73f584772eaafa95a447c90f1c02dba0dec
> change-id: 20240903-msm8939-rpm-apcs-fix-8924b8b7f593
>
> Best regards,
