Some PCI config space registers have to be accessed in with there actual

width. Without this patch DDELinux is not able to read the PCI BARs
correctly.

diff --git a/drivers/pci/pci_intel.h b/drivers/pci/pci_intel.h
index 6aef15a34196ff0cd075bbca88a8e684df2ced49..63801c9f792f4e089157654d351084b40f936e9b 100644 (file)
--- a/drivers/pci/pci_intel.h
+++ b/drivers/pci/pci_intel.h
@@ -28,21 +28,21 @@ Created:    Jan 2000 by Philip Homburg <philip@cs.vu.nl>
        (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
        pci_inb(PCII_CONFDATA+((reg)&3)))
 #define PCII_RREG16_(bus, dev, func, reg) \
-       (PCII_RREG8_(bus, dev, func, reg) | \
-       (PCII_RREG8_(bus, dev, func, reg+1) << 8))
+       (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
+       pci_inw(PCII_CONFDATA+((reg)&2)))
 #define PCII_RREG32_(bus, dev, func, reg) \
-       (PCII_RREG16_(bus, dev, func, reg) | \
-       (PCII_RREG16_(bus, dev, func, reg+2) << 16))
+       (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
+       pci_inl(PCII_CONFDATA))
 
 #define PCII_WREG8_(bus, dev, func, reg, val) \
        (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
        pci_outb(PCII_CONFDATA+((reg)&3), (val)))
 #define PCII_WREG16_(bus, dev, func, reg, val) \
-       (PCII_WREG8_(bus, dev, func, reg, (val)), \
-       (PCII_WREG8_(bus, dev, func, reg+1, (val) >> 8)))
+       (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
+       pci_outw(PCII_CONFDATA+((reg)&2), (val)))
 #define PCII_WREG32_(bus, dev, func, reg, val) \
-       (PCII_WREG16_(bus, dev, func, reg, (val)), \
-       (PCII_WREG16_(bus, dev, func, reg+2, (val) >> 16)))
+       (pci_outl(PCII_CONFADD, PCII_SELREG_(bus, dev, func, reg)), \
+       pci_outl(PCII_CONFDATA, (val)))
 
 /* PIIX configuration registers */
 #define PIIX_PIRQRCA   0x60