From owner-svn-src-head@FreeBSD.ORG  Tue May 10 14:03:05 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B022C106564A;
	Tue, 10 May 2011 14:03:05 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F7A48FC0A;
	Tue, 10 May 2011 14:03:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4AE35d5047118;
	Tue, 10 May 2011 14:03:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4AE35b4047116;
	Tue, 10 May 2011 14:03:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105101403.p4AE35b4047116@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 10 May 2011 14:03:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221738 - head/sys/powerpc/powerpc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2011 14:03:05 -0000

Author: nwhitehorn
Date: Tue May 10 14:03:05 2011
New Revision: 221738
URL: http://svn.freebsd.org/changeset/base/221738

Log:
  Only try to set up IPIs at boot on systems that actually have more than one
  CPU. This fixes a panic observed on Heathrow-based systems without
  SMP-capable PICs when the kernel had both options SMP and INVARIANTS.
  
  MFC after:	5 days

Modified:
  head/sys/powerpc/powerpc/intr_machdep.c

Modified: head/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/intr_machdep.c	Tue May 10 13:59:33 2011	(r221737)
+++ head/sys/powerpc/powerpc/intr_machdep.c	Tue May 10 14:03:05 2011	(r221738)
@@ -397,18 +397,22 @@ powerpc_enable_intr(void)
 
 #ifdef SMP
 	/* Install an IPI handler. */
-	for (n = 0; n < npics; n++) {
-		if (piclist[n].dev != root_pic)
-			continue;
-
-		KASSERT(piclist[n].ipis != 0, ("%s", __func__));
-		error = powerpc_setup_intr("IPI",
-		    MAP_IRQ(piclist[n].node, piclist[n].irqs),
-		    powerpc_ipi_handler, NULL, NULL,
-		    INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie);
-		if (error) {
-			printf("unable to setup IPI handler\n");
-			return (error);
+	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 = powerpc_setup_intr("IPI",
+			    MAP_IRQ(piclist[n].node, piclist[n].irqs),
+			    powerpc_ipi_handler, NULL, NULL,
+			    INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie);
+			if (error) {
+				printf("unable to setup IPI handler\n");
+				return (error);
+			}
 		}
 	}
 #endif