Skip to content

Commit e2577d2

Browse files
torvaldstorvalds
committed
Merge tag 'pci-v4.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: - fix endpoint "end of test" interrupt issue (introduced in v4.14-rc1) (John Keeping) - fix MIPS use-after-free map_irq() issue (introduced in v4.14-rc1) (Lorenzo Pieralisi) * tag 'pci-v4.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: endpoint: Use correct "end of test" interrupt MIPS: PCI: Move map_irq() hooks out of initdata
2 parents 9ae0b37 + 749aaf3 commit e2577d2

File tree

19 files changed

+44
-43
lines changed

19 files changed

+44
-43
lines changed

‎arch/mips/ath79/pci.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "pci.h"
2323

2424
static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
25-
static const struct ath79_pci_irq *ath79_pci_irq_map __initdata;
26-
static unsigned ath79_pci_nr_irqs __initdata;
25+
static const struct ath79_pci_irq *ath79_pci_irq_map;
26+
static unsigned ath79_pci_nr_irqs;
2727

28-
static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
28+
static const struct ath79_pci_irq ar71xx_pci_irq_map[] = {
2929
{
3030
.slot = 17,
3131
.pin = 1,
@@ -41,15 +41,15 @@ static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
4141
}
4242
};
4343

44-
static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = {
44+
static const struct ath79_pci_irq ar724x_pci_irq_map[] = {
4545
{
4646
.slot = 0,
4747
.pin = 1,
4848
.irq = ATH79_PCI_IRQ(0),
4949
}
5050
};
5151

52-
static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = {
52+
static const struct ath79_pci_irq qca955x_pci_irq_map[] = {
5353
{
5454
.bus = 0,
5555
.slot = 0,
@@ -64,7 +64,7 @@ static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = {
6464
},
6565
};
6666

67-
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
67+
int pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
6868
{
6969
int irq = -1;
7070
int i;

‎arch/mips/pci/fixup-capcella.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define INTC PC104PLUS_INTC_IRQ
3333
#define INTD PC104PLUS_INTD_IRQ
3434

35-
static char irq_tab_capcella[][5] __initdata = {
35+
static char irq_tab_capcella[][5] = {
3636
[11] = { -1, INT1, INT1, INT1, INT1 },
3737
[12] = { -1, INT2, INT2, INT2, INT2 },
3838
[14] = { -1, INTA, INTB, INTC, INTD }

‎arch/mips/pci/fixup-cobalt.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static void qube_raq_via_board_id_fixup(struct pci_dev *dev)
147147
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0,
148148
qube_raq_via_board_id_fixup);
149149

150-
static char irq_tab_qube1[] __initdata = {
150+
static char irq_tab_qube1[] = {
151151
[COBALT_PCICONF_CPU] = 0,
152152
[COBALT_PCICONF_ETH0] = QUBE1_ETH0_IRQ,
153153
[COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@@ -156,7 +156,7 @@ static char irq_tab_qube1[] __initdata = {
156156
[COBALT_PCICONF_ETH1] = 0
157157
};
158158

159-
static char irq_tab_cobalt[] __initdata = {
159+
static char irq_tab_cobalt[] = {
160160
[COBALT_PCICONF_CPU] = 0,
161161
[COBALT_PCICONF_ETH0] = ETH0_IRQ,
162162
[COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
@@ -165,7 +165,7 @@ static char irq_tab_cobalt[] __initdata = {
165165
[COBALT_PCICONF_ETH1] = ETH1_IRQ
166166
};
167167

168-
static char irq_tab_raq2[] __initdata = {
168+
static char irq_tab_raq2[] = {
169169
[COBALT_PCICONF_CPU] = 0,
170170
[COBALT_PCICONF_ETH0] = ETH0_IRQ,
171171
[COBALT_PCICONF_RAQSCSI] = RAQ2_SCSI_IRQ,

‎arch/mips/pci/fixup-emma2rh.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*/
4444

4545
#define MAX_SLOT_NUM 10
46-
static unsigned char irq_map[][5] __initdata = {
46+
static unsigned char irq_map[][5] = {
4747
[3] = {0, MARKEINS_PCI_IRQ_INTB, MARKEINS_PCI_IRQ_INTC,
4848
MARKEINS_PCI_IRQ_INTD, 0,},
4949
[4] = {0, MARKEINS_PCI_IRQ_INTA, 0, 0, 0,},

‎arch/mips/pci/fixup-ip32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define INTB MACEPCI_SHARED0_IRQ
2222
#define INTC MACEPCI_SHARED1_IRQ
2323
#define INTD MACEPCI_SHARED2_IRQ
24-
static char irq_tab_mace[][5] __initdata = {
24+
static char irq_tab_mace[][5] = {
2525
/* Dummy INT#A INT#B INT#C INT#D */
2626
{0, 0, 0, 0, 0}, /* This is placeholder row - never used */
2727
{0, SCSI0, SCSI0, SCSI0, SCSI0},

‎arch/mips/pci/fixup-jmr3927.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <asm/txx9/pci.h>
3232
#include <asm/txx9/jmr3927.h>
3333

34-
int __init jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
34+
int jmr3927_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
3535
{
3636
unsigned char irq = pin;
3737

‎arch/mips/pci/fixup-lemote2f.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define PCID 7
3131

3232
/* all the pci device has the PCIA pin, check the datasheet. */
33-
static char irq_tab[][5] __initdata = {
33+
static char irq_tab[][5] = {
3434
/* INTA INTB INTC INTD */
3535
{0, 0, 0, 0, 0}, /* 11: Unused */
3636
{0, 0, 0, 0, 0}, /* 12: Unused */

‎arch/mips/pci/fixup-malta.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
static char pci_irq[5] = {
1313
};
1414

15-
static char irq_tab[][5] __initdata = {
15+
static char irq_tab[][5] = {
1616
/* INTA INTB INTC INTD */
1717
{0, 0, 0, 0, 0 }, /* 0: GT64120 PCI bridge */
1818
{0, 0, 0, 0, 0 }, /* 1: Unused */

‎arch/mips/pci/fixup-mpc30x.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
#include <asm/vr41xx/mpc30x.h>
2424

25-
static const int internal_func_irqs[] __initconst = {
25+
static const int internal_func_irqs[] = {
2626
VRC4173_CASCADE_IRQ,
2727
VRC4173_AC97_IRQ,
2828
VRC4173_USB_IRQ,
2929
};
3030

31-
static const int irq_tab_mpc30x[] __initconst = {
31+
static const int irq_tab_mpc30x[] = {
3232
[12] = VRC4173_PCMCIA1_IRQ,
3333
[13] = VRC4173_PCMCIA2_IRQ,
3434
[29] = MQ200_IRQ,

‎arch/mips/pci/fixup-pmcmsp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
#if defined(CONFIG_PMC_MSP7120_GW)
4949
/* Garibaldi Board IRQ wiring to PCI slots */
50-
static char irq_tab[][5] __initdata = {
50+
static char irq_tab[][5] = {
5151
/* INTA INTB INTC INTD */
5252
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
5353
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@@ -86,7 +86,7 @@ static char irq_tab[][5] __initdata = {
8686
#elif defined(CONFIG_PMC_MSP7120_EVAL)
8787

8888
/* MSP7120 Eval Board IRQ wiring to PCI slots */
89-
static char irq_tab[][5] __initdata = {
89+
static char irq_tab[][5] = {
9090
/* INTA INTB INTC INTD */
9191
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
9292
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@@ -125,7 +125,7 @@ static char irq_tab[][5] __initdata = {
125125
#else
126126

127127
/* Unknown board -- don't assign any IRQs */
128-
static char irq_tab[][5] __initdata = {
128+
static char irq_tab[][5] = {
129129
/* INTA INTB INTC INTD */
130130
{0, 0, 0, 0, 0 }, /* (AD[0]): Unused */
131131
{0, 0, 0, 0, 0 }, /* (AD[1]): Unused */

0 commit comments

Comments
 (0)