svn commit: r206645 - in user/jmallett/octeon/sys/mips: cavium mips

[Juli Mallett]

Author: jmallett
Date: Thu Apr 15 05:24:18 2010
New Revision: 206645
URL: http://svn.freebsd.org/changeset/base/206645

Log:
  o) Make APs on Octeon wait to be awoken.
  o) Use CLEAR_STATUS rather than moving zero to the status register.
  o) Awaken APs on Octeon.
  
  XXX This blows up somewhere around setting up dpcpu stuff.  Probably either
      the TLB wiring isn't being done right or we're not clearing BEV and so
      some unrelated TLB load is blowing up?

Modified:
  user/jmallett/octeon/sys/mips/cavium/asm_octeon.S
  user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
  user/jmallett/octeon/sys/mips/cavium/octeon_mp.c
  user/jmallett/octeon/sys/mips/mips/locore.S
  user/jmallett/octeon/sys/mips/mips/mpboot.S

Modified: user/jmallett/octeon/sys/mips/cavium/asm_octeon.S
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/asm_octeon.S	Thu Apr 15 02:59:21 2010	(r206644)
+++ user/jmallett/octeon/sys/mips/cavium/asm_octeon.S	Thu Apr 15 05:24:18 2010	(r206645)
@@ -25,15 +25,42 @@
  *
  * $FreeBSD$
  */
+
 #include <machine/asm.h>
 
+	.set noreorder
+
 #ifdef SMP
 /*
  * This function must be implemented in assembly because it is called early
  * in AP boot without a valid stack.
  */
 LEAF(platform_processor_id)
-	li	v0, 0
+	.set push
+	.set mips32r2
 	jr	ra
+	rdhwr	v0, $0
+	.set pop
 END(platform_processor_id)
+
+/*
+ * Called on APs to wait until they are told to launch.
+ */
+LEAF(octeon_ap_wait)
+	jal	platform_processor_id
+	nop
+
+1:	ll	t0, octeon_ap_boot
+	bne	v0, t0, 1b
+	nop
+
+	move	t0, zero
+	sc	t0, octeon_ap_boot
+
+	beqz	t0, 1b
+	nop
+
+	j	mpentry
+	nop
+END(octeon_ap_wait)
 #endif

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Thu Apr 15 02:59:21 2010	(r206644)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Thu Apr 15 05:24:18 2010	(r206645)
@@ -834,7 +834,7 @@ octeon_boot_params_init(register_t ptr)
 
         printf("Boot Descriptor Ver: %u -> %u/%u",
                octeon_bd_ver, octeon_cvmx_bd_ver/100, octeon_cvmx_bd_ver%100);
-        printf("  CPU clock: %uMHz\n", octeon_cpu_clock/1000000);
+        printf("  CPU clock: %uMHz  Core Mask: %#x\n", octeon_cpu_clock/1000000, octeon_core_mask);
         printf("  Dram: %u MB", (uint32_t)(octeon_dram >> 20));
         printf("  Board Type: %u  Revision: %u/%u\n",
                octeon_board_type, octeon_board_rev_major, octeon_board_rev_minor);

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Thu Apr 15 02:59:21 2010	(r206644)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Thu Apr 15 05:24:18 2010	(r206645)
@@ -36,6 +36,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/hwfunc.h>
 #include <machine/smp.h>
 
+#include <mips/cavium/octeon_pcmap_regs.h>
+
+unsigned octeon_ap_boot = ~0;
+
 void
 platform_ipi_send(int cpuid)
 {
@@ -51,25 +55,29 @@ platform_ipi_clear(void)
 int
 platform_ipi_intrnum(void)
 {
-	panic("%s: not yet implemented.", __func__);
+	return (1);
 }
 
 void
 platform_init_ap(int cpuid)
 {
-	panic("%s: not yet implemented.", __func__);
-
-	KASSERT(cpuid == 1, ("AP has an invalid cpu id %d", cpuid));
 }
 
 int
 platform_num_processors(void)
 {
-	panic("%s: not yet implemented.", __func__);
+	return (fls(octeon_core_mask));
 }
 
 int
 platform_start_ap(int cpuid)
 {
-	panic("%s: not yet implemented.", __func__);
+	if (atomic_cmpset_32(&octeon_ap_boot, ~0, cpuid) == 0)
+		return (-1);
+	for (;;) {
+		DELAY(1000);
+		if (atomic_cmpset_32(&octeon_ap_boot, 0, ~0) != 0)
+			return (0);
+		printf("Waiting for cpu%d to start\n", cpuid);
+	}
 }

Modified: user/jmallett/octeon/sys/mips/mips/locore.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/locore.S	Thu Apr 15 02:59:21 2010	(r206644)
+++ user/jmallett/octeon/sys/mips/mips/locore.S	Thu Apr 15 05:24:18 2010	(r206645)
@@ -162,6 +162,18 @@ VECTOR(_locore, unknown)
 	sw	a2, _C_LABEL(fenvp)
 #endif
 
+#if defined(TARGET_OCTEON) && defined(SMP)
+	.set push
+	.set mips32r2
+	rdhwr	t2, $0
+	beqz	t2, 1f
+	nop
+	j	octeon_ap_wait
+	nop
+	.set pop
+1:
+#endif
+
 	/*
 	 * Initialize stack and call machine startup.
 	 */

Modified: user/jmallett/octeon/sys/mips/mips/mpboot.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/mpboot.S	Thu Apr 15 02:59:21 2010	(r206644)
+++ user/jmallett/octeon/sys/mips/mips/mpboot.S	Thu Apr 15 05:24:18 2010	(r206645)
@@ -36,9 +36,24 @@
 	.set	noat
 	.set	noreorder
 
+#ifdef TARGET_OCTEON
+#define CLEAR_STATUS \
+	mfc0    a0, COP_0_STATUS_REG    ;\
+	li      a2, (MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) ; \
+	or      a0, a0, a2	        ; \
+	li      a2, ~(MIPS_SR_INT_IE | MIPS_SR_EXL | SR_KSU_USER)   ; \
+	and     a0, a0, a2              ; \
+        mtc0    a0, COP_0_STATUS_REG    
+#else
+#define CLEAR_STATUS \
+	mfc0    a0, COP_0_STATUS_REG    ;\
+	li      a2, ~(MIPS_SR_INT_IE | MIPS_SR_EXL | SR_KSU_USER)   ; \
+	and     a0, a0, a2              ; \
+	mtc0	a0, COP_0_STATUS_REG
+#endif
+
 GLOBAL(mpentry)
-	/* XXX On n64 this will be a problem.  */
-	mtc0	zero, COP_0_STATUS_REG	/* disable interrupts */
+	CLEAR_STATUS			/* disable interrupts */
 
 	mtc0	zero, COP_0_CAUSE_REG	/* clear soft interrupts */