From owner-svn-src-head@FreeBSD.ORG  Sat Jun  5 16:21:55 2010
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 A8ACF106567D;
	Sat,  5 Jun 2010 16:21:55 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97A658FC21;
	Sat,  5 Jun 2010 16:21:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o55GLtB4073806;
	Sat, 5 Jun 2010 16:21:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o55GLtah073804;
	Sat, 5 Jun 2010 16:21:55 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006051621.o55GLtah073804@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 5 Jun 2010 16:21:55 +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: r208835 - 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: Sat, 05 Jun 2010 16:21:55 -0000

Author: nwhitehorn
Date: Sat Jun  5 16:21:55 2010
New Revision: 208835
URL: http://svn.freebsd.org/changeset/base/208835

Log:
  Make sure that interrupt sense settings set after interrupts are enabled
  are respected. This fixes loading the Apple onboard audio driver
  (snd_ai2s) as a module after boot, which would previously cause a panic.
  
  PR:		powerpc/146888
  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	Sat Jun  5 16:00:53 2010	(r208834)
+++ head/sys/powerpc/powerpc/intr_machdep.c	Sat Jun  5 16:21:55 2010	(r208835)
@@ -164,6 +164,7 @@ intr_lookup(u_int irq)
 	i->trig = INTR_TRIGGER_CONFORM;
 	i->pol = INTR_POLARITY_CONFORM;
 	i->irq = irq;
+	i->pic = NULL;
 	i->vector = -1;
 
 	mtx_lock(&intr_table_lock);
@@ -325,6 +326,11 @@ powerpc_setup_intr(const char *name, u_i
 
 	if (!cold) {
 		error = powerpc_map_irq(i);
+
+		if (!error && (i->trig != INTR_TRIGGER_CONFORM ||
+		    i->pol != INTR_POLARITY_CONFORM))
+			PIC_CONFIG(i->pic, i->intline, i->trig, i->pol);
+
 		if (!error && enable)
 			PIC_ENABLE(i->pic, i->intline, i->vector);
 	}
@@ -350,7 +356,7 @@ powerpc_config_intr(int irq, enum intr_t
 	i->trig = trig;
 	i->pol = pol;
 
-	if (!cold)
+	if (!cold && i->pic != NULL)
 		PIC_CONFIG(i->pic, i->intline, trig, pol);
 
 	return (0);