diff options
author | Avi Kivity <avi@redhat.com> | 2009-10-06 10:39:54 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-10-06 10:39:54 +0200 |
commit | 2455aed9dc69d2cfae95ab10c229f96604f8cebb (patch) | |
tree | 3964c6d564cd322293be32c5aef9584615dc547b /hw/msix.c | |
parent | Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-merge (diff) | |
parent | qemu: clean up target page usage in msix (diff) | |
download | qemu-kvm-2455aed9dc69d2cfae95ab10c229f96604f8cebb.tar.gz qemu-kvm-2455aed9dc69d2cfae95ab10c229f96604f8cebb.tar.bz2 qemu-kvm-2455aed9dc69d2cfae95ab10c229f96604f8cebb.zip |
Merge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-merge
* commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d':
qemu: clean up target page usage in msix
fix comment on cpu_register_physical_memory_offset
qemu/pci: reset device registers on bus reset
qemu/pci: refactor code/symbolic constants
qemu/virtio: fix reset with device removal
qemu/qdev: type safety in reset handler
serial: convert isa to qdev
qdev: don't crash on unset drive properties.
floppy: move dma setup + drive connect to fdctrl_init_common()
floppy: add drive properties.
store a pointer to QemuOpts in DeviceState, release it when zapping a device.
allow if=none for drive_add
refactor drive_hot_add
drive cleanup fixes.
Conflicts:
hw/msix.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/msix.c')
-rw-r--r-- | hw/msix.c | 49 |
1 files changed, 24 insertions, 25 deletions
@@ -40,6 +40,13 @@ #define MSIX_VECTOR_CTRL 12 #define MSIX_ENTRY_SIZE 16 #define MSIX_VECTOR_MASK 0x1 + +/* How much space does an MSIX table need. */ +/* The spec requires giving the table structure + * a 4K aligned region all by itself. */ +#define MSIX_PAGE_SIZE 0x1000 +/* Reserve second half of the page for pending bits */ +#define MSIX_PAGE_PENDING (MSIX_PAGE_SIZE / 2) #define MSIX_MAX_ENTRIES 32 @@ -166,12 +173,6 @@ static int kvm_msix_add(PCIDevice *dev, unsigned vector) { return -1; } static void kvm_msix_del(PCIDevice *dev, unsigned vector) {} #endif -/* Reserve second half of the page for pending bits */ -static int msix_page_pending(PCIDevice *d) -{ - return (d->msix_page_size / 2); -} - /* Add MSI-X capability to the config space for the device. */ /* Given a bar and its size, add MSI-X table on top of it * and fill MSI-X capability in the config space. @@ -191,12 +192,13 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries, /* Add space for MSI-X structures */ if (!bar_size) { - new_size = pdev->msix_page_size; - } else if (bar_size < pdev->msix_page_size) { - bar_size = pdev->msix_page_size; - new_size = pdev->msix_page_size * 2; - } else + new_size = MSIX_PAGE_SIZE; + } else if (bar_size < MSIX_PAGE_SIZE) { + bar_size = MSIX_PAGE_SIZE; + new_size = MSIX_PAGE_SIZE * 2; + } else { new_size = bar_size * 2; + } pdev->msix_bar_size = new_size; config_offset = pci_add_capability(pdev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH); @@ -208,8 +210,8 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries, /* Table on top of BAR */ pci_set_long(config + MSIX_TABLE_OFFSET, bar_size | bar_nr); /* Pending bits on top of that */ - pci_set_long(config + MSIX_PBA_OFFSET, (bar_size + msix_page_pending(pdev)) - | bar_nr); + pci_set_long(config + MSIX_PBA_OFFSET, (bar_size + MSIX_PAGE_PENDING) | + bar_nr); pdev->msix_cap = config_offset; /* Make flags bit writeable. */ pdev->wmask[config_offset + MSIX_ENABLE_OFFSET] |= MSIX_ENABLE_MASK; @@ -242,7 +244,7 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, static uint32_t msix_mmio_readl(void *opaque, target_phys_addr_t addr) { PCIDevice *dev = opaque; - unsigned int offset = addr & (dev->msix_page_size - 1); + unsigned int offset = addr & (MSIX_PAGE_SIZE - 1); void *page = dev->msix_table_page; uint32_t val = 0; @@ -264,7 +266,7 @@ static uint8_t msix_pending_mask(int vector) static uint8_t *msix_pending_byte(PCIDevice *dev, int vector) { - return dev->msix_table_page + msix_page_pending(dev) + vector / 8; + return dev->msix_table_page + MSIX_PAGE_PENDING + vector / 8; } static int msix_is_pending(PCIDevice *dev, int vector) @@ -292,7 +294,7 @@ static void msix_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { PCIDevice *dev = opaque; - unsigned int offset = addr & (dev->msix_page_size - 1); + unsigned int offset = addr & (MSIX_PAGE_SIZE - 1); int vector = offset / MSIX_ENTRY_SIZE; int was_masked = msix_is_masked(dev, vector); memcpy(dev->msix_table_page + offset, &val, 4); @@ -325,7 +327,7 @@ void msix_mmio_map(PCIDevice *d, int region_num, { uint8_t *config = d->config + d->msix_cap; uint32_t table = pci_get_long(config + MSIX_TABLE_OFFSET); - uint32_t offset = table & ~(d->msix_page_size - 1); + uint32_t offset = table & ~(MSIX_PAGE_SIZE - 1); /* TODO: for assigned devices, we'll want to make it possible to map * pending bits separately in case they are in a separate bar. */ int table_bir = table & PCI_MSIX_FLAGS_BIRMASK; @@ -341,7 +343,7 @@ void msix_mmio_map(PCIDevice *d, int region_num, /* Initialize the MSI-X structures. Note: if MSI-X is supported, BAR size is * modified, it should be retrieved with msix_bar_size. */ int msix_init(struct PCIDevice *dev, unsigned short nentries, - unsigned bar_nr, unsigned bar_size, target_phys_addr_t page_size) + unsigned bar_nr, unsigned bar_size) { int ret; /* Nothing to do if MSI is not supported by interrupt controller */ @@ -360,8 +362,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, dev->msix_entry_used = qemu_mallocz(MSIX_MAX_ENTRIES * sizeof *dev->msix_entry_used); - dev->msix_page_size = page_size; - dev->msix_table_page = qemu_mallocz(dev->msix_page_size); + dev->msix_table_page = qemu_mallocz(MSIX_PAGE_SIZE); dev->msix_mmio_index = cpu_register_io_memory(msix_mmio_read, msix_mmio_write, dev); @@ -421,8 +422,7 @@ void msix_save(PCIDevice *dev, QEMUFile *f) return; } qemu_put_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE); - qemu_put_buffer(f, dev->msix_table_page + msix_page_pending(dev), - (n + 7) / 8); + qemu_put_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8); } /* Should be called after restoring the config space. */ @@ -439,8 +439,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f) msix_free_irq_entries(dev); qemu_get_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE); - qemu_get_buffer(f, dev->msix_table_page + msix_page_pending(dev), - (n + 7) / 8); + qemu_get_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8); } /* Does device support MSI-X? */ @@ -497,7 +496,7 @@ void msix_reset(PCIDevice *dev) return; msix_free_irq_entries(dev); dev->config[dev->msix_cap + MSIX_ENABLE_OFFSET] &= MSIX_ENABLE_MASK; - memset(dev->msix_table_page, 0, dev->msix_page_size); + memset(dev->msix_table_page, 0, MSIX_PAGE_SIZE); } /* PCI spec suggests that devices make it possible for software to configure |