[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/25] pci: fix pci_default_write_config()
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 17/25] pci: fix pci_default_write_config() |
Date: |
Sat, 3 Oct 2009 05:16:09 +0900 |
When updated ROM expantion address of header type 0, it missed
to update mappings.
Add PCI_ROM_ADDRESS check whether to call pci_update_mappings()
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/pci.c | 3 ++-
hw/pci.h | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index eb8d661..f697d9f 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -671,7 +671,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr,
uint32_t val, int l)
uint8_t wmask = d->wmask[addr];
d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
}
- if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24)
+ if ((memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24)
||
+ memcmp(orig + PCI_ROM_ADDRESS, d->config + PCI_ROM_ADDRESS, 4))
|| ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND])
& (PCI_COMMAND_MEMORY | PCI_COMMAND_IO)))
pci_update_mappings(d);
diff --git a/hw/pci.h b/hw/pci.h
index 66d899d..3ea5258 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -144,6 +144,7 @@ static inline int pci_bar_is_64bit(const PCIIORegion *r)
#define PCI_SUBVENDOR_ID 0x2c /* obsolete, use
PCI_SUBSYSTEM_VENDOR_ID */
#define PCI_SUBDEVICE_ID 0x2e /* obsolete, use PCI_SUBSYSTEM_ID */
+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1
reserved */
#define PCI_ROM_ADDRESS_ENABLE 0x01
/* Bits in the PCI Status Register (PCI 2.3 spec) */
--
1.6.0.2
[Qemu-devel] [PATCH 08/25] pci: use helper functions to access pci config space., Isaku Yamahata, 2009/10/02
[Qemu-devel] [PATCH 10/25] pci: introduce FMT_pcibus for printf format for pcibus_t., Isaku Yamahata, 2009/10/02