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 fd4b712037542af9665e0b2cdf12b06b5ced5203..bffcbd141bd7cc841ecdacb2aaf8a2996201d2bc 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 @@ &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-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
index efd5131645017cdeaaf1f2d7498d351ecbb95b42..34e94ffabb2d54a447cb3e8cea2dbe87b489f805 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 @@ mba_mem: memory@9c700000 {
 };
 
 &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 4ed6f9fb1a3c67212fef575a3183111740e186de..a780751553107d381b149bc9faeca106b51e5ed3 100644 (file)
--- 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 8946becc73a9d6771647046ee359266bd58fbad8..36f291d4d691b8d130e8558ae6b348954cb60c8a 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 @@ 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 7c5478b71f8b158c5c61596303ba738afa9ac20c..482f43fe015103a47a37d67443904b429a0b7775 100644 (file)
--- 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 c52235befafb2736a649d59ce8b5d9075cce27b2..548e34632de2b162f9c8565daa7096732da42374 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 @@ 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 2c866dc8b9cf2396bc431f6d6306e08fcebf9b25..5d0509f61fe86bb8514b3b614d92154ac1cd68f2 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 @@ 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 64de4ed9b0c803d51a47cbdcc2078bc68207034d..31ec5ff0a63d9ae3b1d22dc92c34199d7e1b2fea 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 @@ &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_gpios {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index a80c3dd9a2dae2721f358940fce7e953c40bdbbd..8b42efbf19962599c8c97cc3eb9c069d117be181 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 @@ &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 d9581f4440b383befe3b897c7212452b4287571c..7038a0f7c06e0dd2c28c6a5a1db633915e1af003 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 @@ 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 6730804f4e3e61c7f2c4233f965f0de8708f559d..6e361fe184f5240000fe338f577cd5ab9102a2a8 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 @@ 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 9c4cfd995ff298683aac72345bbde81fbf04008a..00f16cde6c4ac7780e14420db4cb8d3fdb9a2f72 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 @@ &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 52cf3045602f9a3cb844c823810112022344bd78..f70e0de0509c542ca53d8d087a8a5a6cdae50dc0 100644 (file)
--- 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 5c3079959cfa1e493a22df1f89f8eb07916e97bf..89382ad73133e353b7ecb8411c580b8fceffa76e 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 @@ &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 {