From owner-svn-src-head@FreeBSD.ORG  Sun Jan 15 18:26:44 2012
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 5B639106566B;
	Sun, 15 Jan 2012 18:26:44 +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 2B8FC8FC08;
	Sun, 15 Jan 2012 18:26:44 +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 q0FIQixh094601;
	Sun, 15 Jan 2012 18:26:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FIQi5w094599;
	Sun, 15 Jan 2012 18:26:44 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201201151826.q0FIQi5w094599@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 15 Jan 2012 18:26:44 +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: r230144 - head/sys/powerpc/ps3
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: Sun, 15 Jan 2012 18:26:44 -0000

Author: nwhitehorn
Date: Sun Jan 15 18:26:43 2012
New Revision: 230144
URL: http://svn.freebsd.org/changeset/base/230144

Log:
  Pick a constant high IRQ value for the PS3 IPI, which lets PS3 devices be
  usefully loaded and unloaded as modules.
  
  Submitted by:	geoffrey dot levand at mail dot ru
  MFC after:	2 weeks

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

Modified: head/sys/powerpc/ps3/ps3pic.c
==============================================================================
--- head/sys/powerpc/ps3/ps3pic.c	Sun Jan 15 18:08:15 2012	(r230143)
+++ head/sys/powerpc/ps3/ps3pic.c	Sun Jan 15 18:26:43 2012	(r230144)
@@ -62,6 +62,7 @@ struct ps3pic_softc {
 	volatile uint64_t *mask_thread1;
 
 	uint64_t	sc_ipi_outlet[2];
+	uint64_t	sc_ipi_virq;
 	int		sc_vector[64];
 };
 
@@ -131,22 +132,23 @@ ps3pic_attach(device_t dev)
 	thread = 32 - fls(mfctrl());
 	lv1_configure_irq_state_bitmap(ppe, thread,
 	    vtophys(sc->bitmap_thread0));
+
+	sc->sc_ipi_virq = 63;
+
 #ifdef SMP
 	lv1_configure_irq_state_bitmap(ppe, !thread,
 	    vtophys(sc->bitmap_thread1));
 
 	/* Map both IPIs to the same VIRQ to avoid changes in intr_machdep */
 	lv1_construct_event_receive_port(&sc->sc_ipi_outlet[0]);
-	lv1_connect_irq_plug_ext(ppe, thread, sc->sc_ipi_outlet[0],
+	lv1_connect_irq_plug_ext(ppe, thread, sc->sc_ipi_virq,
 	    sc->sc_ipi_outlet[0], 0);
 	lv1_construct_event_receive_port(&sc->sc_ipi_outlet[1]);
-	lv1_connect_irq_plug_ext(ppe, !thread, sc->sc_ipi_outlet[0],
+	lv1_connect_irq_plug_ext(ppe, !thread, sc->sc_ipi_virq,
 	    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);
+	powerpc_register_pic(dev, 0, sc->sc_ipi_virq, 1, FALSE);
 	return (0);
 }
 
@@ -218,7 +220,7 @@ ps3pic_mask(device_t dev, u_int irq)
 	sc = device_get_softc(dev);
 
 	/* Do not mask IPIs! */
-	if (irq == sc->sc_ipi_outlet[0])
+	if (irq == sc->sc_ipi_virq)
 		return;
 
 	atomic_clear_64(&sc->mask_thread0[0], 1UL << (63 - irq));