| Message ID | 20220712124421.3129206-4-stephan.gerhold@kernkonzept.com |
|---|---|
| State | Accepted |
| Commit | 8d8be8dd7c1f5d50f84ecc7a6a41962da48c6164 |
| Headers | show |
| Series | remoteproc: qcom_q6v5_mss: Add MSM8909 | expand |
On 12/07/2022 14:44, Stephan Gerhold wrote: > The remoteproc configuration in qcom-msm8974.dtsi is incomplete because > > diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi > index 814ad0b46232..35246bd02132 100644 > --- a/arch/arm/boot/dts/qcom-msm8974.dtsi > +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi > @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 { > qcom,smem-states = <&modem_smp2p_out 0>; > qcom,smem-state-names = "stop"; > > + status = "disabled"; > + > mba { > memory-region = <&mba_region>; > }; > @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 { > qcom,smem-states = <&adsp_smp2p_out 0>; > qcom,smem-state-names = "stop"; > > + status = "disabled"; > + > smd-edge { > interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>; > > diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > index 58cb2ce1e4df..8a6b8e4de887 100644 > --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > @@ -147,10 +147,12 @@ wcnss { > }; > > &remoteproc_adsp { > + status = "okay"; These go to the end of properties. > cx-supply = <&pm8841_s2>; > }; > > &remoteproc_mss { > + status = "okay"; Ditto > cx-supply = <&pm8841_s2>; > mss-supply = <&pm8841_s3>; > mx-supply = <&pm8841_s1>; > diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts > index d6b2300a8223..577cbffad010 100644 > --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts > +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts > @@ -457,10 +457,12 @@ fuelgauge_pin: fuelgauge-int-pin { > }; > > &remoteproc_adsp { > + status = "okay"; Ditto > cx-supply = <&pma8084_s2>; > }; > > &remoteproc_mss { > + status = "okay"; > cx-supply = <&pma8084_s2>; > mss-supply = <&pma8084_s6>; > mx-supply = <&pma8084_s1>; Best regards, Krzysztof
On Thu, Jul 14, 2022 at 11:55:44AM +0200, Krzysztof Kozlowski wrote: > On 12/07/2022 14:44, Stephan Gerhold wrote: > > The remoteproc configuration in qcom-msm8974.dtsi is incomplete because > > > > diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi > > index 814ad0b46232..35246bd02132 100644 > > --- a/arch/arm/boot/dts/qcom-msm8974.dtsi > > +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi > > @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 { > > qcom,smem-states = <&modem_smp2p_out 0>; > > qcom,smem-state-names = "stop"; > > > > + status = "disabled"; > > + > > mba { > > memory-region = <&mba_region>; > > }; > > @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 { > > qcom,smem-states = <&adsp_smp2p_out 0>; > > qcom,smem-state-names = "stop"; > > > > + status = "disabled"; > > + > > smd-edge { > > interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>; > > > > diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > > index 58cb2ce1e4df..8a6b8e4de887 100644 > > --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > > +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts > > @@ -147,10 +147,12 @@ wcnss { > > }; > > > > &remoteproc_adsp { > > + status = "okay"; > > These go to the end of properties. > All the other nodes in these two files have the 'status = "okay"' at the beginning (just like most of the Qualcomm boards actually). I know there have been some discussion to change this, but until existing boards have been changed I would rather not introduce a wild mix of both approaches (within the same file at least). Thanks, Stephan
On 14/07/2022 21:01, Stephan Gerhold wrote: > On Thu, Jul 14, 2022 at 11:55:44AM +0200, Krzysztof Kozlowski wrote: >> On 12/07/2022 14:44, Stephan Gerhold wrote: >>> The remoteproc configuration in qcom-msm8974.dtsi is incomplete because >>> >>> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi >>> index 814ad0b46232..35246bd02132 100644 >>> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi >>> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi >>> @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 { >>> qcom,smem-states = <&modem_smp2p_out 0>; >>> qcom,smem-state-names = "stop"; >>> >>> + status = "disabled"; >>> + >>> mba { >>> memory-region = <&mba_region>; >>> }; >>> @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 { >>> qcom,smem-states = <&adsp_smp2p_out 0>; >>> qcom,smem-state-names = "stop"; >>> >>> + status = "disabled"; >>> + >>> smd-edge { >>> interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>; >>> >>> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts >>> index 58cb2ce1e4df..8a6b8e4de887 100644 >>> --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts >>> +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts >>> @@ -147,10 +147,12 @@ wcnss { >>> }; >>> >>> &remoteproc_adsp { >>> + status = "okay"; >> >> These go to the end of properties. >> > > All the other nodes in these two files have the 'status = "okay"' at the > beginning (just like most of the Qualcomm boards actually). I know there > have been some discussion to change this, but until existing boards have > been changed I would rather not introduce a wild mix of both approaches > (within the same file at least). I would say less code to fix later, but OK. Best regards, Krzysztof
On Tue, 12 Jul 2022 14:44:18 +0200, Stephan Gerhold wrote: > The remoteproc configuration in qcom-msm8974.dtsi is incomplete because > it lacks the regulator supplies that should be added in the board DT > files. Some of the msm8974 boards are currently missing the regulator > supplies and should have the remoteprocs disabled to avoid making use > of the incomplete configuration. > > This also fixes dtbs_check warnings after moving "qcom,msm8974-mss-pil" > to DT schema, which rightfully complains that the -supply properties > are missing for some boards: > > [...] Applied, thanks! [3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default commit: 8d8be8dd7c1f5d50f84ecc7a6a41962da48c6164 Best regards,
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 814ad0b46232..35246bd02132 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 { qcom,smem-states = <&modem_smp2p_out 0>; qcom,smem-state-names = "stop"; + status = "disabled"; + mba { memory-region = <&mba_region>; }; @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 { qcom,smem-states = <&adsp_smp2p_out 0>; qcom,smem-state-names = "stop"; + status = "disabled"; + smd-edge { interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index 58cb2ce1e4df..8a6b8e4de887 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -147,10 +147,12 @@ wcnss { }; &remoteproc_adsp { + status = "okay"; cx-supply = <&pm8841_s2>; }; &remoteproc_mss { + status = "okay"; cx-supply = <&pm8841_s2>; mss-supply = <&pm8841_s3>; mx-supply = <&pm8841_s1>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index d6b2300a8223..577cbffad010 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -457,10 +457,12 @@ fuelgauge_pin: fuelgauge-int-pin { }; &remoteproc_adsp { + status = "okay"; cx-supply = <&pma8084_s2>; }; &remoteproc_mss { + status = "okay"; cx-supply = <&pma8084_s2>; mss-supply = <&pma8084_s6>; mx-supply = <&pma8084_s1>;
The remoteproc configuration in qcom-msm8974.dtsi is incomplete because it lacks the regulator supplies that should be added in the board DT files. Some of the msm8974 boards are currently missing the regulator supplies and should have the remoteprocs disabled to avoid making use of the incomplete configuration. This also fixes dtbs_check warnings after moving "qcom,msm8974-mss-pil" to DT schema, which rightfully complains that the -supply properties are missing for some boards: qcom-apq8074-dragonboard.dtb: remoteproc@fc880000: 'pll-supply' is a required property From schema: remoteproc/qcom,msm8916-mss-pil.yaml remoteproc@fc880000: 'mss-supply' is a required property From schema: remoteproc/qcom,msm8916-mss-pil.yaml remoteproc@fc880000: 'oneOf' conditional failed, one must be fixed: 'power-domains' is a required property 'power-domain-names' is a required property, or 'cx-supply' is a required property 'mx-supply' is a required property Cc: Luca Weiss <luca@z3ntu.xyz> Cc: Konrad Dybcio <konrad.dybcio@somainline.org> Fixes: f300826d27be ("ARM: dts: qcom-msm8974: Sort and clean up nodes") Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> --- arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++++ arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 2 ++ arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 2 ++ 3 files changed, 8 insertions(+)