arm64: 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 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>
[bjorn: Moved sc7280 change herobrine-lte-sku]
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221231002716.2367375-3-elder@linaro.org

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 fd4b712..bffcbd1 100644 (file)
--- 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 @@
 };
 
 &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-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
index efd5131..34e94ff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
@@ -21,7 +21,7 @@
 };
 
 &ipa {
-       modem-init;
+       qcom,gsi-loader = "modem";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 4ed6f9f..a780751 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -756,8 +756,8 @@ ap_ts_i2c: &i2c14 {
 };
 
 &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 8946bec..36f291d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -474,8 +474,8 @@
 };
 
 &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 7c5478b..482f43f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -518,8 +518,9 @@
 };
 
 &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 c52235b..548e346 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -424,10 +424,10 @@
 };
 
 &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 2c866dc..5d0509f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -495,10 +495,10 @@
 };
 
 &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 64de4ed..31ec5ff 100644 (file)
--- 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 @@
 };
 
 &ipa {
-       status = "okay";
+       qcom,gsi-loader = "self";
        memory-region = <&ipa_fw_mem>;
        firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn";
+       status = "okay";
 };
 
 &pm8998_gpios {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index a80c3dd..8b42efb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -449,6 +449,7 @@
 };
 
 &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 d9581f4..7038a0f 100644 (file)
--- 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 @@
 };
 
 &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 6730804..6e361fe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
@@ -383,9 +383,10 @@
 };
 
 &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 9c4cfd9..00f16cd 100644 (file)
--- 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 @@
 };
 
 &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 52cf304..f70e0de 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
@@ -376,7 +376,7 @@
 };
 
 &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 5c30799..89382ad 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -553,9 +553,10 @@
 };
 
 &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 {