Re: [PATCH 7/7] arm64: dts: apple: t6032-j575d: Add PCIe device nodes

[sashiko-bot@kernel.org]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] arm64: dts: apple: t6032-j575d: wrong BCM4387 compatibles on wifi0/bluetooth0
--

commit a9db7fb0da8155ad8eed2129e9cc8ce52e4427e3
Author: Janne Grunau <j@jannau.net>

arm64: dts: apple: t6032-j575d: Add PCIe device nodes

This commit adds PCIe device nodes for Wi-Fi, Bluetooth, the SD card reader,
Ethernet, and USB xHCI on the M3 Ultra Mac Studio.

> diff --git a/arch/arm64/boot/dts/apple/t6032-j575d.dts b/arch/arm64/boot/dts/apple/t6032-j575d.dts
> index 12991546d4bb2..f99fd47dfc8d5 100644
> --- a/arch/arm64/boot/dts/apple/t6032-j575d.dts
> +++ b/arch/arm64/boot/dts/apple/t6032-j575d.dts

[ ... ]

> @@ -46,3 +49,72 @@ memory@10000000000 {
>  &serial0 {
>  	status = "okay";
>  };
> +
> +/* PCIe devices */
> +
> +/*
> + * Force the bus number assignments so that we can declare some of the
> + * on-board devices and properties that are populated by the bootloader
> + * (such as MAC addresses).
> + */
> +&port00 {
> +	/* WLAN */
> +	bus-range = <1 1>;
> +
> +	wifi0: wifi@0,0 {
> +		compatible = "pci14e4,4433";
> +		reg = <0x10000 0x0 0x0 0x0 0x0>;
> +		/* To be filled by the loader */
> +		local-mac-address = [00 10 18 00 00 10];
> +		apple,antenna-sku = "XX";
> +		brcm,board-type = "apple,aruba";
> +	};
> +
> +	bluetooth0: bluetooth@0,1 {
> +		compatible = "pci14e4,5f71";
> +		reg = <0x10100 0x0 0x0 0x0 0x0>;
> +		/* To be filled by the loader */
> +		local-bd-address = [00 00 00 00 00 00];
> +		brcm,board-type = "apple,aruba";
> +	};
> +};

[Severity: Medium]
Should wifi0 and bluetooth0 under port00 in
arch/arm64/boot/dts/apple/t6032-j575d.dts (and in
arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi from the preceding patch in
this series) use the BCM4388 compatible strings ("pci14e4,4434" and
"pci14e4,5f72") instead of the BCM4387 compatible strings ("pci14e4,4433" and
"pci14e4,5f71")?

In Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml
(commit 4fb80f2f90d6) and
Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml
(commit ef4d6ea11df0), pci14e4,4433 and pci14e4,5f71 identify BCM4387, whereas
pci14e4,4434 and pci14e4,5f72 identify BCM4388 used on M2 Pro/Max/Ultra and
later systems.

On the M2 Ultra Mac Studio (arch/arm64/boot/dts/apple/t6022-j475d.dts), the
inherited BCM4387 compatibles from t600x-j375.dtsi were overridden with
BCM4388:

    &wifi0 {
    	compatible = "pci14e4,4434";
    	brcm,board-type = "apple,canary";
    };

    &bluetooth0 {
    	compatible = "pci14e4,5f72";
    	brcm,board-type = "apple,canary";
    };

And the base M3 device tree in arch/arm64/boot/dts/apple/t8122-jxxx.dtsi also
uses the BCM4388 compatibles under port00:

    	wifi0: wifi@0,0 {
    		compatible = "pci14e4,4434";
    		...
    	};

    	bluetooth0: bluetooth@0,1 {
    		compatible = "pci14e4,5f72";
    		...
    	};

Did copying the port00 child nodes from the M1 template (t600x-j375.dtsi and
t600x-j314-j316.dtsi) leave the older BCM4387 compatibles in place by mistake?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261105-apple-m3-pcie-v1-0-e00a72a604f8@jannau.net?part=7