ARM: Add support for a generic PCI Express host bridge
v5 cover ARM: Add support for a generic PCI Express host bridge
Linux implements a nice binding to describe a "generic" PCI Express host bridge using only device tree.
This patch set adds enough emulation logic to expose the parts that are "generic" as a simple sysbus device and maps it into ARM's virt machine.
With this patch set, we can finally spawn PCI devices on ARM VMs. I was able to have a fully DRM enabled virtual machine with VGA, e1000 and XHCI (for keyboard and mouse) up and working.
It's only a small step for QEMU, but a big step for ARM VM's usability.
v1 -> v2:
- Add documentation links
- Remove mmio_window_size
- Add define for pci range types
- Use 4 PCI INTX IRQ lines
v2 -> v3:
- Update patch description
- Increase ecam region to full size
- Expose number of irqs via define
- Update header description
- Update host bridge qom description string
- Use new Red Hat PCIe host bridge PCI ID
- Coding style fixes
- Map ECAM space via alias to limit its size
- Increase ECAM size to 16 buses
- Use GPEX IRQ number define
- Align ECAM region, Document region allocation better
- Move interrupt-map into irq map function
- s/FDT_PCI_RANGE_TYPE/FDT_PCI_RANGE_TYPE_MASK/
v3 -> v4:
- update memory map comment
v4 -> v5:
- fix size alignment calculation
- expose bus-range as 16
- improve mmio map comment
Alexander Graf (4):
pci: Allocate PCIe host bridge PCI ID
pci: Add generic PCIe host bridge
arm: Add PCIe host bridge in virt machine
pci: Move PCI VGA to pci.mak
default-configs/alpha-softmmu.mak | 2 - default-configs/arm-softmmu.mak | 2 + default-configs/i386-softmmu.mak | 2 - default-configs/mips-softmmu.mak | 2 - default-configs/mips64-softmmu.mak | 2 - default-configs/mips64el-softmmu.mak | 2 - default-configs/mipsel-softmmu.mak | 2 - default-configs/pci.mak | 2 + default-configs/ppc-softmmu.mak | 2 - default-configs/ppc64-softmmu.mak | 2 - default-configs/ppcemb-softmmu.mak | 2 - default-configs/sparc64-softmmu.mak | 2 - default-configs/x86_64-softmmu.mak | 2 - hw/arm/virt.c | 137 +++++++++++++++++++++++++++++-- hw/pci-host/Makefile.objs | 1 + hw/pci-host/gpex.c | 154 +++++++++++++++++++++++++++++++++++ include/hw/pci-host/gpex.h | 56 +++++++++++++ include/hw/pci/pci.h | 1 + include/sysemu/device_tree.h | 9 ++ 19 files changed, 357 insertions(+), 27 deletions(-) create mode 100644 hw/pci-host/gpex.c create mode 100644 include/hw/pci-host/gpex.h
Signature · 1 line
1.7.12.4
PATCH v5 1/4 pci: Allocate PCIe host bridge PCI ID
We are going to introduce a PCIe host controller that doesn't exist that way in real hardware, but still needs to expose some PCIe root device which has PCI IDs.
Allocate a PCI ID in the Red Hat space that we use for other devices of this kind.
--- include/hw/pci/pci.h | 1 + 1 file changed, 1 insertion(+)
include/hw/pci/pci.h +1 -0
@@ -89,6 +89,7 @@#define PCI_DEVICE_ID_REDHAT_SERIAL4 0x0004#define PCI_DEVICE_ID_REDHAT_TEST 0x0005#define PCI_DEVICE_ID_REDHAT_SDHCI 0x0007 +#define PCI_DEVICE_ID_REDHAT_PCIE_HOST 0x0008#define PCI_DEVICE_ID_REDHAT_QXL 0x0100#define FMT_PCIBUS PRIx64
Signature · 1 line
1.7.12.4
PATCH v5 2/4 pci: Add generic PCIe host bridge
In reply to Alexander GrafWith simple exposure of MMFG, ioport window, mmio window and an IRQ line we can successfully create a workable PCIe host bridge that can be mapped anywhere and only needs to get described to the OS using whatever means it likes.
This patch implements such a "generic" host bridge. It handles 4 legacy IRQ lines. MSIs need to be handled external to the host bridge.
This device is particularly useful for the "pci-host-ecam-generic" driver in Linux.
---
v1 -> v2:
- Add documentation links
- Remove mmio_window_size
- Expose 4 INTX IRQs
v2 -> v3:
- Update patch description
- Increase ecam region to full size
- Expose number of irqs via define
- Update header description
- Update host bridge qom description string
- Use new Red Hat PCIe host bridge PCI ID
--- hw/pci-host/Makefile.objs | 1 + hw/pci-host/gpex.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/pci-host/gpex.h | 56 +++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 hw/pci-host/gpex.c create mode 100644 include/hw/pci-host/gpex.h
hw/pci-host/Makefile.objs +1 -0
@@ -15,3 +15,4 @@ common-obj-$(CONFIG_PCI_APB) += apb.o common-obj-$(CONFIG_FULONG) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_Q35) += q35.o +common-obj-$(CONFIG_PCI_GENERIC) += gpex.o
hw/pci-host/gpex.c new file +154 -0
154 lines not on this page · raw message
include/hw/pci-host/gpex.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.7.12.4
PATCH v5 3/4 arm: Add PCIe host bridge in virt machine
In reply to Alexander GrafNow that we have a working "generic" PCIe host bridge driver, we can plug it into ARM's virt machine to always have PCIe available to normal ARM VMs.
I've successfully managed to expose a Bochs VGA device, XHCI and an e1000 into an AArch64 VM with this and they all lived happily ever after.
---
Linux 3.19 only supports the generic PCIe host bridge driver for 32bit ARM systems. If you want to use it with AArch64 guests, please apply the following patch or wait until upstream cleaned up the code properly:
http://csgraf.de/agraf/pci/pci-3.19.patch
v1 -> v2:
- Add define for pci range types
- Remove mmio_window_size
- Use 4 PCI INTX IRQ lines
v2 -> v3:
- Coding style fixes
- Map ECAM space via alias to limit its size
- Increase ECAM size to 16 buses
- Use GPEX IRQ number define
- Align ECAM region, Document region allocation better
- Move interrupt-map into irq map function
- s/FDT_PCI_RANGE_TYPE/FDT_PCI_RANGE_TYPE_MASK/
v3 -> v4:
- update memory map comment
v4 -> v5:
- fix size alignment calculation
- expose bus-range as 16
- improve mmio map comment
--- default-configs/arm-softmmu.mak | 2 + hw/arm/virt.c | 137 ++++++++++++++++++++++++++++++++++++++-- include/sysemu/device_tree.h | 9 +++ 3 files changed, 143 insertions(+), 5 deletions(-)
default-configs/arm-softmmu.mak +2 -0
@@ -82,6 +82,8 @@ CONFIG_ZYNQ=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y +CONFIG_PCI_GENERIC=y + CONFIG_SDHCI=y CONFIG_INTEGRATOR_DEBUG=y
hw/arm/virt.c +132 -5
204 lines not on this page · raw message
include/sysemu/device_tree.h +9 -0
@@ -110,4 +110,13 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt, qdt_tmp); \ }) +#define FDT_PCI_RANGE_RELOCATABLE 0x80000000 +#define FDT_PCI_RANGE_PREFETCHABLE 0x40000000 +#define FDT_PCI_RANGE_ALIASED 0x20000000 +#define FDT_PCI_RANGE_TYPE_MASK 0x03000000 +#define FDT_PCI_RANGE_MMIO_64BIT 0x03000000 +#define FDT_PCI_RANGE_MMIO 0x02000000 +#define FDT_PCI_RANGE_IOPORT 0x01000000 +#define FDT_PCI_RANGE_CONFIG 0x00000000 +#endif /* __DEVICE_TREE_H__ */
Signature · 1 line
1.7.12.4
Re: [Qemu-devel] [PATCH v5 3/4] arm: Add PCIe host bridge in virt machine
hw/arm/virt.c static const MemMapEntry a15memmap[] = { · line 139
Quoted 12 lines · Alexander Graf
typedef struct MemMapEntry {
hw/arm/virt.c +6
-1@@ -129,13 +131,21 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 },/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ -/* 0x10000000 .. 0x40000000 reserved for PCI */ +/* +* PCIE verbose map: +* +* MMIO window { 0x10000000, 0x2eff0000 }, +* PIO window { 0x3eff0000, 0x00010000 }, +* ECAM { 0x3f000000, 0x01000000 },
Is this a typo, or is there really a big gap between the end of the MMIO window and the start of the PIO window?
-- PMM
Re: [Qemu-devel] [PATCH v5 3/4] arm: Add PCIe host bridge in virt machine
Quoted 16 lines · Peter Maydell
hw/arm/virt.c static const MemMapEntry a15memmap[] = { · line 139
Quoted 12 lines · Alexander Graf
typedef struct MemMapEntry {
hw/arm/virt.c +6
-1@@ -129,13 +131,21 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 },/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ -/* 0x10000000 .. 0x40000000 reserved for PCI */ +/* +* PCIE verbose map: +* +* MMIO window { 0x10000000, 0x2eff0000 }, +* PIO window { 0x3eff0000, 0x00010000 }, +* ECAM { 0x3f000000, 0x01000000 }, Is this a typo, or is there really a big gap between the end of the MMIO window and the start of the PIO window?
It's perfectly correct, the map is tuples of { offset, length }:
0000000010000000-000000003efeffff (prio 0, RW): alias pcie-mmio
@gpex_mmio 0000000010000000-000000003efeffff
000000003eff0000-000000003effffff (prio 0, RW): gpex_ioport 000000003f000000-000000003fffffff (prio 0, RW): alias pcie-ecam
@pcie-mmcfg 0000000000000000-0000000000ffffff
Alex
Re: [Qemu-devel] [PATCH v5 3/4] arm: Add PCIe host bridge in virt machine
Quoted 20 lines · Alexander Graf
Quoted 16 lines · Peter Maydell
hw/arm/virt.c static const MemMapEntry a15memmap[] = { · line 139
Quoted 12 lines · Alexander Graf
typedef struct MemMapEntry {
hw/arm/virt.c +6
-1@@ -129,13 +131,21 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x0000000a }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 },/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ -/* 0x10000000 .. 0x40000000 reserved for PCI */ +/* +* PCIE verbose map: +* +* MMIO window { 0x10000000, 0x2eff0000 }, +* PIO window { 0x3eff0000, 0x00010000 }, +* ECAM { 0x3f000000, 0x01000000 }, Is this a typo, or is there really a big gap between the end of the MMIO window and the start of the PIO window?
Quoted 1 line
It's perfectly correct, the map is tuples of { offset, length }:
Oh, of course it is. Ooops :-)
-- PMM
PATCH v5 4/4 pci: Move PCI VGA to pci.mak
In reply to Alexander GrafEvery platform that supports PCI can also spawn the Bochs VGA PCI adapter. Move it to pci.mak to enable it for everyone.
--- default-configs/alpha-softmmu.mak | 2 -- default-configs/i386-softmmu.mak | 2 -- default-configs/mips-softmmu.mak | 2 -- default-configs/mips64-softmmu.mak | 2 -- default-configs/mips64el-softmmu.mak | 2 -- default-configs/mipsel-softmmu.mak | 2 -- default-configs/pci.mak | 2 ++ default-configs/ppc-softmmu.mak | 2 -- default-configs/ppc64-softmmu.mak | 2 -- default-configs/ppcemb-softmmu.mak | 2 -- default-configs/sparc64-softmmu.mak | 2 -- default-configs/x86_64-softmmu.mak | 2 -- 12 files changed, 2 insertions(+), 22 deletions(-)
default-configs/alpha-softmmu.mak +0 -2
@@ -5,8 +5,6 @@ include usb.mak CONFIG_SERIAL=y CONFIG_I8254=y CONFIG_PCKBD=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_VGA_CIRRUS=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y
default-configs/i386-softmmu.mak +0 -2
@@ -3,9 +3,7 @@ include pci.mak include sound.mak include usb.mak -CONFIG_VGA=y CONFIG_QXL=$(CONFIG_SPICE) -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y
default-configs/mips-softmmu.mak +0 -2
@@ -4,8 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y
default-configs/mips64-softmmu.mak +0 -2
@@ -4,8 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y
default-configs/mips64el-softmmu.mak +0 -2
@@ -4,8 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y
default-configs/mipsel-softmmu.mak +0 -2
@@ -4,8 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y
default-configs/pci.mak +2 -0
@@ -33,3 +33,5 @@ CONFIG_NVME_PCI=y CONFIG_SD=y CONFIG_SDHCI=y CONFIG_EDU=y +CONFIG_VGA=y +CONFIG_VGA_PCI=y
default-configs/ppc-softmmu.mak +0 -2
@@ -6,8 +6,6 @@ include usb.mak CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y
default-configs/ppc64-softmmu.mak +0 -2
@@ -6,8 +6,6 @@ include usb.mak CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_I8254=y
default-configs/ppcemb-softmmu.mak +0 -2
@@ -4,8 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_M48T59=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_SERIAL=y CONFIG_I8257=y CONFIG_OPENPIC=y
default-configs/sparc64-softmmu.mak +0 -2
@@ -5,8 +5,6 @@ include usb.mak CONFIG_ISA_MMIO=y CONFIG_M48T59=y CONFIG_PTIMER=y -CONFIG_VGA=y -CONFIG_VGA_PCI=y CONFIG_SERIAL=y CONFIG_PARALLEL=y CONFIG_PCKBD=y
default-configs/x86_64-softmmu.mak +0 -2
@@ -3,9 +3,7 @@ include pci.mak include sound.mak include usb.mak -CONFIG_VGA=y CONFIG_QXL=$(CONFIG_SPICE) -CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y
Signature · 1 line
1.7.12.4
Quoted 11 lines · Alexander Graf
Linux implements a nice binding to describe a "generic" PCI Express host bridge using only device tree.
This patch set adds enough emulation logic to expose the parts that are "generic" as a simple sysbus device and maps it into ARM's virt machine.
With this patch set, we can finally spawn PCI devices on ARM VMs. I was able to have a fully DRM enabled virtual machine with VGA, e1000 and XHCI (for keyboard and mouse) up and working.
It's only a small step for QEMU, but a big step for ARM VM's usability.
Thanks; applied to target-arm.next.
-- PMM