Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a8d6b7 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas
Browse files

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



04c81c72 ("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: 04c81c72 ("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks")
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Steve French <smfrench@gmail.com>
parent 2bd6bf03

arch/mips/ath79/pci.c

+6 −6
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include "pci.h"



static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);

static const struct ath79_pci_irq *ath79_pci_irq_map __initdata;

static unsigned ath79_pci_nr_irqs __initdata;

static const struct ath79_pci_irq *ath79_pci_irq_map;

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,

		.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,

		.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,

		.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 i;

arch/mips/pci/fixup-capcella.c

+2 −2
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ 
#define INTC	PC104PLUS_INTC_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 },

 [12] = { -1, INT2, INT2, INT2, INT2 },

 [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];

}

arch/mips/pci/fixup-cobalt.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

	 qube_raq_via_board_id_fixup);



static char irq_tab_qube1[] __initdata = {

static char irq_tab_qube1[] = {

  [COBALT_PCICONF_CPU]	   = 0,

  [COBALT_PCICONF_ETH0]	   = QUBE1_ETH0_IRQ,

  [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@@ -156,7 +156,7 @@ static char irq_tab_qube1[] __initdata = { 
  [COBALT_PCICONF_ETH1]	   = 0

};



static char irq_tab_cobalt[] __initdata = {

static char irq_tab_cobalt[] = {

  [COBALT_PCICONF_CPU]	   = 0,

  [COBALT_PCICONF_ETH0]	   = ETH0_IRQ,

  [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@@ -165,7 +165,7 @@ static char irq_tab_cobalt[] __initdata = { 
  [COBALT_PCICONF_ETH1]	   = ETH1_IRQ

};



static char irq_tab_raq2[] __initdata = {

static char irq_tab_raq2[] = {

  [COBALT_PCICONF_CPU]	   = 0,

  [COBALT_PCICONF_ETH0]	   = ETH0_IRQ,

  [COBALT_PCICONF_RAQSCSI] = RAQ2_SCSI_IRQ,
@@ -174,7 +174,7 @@ static char irq_tab_raq2[] __initdata = { 
  [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)

		return irq_tab_qube1[slot];

arch/mips/pci/fixup-emma2rh.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
 */



#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,

	       MARKEINS_PCI_IRQ_INTD, 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,

			 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];

}

arch/mips/pci/fixup-fuloong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
/* South bridge slot number is set by the pci probe process */

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;