p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MIPS: PCI: Move map_irq() hooks out of initdata 

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>
This commit is contained in:
Lorenzo Pieralisi 2017-09-19 15:50:42 +01:00 committed by Bjorn Helgaas
parent 2bd6bf03f4
commit 19a8d6b760
32 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mips/ath79/pci.c
View File

@ -22,10 +22,10 @@
#include "pci.h" #include "pci.h"
static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev); static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
static const struct ath79_pci_irq *ath79_pci_irq_map __initdata; static const struct ath79_pci_irq *ath79_pci_irq_map;
static unsigned ath79_pci_nr_irqs __initdata; static unsigned ath79_pci_nr_irqs;
static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = { static const struct ath79_pci_irq ar71xx_pci_irq_map[] = {
{ {
.slot = 17, .slot = 17,
.pin = 1, .pin = 1,
@ -41,7 +41,7 @@ static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
} }
}; };
static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = { static const struct ath79_pci_irq ar724x_pci_irq_map[] = {
{ {
.slot = 0, .slot = 0,
.pin = 1, .pin = 1,
@ -49,7 +49,7 @@ static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = {
} }
}; };
static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = { static const struct ath79_pci_irq qca955x_pci_irq_map[] = {
{ {
.bus = 0, .bus = 0,
.slot = 0, .slot = 0,
@ -64,7 +64,7 @@ static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = {
}, },
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) int pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
{ {
int irq = -1; int irq = -1;
int i; int i;

4
arch/mips/pci/fixup-capcella.c
View File

@ -32,13 +32,13 @@
#define INTC PC104PLUS_INTC_IRQ #define INTC PC104PLUS_INTC_IRQ
#define INTD PC104PLUS_INTD_IRQ #define INTD PC104PLUS_INTD_IRQ
static char irq_tab_capcella[][5] __initdata = { static char irq_tab_capcella[][5] = {
[11] = { -1, INT1, INT1, INT1, INT1 }, [11] = { -1, INT1, INT1, INT1, INT1 },
[12] = { -1, INT2, INT2, INT2, INT2 }, [12] = { -1, INT2, INT2, INT2, INT2 },
[14] = { -1, INTA, INTB, INTC, INTD } [14] = { -1, INTA, INTB, INTC, INTD }
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return irq_tab_capcella[slot][pin]; return irq_tab_capcella[slot][pin];
} }

8
arch/mips/pci/fixup-cobalt.c
View File

@ -147,7 +147,7 @@ static void qube_raq_via_board_id_fixup(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0,
qube_raq_via_board_id_fixup); qube_raq_via_board_id_fixup);
static char irq_tab_qube1[] __initdata = { static char irq_tab_qube1[] = {
[COBALT_PCICONF_CPU] = 0, [COBALT_PCICONF_CPU] = 0,
[COBALT_PCICONF_ETH0] = QUBE1_ETH0_IRQ, [COBALT_PCICONF_ETH0] = QUBE1_ETH0_IRQ,
[COBALT_PCICONF_RAQSCSI] = SCSI_IRQ, [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@ -156,7 +156,7 @@ static char irq_tab_qube1[] __initdata = {
[COBALT_PCICONF_ETH1] = 0 [COBALT_PCICONF_ETH1] = 0
}; };
static char irq_tab_cobalt[] __initdata = { static char irq_tab_cobalt[] = {
[COBALT_PCICONF_CPU] = 0, [COBALT_PCICONF_CPU] = 0,
[COBALT_PCICONF_ETH0] = ETH0_IRQ, [COBALT_PCICONF_ETH0] = ETH0_IRQ,
[COBALT_PCICONF_RAQSCSI] = SCSI_IRQ, [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@ -165,7 +165,7 @@ static char irq_tab_cobalt[] __initdata = {
[COBALT_PCICONF_ETH1] = ETH1_IRQ [COBALT_PCICONF_ETH1] = ETH1_IRQ
}; };
static char irq_tab_raq2[] __initdata = { static char irq_tab_raq2[] = {
[COBALT_PCICONF_CPU] = 0, [COBALT_PCICONF_CPU] = 0,
[COBALT_PCICONF_ETH0] = ETH0_IRQ, [COBALT_PCICONF_ETH0] = ETH0_IRQ,
[COBALT_PCICONF_RAQSCSI] = RAQ2_SCSI_IRQ, [COBALT_PCICONF_RAQSCSI] = RAQ2_SCSI_IRQ,
@ -174,7 +174,7 @@ static char irq_tab_raq2[] __initdata = {
[COBALT_PCICONF_ETH1] = ETH1_IRQ [COBALT_PCICONF_ETH1] = ETH1_IRQ
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
if (cobalt_board_id <= COBALT_BRD_ID_QUBE1) if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
return irq_tab_qube1[slot]; return irq_tab_qube1[slot];

4
arch/mips/pci/fixup-emma2rh.c
View File

@ -43,7 +43,7 @@
*/ */
#define MAX_SLOT_NUM 10 #define MAX_SLOT_NUM 10
static unsigned char irq_map[][5] __initdata = { static unsigned char irq_map[][5] = {
[3] = {0, MARKEINS_PCI_IRQ_INTB, MARKEINS_PCI_IRQ_INTC, [3] = {0, MARKEINS_PCI_IRQ_INTB, MARKEINS_PCI_IRQ_INTC,
MARKEINS_PCI_IRQ_INTD, 0,}, MARKEINS_PCI_IRQ_INTD, 0,},
[4] = {0, MARKEINS_PCI_IRQ_INTA, 0, 0, 0,}, [4] = {0, MARKEINS_PCI_IRQ_INTA, 0, 0, 0,},
@ -85,7 +85,7 @@ static void emma2rh_pci_host_fixup(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,
emma2rh_pci_host_fixup); emma2rh_pci_host_fixup);
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return irq_map[slot][pin]; return irq_map[slot][pin];
} }

2
arch/mips/pci/fixup-fuloong2e.c
View File

@ -19,7 +19,7 @@
/* South bridge slot number is set by the pci probe process */ /* South bridge slot number is set by the pci probe process */
static u8 sb_slot = 5; static u8 sb_slot = 5;
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq = 0; int irq = 0;

4
arch/mips/pci/fixup-ip32.c
View File

@ -21,7 +21,7 @@
#define INTB MACEPCI_SHARED0_IRQ #define INTB MACEPCI_SHARED0_IRQ
#define INTC MACEPCI_SHARED1_IRQ #define INTC MACEPCI_SHARED1_IRQ
#define INTD MACEPCI_SHARED2_IRQ #define INTD MACEPCI_SHARED2_IRQ
static char irq_tab_mace[][5] __initdata = { static char irq_tab_mace[][5] = {
/* Dummy INT#A INT#B INT#C INT#D */ /* Dummy INT#A INT#B INT#C INT#D */
{0, 0, 0, 0, 0}, /* This is placeholder row - never used */ {0, 0, 0, 0, 0}, /* This is placeholder row - never used */
{0, SCSI0, SCSI0, SCSI0, SCSI0}, {0, SCSI0, SCSI0, SCSI0, SCSI0},
@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = {
* irqs. I suppose a device without a pin A will thank us for doing it * irqs. I suppose a device without a pin A will thank us for doing it
* right if there exists such a broken piece of crap. * right if there exists such a broken piece of crap.
*/ */
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return irq_tab_mace[slot][pin]; return irq_tab_mace[slot][pin];
} }

2
arch/mips/pci/fixup-jmr3927.c
View File

@ -31,7 +31,7 @@
#include <asm/txx9/pci.h> #include <asm/txx9/pci.h>
#include <asm/txx9/jmr3927.h> #include <asm/txx9/jmr3927.h>
int __init jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
unsigned char irq = pin; unsigned char irq = pin;

2
arch/mips/pci/fixup-lantiq.c
View File

@ -23,7 +23,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
return 0; return 0;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return of_irq_parse_and_map_pci(dev, slot, pin); return of_irq_parse_and_map_pci(dev, slot, pin);
} }

4
arch/mips/pci/fixup-lemote2f.c
View File

@ -30,7 +30,7 @@
#define PCID 7 #define PCID 7
/* all the pci device has the PCIA pin, check the datasheet. */ /* all the pci device has the PCIA pin, check the datasheet. */
static char irq_tab[][5] __initdata = { static char irq_tab[][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{0, 0, 0, 0, 0}, /* 11: Unused */ {0, 0, 0, 0, 0}, /* 11: Unused */
{0, 0, 0, 0, 0}, /* 12: Unused */ {0, 0, 0, 0, 0}, /* 12: Unused */
@ -51,7 +51,7 @@ static char irq_tab[][5] __initdata = {
{0, 0, 0, 0, 0}, /* 27: Unused */ {0, 0, 0, 0, 0}, /* 27: Unused */
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int virq; int virq;

2
arch/mips/pci/fixup-loongson3.c
View File

@ -32,7 +32,7 @@ static void print_fixup_info(const struct pci_dev *pdev)
pdev->vendor, pdev->device, pdev->irq); pdev->vendor, pdev->device, pdev->irq);
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
print_fixup_info(dev); print_fixup_info(dev);
return dev->irq; return dev->irq;

4
arch/mips/pci/fixup-malta.c
View File

@ -12,7 +12,7 @@
static char pci_irq[5] = { static char pci_irq[5] = {
}; };
static char irq_tab[][5] __initdata = { static char irq_tab[][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{0, 0, 0, 0, 0 }, /* 0: GT64120 PCI bridge */ {0, 0, 0, 0, 0 }, /* 0: GT64120 PCI bridge */
{0, 0, 0, 0, 0 }, /* 1: Unused */ {0, 0, 0, 0, 0 }, /* 1: Unused */
@ -38,7 +38,7 @@ static char irq_tab[][5] __initdata = {
{0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int virq; int virq;
virq = irq_tab[slot][pin]; virq = irq_tab[slot][pin];

6
arch/mips/pci/fixup-mpc30x.c
View File

@ -22,19 +22,19 @@
#include <asm/vr41xx/mpc30x.h> #include <asm/vr41xx/mpc30x.h>
static const int internal_func_irqs[] __initconst = { static const int internal_func_irqs[] = {
VRC4173_CASCADE_IRQ, VRC4173_CASCADE_IRQ,
VRC4173_AC97_IRQ, VRC4173_AC97_IRQ,
VRC4173_USB_IRQ, VRC4173_USB_IRQ,
}; };
static const int irq_tab_mpc30x[] __initconst = { static const int irq_tab_mpc30x[] = {
[12] = VRC4173_PCMCIA1_IRQ, [12] = VRC4173_PCMCIA1_IRQ,
[13] = VRC4173_PCMCIA2_IRQ, [13] = VRC4173_PCMCIA2_IRQ,
[29] = MQ200_IRQ, [29] = MQ200_IRQ,
}; };
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
if (slot == 30) if (slot == 30)
return internal_func_irqs[PCI_FUNC(dev->devfn)]; return internal_func_irqs[PCI_FUNC(dev->devfn)];

8
arch/mips/pci/fixup-pmcmsp.c
View File

@ -47,7 +47,7 @@
#if defined(CONFIG_PMC_MSP7120_GW) #if defined(CONFIG_PMC_MSP7120_GW)
/* Garibaldi Board IRQ wiring to PCI slots */ /* Garibaldi Board IRQ wiring to PCI slots */
static char irq_tab[][5] __initdata = { static char irq_tab[][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@ -86,7 +86,7 @@ static char irq_tab[][5] __initdata = {
#elif defined(CONFIG_PMC_MSP7120_EVAL) #elif defined(CONFIG_PMC_MSP7120_EVAL)
/* MSP7120 Eval Board IRQ wiring to PCI slots */ /* MSP7120 Eval Board IRQ wiring to PCI slots */
static char irq_tab[][5] __initdata = { static char irq_tab[][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@ -125,7 +125,7 @@ static char irq_tab[][5] __initdata = {
#else #else
/* Unknown board -- don't assign any IRQs */ /* Unknown board -- don't assign any IRQs */
static char irq_tab[][5] __initdata = { static char irq_tab[][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@ -202,7 +202,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
* RETURNS: IRQ number * RETURNS: IRQ number
* *
****************************************************************************/ ****************************************************************************/
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
#if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL) #if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL)
printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n"); printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n");

2
arch/mips/pci/fixup-rbtx4927.c
View File

@ -36,7 +36,7 @@
#include <asm/txx9/pci.h> #include <asm/txx9/pci.h>
#include <asm/txx9/rbtx4927.h> #include <asm/txx9/rbtx4927.h>
int __init rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int rbtx4927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
unsigned char irq = pin; unsigned char irq = pin;

2
arch/mips/pci/fixup-rbtx4938.c
View File

@ -13,7 +13,7 @@
#include <asm/txx9/pci.h> #include <asm/txx9/pci.h>
#include <asm/txx9/rbtx4938.h> #include <asm/txx9/rbtx4938.h>
int __init rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq = tx4938_pcic1_map_irq(dev, slot); int irq = tx4938_pcic1_map_irq(dev, slot);

12
arch/mips/pci/fixup-sni.c
View File

@ -40,7 +40,7 @@
* seem to be a documentation error. At least on my RM200C the Cirrus * seem to be a documentation error. At least on my RM200C the Cirrus
* Logic CL-GD5434 VGA is device 3. * Logic CL-GD5434 VGA is device 3.
*/ */
static char irq_tab_rm200[8][5] __initdata = { static char irq_tab_rm200[8][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{ 0, 0, 0, 0, 0 }, /* EISA bridge */ { 0, 0, 0, 0, 0 }, /* EISA bridge */
{ SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */ { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
@ -57,7 +57,7 @@ static char irq_tab_rm200[8][5] __initdata = {
* *
* The VGA card is optional for RM300 systems. * The VGA card is optional for RM300 systems.
*/ */
static char irq_tab_rm300d[8][5] __initdata = { static char irq_tab_rm300d[8][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{ 0, 0, 0, 0, 0 }, /* EISA bridge */ { 0, 0, 0, 0, 0 }, /* EISA bridge */
{ SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */ { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
@ -69,7 +69,7 @@ static char irq_tab_rm300d[8][5] __initdata = {
{ 0, INTD, INTA, INTB, INTC }, /* Slot 4 */ { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */
}; };
static char irq_tab_rm300e[5][5] __initdata = { static char irq_tab_rm300e[5][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{ 0, 0, 0, 0, 0 }, /* HOST bridge */ { 0, 0, 0, 0, 0 }, /* HOST bridge */
{ SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */ { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
@ -96,7 +96,7 @@ static char irq_tab_rm300e[5][5] __initdata = {
#define INTC PCIT_IRQ_INTC #define INTC PCIT_IRQ_INTC
#define INTD PCIT_IRQ_INTD #define INTD PCIT_IRQ_INTD
static char irq_tab_pcit[13][5] __initdata = { static char irq_tab_pcit[13][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{ 0, 0, 0, 0, 0 }, /* HOST bridge */ { 0, 0, 0, 0, 0 }, /* HOST bridge */
{ SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 }, /* SCSI */ { SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 }, /* SCSI */
@ -113,7 +113,7 @@ static char irq_tab_pcit[13][5] __initdata = {
{ 0, INTA, INTB, INTC, INTD }, /* Slot 5 */ { 0, INTA, INTB, INTC, INTD }, /* Slot 5 */
}; };
static char irq_tab_pcit_cplus[13][5] __initdata = { static char irq_tab_pcit_cplus[13][5] = {
/* INTA INTB INTC INTD */ /* INTA INTB INTC INTD */
{ 0, 0, 0, 0, 0 }, /* HOST bridge */ { 0, 0, 0, 0, 0 }, /* HOST bridge */
{ 0, INTB, INTC, INTD, INTA }, /* PCI Slot 9 */ { 0, INTB, INTC, INTD, INTA }, /* PCI Slot 9 */
@ -130,7 +130,7 @@ static inline int is_rm300_revd(void)
return (csmsr & 0xa0) == 0x20; return (csmsr & 0xa0) == 0x20;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
switch (sni_brd_type) { switch (sni_brd_type) {
case SNI_BRD_PCI_TOWER_CPLUS: case SNI_BRD_PCI_TOWER_CPLUS:

2
arch/mips/pci/fixup-tb0219.c
View File

@ -23,7 +23,7 @@
#include <asm/vr41xx/tb0219.h> #include <asm/vr41xx/tb0219.h>
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq = -1; int irq = -1;

2
arch/mips/pci/fixup-tb0226.c
View File

@ -23,7 +23,7 @@
#include <asm/vr41xx/giu.h> #include <asm/vr41xx/giu.h>
#include <asm/vr41xx/tb0226.h> #include <asm/vr41xx/tb0226.h>
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq = -1; int irq = -1;

2
arch/mips/pci/fixup-tb0287.c
View File

@ -22,7 +22,7 @@
#include <asm/vr41xx/tb0287.h> #include <asm/vr41xx/tb0287.h>
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
unsigned char bus; unsigned char bus;
int irq = -1; int irq = -1;

2
arch/mips/pci/pci-alchemy.c
View File

@ -522,7 +522,7 @@ static int __init alchemy_pci_init(void)
arch_initcall(alchemy_pci_init); arch_initcall(alchemy_pci_init);
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
struct alchemy_pci_context *ctx = dev->sysdata; struct alchemy_pci_context *ctx = dev->sysdata;
if (ctx && ctx->board_map_irq) if (ctx && ctx->board_map_irq)

2
arch/mips/pci/pci-bcm47xx.c
View File

@ -28,7 +28,7 @@
#include <linux/bcma/bcma.h> #include <linux/bcma/bcma.h>
#include <bcm47xx.h> #include <bcm47xx.h>
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return 0; return 0;
} }

2
arch/mips/pci/pci-lasat.c
View File

@ -61,7 +61,7 @@ arch_initcall(lasat_pci_setup);
#define LASAT_IRQ_PCIC (LASAT_IRQ_BASE + 7) #define LASAT_IRQ_PCIC (LASAT_IRQ_BASE + 7)
#define LASAT_IRQ_PCID (LASAT_IRQ_BASE + 8) #define LASAT_IRQ_PCID (LASAT_IRQ_BASE + 8)
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
switch (slot) { switch (slot) {
case 1: case 1:

2
arch/mips/pci/pci-mt7620.c
View File

@ -361,7 +361,7 @@ static int mt7620_pci_probe(struct platform_device *pdev)
return 0; return 0;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
u16 cmd; u16 cmd;
u32 val; u32 val;

5
arch/mips/pci/pci-octeon.c
View File

@ -59,8 +59,7 @@ union octeon_pci_address {
} s; } s;
}; };
int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev, int (*octeon_pcibios_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
u8 slot, u8 pin);
enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
/** /**
@ -74,7 +73,7 @@ enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
* as it goes through each bridge. * as it goes through each bridge.
* Returns Interrupt number for the device * Returns Interrupt number for the device
*/ */
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
if (octeon_pcibios_map_irq) if (octeon_pcibios_map_irq)
return octeon_pcibios_map_irq(dev, slot, pin); return octeon_pcibios_map_irq(dev, slot, pin);

2
arch/mips/pci/pci-rt2880.c
View File

@ -181,7 +181,7 @@ static inline void rt2880_pci_write_u32(unsigned long reg, u32 val)
spin_unlock_irqrestore(&rt2880_pci_lock, flags); spin_unlock_irqrestore(&rt2880_pci_lock, flags);
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
u16 cmd; u16 cmd;
int irq = -1; int irq = -1;

2
arch/mips/pci/pci-rt3883.c
View File

@ -564,7 +564,7 @@ static int rt3883_pci_probe(struct platform_device *pdev)
return err; return err;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return of_irq_parse_and_map_pci(dev, slot, pin); return of_irq_parse_and_map_pci(dev, slot, pin);
} }

2
arch/mips/pci/pci-tx4938.c
View File

@ -112,7 +112,7 @@ int __init tx4938_pciclk66_setup(void)
return pciclk; return pciclk;
} }
int __init tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot) int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
{ {
if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4938_pcic1ptr) { if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4938_pcic1ptr) {
switch (slot) { switch (slot) {

4
arch/mips/pci/pci-tx4939.c
View File

@ -48,7 +48,7 @@ void __init tx4939_report_pci1clk(void)
((pciclk + 50000) / 100000) % 10); ((pciclk + 50000) / 100000) % 10);
} }
int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot) int tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
{ {
if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4939_pcic1ptr) { if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4939_pcic1ptr) {
switch (slot) { switch (slot) {
@ -68,7 +68,7 @@ int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
return -1; return -1;
} }
int __init tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
int irq = tx4939_pcic1_map_irq(dev, slot); int irq = tx4939_pcic1_map_irq(dev, slot);

2
arch/mips/pci/pci-xlp.c
View File

@ -205,7 +205,7 @@ int xlp_socdev_to_node(const struct pci_dev *lnkdev)
return PCI_SLOT(lnkdev->devfn) / 8; return PCI_SLOT(lnkdev->devfn) / 8;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
struct pci_dev *lnkdev; struct pci_dev *lnkdev;
int lnkfunc, node; int lnkfunc, node;

2
arch/mips/pci/pci-xlr.c
View File

@ -315,7 +315,7 @@ static void xls_pcie_ack_b(struct irq_data *d)
} }
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return get_irq_vector(dev); return get_irq_vector(dev);
} }

3
arch/mips/pci/pcie-octeon.c
View File

@ -1464,8 +1464,7 @@ static int cvmx_pcie_rc_initialize(int pcie_port)
* as it goes through each bridge. * as it goes through each bridge.
* Returns Interrupt number for the device * Returns Interrupt number for the device
*/ */
int __init octeon_pcie_pcibios_map_irq(const struct pci_dev *dev, int octeon_pcie_pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
u8 slot, u8 pin)
{ {
/* /*
* The EBH5600 board with the PCI to PCIe bridge mistakenly * The EBH5600 board with the PCI to PCIe bridge mistakenly

8
arch/mips/txx9/generic/pci.c
View File

@ -386,9 +386,10 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
return 0; return 0;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) static int (*txx9_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return txx9_board_vec->pci_map_irq(dev, slot, pin); return txx9_pci_map_irq(dev, slot, pin);
} }
char * (*txx9_board_pcibios_setup)(char *str) __initdata; char * (*txx9_board_pcibios_setup)(char *str) __initdata;
@ -424,5 +425,8 @@ char *__init txx9_pcibios_setup(char *str)
txx9_pci_err_action = TXX9_PCI_ERR_IGNORE; txx9_pci_err_action = TXX9_PCI_ERR_IGNORE;
return NULL; return NULL;
} }
txx9_pci_map_irq = txx9_board_vec->pci_map_irq;
return str; return str;
} }