浏览代码

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 <chenhui.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
chenhui zhao 10 年之前
父节点
当前提交
881ea7d3f5
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      arch/powerpc/platforms/85xx/corenet_generic.c

+ 8 - 0
arch/powerpc/platforms/85xx/corenet_generic.c

@@ -214,7 +214,15 @@ define_machine(corenet_generic) {
 	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
 	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
 	.pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 	.pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
 #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,
 	.get_irq		= mpic_get_coreint_irq,
+#endif
 	.restart		= fsl_rstcr_restart,
 	.restart		= fsl_rstcr_restart,
 	.calibrate_decr		= generic_calibrate_decr,
 	.calibrate_decr		= generic_calibrate_decr,
 	.progress		= udbg_progress,
 	.progress		= udbg_progress,