From: chenhui zhao Date: Thu, 23 Jul 2015 03:55:45 +0000 (+0800) Subject: powerpc/corenet: use the mixed mode of MPIC when enabling CPU hotplug X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=881ea7d3f55bf7b8834c81d86c4dcb3d5f786f15;p=deliverable%2Flinux.git powerpc/corenet: use the mixed mode of MPIC when enabling CPU hotplug Core reset may cause issue if using the proxy mode of MPIC. Use the mixed mode of MPIC if enabling CPU hotplug. Signed-off-by: Chenhui Zhao Signed-off-by: Scott Wood --- diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index b39557120cbb..99412b32586d 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -214,7 +214,15 @@ define_machine(corenet_generic) { .pcibios_fixup_bus = fsl_pcibios_fixup_bus, .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif +/* + * Core reset may cause issue if using the proxy mode of MPIC. + * So, use the mixed mode of MPIC if enabling CPU hotplug. + */ +#ifdef CONFIG_HOTPLUG_CPU + .get_irq = mpic_get_irq, +#else .get_irq = mpic_get_coreint_irq, +#endif .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress,