[PATCH v2 1/2] ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting

[PATCH v2 1/2] ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting

[Nicolas Saenz Julienne]

dtbs_check currently complains that:

arch/arm/boot/dts/bcm2711-rpi-4-b.dts:220.10-231.4: Warning
(pci_device_reg): /scb/pcie@7d500000/pci@1,0: PCI unit address format
error, expected "0,0"

Unsurprisingly pci@0,0 is the right address, as illustrated by its reg
property:

    &pcie0 {
	    pci@0,0 {
		    /*
		     * As defined in the IEEE Std 1275-1994 document,
		     * reg is a five-cell address encoded as (phys.hi
		     * phys.mid phys.lo size.hi size.lo). phys.hi
		     * should contain the device's BDF as 0b00000000
		     * bbbbbbbb dddddfff 00000000. The other cells
		     * should be zero.
		     */
		    reg = <0 0 0 0 0>;
	    };
    };

The device is clearly 0. So fix it.

Also add a missing 'device_type = "pci"'.

Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node")
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
---

Changes since v1:
 - s/bus/device/ when talking about unit addresses
 - Add device_type
 - Add Suggested-by 

 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index f24bdd0870a5..8377dc14b7b5 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -217,7 +217,8 @@ phy1: ethernet-phy@1 {
 };
 
 &pcie0 {
-	pci@1,0 {
+	pci@0,0 {
+		device_type = "pci";
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges;
-- 
2.31.1

[PATCH v2 2/2] ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address

[Nicolas Saenz Julienne]

The unit address is supposed to represent '<device>,<function>'. Which
are both 0 for RPi4b's XHCI controller. On top of that although
OpenFirmware states bus number goes in the high part of the last reg
parameter, FDT doesn't seem to care for it[1], so remove it.

[1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210830103909.323356-1-nsaenzju@redhat.com/#24414633
Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node")
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
---

Chages since v1:
 - Add patch as per robh suggestion

 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 8377dc14b7b5..50530cc91876 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -225,8 +225,8 @@ pci@0,0 {
 
 		reg = <0 0 0 0 0>;
 
-		usb@1,0 {
-			reg = <0x10000 0 0 0 0>;
+		usb@0,0 {
+			reg = <0 0 0 0 0>;
 			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
 		};
 	};
-- 
2.31.1

Re: [PATCH v2 2/2] ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address

[Rob Herring]

On Tue, Aug 31, 2021 at 7:59 AM Nicolas Saenz Julienne
<nsaenzju@redhat.com> wrote:
>
> The unit address is supposed to represent '<device>,<function>'. Which
> are both 0 for RPi4b's XHCI controller. On top of that although
> OpenFirmware states bus number goes in the high part of the last reg
> parameter, FDT doesn't seem to care for it[1], so remove it.
>
> [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210830103909.323356-1-nsaenzju@redhat.com/#24414633
> Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node")
> Suggested-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
> ---
>
> Chages since v1:
>  - Add patch as per robh suggestion
>
>  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 1/2] ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting

[Rob Herring]

On Tue, Aug 31, 2021 at 7:59 AM Nicolas Saenz Julienne
<nsaenzju@redhat.com> wrote:
>
> dtbs_check currently complains that:
>
> arch/arm/boot/dts/bcm2711-rpi-4-b.dts:220.10-231.4: Warning
> (pci_device_reg): /scb/pcie@7d500000/pci@1,0: PCI unit address format
> error, expected "0,0"
>
> Unsurprisingly pci@0,0 is the right address, as illustrated by its reg
> property:
>
>     &pcie0 {
>             pci@0,0 {
>                     /*
>                      * As defined in the IEEE Std 1275-1994 document,
>                      * reg is a five-cell address encoded as (phys.hi
>                      * phys.mid phys.lo size.hi size.lo). phys.hi
>                      * should contain the device's BDF as 0b00000000
>                      * bbbbbbbb dddddfff 00000000. The other cells
>                      * should be zero.
>                      */
>                     reg = <0 0 0 0 0>;
>             };
>     };
>
> The device is clearly 0. So fix it.
>
> Also add a missing 'device_type = "pci"'.
>
> Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node")
> Suggested-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
> ---
>
> Changes since v1:
>  - s/bus/device/ when talking about unit addresses
>  - Add device_type
>  - Add Suggested-by
>
>  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Rob Herring <robh@kernel.org>