Преглед на файлове

Platform/Overdrive: revert streamID DT changes for first SATA port

Commit 7a1cd6efbb483564dcf0ff3dda701bd09acf4b08 updated the stream ID
assignment for various masters on the Seattle SoC, primarily to address
a conflict between the second SATA port and the crypto accelerator on
platforms that implement them (B1 silicon). Unfortunately, B0 variants
turn out to exist where the stream ID assignment deviates from the
observed assignment on the B0 Overdrive that I tested these changes on,
leading to DMA access faults when using the first SATA port.

Since that port does not share its SMMU with any other masters, let's
revert the change to its stream ID assignment in the device tree, and
switch back to matching the entire range [0x0, 0x1f].

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
Ard Biesheuvel преди 4 години
родител
ревизия
b7e1c6c1a3
променени са 1 файла, в които са добавени 2 реда и са изтрити 7 реда
  1. 2 7
      Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts

+ 2 - 7
Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts

@@ -86,7 +86,7 @@
 				       */
 				      <0 332 4>,
 				      <0 332 4>;
-			#iommu-cells = <1>;
+			#iommu-cells = <2>;
 			dma-coherent;
 		};
 
@@ -109,12 +109,7 @@
 			interrupts = <0x0 0x163 0x4>;
 			clocks = <&sata_clk>;
 			dma-coherent;
-			iommus = <&sata0_smmu 0x0a>,
-				 <&sata0_smmu 0x0b>,
-				 <&sata0_smmu 0x0e>,
-				 <&sata0_smmu 0x0f>,
-				 <&sata0_smmu 0x1a>,
-				 <&sata0_smmu 0x1e>;
+			iommus = <&sata0_smmu 0x0 0x1f>;
 		};
 
 		sata@e0d00000 {