For a better understanding of the following patch here is some general information about how PCI is implemented on the s390 platform. The physical structure of the pci system (bridge, bus, slot) is not shown to the OS. Instead a firmware and I/O configuration layer abstracts each PCI card to a bare PCI function.
In essence, the fw layer provides a simple enumeration of the individual devices, which the s390 pci implementation in the Linux kernel translates into individual pci domains. HW layer | FW layer | Linux kernel | | (opaque) | function 1 | 0001:00:00.0 | function 2 | 0002:00:00.0 | function 3 | 0003:00:00.0 In qemu we have following problems: (1) We have to represent this s390 specific topology information, respectively the lack thereof (2) We have/want to use common qemu PCI infrastructure The initial implementation did not honor (1) much and tried to derive s390 specific configuration attributes from attributes of qemu pci devices. It turns out that this is not flexible enough and is not sufficient to support s390 specific configurations. Here is some nice characterization about the nature of the s390 host bridge (by Alexander Graf). "Conceptually your PCI bridge is not a sysbus device, since it doesn't live on a flat MMIO + legacy IRQ routing bus. Instead, it lives on its own thing that handles MMIO and IRQs via special backdoor interfaces." The proposed solution is an outcome of a previous discussion here on the qemu-devel mailing list. The s390 patch tries to better model the pci infrastructure by extending the s390 pci host bridge. Major changes are: 1) add configuration attributes (in reality provided by firmware layer) to the host bridge. 2) restrict pci bus of the bridge to just one slot 3) make a s390 host bridge hot plugable Frank Blaschka (2): pci: detangle Sysbus PCI bridge from PCIBus s390x/pci: rework pci infrastructure modeling hw/pci/pci.c | 24 ++++--- hw/s390x/s390-pci-bus.c | 174 ++++++++++++++++++++++++++------------------- hw/s390x/s390-pci-bus.h | 24 ++++++- hw/s390x/s390-pci-inst.c | 2 +- hw/s390x/s390-virtio-ccw.c | 4 +- 5 files changed, 144 insertions(+), 84 deletions(-) -- 2.1.4