mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-pci: change & document virtio pci bar layout.

Browse Source 
This patch adds variables for the pci bars (to get rid of the magic
numbers in the code) and moves the modern virtio bar to region 4 so
regions 2+3 are kept free.  virtio-vga wants use them.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Gerd Hoffmann 2015-06-04 12:34:28 +02:00 committed by Michael S. Tsirkin
parent 8aca0d7586
commit 23c5e39775
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/virtio/virtio-pci.c
View File

@ -926,8 +926,6 @@ static void virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
PCIDevice *dev = &proxy->pci_dev; PCIDevice *dev = &proxy->pci_dev;
int offset; int offset;
cap->bar = 2;
offset = pci_add_capability(dev, PCI_CAP_ID_VNDR, 0, cap->cap_len); offset = pci_add_capability(dev, PCI_CAP_ID_VNDR, 0, cap->cap_len);
assert(offset > 0); assert(offset > 0);
@ -1203,6 +1201,22 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
uint32_t size; uint32_t size;
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
/*
* virtio pci bar layout
*
* region 0 -- virtio legacy io bar
* region 1 -- msi-x bar
* region 2+3 -- not used by virtio-pci
* region 4+5 -- virtio modern memory (64bit) bar
*
* Regions 2+3 can be used by VirtIOPCIProxy subclasses.
* virtio-vga places the vga framebuffer there.
*
*/
uint32_t legacy_io_bar = 0;
uint32_t msix_bar = 1;
uint32_t modern_mem_bar = 4;
config = proxy->pci_dev.config; config = proxy->pci_dev.config;
if (proxy->class_code) { if (proxy->class_code) {
pci_config_set_class(config, proxy->class_code); pci_config_set_class(config, proxy->class_code);
@ -1228,24 +1242,28 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
struct virtio_pci_cap common = { struct virtio_pci_cap common = {
.cfg_type = VIRTIO_PCI_CAP_COMMON_CFG, .cfg_type = VIRTIO_PCI_CAP_COMMON_CFG,
.cap_len = sizeof common, .cap_len = sizeof common,
.bar = modern_mem_bar,
.offset = cpu_to_le32(0x0), .offset = cpu_to_le32(0x0),
.length = cpu_to_le32(0x1000), .length = cpu_to_le32(0x1000),
}; };
struct virtio_pci_cap isr = { struct virtio_pci_cap isr = {
.cfg_type = VIRTIO_PCI_CAP_ISR_CFG, .cfg_type = VIRTIO_PCI_CAP_ISR_CFG,
.cap_len = sizeof isr, .cap_len = sizeof isr,
.bar = modern_mem_bar,
.offset = cpu_to_le32(0x1000), .offset = cpu_to_le32(0x1000),
.length = cpu_to_le32(0x1000), .length = cpu_to_le32(0x1000),
}; };
struct virtio_pci_cap device = { struct virtio_pci_cap device = {
.cfg_type = VIRTIO_PCI_CAP_DEVICE_CFG, .cfg_type = VIRTIO_PCI_CAP_DEVICE_CFG,
.cap_len = sizeof device, .cap_len = sizeof device,
.bar = modern_mem_bar,
.offset = cpu_to_le32(0x2000), .offset = cpu_to_le32(0x2000),
.length = cpu_to_le32(0x1000), .length = cpu_to_le32(0x1000),
}; };
struct virtio_pci_notify_cap notify = { struct virtio_pci_notify_cap notify = {
.cap.cfg_type = VIRTIO_PCI_CAP_NOTIFY_CFG, .cap.cfg_type = VIRTIO_PCI_CAP_NOTIFY_CFG,
.cap.cap_len = sizeof notify, .cap.cap_len = sizeof notify,
.cap.bar = modern_mem_bar,
.cap.offset = cpu_to_le32(0x3000), .cap.offset = cpu_to_le32(0x3000),
.cap.length = cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * .cap.length = cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT *
VIRTIO_QUEUE_MAX), VIRTIO_QUEUE_MAX),
@ -1325,12 +1343,13 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * QEMU_VIRTIO_PCI_QUEUE_MEM_MULT *
VIRTIO_QUEUE_MAX); VIRTIO_QUEUE_MAX);
memory_region_add_subregion(&proxy->modern_bar, 0x3000, &proxy->notify); memory_region_add_subregion(&proxy->modern_bar, 0x3000, &proxy->notify);
pci_register_bar(&proxy->pci_dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, pci_register_bar(&proxy->pci_dev, modern_mem_bar,
PCI_BASE_ADDRESS_SPACE_MEMORY,
&proxy->modern_bar); &proxy->modern_bar);
} }
if (proxy->nvectors && if (proxy->nvectors &&
msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors, 1)) { msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors, msix_bar)) {
error_report("unable to init msix vectors to %" PRIu32, error_report("unable to init msix vectors to %" PRIu32,
proxy->nvectors); proxy->nvectors);
proxy->nvectors = 0; proxy->nvectors = 0;
@ -1349,8 +1368,8 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
&virtio_pci_config_ops, &virtio_pci_config_ops,
proxy, "virtio-pci", size); proxy, "virtio-pci", size);
pci_register_bar(&proxy->pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO, pci_register_bar(&proxy->pci_dev, legacy_io_bar,
&proxy->bar); PCI_BASE_ADDRESS_SPACE_IO, &proxy->bar);
} }
if (!kvm_has_many_ioeventfds()) { if (!kvm_has_many_ioeventfds()) {