[PATCH] PCI Cleanup

The patch removes the pci_confN_(read|write)_config_(byte|word|dword) mess and
pares it down to pci_confN_(read|write).  This change is reflected in the
pci_ops structure, which only has read and write function pointers rather than
the byte, word, and dword versions.  These changes happen in the pci_conf(1|2)
and pci_bios read and write calls.

This patch also removes the pci_config_(read|write) function pointers.  People
shouldn't be using these (I don't think) and should be using the pci_ops
structure linked through the pci_dev structure.  These end up calling the same
functions that the pci_config_(read|write) pointers refer to anyway.

diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index e62369561399be5ff33aead724564f0ffc61ef50..569f58862360e6fba1ab714f2becbf882a8287e0 100644 (file)
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -25,9 +25,6 @@ int pcibios_last_bus = -1;
 struct pci_bus *pci_root_bus = NULL;
 struct pci_ops *pci_root_ops = NULL;
 
-int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value) = NULL;
-int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value) = NULL;
-
 /*
  * legacy, numa, and acpi all want to call pcibios_scan_root
  * from their initcalls. This flag prevents that.

diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c
index 2e443ea074f919557574a4d185ed7ee3273d71ea..e2943266c48df5813915e5b52fd73eb300ba041c 100644 (file)
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
@@ -13,7 +13,7 @@
 #define PCI_CONF1_ADDRESS(bus, dev, fn, reg) \
        (0x80000000 | (bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))
 
-static int pci_conf1_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
+static int __pci_conf1_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
 {
        unsigned long flags;
 
@@ -41,7 +41,7 @@ static int pci_conf1_read (int seg, int bus, int dev, int fn, int reg, int len,
        return 0;
 }
 
-static int pci_conf1_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
+static int __pci_conf1_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
 {
        unsigned long flags;
 
@@ -69,75 +69,23 @@ static int pci_conf1_write (int seg, int bus, int dev, int fn, int reg, int len,
        return 0;
 }
 
-
 #undef PCI_CONF1_ADDRESS
 
-static int pci_conf1_read_config_byte(struct pci_dev *dev, int where, u8 *value)
+static int pci_conf1_read(struct pci_dev *dev, int where, int size, u32 *value)
 {
-       int result; 
-       u32 data;
-
-       if (!value) 
-               return -EINVAL;
-
-       result = pci_conf1_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, &data);
-
-       *value = (u8)data;
-
-       return result;
+       return __pci_conf1_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
-static int pci_conf1_read_config_word(struct pci_dev *dev, int where, u16 *value)
+static int pci_conf1_write(struct pci_dev *dev, int where, int size, u32 value)
 {
-       int result; 
-       u32 data;
-
-       if (!value) 
-               return -EINVAL;
-
-       result = pci_conf1_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, &data);
-
-       *value = (u16)data;
-
-       return result;
-}
-
-static int pci_conf1_read_config_dword(struct pci_dev *dev, int where, u32 *value)
-{
-       if (!value) 
-               return -EINVAL;
-
-       return pci_conf1_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
-}
-
-static int pci_conf1_write_config_byte(struct pci_dev *dev, int where, u8 value)
-{
-       return pci_conf1_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, value);
-}
-
-static int pci_conf1_write_config_word(struct pci_dev *dev, int where, u16 value)
-{
-       return pci_conf1_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, value);
-}
-
-static int pci_conf1_write_config_dword(struct pci_dev *dev, int where, u32 value)
-{
-       return pci_conf1_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
+       return __pci_conf1_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
 static struct pci_ops pci_direct_conf1 = {
-       pci_conf1_read_config_byte,
-       pci_conf1_read_config_word,
-       pci_conf1_read_config_dword,
-       pci_conf1_write_config_byte,
-       pci_conf1_write_config_word,
-       pci_conf1_write_config_dword
+       .read =         pci_conf1_read,
+       .write =        pci_conf1_write,
 };
 
 
@@ -147,7 +95,7 @@ static struct pci_ops pci_direct_conf1 = {
 
 #define PCI_CONF2_ADDRESS(dev, reg)    (u16)(0xC000 | (dev << 8) | reg)
 
-static int pci_conf2_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
+static int __pci_conf2_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
 {
        unsigned long flags;
 
@@ -181,7 +129,7 @@ static int pci_conf2_read (int seg, int bus, int dev, int fn, int reg, int len,
        return 0;
 }
 
-static int pci_conf2_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
+static int __pci_conf2_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
 {
        unsigned long flags;
 
@@ -217,57 +165,21 @@ static int pci_conf2_write (int seg, int bus, int dev, int fn, int reg, int len,
 
 #undef PCI_CONF2_ADDRESS
 
-static int pci_conf2_read_config_byte(struct pci_dev *dev, int where, u8 *value)
-{
-       int result; 
-       u32 data;
-       result = pci_conf2_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, &data);
-       *value = (u8)data;
-       return result;
-}
-
-static int pci_conf2_read_config_word(struct pci_dev *dev, int where, u16 *value)
-{
-       int result; 
-       u32 data;
-       result = pci_conf2_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, &data);
-       *value = (u16)data;
-       return result;
-}
-
-static int pci_conf2_read_config_dword(struct pci_dev *dev, int where, u32 *value)
-{
-       return pci_conf2_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
-}
-
-static int pci_conf2_write_config_byte(struct pci_dev *dev, int where, u8 value)
+static int pci_conf2_read(struct pci_dev *dev, int where, int size, u32 *value)
 {
-       return pci_conf2_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, value);
+       return __pci_conf2_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
-static int pci_conf2_write_config_word(struct pci_dev *dev, int where, u16 value)
+static int pci_conf2_write(struct pci_dev *dev, int where, int size, u32 value)
 {
-       return pci_conf2_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, value);
-}
-
-static int pci_conf2_write_config_dword(struct pci_dev *dev, int where, u32 value)
-{
-       return pci_conf2_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
+       return __pci_conf2_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
 static struct pci_ops pci_direct_conf2 = {
-       pci_conf2_read_config_byte,
-       pci_conf2_read_config_word,
-       pci_conf2_read_config_dword,
-       pci_conf2_write_config_byte,
-       pci_conf2_write_config_word,
-       pci_conf2_write_config_dword
+       .read =         pci_conf2_read,
+       .write =        pci_conf2_write,
 };
 
 
@@ -283,7 +195,7 @@ static struct pci_ops pci_direct_conf2 = {
  */
 static int __devinit pci_sanity_check(struct pci_ops *o)
 {
-       u16 x;
+       u32 x = 0;
        struct pci_bus bus;             /* Fake bus and device */
        struct pci_dev dev;
 
@@ -292,16 +204,16 @@ static int __devinit pci_sanity_check(struct pci_ops *o)
        bus.number = 0;
        dev.bus = &bus;
        for(dev.devfn=0; dev.devfn < 0x100; dev.devfn++)
-               if ((!o->read_word(&dev, PCI_CLASS_DEVICE, &x) &&
+               if ((!o->read(&dev, PCI_CLASS_DEVICE, 2, &x) &&
                     (x == PCI_CLASS_BRIDGE_HOST || x == PCI_CLASS_DISPLAY_VGA)) ||
-                   (!o->read_word(&dev, PCI_VENDOR_ID, &x) &&
+                   (!o->read(&dev, PCI_VENDOR_ID, 2, &x) &&
                     (x == PCI_VENDOR_ID_INTEL || x == PCI_VENDOR_ID_COMPAQ)))
                        return 1;
        DBG("PCI: Sanity check failed\n");
        return 0;
 }
 
-static struct pci_ops * __devinit pci_check_direct(void)
+static int __init pci_direct_init(void)
 {
        unsigned int tmp;
        unsigned long flags;
@@ -321,8 +233,10 @@ static struct pci_ops * __devinit pci_check_direct(void)
                        local_irq_restore(flags);
                        printk(KERN_INFO "PCI: Using configuration type 1\n");
                        if (!request_region(0xCF8, 8, "PCI conf1"))
-                               return NULL;
-                       return &pci_direct_conf1;
+                               pci_root_ops = NULL;
+                       else
+                               pci_root_ops = &pci_direct_conf1;
+                       return 0;
                }
                outl (tmp, 0xCF8);
        }
@@ -339,28 +253,15 @@ static struct pci_ops * __devinit pci_check_direct(void)
                        local_irq_restore(flags);
                        printk(KERN_INFO "PCI: Using configuration type 2\n");
                        if (!request_region(0xCF8, 4, "PCI conf2"))
-                               return NULL;
-                       return &pci_direct_conf2;
+                               pci_root_ops = NULL;
+                       else
+                               pci_root_ops = &pci_direct_conf2;
+                       return 0;
                }
        }
 
        local_irq_restore(flags);
