The t8103 and t600x device trees deleted unused PCIe ports. This was
probably done to replicate Apple's device tree which doesn't has nodes
for most unused hardware.
A more accurate description of the hardware is to disable unused
hardware.
This was discovered during the review of the t8112 device trees in
https://lore.kernel.org/asahi/[email protected]/
Signed-off-by: Janne Grunau <[email protected]>
---
Janne Grunau (2):
arm64: dts: apple: t8103: Disable unused PCIe ports
arm64: dts: apple: t600x: Disable unused PCIe ports
arch/arm64/boot/dts/apple/t600x-die0.dtsi | 4 ++++
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 11 -----------
arch/arm64/boot/dts/apple/t600x-j375.dtsi | 11 +++++++++++
arch/arm64/boot/dts/apple/t8103-j274.dts | 10 ++++++++++
arch/arm64/boot/dts/apple/t8103-j293.dts | 15 ---------------
arch/arm64/boot/dts/apple/t8103-j313.dts | 15 ---------------
arch/arm64/boot/dts/apple/t8103-j456.dts | 10 ++++++++++
arch/arm64/boot/dts/apple/t8103-j457.dts | 11 +++--------
arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++
9 files changed, 42 insertions(+), 49 deletions(-)
---
base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
change-id: 20230214-apple_dts_pcie_disable_unused-03c08218b8af
Best regards,
--
Janne Grunau <[email protected]>
The PCIe ports are unused (without devices) so disable them instead of
removing them.
Signed-off-by: Janne Grunau <[email protected]>
---
arch/arm64/boot/dts/apple/t600x-die0.dtsi | 4 ++++
arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 11 -----------
arch/arm64/boot/dts/apple/t600x-j375.dtsi | 11 +++++++++++
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index 1c41954e3899..273d7060d031 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -233,6 +233,7 @@ pcie0_dart_2: iommu@583008000 {
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1277 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_apcie_gp_sys>;
+ status = "disabled";
};
pcie0_dart_3: iommu@584008000 {
@@ -242,6 +243,7 @@ pcie0_dart_3: iommu@584008000 {
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1280 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_apcie_gp_sys>;
+ status = "disabled";
};
pcie0: pcie@590000000 {
@@ -338,6 +340,7 @@ port02: pci@2,0 {
<0 0 0 2 &port02 0 0 0 1>,
<0 0 0 3 &port02 0 0 0 2>,
<0 0 0 4 &port02 0 0 0 3>;
+ status = "disabled";
};
port03: pci@3,0 {
@@ -357,5 +360,6 @@ port03: pci@3,0 {
<0 0 0 2 &port03 0 0 0 1>,
<0 0 0 3 &port03 0 0 0 2>,
<0 0 0 4 &port03 0 0 0 3>;
+ status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
index 34906d522f0a..356a73d1ce4c 100644
--- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
@@ -101,14 +101,3 @@ sdhci0: mmc@0,0 {
wp-inverted;
};
};
-
-&pcie0_dart_2 {
- status = "disabled";
-};
-
-&pcie0_dart_3 {
- status = "disabled";
-};
-
-/delete-node/ &port02;
-/delete-node/ &port03;
diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
index 00d3a9447c89..1e5a19e49b08 100644
--- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi
@@ -104,6 +104,7 @@ sdhci0: mmc@0,0 {
&port02 {
/* 10 Gbit Ethernet */
bus-range = <3 3>;
+ status = "okay";
ethernet0: ethernet@0,0 {
reg = <0x30000 0x0 0x0 0x0 0x0>;
/* To be filled by the loader */
@@ -114,4 +115,14 @@ ethernet0: ethernet@0,0 {
&port03 {
/* USB xHCI */
bus-range = <4 4>;
+ status = "okay";
+};
+
+
+&pcie0_dart_2 {
+ status = "okay";
+};
+
+&pcie0_dart_3 {
+ status = "okay";
};
--
2.39.1
On Tue, Feb 14, 2023, at 15:07, Janne Grunau wrote:
> The t8103 and t600x device trees deleted unused PCIe ports. This was
> probably done to replicate Apple's device tree which doesn't has nodes
> for most unused hardware.
> A more accurate description of the hardware is to disable unused
> hardware.
>
> This was discovered during the review of the t8112 device trees in
> https://lore.kernel.org/asahi/[email protected]/
>
> Signed-off-by: Janne Grunau <[email protected]>
> ---
> Janne Grunau (2):
> arm64: dts: apple: t8103: Disable unused PCIe ports
> arm64: dts: apple: t600x: Disable unused PCIe ports
For the entire series:
Reviewed-by: Sven Peter <[email protected]>
Thanks,
Sven
On 14/02/2023 23.07, Janne Grunau wrote:
> The t8103 and t600x device trees deleted unused PCIe ports. This was
> probably done to replicate Apple's device tree which doesn't has nodes
> for most unused hardware.
> A more accurate description of the hardware is to disable unused
> hardware.
>
> This was discovered during the review of the t8112 device trees in
> https://lore.kernel.org/asahi/[email protected]/
>
> Signed-off-by: Janne Grunau <[email protected]>
> ---
> Janne Grunau (2):
> arm64: dts: apple: t8103: Disable unused PCIe ports
> arm64: dts: apple: t600x: Disable unused PCIe ports
>
> arch/arm64/boot/dts/apple/t600x-die0.dtsi | 4 ++++
> arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 11 -----------
> arch/arm64/boot/dts/apple/t600x-j375.dtsi | 11 +++++++++++
> arch/arm64/boot/dts/apple/t8103-j274.dts | 10 ++++++++++
> arch/arm64/boot/dts/apple/t8103-j293.dts | 15 ---------------
> arch/arm64/boot/dts/apple/t8103-j313.dts | 15 ---------------
> arch/arm64/boot/dts/apple/t8103-j456.dts | 10 ++++++++++
> arch/arm64/boot/dts/apple/t8103-j457.dts | 11 +++--------
> arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++
> 9 files changed, 42 insertions(+), 49 deletions(-)
> ---
> base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
> change-id: 20230214-apple_dts_pcie_disable_unused-03c08218b8af
>
> Best regards,
Thanks, applied to asahi-soc/dt!
- Hector