From e4d2cea2da3d17b0a5c1e37caadd82c415e49a43 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sat, 31 Jul 2010 23:20:01 +0300 Subject: [PATCH] kvm, pci: Fix unaligned PCI accesses Signed-off-by: Pekka Enberg --- pci.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pci.c b/pci.c index 0558b2c..ee2e06f 100644 --- a/pci.c +++ b/pci.c @@ -56,10 +56,18 @@ static bool pci_device_matches(uint8_t bus_number, uint8_t device_number, uint8_ static bool pci_config_data_in(struct kvm *self, uint16_t port, void *data, int size, uint32_t count) { + unsigned long start; + + /* + * If someone accesses PCI configuration space offsets that are not + * aligned to 4 bytes, it uses iports to signify that. + */ + start = port - PCI_CONFIG_ADDRESS; + if (pci_device_matches(0, 1, 0)) { unsigned long offset; - offset = pci_config_address.register_number << 2; + offset = start + (pci_config_address.register_number << 2); if (offset < sizeof(struct pci_device_header)) { void *p = &virtio_device; @@ -79,6 +87,9 @@ static struct ioport_operations pci_config_data_ops = { void pci__init(void) { - ioport__register(PCI_CONFIG_DATA, &pci_config_data_ops); - ioport__register(PCI_CONFIG_ADDRESS, &pci_config_address_ops); + ioport__register(PCI_CONFIG_DATA, &pci_config_data_ops); + ioport__register(PCI_CONFIG_ADDRESS + 0, &pci_config_address_ops); + ioport__register(PCI_CONFIG_ADDRESS + 1, &pci_config_address_ops); + ioport__register(PCI_CONFIG_ADDRESS + 2, &pci_config_address_ops); + ioport__register(PCI_CONFIG_ADDRESS + 3, &pci_config_address_ops); }