PERFORCE change 1187342 for review

[Brooks Davis]

http://p4web.freebsd.org/@@1187342?ac=10

Change 1187342 by brooks at brooks_zenith on 2013/10/24 16:09:08

	ifdef around platform_init_secondary() rather than requiring
	that all MIPS platforms provide a stub.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#16 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#9 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/cavium/octeon_mp.c#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#7 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/include/hwfunc.h#6 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/include/pte.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/mp_machdep.c#6 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/nlm/xlp_machdep.c#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/rmi/xlr_machdep.c#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/sibyte/sb_machdep.c#6 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#16 (text+ko) ====

@@ -89,6 +89,7 @@
 # Options specific to the BERI platform. 
 #
 BERI_LARGE_TLB			opt_global.h
+PLATFORM_INIT_SECONDARY		opt_global.h
 
 #
 # Options that control the Atheros SoC peripherals

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#9 (text+ko) ====

@@ -4,3 +4,4 @@
 cpu		CPU_MIPS4KC
 
 options 	BERI_LARGE_TLB
+options 	PLATFORM_INIT_SECONDARY

==== //depot/projects/ctsrd/beribsd/src/sys/mips/cavium/octeon_mp.c#5 (text+ko) ====

@@ -46,12 +46,6 @@
 unsigned octeon_ap_boot = ~0;
 
 void
-platform_init_secondary(int cpuid)
-{
-
-}
-
-void
 platform_ipi_send(int cpuid)
 {
 	cvmx_write_csr(CVMX_CIU_MBOX_SETX(cpuid), 1);

==== //depot/projects/ctsrd/beribsd/src/sys/mips/gxemul/gxemul_machdep.c#7 (text+ko) ====

@@ -174,12 +174,6 @@
 
 #ifdef SMP
 void
-platform_init_secondary(int cpuid)
-{
-
-}
-
-void
 platform_ipi_send(int cpuid)
 {
 	GXEMUL_MP_DEV_WRITE(GXEMUL_MP_DEV_IPI_ONE, (1 << 16) | cpuid);

==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/hwfunc.h#6 (text+ko) ====

@@ -69,10 +69,12 @@
  */
 int platform_ipi_intrnum(void);
 
+#ifdef PLATFORM_INIT_SECONDARY
 /*
  * Set up IPIs for this CPU.
  */
 void platform_init_secondary(int cpuid);
+#endif
 
 /*
  * Trigger a IPI interrupt on 'cpuid'.

==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/pte.h#6 (text+ko) ====


==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/mp_machdep.c#6 (text+ko) ====

@@ -302,7 +302,9 @@
 	while (!aps_ready)
 		;
 
+#ifdef PLATFORM_INIT_SECONDARY
 	platform_init_secondary(cpuid);
+#endif
 
 	/* Initialize curthread. */
 	KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
@@ -345,7 +347,9 @@
 	if (mp_ncpus == 1)
 		return;
 
+#ifdef PLATFORM_INIT_SECONDARY
 	platform_init_secondary(0);
+#endif
 
 	/*
 	 * IPI handler

==== //depot/projects/ctsrd/beribsd/src/sys/mips/nlm/xlp_machdep.c#5 (text+ko) ====

@@ -697,12 +697,6 @@
 }
 
 void
-platform_init_secondary(int cpuid)
-{
-
-}
-
-void
 platform_ipi_send(int cpuid)
 {
 

==== //depot/projects/ctsrd/beribsd/src/sys/mips/rmi/xlr_machdep.c#5 (text+ko) ====

@@ -578,12 +578,6 @@
 }
 
 void
-platform_init_secondary(int cpuid)
-{
-
-}
-
-void
 platform_ipi_send(int cpuid)
 {
 

==== //depot/projects/ctsrd/beribsd/src/sys/mips/sibyte/sb_machdep.c#6 (text+ko) ====

@@ -295,12 +295,6 @@
 
 #ifdef SMP
 void
-platform_init_secondary(int cpuid)
-{
-
-}
-
-void
 platform_ipi_send(int cpuid)
 {
 	KASSERT(cpuid == 0 || cpuid == 1,