Almost all copies of platform_mp_init_secondary just called

intr_pic_init_secondary. Replace them with a direct call. On BCM2836
and ARMADA XP we need to add this function, but it can be empty.

Reviewed by:	ian, imp
Sponsored by:	ABT Systems Ltd
Differential Revision:	https://reviews.freebsd.org/D5460

17 files changed, 13 insertions, 97 deletions

diff --git a/sys/arm/allwinner/a20/a20_mp.c b/sys/arm/allwinner/a20/a20_mp.c
index aca9186ddc08..a8ceaf5e89fd 100644
--- a/sys/arm/allwinner/a20/a20_mp.c
+++ b/sys/arm/allwinner/a20/a20_mp.c
@@ -59,13 +59,6 @@ __FBSDID("$FreeBSD$");
 #define	CPUCFG_DBGCTL1		0x1e4
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 	int ncpu;
diff --git a/sys/arm/altera/socfpga/socfpga_mp.c b/sys/arm/altera/socfpga/socfpga_mp.c
index 07d5acbd1b7c..aa249ea2c946 100644
--- a/sys/arm/altera/socfpga/socfpga_mp.c
+++ b/sys/arm/altera/socfpga/socfpga_mp.c
@@ -85,13 +85,6 @@ socfpga_trampoline(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 	int hwcpu, ncpu;
diff --git a/sys/arm/amlogic/aml8726/aml8726_mp.c b/sys/arm/amlogic/aml8726/aml8726_mp.c
index cbcba59348f0..e2996e3ff7ce 100644
--- a/sys/arm/amlogic/aml8726/aml8726_mp.c
+++ b/sys/arm/amlogic/aml8726/aml8726_mp.c
@@ -341,21 +341,6 @@ power_on_cpu(int cpu)
 	}
 }
 
-
-void
-platform_mp_init_secondary(void)
-{
-
-	/*
-	 * Consider modifying the timer driver to support
-	 * per-cpu timers and then enabling the timer for
-	 * each AP.
-	 */
-
-	 intr_pic_init_secondary();
-}
-
-
 void
 platform_mp_setmaxid(void)
 {
diff --git a/sys/arm/annapurna/alpine/alpine_machdep_mp.c b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
index d2049a8cce5e..ada7b024387b 100644
--- a/sys/arm/annapurna/alpine/alpine_machdep_mp.c
+++ b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
@@ -119,13 +119,6 @@ platform_mp_get_core_cnt(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index cac8ecc761a8..41958a87af5a 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -234,7 +234,7 @@ init_secondary(int cpu)
 	cpu_initclocks_ap();
 
 	CTR0(KTR_SMP, "go into scheduler");
-	platform_mp_init_secondary();
+	intr_pic_init_secondary();
 
 	/* Enter the scheduler */
 	sched_throw(NULL);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index d8574e6c3a1c..941e9386717b 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -240,3 +240,10 @@ arm_unmask_irq(uintptr_t nb)
 	else
 		printf("arm_mask_irq: Invalid IRQ number: %d\n", nb);
 }
+
+#ifdef SMP
+void
+intr_pic_init_secondary(void)
+{
+}
+#endif
diff --git a/sys/arm/broadcom/bcm2835/bcm2836_mp.c b/sys/arm/broadcom/bcm2835/bcm2836_mp.c
index e32b581acb0a..6a3a8578e501 100644
--- a/sys/arm/broadcom/bcm2835/bcm2836_mp.c
+++ b/sys/arm/broadcom/bcm2835/bcm2836_mp.c
@@ -77,12 +77,6 @@ static bus_space_handle_t bs_periph;
 	bus_space_write_4(fdtbus_bs_tag, bs_periph, (addr), (val))
 
 void
-platform_mp_init_secondary(void)
-{
-
-}
-
-void
 platform_mp_setmaxid(void)
 {
 
diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index d41c42ae653c..f6bf1612ac43 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -67,13 +67,6 @@ __FBSDID("$FreeBSD$");
 #define	SRC_GPR1_C1ARG			0x24	/* Register for Core 1 entry arg */
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 	bus_space_handle_t scu;
diff --git a/sys/arm/include/smp.h b/sys/arm/include/smp.h
index 1ca44a165b61..e4d6385c9d2e 100644
--- a/sys/arm/include/smp.h
+++ b/sys/arm/include/smp.h
@@ -46,7 +46,6 @@ int	pic_ipi_read(int arg);
 /* Platform interface */
 void	platform_mp_setmaxid(void);
 void	platform_mp_start_ap(void);
-void	platform_mp_init_secondary(void);
 
 /* global data in mp_machdep.c */
 extern struct pcb               stoppcbs[];
diff --git a/sys/arm/mv/armada38x/armada38x_mp.c b/sys/arm/mv/armada38x/armada38x_mp.c
index b7cf3efe02c7..8dc404fcfeb0 100644
--- a/sys/arm/mv/armada38x/armada38x_mp.c
+++ b/sys/arm/mv/armada38x/armada38x_mp.c
@@ -131,13 +131,6 @@ platform_mp_setmaxid(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_start_ap(void)
 {
 	int rv;
diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c
index fd00522f98b2..2a9265df85b5 100644
--- a/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ b/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -87,11 +87,6 @@ platform_mp_setmaxid(void)
 	mp_maxid = mp_ncpus - 1;
 }
 
-void
-platform_mp_init_secondary(void)
-{
-}
-
 void mptramp(void);
 void mptramp_end(void);
 extern vm_offset_t mptramp_pmu_boot;
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index 7eb5d2a022b0..ebd14773913a 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -361,6 +361,11 @@ mv_msi_data(int irq, uint64_t *addr, uint32_t *data)
 
 #if defined(SMP)
 void
+intr_pic_init_secondary(void)
+{
+}
+
+void
 pic_ipi_send(cpuset_t cpus, u_int ipi)
 {
 	uint32_t val, i;
diff --git a/sys/arm/qemu/virt_mp.c b/sys/arm/qemu/virt_mp.c
index 1d7752581820..eeb9a9bef165 100644
--- a/sys/arm/qemu/virt_mp.c
+++ b/sys/arm/qemu/virt_mp.c
@@ -90,10 +90,3 @@ platform_mp_start_ap(void)
 
 	ofw_cpu_early_foreach(virt_start_ap, true);
 }
-
-void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
diff --git a/sys/arm/rockchip/rk30xx_mp.c b/sys/arm/rockchip/rk30xx_mp.c
index 248c548c96dd..dcb0df9aabed 100644
--- a/sys/arm/rockchip/rk30xx_mp.c
+++ b/sys/arm/rockchip/rk30xx_mp.c
@@ -80,13 +80,6 @@ rk30xx_boot2(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 	bus_space_handle_t scu;
diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index 98f3067e9916..21307b6acd36 100644
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -71,13 +71,6 @@ exynos_get_soc_id(void)
 }
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 
diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index 0dd8dceee06a..0f1bcc71df73 100644
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -43,12 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <arm/ti/omap4/omap4_smc.h>
 
 void
-platform_mp_init_secondary(void)
-{
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {
 
diff --git a/sys/arm/xilinx/zy7_mp.c b/sys/arm/xilinx/zy7_mp.c
index 2ef7d66f7780..f49f6da0ed9d 100644
--- a/sys/arm/xilinx/zy7_mp.c
+++ b/sys/arm/xilinx/zy7_mp.c
@@ -47,13 +47,6 @@ __FBSDID("$FreeBSD$");
 #define	   SCU_CONTROL_ENABLE	(1 << 0)
 
 void
-platform_mp_init_secondary(void)
-{
-
-	intr_pic_init_secondary();
-}
-
-void
 platform_mp_setmaxid(void)
 {