-       return NULL;
-}
-
-static int __init pci_direct_init(void)
-{
-       if ((pci_probe & (PCI_PROBE_CONF1 | PCI_PROBE_CONF2)) 
-               && (pci_root_ops = pci_check_direct())) {
-               if (pci_root_ops == &pci_direct_conf1) {
-                       pci_config_read = pci_conf1_read;
-                       pci_config_write = pci_conf1_write;
-               }
-               else {
-                       pci_config_read = pci_conf2_read;
-                       pci_config_write = pci_conf2_write;
-               }
-       }
+       pci_root_ops = NULL;
        return 0;
 }
 

diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index d625ff6c07de335679fc13174a5647d589ce82a9..250e8a2990cfdcd4a1d6b4dbaa266da2f9b0b20d 100644 (file)
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -185,7 +185,7 @@ static int __devinit pci_bios_find_device (unsigned short vendor, unsigned short
        return (int) (ret & 0xff00) >> 8;
 }
 
-static int pci_bios_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
+static int __pci_bios_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
 {
        unsigned long result = 0;
        unsigned long flags;
@@ -240,7 +240,7 @@ static int pci_bios_read (int seg, int bus, int dev, int fn, int reg, int len, u
        return (int)((result & 0xff00) >> 8);
 }
 
-static int pci_bios_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
+static int __pci_bios_write (int seg, int bus, int dev, int fn, int reg, int len, u32 value)
 {
        unsigned long result = 0;
        unsigned long flags;
@@ -295,63 +295,16 @@ static int pci_bios_write (int seg, int bus, int dev, int fn, int reg, int len,
        return (int)((result & 0xff00) >> 8);
 }
 
-static int pci_bios_read_config_byte(struct pci_dev *dev, int where, u8 *value)
+static int pci_bios_read(struct pci_dev *dev, int where, int size, u32 *value)
 {
-       int result; 
-       u32 data;
-
-       if (!value) 
-               return -EINVAL;
-
-       result = pci_bios_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, &data);
-
-       *value = (u8)data;
-
-       return result;
-}
-
-static int pci_bios_read_config_word(struct pci_dev *dev, int where, u16 *value)
-{
-       int result; 
-       u32 data;
-
-       if (!value) 
-               return -EINVAL;
-
-       result = pci_bios_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, &data);
-
-       *value = (u16)data;
-
-       return result;
-}
-
-static int pci_bios_read_config_dword(struct pci_dev *dev, int where, u32 *value)
-{
-       if (!value) 
-               return -EINVAL;
-       
-       return pci_bios_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
-}
-
-static int pci_bios_write_config_byte(struct pci_dev *dev, int where, u8 value)
-{
-       return pci_bios_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 1, value);
-}
-
-static int pci_bios_write_config_word(struct pci_dev *dev, int where, u16 value)
-{
-       return pci_bios_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 2, value);
+       return __pci_bios_read(0, dev->bus->number, PCI_SLOT(dev->devfn), 
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
-static int pci_bios_write_config_dword(struct pci_dev *dev, int where, u32 value)
+static int pci_bios_write(struct pci_dev *dev, int where, int size, u32 value)
 {
-       return pci_bios_write(0, dev->bus->number, PCI_SLOT(dev->devfn), 
-               PCI_FUNC(dev->devfn), where, 4, value);
+       return __pci_bios_write(0, dev->bus->number, PCI_SLOT(dev->devfn),
+               PCI_FUNC(dev->devfn), where, size, value);
 }
 
 
@@ -360,12 +313,8 @@ static int pci_bios_write_config_dword(struct pci_dev *dev, int where, u32 value
  */
 
 static struct pci_ops pci_bios_access = {
-      pci_bios_read_config_byte,
-      pci_bios_read_config_word,
-      pci_bios_read_config_dword,
-      pci_bios_write_config_byte,
-      pci_bios_write_config_word,
-      pci_bios_write_config_dword
+       .read =         pci_bios_read,
+       .write =        pci_bios_write
 };
 
 /*
@@ -551,8 +500,6 @@ static int __init pci_pcbios_init(void)
                && ((pci_root_ops = pci_find_bios()))) {
                pci_probe |= PCI_BIOS_SORT;
                pci_bios_present = 1;
-               pci_config_read = pci_bios_read;
-               pci_config_write = pci_bios_write;
        }
        return 0;
 }

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 53c08e427647c0d880a351d6beb78845c318ebec..c253036cf0369d4d79c3bc86731f644737a1c1bc 100644 (file)
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -19,24 +19,38 @@ spinlock_t pci_lock = SPIN_LOCK_UNLOCKED;
 #define PCI_word_BAD (pos & 1)
 #define PCI_dword_BAD (pos & 3)
 
-#define PCI_OP(rw,size,type) \
-int pci_##rw##_config_##size (struct pci_dev *dev, int pos, type value) \
+#define PCI_OP_READ(size,type,len) \
+int pci_read_config_##size (struct pci_dev *dev, int pos, type *value) \
 {                                                                      \
        int res;                                                        \
        unsigned long flags;                                            \
+       u32 data = 0;                                                   \
        if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;       \
        spin_lock_irqsave(&pci_lock, flags);                            \
-       res = dev->bus->ops->rw##_##size(dev, pos, value);              \
+       res = dev->bus->ops->read(dev, pos, len, &data);                \
+       *value = (type)data;                                            \
        spin_unlock_irqrestore(&pci_lock, flags);                       \
        return res;                                                     \
 }
 
-PCI_OP(read, byte, u8 *)
-PCI_OP(read, word, u16 *)
-PCI_OP(read, dword, u32 *)
-PCI_OP(write, byte, u8)
-PCI_OP(write, word, u16)
-PCI_OP(write, dword, u32)
+#define PCI_OP_WRITE(size,type,len) \
+int pci_write_config_##size (struct pci_dev *dev, int pos, type value) \
+{                                                                      \
+       int res;                                                        \
+       unsigned long flags;                                            \
+       if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;       \
+       spin_lock_irqsave(&pci_lock, flags);                            \
+       res = dev->bus->ops->write(dev, pos, len, value);               \
+       spin_unlock_irqrestore(&pci_lock, flags);                       \
+       return res;                                                     \
+}
+
+PCI_OP_READ(byte, u8, 1)
+PCI_OP_READ(word, u16, 2)
+PCI_OP_READ(dword, u32, 4)
+PCI_OP_WRITE(byte, u8, 1)
+PCI_OP_WRITE(word, u16, 2)
+PCI_OP_WRITE(dword, u32, 4)
 
 EXPORT_SYMBOL(pci_read_config_byte);
 EXPORT_SYMBOL(pci_read_config_word);

diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 9563932275ace28f1218d791ab598dc73b8b93fa..cb7cd71f033ef6a016e126fc989fd421217f5413 100644 (file)
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -22,8 +22,6 @@ extern unsigned long pci_mem_start;
 
 void pcibios_config_init(void);
 struct pci_bus * pcibios_scan_root(int bus);
-extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value);
-extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);
 
 void pcibios_set_master(struct pci_dev *dev);
 void pcibios_penalize_isa_irq(int irq);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index def54af56e327f6b1382a5e4519a835b54082c92..840869b508b743c01ab3f1392f9873687f1c2888 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -456,12 +456,8 @@ extern struct bus_type pci_bus_type;
 /* Low-level architecture-dependent routines */
 
 struct pci_ops {
-       int (*read_byte)(struct pci_dev *, int where, u8 *val);
-       int (*read_word)(struct pci_dev *, int where, u16 *val);
-       int (*read_dword)(struct pci_dev *, int where, u32 *val);
-       int (*write_byte)(struct pci_dev *, int where, u8 val);
-       int (*write_word)(struct pci_dev *, int where, u16 val);
-       int (*write_dword)(struct pci_dev *, int where, u32 val);
+       int (*read)(struct pci_dev *, int where, int size, u32 *val);
+       int (*write)(struct pci_dev *, int where, int size, u32 val);
 };
 
 struct pbus_set_ranges_data