Hi,
On Mon, Oct 24, 2022 at 02:25:12PM +0300, Mika Westerberg wrote:
> On Mon, Oct 24, 2022 at 02:13:10PM +0300, Mika Westerberg wrote:
> > Hi,
> >
> > On Fri, Oct 14, 2022 at 03:48:58PM +0100, Jonathan Cameron wrote:
> > > > Thanks for the detailed report! I wonder if you could try the below
> > > > patch and see if it changes anything?
> > > Thanks for the quick response.
> > >
> > > Doesn't fix it unfortunately.
> >
> > I'm back now.
> >
> > Trying to reproduce this with mainline kernel (arm64 defconfig) and the
> > following command line:
> >
> > qemu-system-aarch64 \
> > -M virt,nvdimm=on,gic-version=3 -m 4g,maxmem=8G,slots=8 -cpu max -smp 4 \
> > -bios /usr/share/qemu-efi-aarch64/QEMU_EFI.fd \
> > -nographic -no-reboot \
> > -kernel Image \
> > -initrd rootfs.cpio.bz2 \
> > -device pcie-root-port,port=0,id=root_port13,chassis=0,slot=2 \
> > -device x3130-upstream,id=sw1,bus=root_port13,multifunction=on \
> > -device e1000,bus=root_port13,addr=0.1 \
> > -device xio3130-downstream,id=fun1,bus=sw1,chassis=0,slot=3 \
> > -device e1000,bus=fun1
> >
> > But the resulting PCIe topology is pretty flat:
> >
> > # lspci
> > 00:00.0 Host bridge: Red Hat, Inc. QEMU PCIe Host bridge
> > 00:01.0 Ethernet controller: Red Hat, Inc. Virtio network device
> >
> > I wonder what I'm missing here? Do I need to enable additional drivers
> > to get the topology to resemble yours?
>
> Nevermind, I was missing one \ in the command line ;-) Now I can see the
> topology similar to yours.
I think I know what the problem is now - there is a multifunction device
with the switch upstream port and the resource distribution code is not
prepared to handle such (not sure how common this is in real hardware
but allowed by the PCIe spec).
Simple fix would be just ignore all resource distribution if we
encounter such topologies but I think can still allow it, just by
accounting the resources reserved for the multifunction device(s).
Can you try on your side so that you revert this revert:
5632e2beaf9d ("Revert "PCI: Distribute available resources for root buses, too"")
and then apply the below patch and see if the problem goes away? Thanks!
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index dc6a30ee6edf..a7ca3fecf259 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1833,10 +1833,65 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus,
* bridges below.
*/
if (hotplug_bridges + normal_bridges == 1) {
- dev = list_first_entry(&bus->devices, struct pci_dev, bus_list);
- if (dev->subordinate)
- pci_bus_distribute_available_resources(dev->subordinate,
- add_list, io, mmio, mmio_pref);
+ /* Upstream port must be the first */
+ bridge = list_first_entry(&bus->devices, struct pci_dev, bus_list);
+ if (!bridge->subordinate)
+ return;
+
+ /*
+ * It is possible to have switch upstream port as a part
+ * of multifunction device, although not too common. For
+ * this reason reduce the resources occupied by the
+ * other functions before distributing the rest.
+ */
+ list_for_each_entry(dev, &bus->devices, bus_list) {
+ int i;
+
+ if (dev == bridge)
+ continue;
+
+ /*
+ * It should be multifunction but if not stop
+ * the distribution and bail out.
+ */
+ if (!dev->multifunction)
+ return;
+
+ for (i = 0; i < PCI_ROM_RESOURCE; i++) {
+ const struct resource *dev_res = &dev->resource[i];
+ resource_size_t dev_sz;
+ struct resource *b_res;
+
+ if (dev_res->flags & IORESOURCE_IO) {
+ b_res = &io;
+ } else if (dev_res->flags & IORESOURCE_MEM) {
+ if (dev_res->flags & IORESOURCE_PREFETCH)
+ b_res = &mmio_pref;
+ else
+ b_res = &mmio;
+ } else {
+ continue;
+ }
+
+ /* Size aligned to bridge window */
+ align = pci_resource_alignment(bridge, b_res);
+ dev_sz = ALIGN(resource_size(dev_res), align);
+
+ pci_dbg(dev, "%pR aligned to %llx\n", dev_res,
+ dev_sz);
+
+ if (dev_sz >= resource_size(b_res))
+ memset(b_res, 0, sizeof(*b_res));
+ else
+ b_res->end -= dev_sz;
+
+ pci_dbg(bridge, "updated available to %pR\n", b_res);
+ }
+ }
+
+ pci_bus_distribute_available_resources(bridge->subordinate,
+ add_list, io, mmio,
+ mmio_pref);
return;
}
