[PATCH 0/2] Fix Apple silicon PCIe iommu device tree node names

[PATCH 0/2] Fix Apple silicon PCIe iommu device tree node names

[Janne Grunau]

Hej,

the iommu nodes for the PCIe ports were added with the non-standard
node name "dart" instead of the recommended generic "iommu" from the
devicetree specification. This series fixes this for t8103 and t600x.
Patches are based on the asahi-soc-dt-6.2-v2 tag in the asahi-soc
repository (https://github.com/AsahiLinux/linux.git).

cheers,

Janne

To: Hector Martin <marcan@marcan.st>
To: Sven Peter <sven@svenpeter.dev>
To: Alyssa Rosenzweig <alyssa@rosenzweig.io>
To: Rob Herring <robh+dt@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
To: Marc Zyngier <maz@kernel.org>
Cc: asahi@lists.linux.dev
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Janne Grunau <j@jannau.net>

---
Janne Grunau (2):
      arch: arm64: apple: t8103: Use standard "iommu" node name
      arch: arm64: apple: t600x: Use standard "iommu" node name

 arch/arm64/boot/dts/apple/t600x-die0.dtsi | 8 ++++----
 arch/arm64/boot/dts/apple/t8103.dtsi      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
base-commit: d32c1530c7230b756ca9a6b6cf92ce6e60788594
change-id: 20221206-arm64-dts-apple-pcie-iommu-7b0d4d5d4329

Best regards,
-- 
Janne Grunau <j@jannau.net>

[PATCH 1/2] arch: arm64: apple: t8103: Use standard "iommu" node name

[Janne Grunau]

The PCIe iommu nodes use "dart" as node names. Replace it with the
the standard "iommu" node name as all other iommu nodes.

Fixes: 3c866bb79577 ("arm64: dts: apple: t8103: Add PCIe DARTs")
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/boot/dts/apple/t8103.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 6f5a2334e5b1..daf46f7b8a6e 100644
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -670,7 +670,7 @@ nvme@27bcc0000 {
 			resets = <&ps_ans2>;
 		};
 
-		pcie0_dart_0: dart@681008000 {
+		pcie0_dart_0: iommu@681008000 {
 			compatible = "apple,t8103-dart";
 			reg = <0x6 0x81008000 0x0 0x4000>;
 			#iommu-cells = <1>;
@@ -679,7 +679,7 @@ pcie0_dart_0: dart@681008000 {
 			power-domains = <&ps_apcie_gp>;
 		};
 
-		pcie0_dart_1: dart@682008000 {
+		pcie0_dart_1: iommu@682008000 {
 			compatible = "apple,t8103-dart";
 			reg = <0x6 0x82008000 0x0 0x4000>;
 			#iommu-cells = <1>;
@@ -688,7 +688,7 @@ pcie0_dart_1: dart@682008000 {
 			power-domains = <&ps_apcie_gp>;
 		};
 
-		pcie0_dart_2: dart@683008000 {
+		pcie0_dart_2: iommu@683008000 {
 			compatible = "apple,t8103-dart";
 			reg = <0x6 0x83008000 0x0 0x4000>;
 			#iommu-cells = <1>;

-- 
2.38.1

[PATCH 2/2] arch: arm64: apple: t600x: Use standard "iommu" node name

[Janne Grunau]

The PCIe iommu nodes use "dart" as node names. Replace it with the
the standard "iommu" node name as all other iommu nodes.

Fixes: 7b0b0191a2c7 ("arm64: dts: apple: Add initial t6000/t6001/t6002 DTs")
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/boot/dts/apple/t600x-die0.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 0b8958a8db77..f006f990a8e2 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -208,7 +208,7 @@ mca: mca@39b600000 {
 		#sound-dai-cells = <1>;
 	};
 
-	pcie0_dart_0: dart@581008000 {
+	pcie0_dart_0: iommu@581008000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x5 0x81008000 0x0 0x4000>;
 		#iommu-cells = <1>;
@@ -217,7 +217,7 @@ pcie0_dart_0: dart@581008000 {
 		power-domains = <&ps_apcie_gp_sys>;
 	};
 
-	pcie0_dart_1: dart@582008000 {
+	pcie0_dart_1: iommu@582008000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x5 0x82008000 0x0 0x4000>;
 		#iommu-cells = <1>;
@@ -226,7 +226,7 @@ pcie0_dart_1: dart@582008000 {
 		power-domains = <&ps_apcie_gp_sys>;
 	};
 
-	pcie0_dart_2: dart@583008000 {
+	pcie0_dart_2: iommu@583008000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x5 0x83008000 0x0 0x4000>;
 		#iommu-cells = <1>;
@@ -235,7 +235,7 @@ pcie0_dart_2: dart@583008000 {
 		power-domains = <&ps_apcie_gp_sys>;
 	};
 
-	pcie0_dart_3: dart@584008000 {
+	pcie0_dart_3: iommu@584008000 {
 		compatible = "apple,t6000-dart";
 		reg = <0x5 0x84008000 0x0 0x4000>;
 		#iommu-cells = <1>;

-- 
2.38.1

Re: [PATCH 0/2] Fix Apple silicon PCIe iommu device tree node names

[Mark Kettenis]

> Content-Type: text/plain; charset="utf-8"
> From: Janne Grunau <j@jannau.net>
> Date: Tue, 06 Dec 2022 23:57:35 +0100
> Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
>  devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
>  Janne Grunau <j@jannau.net>
> 
> Hej,
> 
> the iommu nodes for the PCIe ports were added with the non-standard
> node name "dart" instead of the recommended generic "iommu" from the
> devicetree specification. This series fixes this for t8103 and t600x.
> Patches are based on the asahi-soc-dt-6.2-v2 tag in the asahi-soc
> repository (https://github.com/AsahiLinux/linux.git).
> 
> cheers,
> 
> Janne
> 
> To: Hector Martin <marcan@marcan.st>
> To: Sven Peter <sven@svenpeter.dev>
> To: Alyssa Rosenzweig <alyssa@rosenzweig.io>
> To: Rob Herring <robh+dt@kernel.org>
> To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
> To: Marc Zyngier <maz@kernel.org>
> Cc: asahi@lists.linux.dev
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Janne Grunau <j@jannau.net>
> 
> ---
> Janne Grunau (2):
>       arch: arm64: apple: t8103: Use standard "iommu" node name
>       arch: arm64: apple: t600x: Use standard "iommu" node name
> 
>  arch/arm64/boot/dts/apple/t600x-die0.dtsi | 8 ++++----
>  arch/arm64/boot/dts/apple/t8103.dtsi      | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> ---
> base-commit: d32c1530c7230b756ca9a6b6cf92ce6e60788594
> change-id: 20221206-arm64-dts-apple-pcie-iommu-7b0d4d5d4329

For the series:

Reviewed-by: Mark Kettenis <kettenis@openbsd.org>

Re: [PATCH 0/2] Fix Apple silicon PCIe iommu device tree node names

[Hector Martin]

On 07/12/2022 07.57, Janne Grunau wrote:
> Hej,
> 
> the iommu nodes for the PCIe ports were added with the non-standard
> node name "dart" instead of the recommended generic "iommu" from the
> devicetree specification. This series fixes this for t8103 and t600x.
> Patches are based on the asahi-soc-dt-6.2-v2 tag in the asahi-soc
> repository (https://github.com/AsahiLinux/linux.git).
> 
> cheers,
> 
> Janne
> 
> To: Hector Martin <marcan@marcan.st>
> To: Sven Peter <sven@svenpeter.dev>
> To: Alyssa Rosenzweig <alyssa@rosenzweig.io>
> To: Rob Herring <robh+dt@kernel.org>
> To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
> To: Marc Zyngier <maz@kernel.org>
> Cc: asahi@lists.linux.dev
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Janne Grunau <j@jannau.net>
> 
> ---
> Janne Grunau (2):
>       arch: arm64: apple: t8103: Use standard "iommu" node name
>       arch: arm64: apple: t600x: Use standard "iommu" node name
> 
>  arch/arm64/boot/dts/apple/t600x-die0.dtsi | 8 ++++----
>  arch/arm64/boot/dts/apple/t8103.dtsi      | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> ---
> base-commit: d32c1530c7230b756ca9a6b6cf92ce6e60788594
> change-id: 20221206-arm64-dts-apple-pcie-iommu-7b0d4d5d4329
> 
> Best regards,

Thanks, applied to asahi-soc/dt!

- Hector