From owner-svn-src-projects@FreeBSD.ORG  Sun May 16 19:01:33 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03CD81065670;
	Sun, 16 May 2010 19:01:33 +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 E6EAE8FC08;
	Sun, 16 May 2010 19:01:32 +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 o4GJ1WeD087537;
	Sun, 16 May 2010 19:01:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4GJ1WT4087535;
	Sun, 16 May 2010 19:01:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005161901.o4GJ1WT4087535@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 16 May 2010 19:01:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208163 - projects/ppc64/sys/powerpc/powermac
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2010 19:01:33 -0000

Author: nwhitehorn
Date: Sun May 16 19:01:32 2010
New Revision: 208163
URL: http://svn.freebsd.org/changeset/base/208163

Log:
  Set the interrupt sense correctly on internal children of the bridge. This
  prevents htpic(4) from triggering an interrupt storm.

Modified:
  projects/ppc64/sys/powerpc/powermac/uninorth.c

Modified: projects/ppc64/sys/powerpc/powermac/uninorth.c
==============================================================================
--- projects/ppc64/sys/powerpc/powermac/uninorth.c	Sun May 16 17:55:09 2010	(r208162)
+++ projects/ppc64/sys/powerpc/powermac/uninorth.c	Sun May 16 19:01:32 2010	(r208163)
@@ -177,6 +177,12 @@ unin_chip_add_intr(phandle_t devnode, st
 		    dinfo->udi_ninterrupts, INTR_VEC(iparent, intr[i]),
 		    INTR_VEC(iparent, intr[i]), 1);
 
+		if (icells > 1) {
+			powerpc_config_intr(INTR_VEC(iparent, intr[i]),
+			    (intr[i+1] & 1) ? INTR_TRIGGER_LEVEL :
+			    INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH);
+		}
+
 		dinfo->udi_interrupts[dinfo->udi_ninterrupts] =
 		    INTR_VEC(iparent, intr[i]);
 		dinfo->udi_ninterrupts++;