[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper |
Date: |
Mon, 14 Oct 2013 17:58:52 +0300 |
BAR base was calculated incorrectly.
Use existing pci_bar_address to get it right.
Tested-by: Igor Mammedov <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pci.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index ae23c58..a98c8a0 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2306,7 +2306,7 @@ static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev,
void *opaque)
Range *range = opaque;
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
uint16_t cmd = pci_get_word(dev->config + PCI_COMMAND);
- int r;
+ int i;
if (!(cmd & PCI_COMMAND_MEMORY)) {
return;
@@ -2325,17 +2325,21 @@ static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev,
void *opaque)
range_extend(range, &pref_range);
}
}
- for (r = 0; r < PCI_NUM_REGIONS; ++r) {
- PCIIORegion *region = &dev->io_regions[r];
+ for (i = 0; i < PCI_NUM_REGIONS; ++i) {
+ PCIIORegion *r = &dev->io_regions[i];
Range region_range;
- if (!region->size ||
- (region->type & PCI_BASE_ADDRESS_SPACE_IO) ||
- !(region->type & PCI_BASE_ADDRESS_MEM_TYPE_64)) {
+ if (!r->size ||
+ (r->type & PCI_BASE_ADDRESS_SPACE_IO) ||
+ !(r->type & PCI_BASE_ADDRESS_MEM_TYPE_64)) {
+ continue;
+ }
+ region_range.begin = pci_bar_address(dev, i, r->type, r->size);
+ region_range.end = region_range.begin + r->size;
+
+ if (region_range.begin == PCI_BAR_UNMAPPED) {
continue;
}
- region_range.begin = pci_get_quad(dev->config + pci_bar(dev, r));
- region_range.end = region_range.begin + region->size;
region_range.begin = MAX(region_range.begin, 0x1ULL << 32);
--
MST
- [Qemu-devel] [PULL 06/43] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init, (continued)
- [Qemu-devel] [PULL 06/43] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 07/43] hw/vmxnet3: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 10/43] hw/pcie: AER and hot-plug events must use device's interrupt, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 09/43] hw: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 11/43] hw/pci: removed irq field from PCIDevice, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 12/43] cleanup object.h: include error.h directly, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 13/43] qom: cleanup struct Error references, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 14/43] qom: add pointer to int property helpers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 17/43] loader: support for unmapped ROM blobs, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 18/43] pcie_host: expose UNMAPPED macro, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 19/43] pcie_host: expose address format, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 20/43] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 21/43] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 23/43] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 25/43] acpi: ssdt pcihp: updat generated file, Michael S. Tsirkin, 2013/10/14