PCI: Allocate maximum available buses to help extending the daisy chain
PATCH 1/1 PCI: Allocate maximum available buses to help extending the daisy chain
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Before:
+-04.0
+-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]--
| +-01.0-[66]--
| +-02.0-[67]--
| +-03.0-[68]--
| \-04.0-[69]--
+-08.0In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
After:
+-04.0
+-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]--
| +-01.0-[66-84]--
| +-02.0-[85-a3]--
| +-03.0-[a4-c0]--
| \-04.0-[c1]--
+-08.0--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/pci/probe.c +9 -0
@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config
@@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) { +pci_info (dev,"Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n" , + subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures.
Signature · 1 line
2.34.1
Adding Mika.
Quoted 69 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0Signed-off-by Sanjay R Mehta <[email protected]>Signed-off-by Sanath S <[email protected]>--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/pci/probe.c +9
-0@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config @@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) { +pci_info (dev,"Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n" , + subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures.
Quoted 1 line · Sanath S
Adding Mika.
Thanks!
Quoted 12 lines · Sanath S
Quoted 11 lines
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0
This is something the BIOS should be doing but for some reason it is not on that particular system.
Quoted 1 line
Quoted 1 line
In case of a thunderbolt capable bridge, reconfigure the buses allocated
Thunderbolt
Quoted 4 lines
Quoted 4 lines
by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
This is necessary only when there is no proper BIOS allocation for the resources.
Quoted 10 lines
Quoted 10 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0
Did you get confirmation that this actually solves the issue?
Quoted 31 lines
Quoted 31 lines
Signed-off-by Sanjay R Mehta <[email protected]>Signed-off-by Sanath S <[email protected]>--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/pci/probe.c +9
-0@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config @@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) { +pci_info (dev,"Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n" , + subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures.
Quoted 24 lines · Mika Westerberg
Quoted 1 line · Sanath S
Adding Mika.
Thanks!
Quoted 12 lines · Sanath S
Quoted 11 lines
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0
Quoted 2 lines
This is something the BIOS should be doing but for some reason it is not on that particular system.
Yes, BIOS should be doing it. Idea here is if BIOS has not distributed it correctly, OS can reallocate and distribute it correctly.
Quoted 2 lines
Quoted 1 line
Quoted 1 line
In case of a thunderbolt capable bridge, reconfigure the buses allocated
Thunderbolt
Will correct it.
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
This is necessary only when there is no proper BIOS allocation for the resources.
Yes, will send out a v2 with updated commit message.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Did you get confirmation that this actually solves the issue?
I've tested this on my setup, it is resolving the issue.
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Signed-off-by Sanjay R Mehta <[email protected]>Signed-off-by Sanath S <[email protected]>--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/pci/probe.c +9
-0@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config @@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) { +pci_info (dev,"Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n" , + subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures.
Quoted 52 lines · Sanath S
Quoted 24 lines · Mika Westerberg
Quoted 1 line · Sanath S
Adding Mika.
Thanks!
Quoted 12 lines · Sanath S
Quoted 11 lines
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0Quoted 2 lines
This is something the BIOS should be doing but for some reason it is not on that particular system.
Yes, BIOS should be doing it. Idea here is if BIOS has not distributed it correctly, OS
can reallocate and distribute it correctly.Quoted 2 lines
Quoted 1 line
Quoted 1 line
In case of a thunderbolt capable bridge, reconfigure the buses allocated
Thunderbolt
Will correct it.
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
This is necessary only when there is no proper BIOS allocation for the resources.
Yes, will send out a v2 with updated commit message.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Did you get confirmation that this actually solves the issue?
I've tested this on my setup, it is resolving the issue.
Right, but it would be good to get confirmation from the person who reported the issue that this actually helps. There is nothing in the bugzilla whether the patch worked or not.
Quoted 7 lines · Mika Westerberg
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Did you get confirmation that this actually solves the issue?
I've tested this on my setup, it is resolving the issue.
Right, but it would be good to get confirmation from the person who reported the issue that this actually helps. There is nothing in the bugzilla whether the patch worked or not.
If you do change the defaults, then please don't forget to updateDocumentation/admin-guide/kernel-parameters.txt in the same commit accordingly for `hpbussize=nn', etc.
NB it seems a common problem with vendor firmware failing to assign a
reasonable quantity of downstream buses for hot-plug ports. E.g. with my production laptop back from 2018 a single-device ExpressCard option, such as a PCIe serial port works just fine with hot-plug, however if I hot-plug a whole bus hierarchy in an external enclosure, then the system runs out of buses at the first PCIe switch (unless I use `hpbussize=nn', etc.).
Maciej
kernel test robot
build botkernel test robot noticed disk issues on:
Hello,
kernel test robot noticed disk issues on:
commit: 4f0dbecaea6160d50d568fcaa4e09346052f7423 ("[PATCH] PCI: Allocate maximum available buses to help extending the daisy chain")
url: https://github.com/intel-lab-lkp/linux/commits/Sanath-S/PCI-Allocate-maximum-available-buses-to-help-extending-the-daisy-chain/20230816-132324
base: https://git.kernel.org/cgit/linux/kernel/git/pci/pci.git next
patch link: https://lore.kernel.org/all/[email protected]/
patch subject: [PATCH] PCI: Allocate maximum available buses to help extending the daisy chain
in testcase: filebench
version: filebench-x86_64-22620e6-1_20221010
with following parameters:
fs: xfs
test: filemicro_statfile.f
cpufreq_governor: performance
compiler: gcc-12
test machine: 96 threads 2 sockets Intel(R) Xeon(R) Platinum 8260L CPU @ 2.40GHz (Cascade Lake) with 128G memory
(please refer to attached dmesg/kmsg for entire log/backtrace)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-lkp/[email protected]
[ 6.738560][ T1] pci 0000:17:00.0: Bridge has subordinate 0x19 but max busn 0x39, reconfiguring ... [ 238.092454][ T1230] ls: cannot access '/dev/nvme1n1p1': No such file or directory [ 238.092457][ T1230] [ 238.526845][ T1230] disk number 2 mismatch with 1 real disks: /dev/nvme1n1p1 /dev/nvme0n1p1
before this commit, we have below two disks on server:
# ls -l /dev/disk/by-path/ lrwxrwxrwx 1 root root 13 Aug 23 23:00 pci-0000:83:00.0-nvme-1 -> ../../nvme0n1 lrwxrwxrwx 1 root root 15 Aug 23 23:00 pci-0000:83:00.0-nvme-1-part1 -> ../../nvme0n1p1 lrwxrwxrwx 1 root root 13 Aug 23 23:00 pci-0000:84:00.0-nvme-1 -> ../../nvme1n1 lrwxrwxrwx 1 root root 15 Aug 23 23:00 pci-0000:84:00.0-nvme-1-part1 -> ../../nvme1n1p1
but after this commit, there is no nvme1n1p1 detected
The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20230823/[email protected]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
[+cc Mika, Maciej]
Quoted 11 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0
Looks like a clear issue here because there's no other use for buses 70-c1. But what would happen if there were more hotplug-capable downstream ports, e.g., assume one at 08.1 leading to [bus c2-c7]?
The 04.1 bridge has a lot of space, but 08.1 has very little. With this patch, would we distribute it more evenly across 04.1 and 08.1? If not, I think we'll just have the same problem when somebody plugs in a similar hierarchy at 08.1.
Quoted 6 lines
In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
Quoted 8 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0
This doesn't look like anything specific to Thunderbolt; it's just that we don't do a good job of reassigning bus numbers in general, right? We shouldn't just punt and say "BIOS should have done something" because not all machines *have* BIOS, and the OS can reconfigure bus numbers as needed. The patch certainly isn't Thunderbolt-specific.
I guess this patch is on hold for now because the kernel test robot complained:
https://lore.kernel.org/r/[email protected]
and this hasn't been resolved or explained yet.
Quoted 21 lines
Signed-off-by Sanjay R Mehta <[email protected]>Signed-off-by Sanath S <[email protected]>--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/pci/probe.c +2
-0@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config
drivers/pci/probe.c static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, · line 1298
Quoted 5 lines
drivers/pci/probe.c +2
-0@@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) {
I don't quite understand the test here. In the "Before" example above, I think bus->busn_res is [bus 63-c1], and subordinate is 69. That certainly makes this condition true, but wouldn't you also want to reallocate bus numbers if bus->busn_res were [bus 63-ff] and subordinate were 69?
drivers/pci/probe.c static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, · line 1299
Quoted 1 line
drivers/pci/probe.c +1
-0+ pci_info(dev, "Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n",
Most other logging here starts with lower-case, e.g., "bridge has ..." Print the bus numbers in the typical format ("%02x"). Maybe use "%pR" and &bus->busn_res for the first part.
Quoted 10 lines
drivers/pci/probe.c +4
-0+ subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures. Signature · 1 line
2.34.1
Quoted 47 lines · Bjorn Helgaas
[+cc Mika, Maciej]
Quoted 11 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0Looks like a clear issue here because there's no other use for buses 70-c1. But what would happen if there were more hotplug-capable downstream ports, e.g., assume one at 08.1 leading to [bus c2-c7]?
The 04.1 bridge has a lot of space, but 08.1 has very little. With this patch, would we distribute it more evenly across 04.1 and 08.1? If not, I think we'll just have the same problem when somebody plugs in a similar hierarchy at 08.1.
Quoted 6 lines
In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
Quoted 8 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0
Quoted 6 lines
This doesn't look like anything specific to Thunderbolt; it's just that we don't do a good job of reassigning bus numbers in general, right? We shouldn't just punt and say "BIOS should have done something" because not all machines *have* BIOS, and the OS can reconfigure bus numbers as needed. The patch certainly isn't Thunderbolt-specific.
From the discussions Sanath and I have been in related to this issue the BIOS is pretty static with it's initialization under the presumption that the OS will rebalance things if necessary.
Quoted 6 lines
I guess this patch is on hold for now because the kernel test robot complained:
https://lore.kernel.org/r/[email protected]
and this hasn't been resolved or explained yet.
For this particular issue it's being approached a different way.
Windows never rebalances things but doesn't suffer from this issue. That's because Windows actually does a "Downstream port reset" when it encounters a USB4 router.
Sanath posted a quirk that aligned this behavior when encountering an AMD USB4 router, but as part of the discussion I suggested that we do it for everyone.
https://lore.kernel.org/linux-usb/[email protected]/
So Sanath has a new patch that does this that is under testing right now and will be posted soon.
Thanks!
Quoted 49 lines
Quoted 21 lines
Signed-off-by Sanjay R Mehta <[email protected]>Signed-off-by Sanath S <[email protected]>--- drivers/pci/probe.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/pci/probe.c +2
-0@@ -1263,6 +1263,8 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,bool fixed_buses;u8 fixed_sec, fixed_sub;int next_busnr; +int start = bus->busn_res.start; +int end = bus->busn_res.end;/* * Make sure the bridge is powered on to be able to access config drivers/pci/probe.c static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, · line 1298
Quoted 5 lines
drivers/pci/probe.c +2
-0@@ -1292,6 +1294,13 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, broken =1 ; } +/* Reconfigure, If maximum buses are not allocated */ +if (!pass && start !=0 && end !=0xff && subordinate != end) {I don't quite understand the test here. In the "Before" example above, I think
bus->busn_resis [bus 63-c1], and subordinate is 69. That certainly makes this condition true, but wouldn't you also want to reallocate bus numbers ifbus->busn_reswere [bus 63-ff] and subordinate were 69?drivers/pci/probe.c static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, · line 1299
Quoted 1 line
drivers/pci/probe.c +1
-0+ pci_info(dev, "Bridge has subordinate 0x%x but max busn 0x%x, reconfiguring\n",Most other logging here starts with lower-case, e.g., "bridge has ..." Print the bus numbers in the typical format ("%02x"). Maybe use "%pR" and
&bus->busn_resfor the first part.Quoted 10 lines
drivers/pci/probe.c +4
-0+ subordinate, end); + broken =1 ; + } +/* * Disable Master-Abort Mode during probing to avoid reporting of * bus errors in some architectures. Signature · 1 line
2.34.1
Quoted 64 lines · Mario Limonciello
Quoted 45 lines · Bjorn Helgaas
Quoted 11 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0Looks like a clear issue here because there's no other use for buses 70-c1. But what would happen if there were more hotplug-capable downstream ports, e.g., assume one at 08.1 leading to [bus c2-c7]?
The 04.1 bridge has a lot of space, but 08.1 has very little. With this patch, would we distribute it more evenly across 04.1 and 08.1? If not, I think we'll just have the same problem when somebody plugs in a similar hierarchy at 08.1.
Quoted 6 lines
In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
Quoted 8 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0Quoted 6 lines
This doesn't look like anything specific to Thunderbolt; it's just that we don't do a good job of reassigning bus numbers in general, right? We shouldn't just punt and say "BIOS should have done something" because not all machines *have* BIOS, and the OS can reconfigure bus numbers as needed. The patch certainly isn't Thunderbolt-specific.
From the discussions Sanath and I have been in related to this issue the BIOS is pretty static with it's initialization under the presumption that the OS will rebalance things if necessary.
...For this particular issue it's being approached a different way.
Windows never rebalances things but doesn't suffer from this issue. That's because Windows actually does a "Downstream port reset" when it encounters a USB4 router.
Quoted 8 lines
Sanath posted a quirk that aligned this behavior when encountering an AMD USB4 router, but as part of the discussion I suggested that we do it for everyone.
https://lore.kernel.org/linux-usb/[email protected]/
So Sanath has a new patch that does this that is under testing right now and will be posted soon.
Hmm, ok. I don't know what a "downstream port reset" does or how it resolves the bus number allocation issue, but I'm happy if you have a fix that doesn't need PCI core changes.
Bjorn
Quoted 71 lines · Bjorn Helgaas
Quoted 70 lines · Mario Limonciello
Quoted 45 lines · Bjorn Helgaas
Quoted 11 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0Looks like a clear issue here because there's no other use for buses 70-c1. But what would happen if there were more hotplug-capable downstream ports, e.g., assume one at 08.1 leading to [bus c2-c7]?
The 04.1 bridge has a lot of space, but 08.1 has very little. With this patch, would we distribute it more evenly across 04.1 and 08.1? If not, I think we'll just have the same problem when somebody plugs in a similar hierarchy at 08.1.
Quoted 6 lines
In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
Quoted 8 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0Quoted 6 lines
This doesn't look like anything specific to Thunderbolt; it's just that we don't do a good job of reassigning bus numbers in general, right? We shouldn't just punt and say "BIOS should have done something" because not all machines *have* BIOS, and the OS can reconfigure bus numbers as needed. The patch certainly isn't Thunderbolt-specific.
From the discussions Sanath and I have been in related to this issue
the BIOS is pretty static with it's initialization under the presumption that the OS will rebalance things if necessary.
...For this particular issue it's being approached a different way.
Windows never rebalances things but doesn't suffer from this issue. That's because Windows actually does a "Downstream port reset" when it encounters a USB4 router.
Sanath posted a quirk that aligned this behavior when encountering an AMD USB4 router, but as part of the discussion I suggested that we do it for everyone.
Quoted 8 lines
Quoted 2 lines
So Sanath has a new patch that does this that is under testing right now and will be posted soon.
Hmm, ok. I don't know what a "downstream port reset" does or how it resolves the bus number allocation issue, but I'm happy if you have a fix that doesn't need PCI core changes.
Bjorn
The issue is specifically with resources that were assigned with BIOS in this "static case". The downstream port reset ends up resetting the topology and thus the resources get assigned by Linux instead and will be better balanced for more devices to be daisy chained.
Quoted 77 lines · Mario Limonciello
Quoted 76 lines · Bjorn Helgaas
Quoted 74 lines · Mario Limonciello
Quoted 47 lines · Bjorn Helgaas
Quoted 11 lines · Sanath S
In the case of Thunderbolt, it contains a PCIe switch and one or more hotplug-capable PCIe downstream ports where the daisy chain can be extended.
Currently when a Thunderbolt Dock is plugged in during S5/Reboot, System BIOS allocates a very minimal number of buses for bridges and hot-plug capable PCIe downstream ports to enumerate the dock during boot. Because of this, we run out of bus space pretty quickly when more PCIe devices are attached to hotplug downstream ports in order to extend the chain.
Quoted 8 lines
Before:
+-04.0 +-04.1-[63-c1]----00.0-[64-69]--+-00.0-[65]-- | +-01.0-[66]-- | +-02.0-[67]-- | +-03.0-[68]-- | \-04.0-[69]-- +-08.0Looks like a clear issue here because there's no other use for buses 70-c1. But what would happen if there were more hotplug-capable downstream ports, e.g., assume one at 08.1 leading to [bus c2-c7]?
The 04.1 bridge has a lot of space, but 08.1 has very little. With this patch, would we distribute it more evenly across 04.1 and 08.1? If not, I think we'll just have the same problem when somebody plugs in a similar hierarchy at 08.1.
Quoted 7 lines
In case of a thunderbolt capable bridge, reconfigure the buses allocated by BIOS to the maximum available buses. So that the hot-plug bridges gets maximum buses and chain can be extended to accommodate more PCIe devices. This fix is necessary for all the PCIe downstream ports where the daisy chain can be extended.
Quoted 8 lines
After:
+-04.0 +-04.1-[63-c1]----00.0-[64-c1]--+-00.0-[65]-- | +-01.0-[66-84]-- | +-02.0-[85-a3]-- | +-03.0-[a4-c0]-- | \-04.0-[c1]-- +-08.0Quoted 6 lines
This doesn't look like anything specific to Thunderbolt; it's just that we don't do a good job of reassigning bus numbers in general, right? We shouldn't just punt and say "BIOS should have done something" because not all machines *have* BIOS, and the OS can reconfigure bus numbers as needed. The patch certainly isn't Thunderbolt-specific.
From the discussions Sanath and I have been in related to this issue
the BIOS is pretty static with it's initialization under the presumption that the OS will rebalance things if necessary.
...For this particular issue it's being approached a different way.
Windows never rebalances things but doesn't suffer from this issue. That's because Windows actually does a "Downstream port reset" when it encounters a USB4 router.
Sanath posted a quirk that aligned this behavior when encountering an AMD USB4 router, but as part of the discussion I suggested that we do it for everyone.
https://lore.kernel.org/linux-usb/[email protected]/
So Sanath has a new patch that does this that is under testing right now and will be posted soon.
Quoted 8 lines
Quoted 3 lines
Hmm, ok. I don't know what a "downstream port reset" does or how it resolves the bus number allocation issue, but I'm happy if you have a fix that doesn't need PCI core changes.
The issue is specifically with resources that were assigned with BIOS in this "static case". The downstream port reset ends up resetting the topology and thus the resources get assigned by Linux instead and will be better balanced for more devices to be daisy chained.
It sounds like the downstream port reset maybe just resets the bridge secondary/subordinate bus numbers, which forces Linux to reassign them? But Linux isn't smart enough to proactively reassign them? If so, the reset sounds a little like a band-aid, not a real fix, but I'm guessing nobody is signing up to rework that PCI core reassignment code ;)
Bjorn