diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-10-30 21:21:05 +0900 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-11-09 08:43:07 -0600 |
| commit | b3b1169731c976dfe8dc5b4b121cfc670abc84c9 (patch) | |
| tree | 4f8f3a4ff368b54bc1d4c2e3ebeae8add3942ce7 /hw | |
| parent | 5029fe12dccbe261d5bd5bc840110ae48aa112c9 (diff) | |
pci: make pci_bar() aware of header type 1.
make pci_bar() aware of header type 1. When PCI_ROM_SLOT
it should return PCI_ROM_ADDRESS1 (!= PCI_ROM_ADDRESS)
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci.c | 18 | ||||
| -rw-r--r-- | hw/pci.h | 1 |
2 files changed, 13 insertions, 6 deletions
@@ -84,9 +84,15 @@ static const VMStateDescription vmstate_pcibus = { } }; -static inline int pci_bar(int reg) +static int pci_bar(PCIDevice *d, int reg) { - return reg == PCI_ROM_SLOT ? PCI_ROM_ADDRESS : PCI_BASE_ADDRESS_0 + reg * 4; + uint8_t type; + + if (reg != PCI_ROM_SLOT) + return PCI_BASE_ADDRESS_0 + reg * 4; + + type = d->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION; + return type == PCI_HEADER_TYPE_BRIDGE ? PCI_ROM_ADDRESS1 : PCI_ROM_ADDRESS; } static void pci_device_reset(PCIDevice *dev) @@ -102,7 +108,7 @@ static void pci_device_reset(PCIDevice *dev) if (!dev->io_regions[r].size) { continue; } - pci_set_long(dev->config + pci_bar(r), dev->io_regions[r].type); + pci_set_long(dev->config + pci_bar(dev, r), dev->io_regions[r].type); } pci_update_mappings(dev); } @@ -472,7 +478,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, r->map_func = map_func; wmask = ~(size - 1); - addr = pci_bar(region_num); + addr = pci_bar(pci_dev, region_num); if (region_num == PCI_ROM_SLOT) { /* ROM enable bit is writeable */ wmask |= PCI_ROM_ADDRESS_ENABLE; @@ -494,7 +500,7 @@ static void pci_update_mappings(PCIDevice *d) if (r->size != 0) { if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { if (cmd & PCI_COMMAND_IO) { - new_addr = pci_get_long(d->config + pci_bar(i)); + new_addr = pci_get_long(d->config + pci_bar(d, i)); new_addr = new_addr & ~(r->size - 1); last_addr = new_addr + r->size - 1; /* NOTE: we have only 64K ioports on PC */ @@ -507,7 +513,7 @@ static void pci_update_mappings(PCIDevice *d) } } else { if (cmd & PCI_COMMAND_MEMORY) { - new_addr = pci_get_long(d->config + pci_bar(i)); + new_addr = pci_get_long(d->config + pci_bar(d, i)); /* the ROM slot has a specific enable bit */ if (i == PCI_ROM_SLOT && !(new_addr & PCI_ROM_ADDRESS_ENABLE)) goto no_mem_map; @@ -120,6 +120,7 @@ typedef struct PCIIORegion { #define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS_ENABLE 0x01 #define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ +#define PCI_ROM_ADDRESS1 0x38 /* Same as PCI_ROM_ADDRESS, but for htype 1 */ #define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ #define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ #define PCI_MIN_GNT 0x3e /* 8 bits */ |