Skip to contentSkip to conversation

arm64: dts: marvell: keep SMMU disabled by default for Armada 7040 and 8040

PATCH In review Tomasz Nowicki 2 participants 2 messages Nov 5, 2020 – Nov 30, 2020

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

PATCH 1/1 arm64: dts: marvell: keep SMMU disabled by default for Armada 7040 and 8040

FW has to configure devices' StreamIDs so that SMMU is able to lookup context and do proper translation later on. For Armada 7040 & 8040 and publicly available FW, most of the devices are configured properly, but some like ap_sdhci0, PCIe, NIC still remain unassigned which results in SMMU faults about unmatched StreamID (assuming ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=y).

Since there is dependency on custom FW let SMMU be disabled by default. People who still willing to use SMMU need to enable manually and use ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=n (or via kernel command line) with extra caution.

Fixes 83a3545d9c37 ("arm64: dts: marvell: add SMMU support")
Cc <[email protected]> # 5.9+
---
 arch/arm64/boot/dts/marvell/armada-7040.dtsi | 4 ----
 arch/arm64/boot/dts/marvell/armada-8040.dtsi | 4 ----
 2 files changed, 8 deletions(-)
arch/arm64/boot/dts/marvell/armada-7040.dtsi +0 -4
index 7a3198cd7a07..2f440711d21d 100644
@@ -15,10 +15,6 @@ / {
 		     "marvell,armada-ap806";
 };
 
-&smmu {
-	status = "okay";
-};
-
 &cp0_pcie0 {
 	iommu-map =
 		<0x0   &smmu 0x480 0x20>,
arch/arm64/boot/dts/marvell/armada-8040.dtsi +0 -4
index 79e8ce59baa8..22c2d6ebf381 100644
@@ -15,10 +15,6 @@ / {
 		     "marvell,armada-ap806";
 };
 
-&smmu {
-	status = "okay";
-};
-
 &cp0_pcie0 {
 	iommu-map =
 		<0x0   &smmu 0x480 0x20>,
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Hi,

Quoted 7 lines

FW has to configure devices' StreamIDs so that SMMU is able to lookup context and do proper translation later on. For Armada 7040 & 8040 and publicly available FW, most of the devices are configured properly, but some like ap_sdhci0, PCIe, NIC still remain unassigned which results in SMMU faults about unmatched StreamID (assuming ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=y).

Quoted 8 lines

Since there is dependency on custom FW let SMMU be disabled by default. People who still willing to use SMMU need to enable manually and use ARM_SMMU_DISABLE_BYPASS_BY_DEFAUL=n (or via kernel command line) with extra caution.

Fixes 83a3545d9c37 ("arm64: dts: marvell: add SMMU support")
Cc <[email protected]> # 5.9+

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 38 lines
---
 arch/arm64/boot/dts/marvell/armada-7040.dtsi | 4 ----
 arch/arm64/boot/dts/marvell/armada-8040.dtsi | 4 ----
 2 files changed, 8 deletions(-)
arch/arm64/boot/dts/marvell/armada-7040.dtsi +0 -4
index 7a3198cd7a07..2f440711d21d 100644
@@ -15,10 +15,6 @@ / {
 		     "marvell,armada-ap806";
 };
 
-&smmu {
-	status = "okay";
-};
-
 &cp0_pcie0 {
 	iommu-map =
 		<0x0   &smmu 0x480 0x20>,
arch/arm64/boot/dts/marvell/armada-8040.dtsi +0 -4
index 79e8ce59baa8..22c2d6ebf381 100644
@@ -15,10 +15,6 @@ / {
 		     "marvell,armada-ap806";
 };
 
-&smmu {
-	status = "okay";
-};
-
 &cp0_pcie0 {
 	iommu-map =
 		<0x0   &smmu 0x480 0x20>,
Signature · 1 line
2.25.1
Signature · 7 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu