浏览代码

ARCv2: smp: [plat-*]: No need to explicitly call mcip_init_early_smp()

MCIP now registers it's own probe callback with smp_ops.init_early_smp()
which is called by ARC common code, so no need for platforms to do that.

This decouples the platforms and MCIP and helps confine MCIP details
to it's own file.

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Vineet Gupta 9 年之前
父节点
当前提交
26b8f99623
共有 4 个文件被更改,包括 8 次插入14 次删除
  1. 0 1
      arch/arc/include/asm/mcip.h
  2. 8 7
      arch/arc/kernel/mcip.c
  3. 0 5
      arch/arc/plat-axs10x/axs10x.c
  4. 0 1
      arch/arc/plat-sim/platform.c

+ 0 - 1
arch/arc/include/asm/mcip.h

@@ -86,7 +86,6 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param,
 	__mcip_cmd(cmd, param);
 }
 
-extern void mcip_init_early_smp(void);
 extern void mcip_init_smp(unsigned int cpu);
 
 #endif

+ 8 - 7
arch/arc/kernel/mcip.c

@@ -97,13 +97,7 @@ static void mcip_ipi_clear(int irq)
 #endif
 }
 
-struct plat_smp_ops plat_smp_ops = {
-	.info		= smp_cpuinfo_buf,
-	.ipi_send	= mcip_ipi_send,
-	.ipi_clear	= mcip_ipi_clear,
-};
-
-void mcip_init_early_smp(void)
+static void mcip_probe_n_setup(void)
 {
 	struct mcip_bcr {
 #ifdef CONFIG_CPU_BIG_ENDIAN
@@ -142,6 +136,13 @@ void mcip_init_early_smp(void)
 		panic("kernel trying to use non-existent GRTC\n");
 }
 
+struct plat_smp_ops plat_smp_ops = {
+	.info		= smp_cpuinfo_buf,
+	.init_early_smp	= mcip_probe_n_setup,
+	.ipi_send	= mcip_ipi_send,
+	.ipi_clear	= mcip_ipi_clear,
+};
+
 /***************************************************************************
  * ARCv2 Interrupt Distribution Unit (IDU)
  *

+ 0 - 5
arch/arc/plat-axs10x/axs10x.c

@@ -455,11 +455,6 @@ static void __init axs103_early_init(void)
 	axs10x_print_board_ver(AXC003_CREG + 4088, "AXC003 CPU Card");
 
 	axs10x_early_init();
-
-#ifdef CONFIG_ARC_MCIP
-	/* No Hardware init, but filling the smp ops callbacks */
-	mcip_init_early_smp();
-#endif
 }
 #endif
 

+ 0 - 1
arch/arc/plat-sim/platform.c

@@ -31,7 +31,6 @@ static const char *simulation_compat[] __initconst = {
 MACHINE_START(SIMULATION, "simulation")
 	.dt_compat	= simulation_compat,
 #ifdef CONFIG_ARC_MCIP
-	.init_early	= mcip_init_early_smp,
 	.init_smp	= mcip_init_smp,
 #endif
 MACHINE_END