diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-05-02 12:29:39 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-05-03 16:13:59 -0300 |
| commit | aa440998aa5c497b2d32c35852a9d239d17a62f4 (patch) | |
| tree | 4a5f80f7cb2945138c70b7619eb2007127723e99 | |
| parent | b97c4d0d9c0e1d302f4918823e6a321754217eb2 (diff) | |
pci-assign: Properly handle more overlapping accesses
Ensure that accesses exceeding PCI_CAPABILITY_LIST and
PCI_INTERRUPT_LINE+PIN hit the real device in areas we do not
virtualize. Again, we do not optimize these checks and accesses a lot,
they are considered to be slow paths.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | hw/device-assignment.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/hw/device-assignment.c b/hw/device-assignment.c index cea072ea6..8e9573005 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -438,11 +438,22 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, * - interrupt line & pin */ if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) || - ranges_overlap(address, len, PCI_ROM_ADDRESS, 5) || - ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) { - /* used for update-mappings (BAR emulation) */ + ranges_overlap(address, len, PCI_ROM_ADDRESS, 4)) { pci_default_write_config(d, address, val, len); return; + } else if (ranges_overlap(address, len, PCI_CAPABILITY_LIST, 1) || + ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) { + uint32_t real_val; + + pci_default_write_config(d, address, val, len); + + /* Ensure that writes to overlapping areas we don't virtualize still + * hit the device. */ + real_val = assigned_dev_pci_read(d, address, len); + val = merge_bits(val, real_val, address, len, + PCI_CAPABILITY_LIST, 0xff); + val = merge_bits(val, real_val, address, len, + PCI_INTERRUPT_LINE, 0xffff); } DEBUG("NON BAR (%x.%x): address=%04x val=0x%08x len=%d\n", @@ -467,7 +478,7 @@ again: static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, int len) { - uint32_t val = 0; + uint32_t val = 0, virt_val; int fd; ssize_t ret; AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d); @@ -483,13 +494,11 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, * Catch access to * - vendor & device ID * - base address registers - * - ROM base address & capability pointer - * - interrupt line & pin + * - ROM base address */ if (ranges_overlap(address, len, PCI_VENDOR_ID, 4) || ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) || - ranges_overlap(address, len, PCI_ROM_ADDRESS, 5) || - ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) { + ranges_overlap(address, len, PCI_ROM_ADDRESS, 4)) { val = pci_default_read_config(d, address, len); DEBUG("(%x.%x): address=%04x val=0x%08x len=%d\n", (d->devfn >> 3) & 0x1F, (d->devfn & 0x7), address, val, len); @@ -523,6 +532,15 @@ do_log: address, len, PCI_COMMAND, 0xffff); } + /* + * Merge bits from virtualized + * - capability pointer + * - interrupt line & pin + */ + virt_val = pci_default_read_config(d, address, len); + val = merge_bits(val, virt_val, address, len, PCI_CAPABILITY_LIST, 0xff); + val = merge_bits(val, virt_val, address, len, PCI_INTERRUPT_LINE, 0xffff); + if (!pci_dev->cap.available) { /* kill the special capabilities */ if (address == PCI_COMMAND && len == 4) { |