1 files changed, 59 insertions, 14 deletions

diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index d21b3a2dc978..766b104ac1a1 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -58,6 +58,35 @@ struct irq_router_handler {
 int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
 
 /*
+ *  Check passed address for the PCI IRQ Routing Table signature
+ *  and perform checksum verification.
+ */
+
+static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
+{
+        struct irq_routing_table *rt;
+        int i;
+        u8 sum;
+
+        rt = (struct irq_routing_table *) addr;
+        if (rt->signature != PIRQ_SIGNATURE ||
+            rt->version != PIRQ_VERSION ||
+            rt->size % 16 ||
+            rt->size < sizeof(struct irq_routing_table))
+                return NULL;
+        sum = 0;
+        for (i=0; i < rt->size; i++)
+                sum += addr[i];
+        if (!sum) {
+                DBG("PCI: Interrupt Routing Table found at 0x%p\n", rt);
+                return rt;
+        }
+        return NULL;
+}
+
+
+
+/*
  *  Search 0xf0000 -- 0xfffff for the PCI IRQ Routing Table.
  */
 
@@ -65,23 +94,17 @@ static struct irq_routing_table * __init pirq_find_routing_table(void)
 {
         u8 *addr;
         struct irq_routing_table *rt;
-        int i;
-        u8 sum;
 
+        if (pirq_table_addr) {
+                rt = pirq_check_routing_table((u8 *) __va(pirq_table_addr));
+                if (rt)
+                        return rt;
+                printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n");
+        }
         for(addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) {
-                rt = (struct irq_routing_table *) addr;
-                if (rt->signature != PIRQ_SIGNATURE ||
-                    rt->version != PIRQ_VERSION ||
-                    rt->size % 16 ||
-                    rt->size < sizeof(struct irq_routing_table))
-                        continue;
-                sum = 0;
-                for(i=0; i<rt->size; i++)
-                        sum += addr[i];
-                if (!sum) {
-                        DBG("PCI: Interrupt Routing Table found at 0x%p\n", rt);
+                rt = pirq_check_routing_table(addr);
+                if (rt)
                         return rt;
-                }
         }
         return NULL;
 }
@@ -227,6 +250,24 @@ static int pirq_via_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
 }
 
 /*
+ * The VIA pirq rules are nibble-based, like ALI,
+ * but without the ugly irq number munging.
+ * However, for 82C586, nibble map is different .
+ */
+static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
+{
+        static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+        return read_config_nybble(router, 0x55, pirqmap[pirq-1]);
+}
+
+static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
+{
+        static unsigned int pirqmap[4] = { 3, 2, 5, 1 };
+        write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);
+        return 1;
+}
+
+/*
  * ITE 8330G pirq rules are nibble-based
  * FIXME: pirqmap may be { 1, 0, 3, 2 },
  *        2+3 are both mapped to irq 9 on my system
@@ -512,6 +553,10 @@ static __init int via_router_probe(struct irq_router *r, struct pci_dev *router,
         switch(device)
         {
                 case PCI_DEVICE_ID_VIA_82C586_0:
+                        r->name = "VIA";
+                        r->get = pirq_via586_get;
+                        r->set = pirq_via586_set;
+                        return 1;
                 case PCI_DEVICE_ID_VIA_82C596:
                 case PCI_DEVICE_ID_VIA_82C686:
                 case PCI_DEVICE_ID_VIA_8231: