19a8d6b760
04c81c7293("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") moved the PCI IRQ fixup to the new host bridge map/swizzle_irq() hooks mechanism. Those hooks can also be called after boot, when all the __init/__initdata/__initconst sections have been freed. Therefore, functions called by them (and the data they refer to) must not be marked as __init/__initdata/__initconst lest compilation trigger section mismatch warnings. Fix all the board files map_irq() hooks by simply removing the respective __init/__initdata/__initconst section markers and by adding another persistent hook IRQ map for the txx9 board files. Fixes:04c81c7293("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Steve French <smfrench@gmail.com>
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
/*
|
|
* Toshiba rbtx4938 pci routines
|
|
* Copyright (C) 2000-2001 Toshiba Corporation
|
|
*
|
|
* 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
|
|
* terms of the GNU General Public License version 2. This program is
|
|
* licensed "as is" without any warranty of any kind, whether express
|
|
* or implied.
|
|
*
|
|
* Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <asm/txx9/pci.h>
|
|
#include <asm/txx9/rbtx4938.h>
|
|
|
|
int rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
int irq = tx4938_pcic1_map_irq(dev, slot);
|
|
|
|
if (irq >= 0)
|
|
return irq;
|
|
irq = pin;
|
|
/* IRQ rotation */
|
|
irq--; /* 0-3 */
|
|
if (slot == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) {
|
|
/* PCI CardSlot (IDSEL=A23) */
|
|
/* PCIA => PCIA (IDSEL=A23) */
|
|
irq = (irq + 0 + slot) % 4;
|
|
} else {
|
|
/* PCI Backplane */
|
|
if (txx9_pci_option & TXX9_PCI_OPT_PICMG)
|
|
irq = (irq + 33 - slot) % 4;
|
|
else
|
|
irq = (irq + 3 + slot) % 4;
|
|
}
|
|
irq++; /* 1-4 */
|
|
|
|
switch (irq) {
|
|
case 1:
|
|
irq = RBTX4938_IRQ_IOC_PCIA;
|
|
break;
|
|
case 2:
|
|
irq = RBTX4938_IRQ_IOC_PCIB;
|
|
break;
|
|
case 3:
|
|
irq = RBTX4938_IRQ_IOC_PCIC;
|
|
break;
|
|
case 4:
|
|
irq = RBTX4938_IRQ_IOC_PCID;
|
|
break;
|
|
}
|
|
return irq;
|
|
}
|