diff options
| author | Chenhui Zhao <chenhui.zhao@freescale.com> | 2014-11-18 08:13:41 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:55 (GMT) |
| commit | f21fd3c0684f4bc91e95a08f67e43438f7171131 (patch) | |
| tree | 56c85c23d42f7fe857319ca7eefe3569f11f7298 | |
| parent | 7b909a75e3a6d285c84224788ec6d562f0482119 (diff) | |
| download | linux-fsl-qoriq-f21fd3c0684f4bc91e95a08f67e43438f7171131.tar.xz | |
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.
Change-Id: I0e6b9dbd2126f0fb0af917d25c948266417bb71f
Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/24102
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Yang Li <LeoLi@freescale.com>
Reviewed-by: Dongsheng Wang <dongsheng.wang@freescale.com>
Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com>
| -rw-r--r-- | arch/powerpc/platforms/85xx/corenet_generic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 81fef36..9e095e8 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -256,7 +256,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. + * 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, |