* Patch by Arun Dharankar, 4 Apr 2003:

[karo-tx-uboot.git] / board / mpl / common / pci.c

diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c
index a26f542eb34196b241f908cc5132e2ff208467ce..692930b41639d5e55f800cf0d8199fd8c39112f2 100644 (file)
--- a/board/mpl/common/pci.c
+++ b/board/mpl/common/pci.c
@@ -65,21 +65,22 @@ void pci_pip405_write_regs(struct pci_controller *hose, pci_dev_t dev,
 static void pci_pip405_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 {
        unsigned char int_line = 0xff;
+       unsigned char pin;
        /*
         * Write pci interrupt line register
         */
        if(PCI_DEV(dev)==0) /* Device0 = PPC405 -> skip */
                return;
-       if(PCI_FUNC(dev)==0)
-       {
-               /* assuming all function 0 are using their INTA# Pin*/
-               int_line=PCI_IRQ_VECTOR(dev);
-               pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE, int_line);
+       pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_PIN, &pin);
+       if ((pin == 0) || (pin > 4))
+           return;
+
+       int_line = ((PCI_DEV(dev) + (pin-1) + 10) % 4) + 28;
+       pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE, int_line);
 #ifdef DEBUG
-               printf("Fixup IRQ: dev %d (%x) int line %d 0x%x\n",
-                      PCI_DEV(dev),dev,int_line,int_line);
+       printf("Fixup IRQ: dev %d (%x) int line %d 0x%x\n",
+              PCI_DEV(dev),dev,int_line,int_line);
 #endif
-       }
 }
 
 extern void pci_405gp_init(struct pci_controller *hose);
@@ -90,11 +91,34 @@ static struct pci_controller hose = {
   fixup_irq: pci_pip405_fixup_irq,
 };
 
+
+static void reloc_pci_cfg_table(struct pci_config_table *table)
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       unsigned long addr;
+
+       for (; table && table->vendor; table++) {
+               addr = (ulong) (table->config_device) + gd->reloc_off;
+#ifdef DEBUG
+               printf ("device \"%d\": 0x%08lx => 0x%08lx\n",
+                               table->device, (ulong) (table->config_device), addr);
+#endif
+               table->config_device =
+                       (void (*)(struct pci_controller* hose, pci_dev_t dev,
+                             struct pci_config_table *))addr;
+               table->priv[0]+=gd->reloc_off;
+       }
+}
+
 void pci_init_board(void)
 {
        /*we want the ptrs to RAM not flash (ie don't use init list)*/
        hose.fixup_irq    = pci_pip405_fixup_irq;
        hose.config_table = pci_pip405_config_table;
+       reloc_pci_cfg_table(hose.config_table);
+#ifdef DEBUG
+       printf("Init PCI: fixup_irq=%p config_table=%p hose=%p\n",pci_pip405_fixup_irq,pci_pip405_config_table,hose);
+#endif
        pci_405gp_init(&hose);
 }