arm64: dts: qcom: sdm845: Disable Adreno, modem and Venus by default

Components that rely on proprietary (not to mention signed!) firmware should
not be enabled by default, as lack of the aforementioned firmware could cause
various issues, from random errors to straight-up failing to boot.

Re-enable these remote processors on boards that didn't previously explicitly
disable them.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Tested-By: Steev Klimaszewski <steev@kali.org>
[bjorn: Added missing changes to db845c and lenovo-yoga-c630 to the patch]
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211002001358.45920-3-konrad.dybcio@somainline.org

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index dfd1b42c07fd589a473b72f526b3cc069894c469..1f8a26f36f2e978e7a10745c70e6dfe82f5b5d0f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -616,6 +616,14 @@ ap_ts_i2c: &i2c14 {
        };
 };
 
+&gmu {
+       status = "okay";
+};
+
+&gpu {
+       status = "okay";
+};
+
 &ipa {
        status = "okay";
        modem-init;
@@ -643,6 +651,8 @@ ap_ts_i2c: &i2c14 {
 };
 
 &mss_pil {
+       status = "okay";
+
        iommus = <&apps_smmu 0x781 0x0>,
                 <&apps_smmu 0x724 0x3>;
 };
@@ -1317,6 +1327,8 @@ ap_ts_i2c: &i2c14 {
 };
 
 &venus {
+       status = "okay";
+
        video-firmware {
                iommus = <&apps_smmu 0x10b2 0x0>;
        };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 2d5533dd4ec2d6ba938c3c7e1b13a2c8c7257703..e2f40043aef6fc44df06ce4b1aa344858d21b944 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -420,7 +420,12 @@
                           <GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/a630_zap.mbn";
@@ -999,6 +1004,10 @@
        vdda-pll-supply = <&vreg_l26a_1p2>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcd9340{
        pinctrl-0 = <&wcd_intr_default>;
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 52dd7a858231e41b81f791e904c95e6fbe535276..bccc90a469abaea3bfd33f525f7d0f4e84df443e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -439,7 +439,13 @@
                           <GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
+
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/a630_zap.mbn";
@@ -566,6 +572,10 @@
        vdda-pll-supply = <&vdda_usb2_ss_core>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wifi {
        status = "okay";
        vdd-0.8-cx-mx-supply = <&vreg_l5a_0p8>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 8bf2430a3af7785756ce544cbe06ba638234cdaa..dc95409120d293a4204b57667a4e4878b23b6adb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -368,7 +368,13 @@
                                <GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
+
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
@@ -647,6 +653,10 @@
        };
 };
 
+&venus {
+       status = "okay";
+};
+
 &wifi {
        status = "okay";
        vdd-0.8-cx-mx-supply = <&vreg_l5a_0p8>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
index 054fd97f4b280632d85a05db692b6e852070e395..6a29d0a1a08d68239b60542b531e6dcd2e79f17a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
@@ -257,7 +257,13 @@
                           <GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
+
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/a630_zap.mbn";
@@ -514,6 +520,10 @@
        vdda-pll-supply = <&vreg_l1a_0p875>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcd9340{
        pinctrl-0 = <&wcd_intr_default>;
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index d0da908d6220f6a4c70c3d387610f19cb2b76419..9c3d9de73e687b1ae67aa55cbd779d50084ec16d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2995,6 +2995,8 @@
                                        <&rpmhpd SDM845_MSS>;
                        power-domain-names = "cx", "mx", "mss";
 
+                       status = "disabled";
+
                        mba {
                                memory-region = <&mba_region>;
                        };
@@ -3889,6 +3891,8 @@
                                        <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_VENUS_CFG 0>;
                        interconnect-names = "video-mem", "cpu-cfg";
 
+                       status = "disabled";
+
                        video-core0 {
                                compatible = "venus-decoder";
                        };
@@ -4423,6 +4427,8 @@
                        interconnects = <&mem_noc MASTER_GFX3D 0 &mem_noc SLAVE_EBI1 0>;
                        interconnect-names = "gfx-mem";
 
+                       status = "disabled";
+
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";
 
@@ -4518,6 +4524,8 @@
 
                        operating-points-v2 = <&gmu_opp_table>;
 
+                       status = "disabled";
+
                        gmu_opp_table: opp-table {
                                compatible = "operating-points-v2";
 

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 5607c5e7322e3f834f22bac99f312456f1b201f1..2971cde7669a6fef2875027bc2b34f6a3ea373e6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -311,7 +311,12 @@
                           <GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+       status = "okay";
+};
+
 &gpu {
+       status = "okay";
        zap-shader {
                memory-region = <&gpu_mem>;
                firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
@@ -433,6 +438,7 @@
 };
 
 &mss_pil {
+       status = "okay";
        firmware-name = "qcom/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/LENOVO/81JL/qcdsp2850.mbn";
 };
 
@@ -694,6 +700,10 @@
        vdda-pll-supply = <&vdda_usb2_ss_core>;
 };
 
+&venus {
+       status = "okay";
+};
+
 &wcd9340{
        pinctrl-0 = <&wcd_intr_default>;
        pinctrl-names = "default";