From owner-svn-src-all@FreeBSD.ORG  Mon Nov 21 04:35:24 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F92D106566B;
	Mon, 21 Nov 2011 04:35:24 +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 F2E688FC0A;
	Mon, 21 Nov 2011 04:35:23 +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 pAL4ZN4M024154;
	Mon, 21 Nov 2011 04:35:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAL4ZNdh024152;
	Mon, 21 Nov 2011 04:35:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201111210435.pAL4ZNdh024152@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 21 Nov 2011 04:35:23 +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: r227779 - head/sys/powerpc/ps3
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2011 04:35:24 -0000

Author: nwhitehorn
Date: Mon Nov 21 04:35:23 2011
New Revision: 227779
URL: http://svn.freebsd.org/changeset/base/227779

Log:
  The PPC IRQ layer assumes that the IPI IRQ is the last IRQ on the PIC.
  This assumption is invalid and the code should be fixed, but humor it for
  now and set the "IPI" for PS3s in the non-SMP case to a large number. This
  fixes boot with a non-SMP kernel.
  
  Submitted by:	geoffrey dot levand at mail dot ru
  MFC after:	1 week

Modified:
  head/sys/powerpc/ps3/ps3pic.c

Modified: head/sys/powerpc/ps3/ps3pic.c
==============================================================================
--- head/sys/powerpc/ps3/ps3pic.c	Mon Nov 21 04:17:24 2011	(r227778)
+++ head/sys/powerpc/ps3/ps3pic.c	Mon Nov 21 04:35:23 2011	(r227779)
@@ -142,6 +142,8 @@ ps3pic_attach(device_t dev)
 	lv1_construct_event_receive_port(&sc->sc_ipi_outlet[1]);
 	lv1_connect_irq_plug_ext(ppe, !thread, sc->sc_ipi_outlet[0],
 	    sc->sc_ipi_outlet[1], 0);
+#else
+	sc->sc_ipi_outlet[0] = sc->sc_ipi_outlet[1] = 63;
 #endif
 
 	powerpc_register_pic(dev, 0, sc->sc_ipi_outlet[0], 1, FALSE);