Skip to contentSkip to conversation

arm64: dts: fvp: Update bus-range property

PATCH Applied Aneesh Kumar K.V (Arm) 2 participants 4 messages Nov 28, 2024 – Dec 5, 2024 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: fvp: Update bus-range property

These days, the Fixed Virtual Platforms(FVP) Base RevC model supports more PCI devices. Update the max bus number so that Linux can enumerate them correctly. Without this, the kernel throws the below error while booting with the default hierarchy

pci_bus 0000:01: busn_res: [bus 01] end is updated to 01
pci_bus 0000:02: busn_res: can not insert [bus 02-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:02: busn_res: [bus 02-01] end is updated to 02
pci_bus 0000:02: busn_res: can not insert [bus 02] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: can not insert [bus 03-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: [bus 03-01] end is updated to 03
pci_bus 0000:03: busn_res: can not insert [bus 03] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: can not insert [bus 04-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: [bus 04-01] end is updated to 04
pci_bus 0000:04: busn_res: can not insert [bus 04] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci 0000:00:01.0: BAR 14: assigned [mem 0x50000000-0x500fffff]

The change is using 0xff as max bus nr because the ECAM window is 256MB in size.

pci-host-generic 40000000.pci: ECAM at [mem 0x40000000-0x4fffffff] for [bus 00-01]

lspci output with and without the change without fix:
00:00.0 Host bridge: ARM Device 00ba (rev 01) 00:01.0 PCI bridge: ARM Device 0def 00:02.0 PCI bridge: ARM Device 0def 00:03.0 PCI bridge: ARM Device 0def 00:04.0 PCI bridge: ARM Device 0def 00:1e.0 Unassigned class [ff00]: ARM Device ff80 00:1e.1 Unassigned class [ff00]: ARM Device ff80 00:1f.0 SATA controller: Device 0abc:aced (rev 01) 01:00.0 SATA controller: Device 0abc:aced (rev 01)

with fix:
00:00.0 Host bridge: ARM Device 00ba (rev 01) 00:01.0 PCI bridge: ARM Device 0def 00:02.0 PCI bridge: ARM Device 0def 00:03.0 PCI bridge: ARM Device 0def 00:04.0 PCI bridge: ARM Device 0def 00:1e.0 Unassigned class [ff00]: ARM Device ff80 00:1e.1 Unassigned class [ff00]: ARM Device ff80 00:1f.0 SATA controller: Device 0abc:aced (rev 01) 01:00.0 SATA controller: Device 0abc:aced (rev 01) 02:00.0 Unassigned class [ff00]: ARM Device ff80 02:00.4 Unassigned class [ff00]: ARM Device ff80 03:00.0 PCI bridge: ARM Device 0def 04:00.0 PCI bridge: ARM Device 0def 04:01.0 PCI bridge: ARM Device 0def 04:02.0 PCI bridge: ARM Device 0def 05:00.0 SATA controller: Device 0abc:aced (rev 01) 06:00.0 Unassigned class [ff00]: ARM Device ff80 06:00.7 Unassigned class [ff00]: ARM Device ff80 07:00.0 Unassigned class [ff00]: ARM Device ff80 07:00.3 Unassigned class [ff00]: ARM Device ff80 08:00.0 Unassigned class [ff00]: ARM Device ff80 08:00.1 Unassigned class [ff00]: ARM Device ff80

Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Rob Herring <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Conor Dooley <[email protected]>
---
 arch/arm64/boot/dts/arm/fvp-base-revc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/arm/fvp-base-revc.dts +1 -1
index 289c5f9d1c8d..225a1ed8aa08 100644
@@ -233,7 +233,7 @@ pci: pci@40000000 {
 		#interrupt-cells = <0x1>;
 		compatible = "pci-host-ecam-generic";
 		device_type = "pci";
-		bus-range = <0x0 0x1>;
+		bus-range = <0x0 0xff>;
 		reg = <0x0 0x40000000 0x0 0x10000000>;
 		ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>;
 		interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.43.0
#2 lore raw
In reply to a message not in the archive
Quoted 66 lines · Liviu Dudau
Quoted 57 lines · Aneesh Kumar K.V (Arm)

These days, the Fixed Virtual Platforms(FVP) Base RevC model supports more PCI devices. Update the max bus number so that Linux can enumerate them correctly. Without this, the kernel throws the below error while booting with the default hierarchy

pci_bus 0000:01: busn_res: [bus 01] end is updated to 01
pci_bus 0000:02: busn_res: can not insert [bus 02-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:02: busn_res: [bus 02-01] end is updated to 02
pci_bus 0000:02: busn_res: can not insert [bus 02] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: can not insert [bus 03-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: [bus 03-01] end is updated to 03
pci_bus 0000:03: busn_res: can not insert [bus 03] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: can not insert [bus 04-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: [bus 04-01] end is updated to 04
pci_bus 0000:04: busn_res: can not insert [bus 04] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci 0000:00:01.0: BAR 14: assigned [mem 0x50000000-0x500fffff]

The change is using 0xff as max bus nr because the ECAM window is 256MB in size.

pci-host-generic 40000000.pci: ECAM at [mem 0x40000000-0x4fffffff] for [bus 00-01]

lspci output with and without the change without fix:
00:00.0 Host bridge: ARM Device 00ba (rev 01) 00:01.0 PCI bridge: ARM Device 0def 00:02.0 PCI bridge: ARM Device 0def 00:03.0 PCI bridge: ARM Device 0def 00:04.0 PCI bridge: ARM Device 0def 00:1e.0 Unassigned class [ff00]: ARM Device ff80 00:1e.1 Unassigned class [ff00]: ARM Device ff80 00:1f.0 SATA controller: Device 0abc:aced (rev 01) 01:00.0 SATA controller: Device 0abc:aced (rev 01)

with fix:
00:00.0 Host bridge: ARM Device 00ba (rev 01) 00:01.0 PCI bridge: ARM Device 0def 00:02.0 PCI bridge: ARM Device 0def 00:03.0 PCI bridge: ARM Device 0def 00:04.0 PCI bridge: ARM Device 0def 00:1e.0 Unassigned class [ff00]: ARM Device ff80 00:1e.1 Unassigned class [ff00]: ARM Device ff80 00:1f.0 SATA controller: Device 0abc:aced (rev 01) 01:00.0 SATA controller: Device 0abc:aced (rev 01) 02:00.0 Unassigned class [ff00]: ARM Device ff80 02:00.4 Unassigned class [ff00]: ARM Device ff80 03:00.0 PCI bridge: ARM Device 0def 04:00.0 PCI bridge: ARM Device 0def 04:01.0 PCI bridge: ARM Device 0def 04:02.0 PCI bridge: ARM Device 0def 05:00.0 SATA controller: Device 0abc:aced (rev 01) 06:00.0 Unassigned class [ff00]: ARM Device ff80 06:00.7 Unassigned class [ff00]: ARM Device ff80 07:00.0 Unassigned class [ff00]: ARM Device ff80 07:00.3 Unassigned class [ff00]: ARM Device ff80 08:00.0 Unassigned class [ff00]: ARM Device ff80 08:00.1 Unassigned class [ff00]: ARM Device ff80

Quoted 7 lines
Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Rob Herring <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Conor Dooley <[email protected]>
Quoted 4 lines

Sudeep, can you please take this patch through your tree?

I have already queued and must be in -next, just didn't get to a point to respond as applied yet. I will update with your tags. Thanks!

Signature · 2 lines
Regards,
Sudeep
Applied
#3 lore raw
In reply to Aneesh Kumar K.V (Arm)
Quoted 17 lines · Aneesh Kumar K.V (Arm)

These days, the Fixed Virtual Platforms(FVP) Base RevC model supports more PCI devices. Update the max bus number so that Linux can enumerate them correctly. Without this, the kernel throws the below error while booting with the default hierarchy

pci_bus 0000:01: busn_res: [bus 01] end is updated to 01
pci_bus 0000:02: busn_res: can not insert [bus 02-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:02: busn_res: [bus 02-01] end is updated to 02
pci_bus 0000:02: busn_res: can not insert [bus 02] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: can not insert [bus 03-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: [bus 03-01] end is updated to 03
pci_bus 0000:03: busn_res: can not insert [bus 03] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: can not insert [bus 04-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: [bus 04-01] end is updated to 04
pci_bus 0000:04: busn_res: can not insert [bus 04] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci 0000:00:01.0: BAR 14: assigned [mem 0x50000000-0x500fffff]

Quoted 1 line

[...]

Applied to sudeep.holla/linux (for-next/juno/fixes), thanks!

[1/1] arm64: dts: fvp: Update bus-range property

      https://git.kernel.org/sudeep.holla/c/4f776d81bf92

--
Regards,
Sudeep

#5 lore raw
In reply to a message not in the archive
Quoted 21 lines · Liviu Dudau
Quoted 20 lines · Sudeep Holla
Quoted 18 lines · Aneesh Kumar K.V (Arm)

These days, the Fixed Virtual Platforms(FVP) Base RevC model supports more PCI devices. Update the max bus number so that Linux can enumerate them correctly. Without this, the kernel throws the below error while booting with the default hierarchy

pci_bus 0000:01: busn_res: [bus 01] end is updated to 01
pci_bus 0000:02: busn_res: can not insert [bus 02-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:02: busn_res: [bus 02-01] end is updated to 02
pci_bus 0000:02: busn_res: can not insert [bus 02] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: can not insert [bus 03-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:03: busn_res: [bus 03-01] end is updated to 03
pci_bus 0000:03: busn_res: can not insert [bus 03] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: can not insert [bus 04-01] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci_bus 0000:04: busn_res: [bus 04-01] end is updated to 04
pci_bus 0000:04: busn_res: can not insert [bus 04] under [bus 00-01] (conflicts with (null) [bus 00-01]) pci 0000:00:01.0: BAR 14: assigned [mem 0x50000000-0x500fffff]

[...]

Quoted 7 lines
Quoted 4 lines

Applied to sudeep.holla/linux (for-next/juno/fixes), thanks!

[1/1] arm64: dts: fvp: Update bus-range property

      https://git.kernel.org/sudeep.holla/c/4f776d81bf92

Thanks for the quick response. TBH, I did not receive your initial review email, that's why I've messaged thinking it got lost.

No I hadn't responded on the list yet. I queue and wait for a day for the kbuild bot or any other bots to report no failures before I officially respond as applied as I wouldn't have tried all build configs in general but it doesn't apply for DT files though 😉.

--
Regards,
Sudeep