Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 22 Dec 2013 14:13:00 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r259723 - user/nwhitehorn/mips_pic_if/mips/mips
Message-ID:  <201312221413.rBMED0kq079025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: nwhitehorn
Date: Sun Dec 22 14:13:00 2013
New Revision: 259723
URL: http://svnweb.freebsd.org/changeset/base/259723

Log:
  SMP fixes.

Modified:
  user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c
  user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c
  user/nwhitehorn/mips_pic_if/mips/mips/nexus.c

Modified: user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c
==============================================================================
--- user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c	Sun Dec 22 13:03:33 2013	(r259722)
+++ user/nwhitehorn/mips_pic_if/mips/mips/intr_machdep.c	Sun Dec 22 14:13:00 2013	(r259723)
@@ -78,6 +78,7 @@
 #include <sys/proc.h>
 
 #include <machine/frame.h>
+#include <machine/hwfunc.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
@@ -377,9 +378,6 @@ mips_enable_intr(void)
 {
 	struct mips_intr *i;
 	int error, vector;
-#ifdef SMP
-	int n;
-#endif
 
 	if (npics == 0)
 		panic("no PIC detected\n");
@@ -390,21 +388,13 @@ mips_enable_intr(void)
 #ifdef SMP
 	/* Install an IPI handler. */
 	if (mp_ncpus > 1) {
-		for (n = 0; n < npics; n++) {
-			if (piclist[n].dev != root_pic)
-				continue;
-
-			KASSERT(piclist[n].ipis != 0,
-			    ("%s: SMP root PIC does not supply any IPIs",
-			    __func__));
-			error = mips_setup_intr("IPI",
-			    mips_get_irq(piclist[n].node, piclist[n].irqs),
-			    mips_ipi_handler, NULL, NULL,
-			    INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie);
-			if (error) {
-				printf("unable to setup IPI handler\n");
-				return (error);
-			}
+		error = mips_setup_intr("IPI",
+		    platform_ipi_intrnum(),
+		    mips_ipi_handler, NULL, NULL,
+		    INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie);
+		if (error) {
+			printf("unable to setup IPI handler\n");
+			return (error);
 		}
 	}
 #endif

Modified: user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c
==============================================================================
--- user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c	Sun Dec 22 13:03:33 2013	(r259722)
+++ user/nwhitehorn/mips_pic_if/mips/mips/mp_machdep.c	Sun Dec 22 14:13:00 2013	(r259723)
@@ -110,7 +110,7 @@ ipi_cpu(int cpu, u_int ipi)
 /*
  * Handle an IPI sent to this processor.
  */
-static int
+int
 mips_ipi_handler(void *arg)
 {
 	u_int	cpu, ipi, ipi_bitmap;
@@ -338,18 +338,10 @@ smp_init_secondary(u_int32_t cpuid)
 static void
 release_aps(void *dummy __unused)
 {
-	int ipi_irq;
 
 	if (mp_ncpus == 1)
 		return;
 
-	/*
-	 * IPI handler
-	 */
-	ipi_irq = platform_ipi_intrnum();
-	cpu_establish_hardintr("ipi", mips_ipi_handler, NULL, NULL, ipi_irq,
-			       INTR_TYPE_MISC | INTR_EXCL, NULL);
-
 	atomic_store_rel_int(&aps_ready, 1);
 
 	while (smp_started == 0)

Modified: user/nwhitehorn/mips_pic_if/mips/mips/nexus.c
==============================================================================
--- user/nwhitehorn/mips_pic_if/mips/mips/nexus.c	Sun Dec 22 13:03:33 2013	(r259722)
+++ user/nwhitehorn/mips_pic_if/mips/mips/nexus.c	Sun Dec 22 14:13:00 2013	(r259723)
@@ -529,7 +529,7 @@ nexus_bind_intr(device_t bus __unused, d
     struct resource *r, int cpu)
 {
 
-	return (powerpc_bind_intr(rman_get_start(r), cpu));
+	return (mips_bind_intr(rman_get_start(r), cpu));
 }
 #endif

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312221413.rBMED0kq079025>