Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / i386 / kernel / scx200.c

diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c
index 22a2fe2..321f5fd 100644 (file)
--- a/arch/i386/kernel/scx200.c
+++ b/arch/i386/kernel/scx200.c
@@ -12,7 +12,10 @@
 #include <linux/pci.h>
 
 #include <linux/scx200.h>
-#include <linux/scx200.h>
+#include <linux/scx200_gpio.h>
+
+/* Verify that the configuration block really is there */
+#define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
 
 #define NAME "scx200"
 
@@ -23,8 +26,66 @@ MODULE_LICENSE("GPL");
 unsigned scx200_gpio_base = 0;
 long scx200_gpio_shadow[2];
 
-spinlock_t scx200_gpio_lock = SPIN_LOCK_UNLOCKED;
-static spinlock_t scx200_gpio_config_lock = SPIN_LOCK_UNLOCKED;
+unsigned scx200_cb_base = 0;
+
+static struct pci_device_id scx200_tbl[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
+       { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
+       { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_XBUS)   },
+       { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_XBUS)   },
+       { },
+};
+MODULE_DEVICE_TABLE(pci,scx200_tbl);
+
+static int __devinit scx200_probe(struct pci_dev *, const struct pci_device_id *);
+
+static struct pci_driver scx200_pci_driver = {
+       .name = "scx200",
+       .id_table = scx200_tbl,
+       .probe = scx200_probe,
+};
+
+static DEFINE_SPINLOCK(scx200_gpio_config_lock);
+
+static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+       int bank;
+       unsigned base;
+
+       if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE ||
+           pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) {
+               base = pci_resource_start(pdev, 0);
+               printk(KERN_INFO NAME ": GPIO base 0x%x\n", base);
+
+               if (request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO") == 0) {
+                       printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n");
+                       return -EBUSY;
+               }
+
+               scx200_gpio_base = base;
+
+               /* read the current values driven on the GPIO signals */
+               for (bank = 0; bank < 2; ++bank)
+                       scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);
+
+       } else {
+               /* find the base of the Configuration Block */
+               if (scx200_cb_probe(SCx200_CB_BASE_FIXED)) {
+                       scx200_cb_base = SCx200_CB_BASE_FIXED;
+               } else {
+                       pci_read_config_dword(pdev, SCx200_CBA_SCRATCH, &base);
+                       if (scx200_cb_probe(base)) {
+                               scx200_cb_base = base;
+                       } else {
+                               printk(KERN_WARNING NAME ": Configuration Block not found\n");
+                               return -ENODEV;
+                       }
+               }
+               printk(KERN_INFO NAME ": Configuration Block base 0x%x\n", scx200_cb_base);
+       }
+
+       return 0;
+}
 
 u32 scx200_gpio_configure(int index, u32 mask, u32 bits)
 {
@@ -44,6 +105,7 @@ u32 scx200_gpio_configure(int index, u32 mask, u32 bits)
        return config;
 }
 
+#if 0
 void scx200_gpio_dump(unsigned index)
 {
        u32 config = scx200_gpio_configure(index, ~0, 0);
@@ -75,42 +137,18 @@ void scx200_gpio_dump(unsigned index)
                printk(" DEBOUNCE"); /* debounce */
        printk("\n");
 }
+#endif  /*  0  */
 
-int __init scx200_init(void)
+static int __init scx200_init(void)
 {
-       struct pci_dev *bridge;
-       int bank;
-       unsigned base;
-
        printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
 
-       if ((bridge = pci_find_device(PCI_VENDOR_ID_NS, 
-                                     PCI_DEVICE_ID_NS_SCx200_BRIDGE,
-                                     NULL)) == NULL
-           && (bridge = pci_find_device(PCI_VENDOR_ID_NS,
-                                        PCI_DEVICE_ID_NS_SC1100_BRIDGE,
-                                        NULL)) == NULL)
-               return -ENODEV;
-
-       base = pci_resource_start(bridge, 0);
-       printk(KERN_INFO NAME ": GPIO base 0x%x\n", base);
-
-       if (request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO") == 0) {
-               printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n");
-               return -EBUSY;
-       }
-
-       scx200_gpio_base = base;
-
-       /* read the current values driven on the GPIO signals */
-       for (bank = 0; bank < 2; ++bank)
-               scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);
-
-       return 0;
+       return pci_register_driver(&scx200_pci_driver);
 }
 
-void __exit scx200_cleanup(void)
+static void __exit scx200_cleanup(void)
 {
+       pci_unregister_driver(&scx200_pci_driver);
        release_region(scx200_gpio_base, SCx200_GPIO_SIZE);
 }
 
@@ -119,9 +157,8 @@ module_exit(scx200_cleanup);
 
 EXPORT_SYMBOL(scx200_gpio_base);
 EXPORT_SYMBOL(scx200_gpio_shadow);
-EXPORT_SYMBOL(scx200_gpio_lock);
 EXPORT_SYMBOL(scx200_gpio_configure);
-EXPORT_SYMBOL(scx200_gpio_dump);
+EXPORT_SYMBOL(scx200_cb_base);
 
 /*
     Local variables: