Commit be8bec56 authored by Kyle Moffett's avatar Kyle Moffett Committed by Benjamin Herrenschmidt

powerpc/mpic: Invert the meaning of MPIC_PRIMARY

It turns out that there are only 2 in-tree platforms which use MPICs
which are not "primary":  IBM Cell and PowerMac.  To reduce the
complexity of the typical board setup code, invert the MPIC_PRIMARY bit
into MPIC_SECONDARY.
Signed-off-by: default avatarKyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 996983b7
...@@ -334,11 +334,11 @@ struct mpic ...@@ -334,11 +334,11 @@ struct mpic
* Note setting any ID (leaving those bits to 0) means standard MPIC * Note setting any ID (leaving those bits to 0) means standard MPIC
*/ */
/* This is the primary controller, only that one has IPIs and /*
* has afinity control. A non-primary MPIC always uses CPU0 * This is a secondary ("chained") controller; it only uses the CPU0
* registers only * registers. Primary controllers have IPIs and affinity control.
*/ */
#define MPIC_PRIMARY 0x00000001 #define MPIC_SECONDARY 0x00000001
/* Set this for a big-endian MPIC */ /* Set this for a big-endian MPIC */
#define MPIC_BIG_ENDIAN 0x00000002 #define MPIC_BIG_ENDIAN 0x00000002
......
...@@ -71,7 +71,7 @@ static void __init iss4xx_init_irq(void) ...@@ -71,7 +71,7 @@ static void __init iss4xx_init_irq(void)
/* The MPIC driver will get everything it needs from the /* The MPIC driver will get everything it needs from the
* device-tree, just pass 0 to all arguments * device-tree, just pass 0 to all arguments
*/ */
struct mpic *mpic = mpic_alloc(np, 0, MPIC_PRIMARY, 0, 0, struct mpic *mpic = mpic_alloc(np, 0, 0, 0, 0,
" MPIC "); " MPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
void __init corenet_ds_pic_init(void) void __init corenet_ds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
unsigned int flags = MPIC_PRIMARY | MPIC_BIG_ENDIAN | unsigned int flags = MPIC_BIG_ENDIAN |
MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU; MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU;
if (ppc_md.get_irq == mpic_get_coreint_irq) if (ppc_md.get_irq == mpic_get_coreint_irq)
......
...@@ -58,7 +58,7 @@ static void machine_restart(char *cmd) ...@@ -58,7 +58,7 @@ static void machine_restart(char *cmd)
static void __init ksi8560_pic_init(void) static void __init ksi8560_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
void __init mpc8536_ds_pic_init(void) void __init mpc8536_ds_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -51,7 +51,7 @@ static int mpc85xx_exclude_device(struct pci_controller *hose, ...@@ -51,7 +51,7 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
static void __init mpc85xx_ads_pic_init(void) static void __init mpc85xx_ads_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -189,7 +189,7 @@ static void __init mpc85xx_cds_pic_init(void) ...@@ -189,7 +189,7 @@ static void __init mpc85xx_cds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -72,13 +72,12 @@ void __init mpc85xx_ds_pic_init(void) ...@@ -72,13 +72,12 @@ void __init mpc85xx_ds_pic_init(void)
if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) { if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU, MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
} else { } else {
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU, MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
......
...@@ -435,7 +435,7 @@ machine_arch_initcall(p1021_mds, swiotlb_setup_bus_notifier); ...@@ -435,7 +435,7 @@ machine_arch_initcall(p1021_mds, swiotlb_setup_bus_notifier);
static void __init mpc85xx_mds_pic_init(void) static void __init mpc85xx_mds_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -49,13 +49,12 @@ void __init mpc85xx_rdb_pic_init(void) ...@@ -49,13 +49,12 @@ void __init mpc85xx_rdb_pic_init(void)
if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) { if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) {
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU, MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
} else { } else {
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU, MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
void __init p1010_rdb_pic_init(void) void __init p1010_rdb_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -242,7 +242,7 @@ p1022ds_valid_monitor_port(enum fsl_diu_monitor_port port) ...@@ -242,7 +242,7 @@ p1022ds_valid_monitor_port(enum fsl_diu_monitor_port port)
void __init p1022_ds_pic_init(void) void __init p1022_ds_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU, MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
......
...@@ -94,7 +94,7 @@ machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices); ...@@ -94,7 +94,7 @@ machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);
static void __init mpc85xx_rds_pic_init(void) static void __init mpc85xx_rds_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
......
...@@ -55,7 +55,7 @@ static int sbc_rev; ...@@ -55,7 +55,7 @@ static int sbc_rev;
static void __init sbc8548_pic_init(void) static void __init sbc8548_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
static void __init sbc8560_pic_init(void) static void __init sbc8560_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -49,7 +49,7 @@ static void __init socrates_pic_init(void) ...@@ -49,7 +49,7 @@ static void __init socrates_pic_init(void)
struct device_node *np; struct device_node *np;
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
static void __init stx_gp3_pic_init(void) static void __init stx_gp3_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
static void __init tqm85xx_pic_init(void) static void __init tqm85xx_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
void __init xes_mpc85xx_pic_init(void) void __init xes_mpc85xx_pic_init(void)
{ {
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS, MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
0, 256, " OpenPIC "); 0, 256, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -38,9 +38,8 @@ void __init mpc86xx_init_irq(void) ...@@ -38,9 +38,8 @@ void __init mpc86xx_init_irq(void)
#endif #endif
struct mpic *mpic = mpic_alloc(NULL, 0, struct mpic *mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
MPIC_SINGLE_DEST_CPU,
0, 256, " MPIC "); 0, 256, " MPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -211,7 +211,7 @@ static void __init mpic_init_IRQ(void) ...@@ -211,7 +211,7 @@ static void __init mpic_init_IRQ(void)
/* The MPIC driver will get everything it needs from the /* The MPIC driver will get everything it needs from the
* device-tree, just pass 0 to all arguments * device-tree, just pass 0 to all arguments
*/ */
mpic = mpic_alloc(dn, 0, 0, 0, 0, " MPIC "); mpic = mpic_alloc(dn, 0, MPIC_SECONDARY, 0, 0, " MPIC ");
if (mpic == NULL) if (mpic == NULL)
continue; continue;
mpic_init(mpic); mpic_init(mpic);
......
...@@ -435,8 +435,7 @@ static void __init chrp_find_openpic(void) ...@@ -435,8 +435,7 @@ static void __init chrp_find_openpic(void)
if (len > 1) if (len > 1)
isu_size = iranges[3]; isu_size = iranges[3];
chrp_mpic = mpic_alloc(np, opaddr, MPIC_PRIMARY, chrp_mpic = mpic_alloc(np, opaddr, 0, isu_size, 0, " MPIC ");
isu_size, 0, " MPIC ");
if (chrp_mpic == NULL) { if (chrp_mpic == NULL) {
printk(KERN_ERR "Failed to allocate MPIC structure\n"); printk(KERN_ERR "Failed to allocate MPIC structure\n");
goto bail; goto bail;
......
...@@ -155,7 +155,7 @@ static void __init holly_init_IRQ(void) ...@@ -155,7 +155,7 @@ static void __init holly_init_IRQ(void)
#endif #endif
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108, MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
24, 24,
NR_IRQS-4, /* num_sources used */ NR_IRQS-4, /* num_sources used */
......
...@@ -82,7 +82,7 @@ static void __init linkstation_init_IRQ(void) ...@@ -82,7 +82,7 @@ static void __init linkstation_init_IRQ(void)
{ {
struct mpic *mpic; struct mpic *mpic;
mpic = mpic_alloc(NULL, 0, MPIC_PRIMARY | MPIC_WANTS_RESET, mpic = mpic_alloc(NULL, 0, MPIC_WANTS_RESET,
4, 32, " EPIC "); 4, 32, " EPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -109,7 +109,7 @@ static void __init mpc7448_hpc2_init_IRQ(void) ...@@ -109,7 +109,7 @@ static void __init mpc7448_hpc2_init_IRQ(void)
#endif #endif
mpic = mpic_alloc(NULL, 0, mpic = mpic_alloc(NULL, 0,
MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108, MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
24, 24,
NR_IRQS-4, /* num_sources used */ NR_IRQS-4, /* num_sources used */
......
...@@ -84,7 +84,7 @@ static void __init storcenter_init_IRQ(void) ...@@ -84,7 +84,7 @@ static void __init storcenter_init_IRQ(void)
{ {
struct mpic *mpic; struct mpic *mpic;
mpic = mpic_alloc(NULL, 0, MPIC_PRIMARY | MPIC_WANTS_RESET, mpic = mpic_alloc(NULL, 0, MPIC_WANTS_RESET,
16, 32, " OpenPIC "); 16, 32, " OpenPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -221,7 +221,7 @@ static void __init maple_init_IRQ(void) ...@@ -221,7 +221,7 @@ static void __init maple_init_IRQ(void)
unsigned long openpic_addr = 0; unsigned long openpic_addr = 0;
int naddr, n, i, opplen, has_isus = 0; int naddr, n, i, opplen, has_isus = 0;
struct mpic *mpic; struct mpic *mpic;
unsigned int flags = MPIC_PRIMARY; unsigned int flags = 0;
/* Locate MPIC in the device-tree. Note that there is a bug /* Locate MPIC in the device-tree. Note that there is a bug
* in Maple device-tree where the type of the controller is * in Maple device-tree where the type of the controller is
......
...@@ -224,7 +224,7 @@ static __init void pas_init_IRQ(void) ...@@ -224,7 +224,7 @@ static __init void pas_init_IRQ(void)
openpic_addr = of_read_number(opprop, naddr); openpic_addr = of_read_number(opprop, naddr);
printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
mpic_flags = MPIC_PRIMARY | MPIC_LARGE_VECTORS | MPIC_NO_BIAS; mpic_flags = MPIC_LARGE_VECTORS | MPIC_NO_BIAS;
nmiprop = of_get_property(mpic_node, "nmi-source", NULL); nmiprop = of_get_property(mpic_node, "nmi-source", NULL);
if (nmiprop) if (nmiprop)
......
...@@ -499,7 +499,7 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np, ...@@ -499,7 +499,7 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,
{ {
const char *name = master ? " MPIC 1 " : " MPIC 2 "; const char *name = master ? " MPIC 1 " : " MPIC 2 ";
struct mpic *mpic; struct mpic *mpic;
unsigned int flags = master ? MPIC_PRIMARY : 0; unsigned int flags = master ? 0 : MPIC_SECONDARY;
pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0); pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);
......
...@@ -192,8 +192,7 @@ static void __init pseries_mpic_init_IRQ(void) ...@@ -192,8 +192,7 @@ static void __init pseries_mpic_init_IRQ(void)
BUG_ON(openpic_addr == 0); BUG_ON(openpic_addr == 0);
/* Setup the openpic driver */ /* Setup the openpic driver */
mpic = mpic_alloc(pSeries_mpic_node, openpic_addr, mpic = mpic_alloc(pSeries_mpic_node, openpic_addr, 0,
MPIC_PRIMARY,
16, 250, /* isu size, irq count */ 16, 250, /* isu size, irq count */
" MPIC "); " MPIC ");
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
......
...@@ -154,7 +154,7 @@ static inline unsigned int mpic_processor_id(struct mpic *mpic) ...@@ -154,7 +154,7 @@ static inline unsigned int mpic_processor_id(struct mpic *mpic)
{ {
unsigned int cpu = 0; unsigned int cpu = 0;
if (mpic->flags & MPIC_PRIMARY) if (!(mpic->flags & MPIC_SECONDARY))
cpu = hard_smp_processor_id(); cpu = hard_smp_processor_id();
return cpu; return cpu;
...@@ -990,7 +990,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq, ...@@ -990,7 +990,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
else if (hw >= mpic->ipi_vecs[0]) { else if (hw >= mpic->ipi_vecs[0]) {
WARN_ON(!(mpic->flags & MPIC_PRIMARY)); WARN_ON(mpic->flags & MPIC_SECONDARY);
DBG("mpic: mapping as IPI\n"); DBG("mpic: mapping as IPI\n");
irq_set_chip_data(virq, mpic); irq_set_chip_data(virq, mpic);
...@@ -1001,7 +1001,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq, ...@@ -1001,7 +1001,7 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
if (hw >= mpic->timer_vecs[0] && hw <= mpic->timer_vecs[7]) { if (hw >= mpic->timer_vecs[0] && hw <= mpic->timer_vecs[7]) {
WARN_ON(!(mpic->flags & MPIC_PRIMARY)); WARN_ON(mpic->flags & MPIC_SECONDARY);
DBG("mpic: mapping as timer\n"); DBG("mpic: mapping as timer\n");
irq_set_chip_data(virq, mpic); irq_set_chip_data(virq, mpic);
...@@ -1184,12 +1184,12 @@ struct mpic * __init mpic_alloc(struct device_node *node, ...@@ -1184,12 +1184,12 @@ struct mpic * __init mpic_alloc(struct device_node *node,
mpic->hc_irq = mpic_irq_chip; mpic->hc_irq = mpic_irq_chip;
mpic->hc_irq.name = name; mpic->hc_irq.name = name;
if (flags & MPIC_PRIMARY) if (!(flags & MPIC_SECONDARY))
mpic->hc_irq.irq_set_affinity = mpic_set_affinity; mpic->hc_irq.irq_set_affinity = mpic_set_affinity;
#ifdef CONFIG_MPIC_U3_HT_IRQS #ifdef CONFIG_MPIC_U3_HT_IRQS
mpic->hc_ht_irq = mpic_irq_ht_chip; mpic->hc_ht_irq = mpic_irq_ht_chip;
mpic->hc_ht_irq.name = name; mpic->hc_ht_irq.name = name;
if (flags & MPIC_PRIMARY) if (!(flags & MPIC_SECONDARY))
mpic->hc_ht_irq.irq_set_affinity = mpic_set_affinity; mpic->hc_ht_irq.irq_set_affinity = mpic_set_affinity;
#endif /* CONFIG_MPIC_U3_HT_IRQS */ #endif /* CONFIG_MPIC_U3_HT_IRQS */
...@@ -1375,7 +1375,7 @@ struct mpic * __init mpic_alloc(struct device_node *node, ...@@ -1375,7 +1375,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
mpic->next = mpics; mpic->next = mpics;
mpics = mpic; mpics = mpic;
if (flags & MPIC_PRIMARY) { if (!(flags & MPIC_SECONDARY)) {
mpic_primary = mpic; mpic_primary = mpic;
irq_set_default_host(mpic->irqhost); irq_set_default_host(mpic->irqhost);
} }
...@@ -1450,7 +1450,7 @@ void __init mpic_init(struct mpic *mpic) ...@@ -1450,7 +1450,7 @@ void __init mpic_init(struct mpic *mpic)
/* Do the HT PIC fixups on U3 broken mpic */ /* Do the HT PIC fixups on U3 broken mpic */
DBG("MPIC flags: %x\n", mpic->flags); DBG("MPIC flags: %x\n", mpic->flags);
if ((mpic->flags & MPIC_U3_HT_IRQS) && (mpic->flags & MPIC_PRIMARY)) { if ((mpic->flags & MPIC_U3_HT_IRQS) && !(mpic->flags & MPIC_SECONDARY)) {
mpic_scan_ht_pics(mpic); mpic_scan_ht_pics(mpic);
mpic_u3msi_init(mpic); mpic_u3msi_init(mpic);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment