* [PATCH 0/2] dts: qcom: use "qcom,gsi-loader"
@ 2022-12-31 0:27 Alex Elder
2022-12-31 0:27 ` [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Alex Elder
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alex Elder @ 2022-12-31 0:27 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, andersson, konrad.dybcio, agross
Cc: caleb.connolly, mka, evgreen, quic_cpratapa, quic_avuyyuru,
quic_jponduru, quic_subashab, elder, devicetree, linux-arm-msm,
linux-kernel
IPA hardware has a GSI component that needs firmware loaded.
Recently, the way to specify how this firmware is loaded has
been changed. As a result, indicating this via the presence or
absence of a "modem-init" property is now deprecated. Instead,
a new "qcom,gsi-loader" property is used; this permits a third
method of loading GSI firmware to be supported.
https://lore.kernel.org/netdev/20221116073257.34010-1-elder@linaro.org/
This series updates all of the exiting ARM and arm64 DTS files for
platforms implementing IPA so they specify the GSI loader using the
new property.
-Alex
Alex Elder (2):
ARM: dts: qcom: use qcom,gsi-loader for IPA
arm64: dts: qcom: use qcom,gsi-loader for IPA
arch/arm/boot/dts/qcom-sdx55-t55.dts | 4 ++--
arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 ++--
arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 ++---
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 3 ++-
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 ++--
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 ++-
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 +
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 3 ++-
arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 ++-
arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts | 4 ++--
arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 4 ++--
arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 ++-
17 files changed, 29 insertions(+), 24 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA 2022-12-31 0:27 [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Alex Elder @ 2022-12-31 0:27 ` Alex Elder 2022-12-31 11:52 ` Konrad Dybcio 2022-12-31 0:27 ` [PATCH 2/2] arm64: " Alex Elder 2023-01-18 23:55 ` (subset) [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Bjorn Andersson 2 siblings, 1 reply; 6+ messages in thread From: Alex Elder @ 2022-12-31 0:27 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, andersson, konrad.dybcio, agross Cc: caleb.connolly, mka, evgreen, quic_cpratapa, quic_avuyyuru, quic_jponduru, quic_subashab, elder, devicetree, linux-arm-msm, linux-kernel Depending on the platform, either the modem or the AP must load GSI firmware for IPA before it can be used. To date, this has been indicated by the presence or absence of a "modem-init" property. That mechanism has been deprecated. Instead, we indicate how GSI firmware should be loaded by the value of the "qcom,gsi-loader" property. Update all ARM platforms that use IPA to use the "qcom,gsi-loader" property to specify how the GSI firmware is loaded. Update the affected nodes so the status property is last. Signed-off-by: Alex Elder <elder@linaro.org> --- arch/arm/boot/dts/qcom-sdx55-t55.dts | 4 ++-- arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom-sdx55-t55.dts index 7ed8feb99afbe..61ac5f54cd57d 100644 --- a/arch/arm/boot/dts/qcom-sdx55-t55.dts +++ b/arch/arm/boot/dts/qcom-sdx55-t55.dts @@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &qpic_bam { diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts index ac8b4626ae9ac..c9c1f7da1261b 100644 --- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts +++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts @@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &pcie0_phy { -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA 2022-12-31 0:27 ` [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Alex Elder @ 2022-12-31 11:52 ` Konrad Dybcio 0 siblings, 0 replies; 6+ messages in thread From: Konrad Dybcio @ 2022-12-31 11:52 UTC (permalink / raw) To: Alex Elder, robh+dt, krzysztof.kozlowski+dt, andersson, agross Cc: caleb.connolly, mka, evgreen, quic_cpratapa, quic_avuyyuru, quic_jponduru, quic_subashab, elder, devicetree, linux-arm-msm, linux-kernel On 31.12.2022 01:27, Alex Elder wrote: > Depending on the platform, either the modem or the AP must load GSI > firmware for IPA before it can be used. To date, this has been > indicated by the presence or absence of a "modem-init" property. > > That mechanism has been deprecated. Instead, we indicate how GSI > firmware should be loaded by the value of the "qcom,gsi-loader" > property. > > Update all ARM platforms that use IPA to use the "qcom,gsi-loader" > property to specify how the GSI firmware is loaded. > > Update the affected nodes so the status property is last. > > Signed-off-by: Alex Elder <elder@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm/boot/dts/qcom-sdx55-t55.dts | 4 ++-- > arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom-sdx55-t55.dts > index 7ed8feb99afbe..61ac5f54cd57d 100644 > --- a/arch/arm/boot/dts/qcom-sdx55-t55.dts > +++ b/arch/arm/boot/dts/qcom-sdx55-t55.dts > @@ -237,9 +237,9 @@ &blsp1_uart3 { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > + status = "okay"; > }; > > &qpic_bam { > diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts > index ac8b4626ae9ac..c9c1f7da1261b 100644 > --- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts > +++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts > @@ -237,9 +237,9 @@ &blsp1_uart3 { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > + status = "okay"; > }; > > &pcie0_phy { ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm64: dts: qcom: use qcom,gsi-loader for IPA 2022-12-31 0:27 [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Alex Elder 2022-12-31 0:27 ` [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Alex Elder @ 2022-12-31 0:27 ` Alex Elder 2022-12-31 11:53 ` Konrad Dybcio 2023-01-18 23:55 ` (subset) [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Bjorn Andersson 2 siblings, 1 reply; 6+ messages in thread From: Alex Elder @ 2022-12-31 0:27 UTC (permalink / raw) To: robh+dt, krzysztof.kozlowski+dt, andersson, konrad.dybcio, agross Cc: caleb.connolly, mka, evgreen, quic_cpratapa, quic_avuyyuru, quic_jponduru, quic_subashab, elder, devicetree, linux-arm-msm, linux-kernel Depending on the platform, either the modem or the AP must load GSI firmware for IPA before it can be used. To date, this has been indicated by the presence or absence of a "modem-init" property. That mechanism has been deprecated. Instead, we indicate how GSI firmware should be loaded by the value of the "qcom,gsi-loader" property. Update all arm64 platforms that use IPA to use the "qcom,gsi-loader" property to specify how the GSI firmware is loaded. Update the affected nodes so the status property is last. Signed-off-by: Alex Elder <elder@linaro.org> --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 ++--- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 3 ++- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 ++- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 3 ++- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 ++- arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 ++- 15 files changed, 25 insertions(+), 20 deletions(-) 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 fd4b712037542..bffcbd141bd7c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi @@ -19,12 +19,11 @@ &remoteproc_mpss { }; &ipa { - status = "okay"; - /* * Trogdor doesn't have QHEE (Qualcomm's EL2 blob), so the * modem needs to cover certain init steps (GSI init), and * the AP needs to wait for it. */ - modem-init; + qcom,gsi-loader = "modem"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index f7efb9966afd1..5ad97cd5f1b75 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -377,8 +377,8 @@ &gpi_dma1 { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_cpu { diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi index df49564ae6dc1..6d80c64097e97 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi @@ -337,8 +337,8 @@ vreg_bob: bob { /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_va_macro { diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index ca676e04687b0..c194a88f91fd1 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -756,8 +756,8 @@ &gpu { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpasscc { diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi index 1eb423e4be24c..b62beffc27bf7 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -474,8 +474,8 @@ zap-shader { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index de2d10e0315af..f5a186fd7c72b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -518,8 +518,9 @@ &i2c10 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 42cf4dd5ea284..d8a601d36c6df 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -424,10 +424,10 @@ rmi4_f12: rmi4-f12@12 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn"; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index bb77ccfdc68c0..fcd401f460456 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -495,10 +495,10 @@ touchscreen@38 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/axolotl/ipa_fws.mbn"; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index eb6b2b676eca4..d6b11d56ebb37 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -299,9 +299,10 @@ &mss_pil { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn"; + status = "okay"; }; &pm8998_gpio { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 38ba809a95cd6..9ca4682aea1b2 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -449,6 +449,7 @@ &ibb { }; &ipa { + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/polaris/ipa_fws.mbn"; status = "okay"; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index f32b7445f7c96..15da94808b21d 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -465,8 +465,9 @@ ecsh: hid@5c { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index daca1e0ad62ad..15f6059b75757 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -383,9 +383,10 @@ digitizer@9 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm850/samsung/w737/ipa_fws.elf"; + status = "okay"; }; /* No idea why it causes an SError when enabled */ diff --git a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts index 9c4cfd995ff29..00f16cde6c4ac 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts @@ -290,9 +290,9 @@ &i2c11 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; &mpss { diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts index 52cf3045602f9..f70e0de0509c5 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts @@ -376,7 +376,7 @@ &usb_2_qmpphy { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi index 1f2d660f8f86c..d00e8d922ceeb 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi @@ -524,9 +524,10 @@ &i2c17 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; firmware-name = "qcom/sm8350/Sony/sagami/ipa_fws.mbn"; + status = "okay"; }; &mpss { -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] arm64: dts: qcom: use qcom,gsi-loader for IPA 2022-12-31 0:27 ` [PATCH 2/2] arm64: " Alex Elder @ 2022-12-31 11:53 ` Konrad Dybcio 0 siblings, 0 replies; 6+ messages in thread From: Konrad Dybcio @ 2022-12-31 11:53 UTC (permalink / raw) To: Alex Elder, robh+dt, krzysztof.kozlowski+dt, andersson, agross Cc: caleb.connolly, mka, evgreen, quic_cpratapa, quic_avuyyuru, quic_jponduru, quic_subashab, elder, devicetree, linux-arm-msm, linux-kernel On 31.12.2022 01:27, Alex Elder wrote: > Depending on the platform, either the modem or the AP must load GSI > firmware for IPA before it can be used. To date, this has been > indicated by the presence or absence of a "modem-init" property. > > That mechanism has been deprecated. Instead, we indicate how GSI > firmware should be loaded by the value of the "qcom,gsi-loader" > property. > > Update all arm64 platforms that use IPA to use the "qcom,gsi-loader" > property to specify how the GSI firmware is loaded. > > Update the affected nodes so the status property is last. > > Signed-off-by: Alex Elder <elder@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 ++--- > arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 3 ++- > arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++-- > arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 ++-- > arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 ++- > arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + > arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 3 ++- > arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 ++- > arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts | 4 ++-- > arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 4 ++-- > arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 ++- > 15 files changed, 25 insertions(+), 20 deletions(-) > > 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 fd4b712037542..bffcbd141bd7c 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi > @@ -19,12 +19,11 @@ &remoteproc_mpss { > }; > > &ipa { > - status = "okay"; > - > /* > * Trogdor doesn't have QHEE (Qualcomm's EL2 blob), so the > * modem needs to cover certain init steps (GSI init), and > * the AP needs to wait for it. > */ > - modem-init; > + qcom,gsi-loader = "modem"; > + status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > index f7efb9966afd1..5ad97cd5f1b75 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > @@ -377,8 +377,8 @@ &gpi_dma1 { > }; > > &ipa { > + qcom,gsi-loader = "modem"; > status = "okay"; > - modem-init; > }; > > &lpass_cpu { > diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > index df49564ae6dc1..6d80c64097e97 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > @@ -337,8 +337,8 @@ vreg_bob: bob { > /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ > > &ipa { > + qcom,gsi-loader = "modem"; > status = "okay"; > - modem-init; > }; > > &lpass_va_macro { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > index ca676e04687b0..c194a88f91fd1 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi > @@ -756,8 +756,8 @@ &gpu { > }; > > &ipa { > + qcom,gsi-loader = "modem"; > status = "okay"; > - modem-init; > }; > > &lpasscc { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > index 1eb423e4be24c..b62beffc27bf7 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > @@ -474,8 +474,8 @@ zap-shader { > }; > > &ipa { > + qcom,gsi-loader = "modem"; > status = "okay"; > - modem-init; > }; > > &mss_pil { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts > index de2d10e0315af..f5a186fd7c72b 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts > @@ -518,8 +518,9 @@ &i2c10 { > }; > > &ipa { > - status = "okay"; > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > + status = "okay"; > }; > > &mdss { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > index 42cf4dd5ea284..d8a601d36c6df 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi > @@ -424,10 +424,10 @@ rmi4_f12: rmi4-f12@12 { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn"; > + status = "okay"; > }; > > &mdss { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > index bb77ccfdc68c0..fcd401f460456 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > @@ -495,10 +495,10 @@ touchscreen@38 { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > firmware-name = "qcom/sdm845/axolotl/ipa_fws.mbn"; > + status = "okay"; > }; > > &mdss { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > index eb6b2b676eca4..d6b11d56ebb37 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > @@ -299,9 +299,10 @@ &mss_pil { > }; > > &ipa { > - status = "okay"; > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn"; > + status = "okay"; > }; > > &pm8998_gpio { > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > index 38ba809a95cd6..9ca4682aea1b2 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > @@ -449,6 +449,7 @@ &ibb { > }; > > &ipa { > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > firmware-name = "qcom/sdm845/polaris/ipa_fws.mbn"; > status = "okay"; > diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > index f32b7445f7c96..15da94808b21d 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > @@ -465,8 +465,9 @@ ecsh: hid@5c { > }; > > &ipa { > - status = "okay"; > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > + status = "okay"; > }; > > &mdss { > diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > index daca1e0ad62ad..15f6059b75757 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > @@ -383,9 +383,10 @@ digitizer@9 { > }; > > &ipa { > - status = "okay"; > + qcom,gsi-loader = "self"; > memory-region = <&ipa_fw_mem>; > firmware-name = "qcom/sdm850/samsung/w737/ipa_fws.elf"; > + status = "okay"; > }; > > /* No idea why it causes an SError when enabled */ > diff --git a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts > index 9c4cfd995ff29..00f16cde6c4ac 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts > +++ b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts > @@ -290,9 +290,9 @@ &i2c11 { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&pil_ipa_fw_mem>; > + status = "okay"; > }; > > &mpss { > diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > index 52cf3045602f9..f70e0de0509c5 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts > @@ -376,7 +376,7 @@ &usb_2_qmpphy { > }; > > &ipa { > - status = "okay"; > - > + qcom,gsi-loader = "self"; > memory-region = <&pil_ipa_fw_mem>; > + status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > index 1f2d660f8f86c..d00e8d922ceeb 100644 > --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi > @@ -524,9 +524,10 @@ &i2c17 { > }; > > &ipa { > - status = "okay"; > + qcom,gsi-loader = "self"; > memory-region = <&pil_ipa_fw_mem>; > firmware-name = "qcom/sm8350/Sony/sagami/ipa_fws.mbn"; > + status = "okay"; > }; > > &mpss { ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" 2022-12-31 0:27 [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Alex Elder 2022-12-31 0:27 ` [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Alex Elder 2022-12-31 0:27 ` [PATCH 2/2] arm64: " Alex Elder @ 2023-01-18 23:55 ` Bjorn Andersson 2 siblings, 0 replies; 6+ messages in thread From: Bjorn Andersson @ 2023-01-18 23:55 UTC (permalink / raw) To: agross, elder, robh+dt, krzysztof.kozlowski+dt, konrad.dybcio Cc: quic_jponduru, caleb.connolly, quic_subashab, mka, evgreen, devicetree, quic_avuyyuru, quic_cpratapa, linux-arm-msm, linux-kernel, elder On Fri, 30 Dec 2022 18:27:14 -0600, Alex Elder wrote: > IPA hardware has a GSI component that needs firmware loaded. > Recently, the way to specify how this firmware is loaded has > been changed. As a result, indicating this via the presence or > absence of a "modem-init" property is now deprecated. Instead, > a new "qcom,gsi-loader" property is used; this permits a third > method of loading GSI firmware to be supported. > https://lore.kernel.org/netdev/20221116073257.34010-1-elder@linaro.org/ > > [...] Applied, thanks! [1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA commit: cbf91f46a72a0a1f8d2517c166101c4c85a0b940 Best regards, -- Bjorn Andersson <andersson@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-18 23:56 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-12-31 0:27 [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Alex Elder 2022-12-31 0:27 ` [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Alex Elder 2022-12-31 11:52 ` Konrad Dybcio 2022-12-31 0:27 ` [PATCH 2/2] arm64: " Alex Elder 2022-12-31 11:53 ` Konrad Dybcio 2023-01-18 23:55 ` (subset) [PATCH 0/2] dts: qcom: use "qcom,gsi-loader" Bjorn Andersson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).