Skip to contentSkip to conversation

arm64: dts: qcom: sc7180: Move the fixed-perm property to SoC dtsi

PATCH Applied Sibi Sankar 3 participants 3 messages Jul 16, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sc7180: Move the fixed-perm property to SoC dtsi

All the platforms using SC7180 SoC are expected to have the wlan firmware memory statically mapped by the Trusted Firmware. Hence move back the qcom,msa-fixed-perm property to the SoC dtsi.

Fixes 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node")
---
 arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 -
 arch/arm64/boot/dts/qcom/sc7180.dtsi    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-idp.dts +0 -1
index 860fc4658b8b1..26cc4913d3ddc 100644
@@ -392,7 +392,6 @@ video-firmware {
 
 &wifi {
 	status = "okay";
-	qcom,msa-fixed-perm;
 	vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>;
 	vdd-1.8-xo-supply = <&vreg_l1c_1p8>;
 	vdd-1.3-rfa-supply = <&vreg_l2c_1p3>;
arch/arm64/boot/dts/qcom/sc7180.dtsi +1 -0
index 126e2fce26c1a..a91d3f074625e 100644
@@ -3233,6 +3233,7 @@ wifi: wifi@18800000 {
 				<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
 				<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
 			memory-region = <&wlan_mem>;
+			qcom,msa-fixed-perm;
 			status = "disabled";
 		};
 	};
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 29 lines · Sibi Sankar

All the platforms using SC7180 SoC are expected to have the wlan firmware memory statically mapped by the Trusted Firmware. Hence move back the qcom,msa-fixed-perm property to the SoC dtsi.

Fixes 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node")
---
 arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 -
 arch/arm64/boot/dts/qcom/sc7180.dtsi    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-idp.dts +0 -1
index 860fc4658b8b1..26cc4913d3ddc 100644
@@ -392,7 +392,6 @@ video-firmware {
 
 &wifi {
        status = "okay";
-       qcom,msa-fixed-perm;
        vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>;
        vdd-1.8-xo-supply = <&vreg_l1c_1p8>;
        vdd-1.3-rfa-supply = <&vreg_l2c_1p3>;
arch/arm64/boot/dts/qcom/sc7180.dtsi +0 -0
index 126e2fce26c1a..a91d3f074625e 100644

arch/arm64/boot/dts/qcom/sc7180.dtsi wifi: wifi@18800000 { · line 3236

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +1 -0
@@ -3233,6 +3233,7 @@ wifi: wifi@18800000 {
                                <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
                                <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
                        memory-region = <&wlan_mem>;
+                       qcom,msa-fixed-perm;

Seems good to me. If someone ever comes up with a firmware where it's sane to not have this property, we can either delete the property from those boards or migrate the property to the the existing board dts files.

#2 lore raw
In reply to Sibi Sankar
Quoted 6 lines · Sibi Sankar

All the platforms using SC7180 SoC are expected to have the wlan firmware memory statically mapped by the Trusted Firmware. Hence move back the qcom,msa-fixed-perm property to the SoC dtsi.

Fixes 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node")

Thank you, applied.

Quoted 33 lines
---
 arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 -
 arch/arm64/boot/dts/qcom/sc7180.dtsi    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-idp.dts +0 -1
index 860fc4658b8b1..26cc4913d3ddc 100644
@@ -392,7 +392,6 @@ video-firmware {
 
 &wifi {
 	status = "okay";
-	qcom,msa-fixed-perm;
 	vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>;
 	vdd-1.8-xo-supply = <&vreg_l1c_1p8>;
 	vdd-1.3-rfa-supply = <&vreg_l2c_1p3>;
arch/arm64/boot/dts/qcom/sc7180.dtsi +1 -0
index 126e2fce26c1a..a91d3f074625e 100644
@@ -3233,6 +3233,7 @@ wifi: wifi@18800000 {
 				<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
 				<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
 			memory-region = <&wlan_mem>;
+			qcom,msa-fixed-perm;
 			status = "disabled";
 		};
 	};
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project