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

Commit 06be64a3 authored by Haiying Wang's avatar Haiying Wang Committed by Kumar Gala
Browse files

powerpc/85xx: Don't reset the MPIC for CAMP mode on MPC8572DS 



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: default avatarHaiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent c64ef80b

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+10 −1
Original line number Diff line number Diff line
@@ -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) {
@@ -76,11 +77,19 @@ void __init mpc85xx_ds_pic_init(void) 
		return;

	}



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