Skip to content

Commit

Permalink
powerpc/85xx: Don't reset the MPIC for CAMP mode on MPC8572DS
Browse files Browse the repository at this point in the history
The flag MPIC_WANTS_RESET shouldn't be set if we are doing cooperative
asymmetric MP.  The second linux shouldn't reset the pic or the first
one gets very confused.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Haiying Wang authored and Kumar Gala committed Dec 3, 2008
1 parent c64ef80 commit 06be64a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion arch/powerpc/platforms/85xx/mpc85xx_ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ void __init mpc85xx_ds_pic_init(void)
struct device_node *cascade_node = NULL;
int cascade_irq;
#endif
unsigned long root = of_get_flat_dt_root();

np = of_find_node_by_type(NULL, "open-pic");
if (np == NULL) {
Expand All @@ -76,11 +77,19 @@ void __init mpc85xx_ds_pic_init(void)
return;
}

mpic = mpic_alloc(np, r.start,
if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {
mpic = mpic_alloc(np, r.start,
MPIC_PRIMARY |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
0, 256, " OpenPIC ");
} else {
mpic = mpic_alloc(np, r.start,
MPIC_PRIMARY | MPIC_WANTS_RESET |
MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC ");
}

BUG_ON(mpic == NULL);
of_node_put(np);

Expand Down

0 comments on commit 06be64a

Please sign in to comment.