dts: qcom: use "qcom,gsi-loader"
Subsystems (4)
cover dts: qcom: use "qcom,gsi-loader"
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/[email protected]/
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(-)
Signature · 1 line
2.34.1
PATCH 1/2 ARM: dts: qcom: use qcom,gsi-loader for IPA
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.
--- 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(-)
arch/arm/boot/dts/qcom-sdx55-t55.dts +2 -2
@@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &qpic_bam {
arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts +2 -2
@@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &pcie0_phy {
Signature · 1 line
2.34.1
Re: [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA
Quoted 8 lines · Alex Elder
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.
Quoted 7 lines
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 <[email protected]>---
Konrad
Quoted 36 lines
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(-)arch/arm/boot/dts/qcom-sdx55-t55.dts +2
-2@@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &qpic_bam {arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts +2
-2@@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &pcie0_phy {
PATCH 2/2 arm64: dts: qcom: use qcom,gsi-loader for IPA
In reply to Alex ElderDepending 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.
--- 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(-)
arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +2 -3
@@ -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"; };
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +1 -1
@@ -377,8 +377,8 @@ &gpi_dma1 { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_cpu {
arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi +1 -1
@@ -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 {
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +1 -1
@@ -756,8 +756,8 @@ &gpu { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpasscc {
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +1 -1
@@ -474,8 +474,8 @@ zap-shader { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &mss_pil {
arch/arm64/boot/dts/qcom/sdm845-mtp.dts +2 -1
@@ -518,8 +518,9 @@ &i2c10 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss {
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +2 -2
@@ -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 {
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +2 -2
@@ -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 {
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +2 -1
@@ -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 {
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +1 -0
@@ -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";
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +2 -1
@@ -465,8 +465,9 @@ ecsh: hid@5c { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss {
arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +2 -1
@@ -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 */
arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts +2 -2
@@ -290,9 +290,9 @@ &i2c11 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; &mpss {
arch/arm64/boot/dts/qcom/sm8350-mtp.dts +2 -2
@@ -376,7 +376,7 @@ &usb_2_qmpphy { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; };
arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +2 -1
@@ -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 {
Signature · 1 line
2.34.1
Re: [PATCH 2/2] arm64: dts: qcom: use qcom,gsi-loader for IPA
Quoted 8 lines · Alex Elder
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.
Quoted 7 lines
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 <[email protected]>---
Konrad
Quoted 246 lines
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(-)arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +2
-3@@ -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"; };arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +1
-1@@ -377,8 +377,8 @@ &gpi_dma1 { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_cpu {arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi +1
-1@@ -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 {arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +1
-1@@ -756,8 +756,8 @@ &gpu { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpasscc {arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +1
-1@@ -474,8 +474,8 @@ zap-shader { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &mss_pil {arch/arm64/boot/dts/qcom/sdm845-mtp.dts +2
-1@@ -518,8 +518,9 @@ &i2c10 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss {arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +2
-2@@ -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 {arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +2
-2@@ -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 {arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +2
-1@@ -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 {arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +1
-0@@ -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";arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +2
-1@@ -465,8 +465,9 @@ ecsh: hid@5c { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss {arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +2
-1@@ -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 */arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts +2
-2@@ -290,9 +290,9 @@ &i2c11 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; &mpss {arch/arm64/boot/dts/qcom/sm8350-mtp.dts +2
-2@@ -376,7 +376,7 @@ &usb_2_qmpphy { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; };arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +2
-1@@ -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 {
Re: (subset) [PATCH 0/2] dts: qcom: use "qcom,gsi-loader"
In reply to Alex ElderQuoted 9 lines · Alex Elder
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/[email protected]/[...]
Applied, thanks!
[1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA
commit: cbf91f46a72a0a1f8d2517c166101c4c85a0b940
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>