| Message ID | 20250126-msm8226-modem-v2-7-e88d76d6daff@lucaweiss.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Modem support for MSM8226 | expand |
On Sun, Jan 26, 2025 at 09:57:26PM +0100, Luca Weiss wrote: > Add a node for the modem remoteproc found on MSM8226. > > For the apq8026 smartwatches, delete the modem reserved-memory again > since they have very little RAM in the first place anyways, and all of > these devices don't have functional modem firmware anyways - these > watches don't even have GPS. > > Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> > --- > .../boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 7 ++ > .../boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 7 ++ > arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 7 ++ > .../dts/qcom/qcom-apq8026-samsung-milletwifi.dts | 2 + > .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 6 +- > arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 80 ++++++++++++++++++++++ > arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 + > 7 files changed, 109 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > index a2ca456012f1a070afc2805ae71ddbf6f5aac607..816b61ea504ee80d86dd4ccd1a15db687f6a91ff 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > @@ -9,6 +9,8 @@ > #include "pm8226.dtsi" > > /delete-node/ &adsp_region; > +/delete-node/ &mba_region; > +/delete-node/ &mpss_region; > > / { > model = "ASUS ZenWatch 2"; > @@ -82,6 +84,11 @@ bluetooth { > }; > }; > > +/* No (useful) modem on this device */ > +&modem { > + /delete-property/ memory-region; > +}; Rather than putting /delete-node/ and /delete-property/ on all devices that do not need/use the modem, I think it would be cleaner if you make the remoteproc related reserved-memory status = "disabled" by default and enable it only where necessary together with the modem. The &modem itself is status = "disabled" by default, so it makes sense to use the same for the reserved memory as well. See e.g. the existing usage of this pattern for &mpss_mem/&wcnss_mem/&venus_mem/&mba_mem in msm8916.dtsi. Then you can drop the /delete-property/ here. It would be even nicer to use the dynamic allocation (size/alignment/alloc-ranges instead of reg), but I'm skeptical if this will work properly on such an old platform... Thanks, Stephan
On maandag 27 januari 2025 10:19:21 Midden-Europese standaardtijd Stephan Gerhold wrote: > On Sun, Jan 26, 2025 at 09:57:26PM +0100, Luca Weiss wrote: > > Add a node for the modem remoteproc found on MSM8226. > > > > For the apq8026 smartwatches, delete the modem reserved-memory again > > since they have very little RAM in the first place anyways, and all of > > these devices don't have functional modem firmware anyways - these > > watches don't even have GPS. > > > > Co-developed-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > > Signed-off-by: Luca Weiss <luca@lucaweiss.eu> > > --- > > .../boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 7 ++ > > .../boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 7 ++ > > arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 7 ++ > > .../dts/qcom/qcom-apq8026-samsung-milletwifi.dts | 2 + > > .../qcom/qcom-msm8226-samsung-matisse-common.dtsi | 6 +- > > arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 80 +++++++++++++++++ +++++ > > arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 + > > 7 files changed, 109 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/ arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > > index a2ca456012f1a070afc2805ae71ddbf6f5aac607..816b61ea504ee80d86dd4ccd1a15db687f6a91ff 100644 > > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > > @@ -9,6 +9,8 @@ > > #include "pm8226.dtsi" > > > > /delete-node/ &adsp_region; > > +/delete-node/ &mba_region; > > +/delete-node/ &mpss_region; > > > > / { > > model = "ASUS ZenWatch 2"; > > @@ -82,6 +84,11 @@ bluetooth { > > }; > > }; > > > > +/* No (useful) modem on this device */ > > +&modem { > > + /delete-property/ memory-region; > > +}; > > Rather than putting /delete-node/ and /delete-property/ on all devices > that do not need/use the modem, I think it would be cleaner if you make > the remoteproc related reserved-memory status = "disabled" by default > and enable it only where necessary together with the modem. The &modem > itself is status = "disabled" by default, so it makes sense to use the > same for the reserved memory as well. See e.g. the existing usage of > this pattern for &mpss_mem/&wcnss_mem/&venus_mem/&mba_mem in > msm8916.dtsi. Then you can drop the /delete-property/ here. That's a good point, I didn't realize you can disable a reserved-memory node like that. And since often even APQ variants have useful modem firmware (e.g. GPS) I didn't find something quickly I guess. > > It would be even nicer to use the dynamic allocation > (size/alignment/alloc-ranges instead of reg), but I'm skeptical if this > will work properly on such an old platform... IIRC I've read in msm8974 docs that dynamic allocation should be possible, I can give it a try some day, both on 8974 and 8226. Regards Luca > > Thanks, > Stephan >
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts index a2ca456012f1a070afc2805ae71ddbf6f5aac607..816b61ea504ee80d86dd4ccd1a15db687f6a91ff 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts @@ -9,6 +9,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; / { model = "ASUS ZenWatch 2"; @@ -82,6 +84,11 @@ bluetooth { }; }; +/* No (useful) modem on this device */ +&modem { + /delete-property/ memory-region; +}; + &pm8226_vib { status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts index ac228965a48559cd0e54671b1b80773a34595d1e..06c4dca6c9ea2da4ef0be877d25830c172757fa2 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts @@ -10,6 +10,8 @@ #include <dt-bindings/input/ti-drv260x.h> /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; / { model = "Huawei Watch"; @@ -141,6 +143,11 @@ bluetooth { }; }; +/* No (useful) modem on this device */ +&modem { + /delete-property/ memory-region; +}; + &rpm_requests { regulators { compatible = "qcom,rpm-pm8226-regulators"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts index a70de21bf139bd3f67d9e848f75cac20839335fb..1c3e2d2cd54979d4859196c7003d9543971e53bc 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts @@ -10,6 +10,8 @@ #include <dt-bindings/clock/qcom,mmcc-msm8974.h> /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; / { model = "LG G Watch R"; @@ -149,6 +151,11 @@ bluetooth { }; }; +/* No (useful) modem on this device */ +&modem { + /delete-property/ memory-region; +}; + &rpm_requests { regulators { compatible = "qcom,rpm-pm8226-regulators"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts index 7d519156d91d156d801c477711751aba66cc3224..a8543ca7b5569549418683b6be320784eba1768c 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts @@ -12,6 +12,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi index a15a44fc0181bf23e7531ecdc8978505ca48189d..fbd568c7d6b7415d240aa1a2329d07cf9135274c 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi @@ -8,6 +8,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / { @@ -145,12 +147,12 @@ framebuffer@3200000 { no-map; }; - mpss@8400000 { + mpss_region: mpss@8400000 { reg = <0x08400000 0x1f00000>; no-map; }; - mba@a300000 { + mba_region: mba@a300000 { reg = <0x0a300000 0x100000>; no-map; }; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index 7e0838af6c2d0dc26e0082471b70578bc627491d..f7f57c3f583557830c0a6dc9f0eebc2ddebbbe3c 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -213,6 +213,16 @@ smem_region: smem@3000000 { no-map; }; + mpss_region: mpss@8000000 { + reg = <0x08000000 0x5100000>; + no-map; + }; + + mba_region: mba@d100000 { + reg = <0x0d100000 0x100000>; + no-map; + }; + adsp_region: adsp@dc00000 { reg = <0x0dc00000 0x1900000>; no-map; @@ -253,6 +263,31 @@ adsp_smp2p_in: slave-kernel { }; }; + smp2p-modem { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = <GIC_SPI 27 IRQ_TYPE_EDGE_RISING>; + + mboxes = <&apcs 14>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + modem_smp2p_out: master-kernel { + qcom,entry-name = "master-kernel"; + #qcom,smem-state-cells = <1>; + }; + + modem_smp2p_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + smsm { compatible = "qcom,smsm"; #address-cells = <1>; @@ -879,6 +914,51 @@ spmi_bus: spmi@fc4cf000 { #interrupt-cells = <4>; }; + modem: remoteproc@fc880000 { + compatible = "qcom,msm8226-mss-pil"; + reg = <0xfc880000 0x100>, + <0xfc820000 0x020>; + reg-names = "qdsp6", "rmb"; + + interrupts-extended = <&intc GIC_SPI 24 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 1 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 2 IRQ_TYPE_EDGE_RISING>, + <&modem_smp2p_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack"; + + clocks = <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>, + <&gcc GCC_MSS_CFG_AHB_CLK>, + <&gcc GCC_BOOT_ROM_AHB_CLK>, + <&xo_board>; + clock-names = "iface", "bus", "mem", "xo"; + + resets = <&gcc GCC_MSS_RESTART>; + reset-names = "mss_restart"; + + power-domains = <&rpmpd MSM8226_VDDCX>; + power-domain-names = "cx"; + + qcom,ext-bhs-reg = <&tcsr_regs_1 0x194>; + qcom,halt-regs = <&tcsr_regs_1 0x180 0x200 0x280>; + + qcom,smem-states = <&modem_smp2p_out 0>; + qcom,smem-state-names = "stop"; + + memory-region = <&mba_region>, <&mpss_region>; + + status = "disabled"; + + smd-edge { + interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>; + + mboxes = <&apcs 12>; + qcom,smd-edge = <0>; + + label = "modem"; + }; + }; + tcsr_mutex: hwlock@fd484000 { compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex"; reg = <0xfd484000 0x1000>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts index 3037344eb24055071cc77c9cfce0f1d0f95de921..18396623a91dd4bf4b66f01c1d983c391722f3b5 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts @@ -9,6 +9,8 @@ #include "pm8226.dtsi" /delete-node/ &adsp_region; +/delete-node/ &mba_region; +/delete-node/ &mpss_region; /delete-node/ &smem_region; / {