From owner-p4-projects@FreeBSD.ORG  Tue Feb 17 07:31:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92F491065673; Tue, 17 Feb 2009 07:31:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53695106566C
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 07:31:47 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 418E28FC14
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 07:31:47 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1H7VlQx000367
	for <perforce@freebsd.org>; Tue, 17 Feb 2009 07:31:47 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1H7Vlox000365
	for perforce@freebsd.org; Tue, 17 Feb 2009 07:31:47 GMT
	(envelope-from andrew@freebsd.org)
Date: Tue, 17 Feb 2009 07:31:47 GMT
Message-Id: <200902170731.n1H7Vlox000365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157830 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 07:31:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=157830

Change 157830 by andrew@andrew_bender on 2009/02/17 07:31:44

	Pass INTCTL_INTPND back into itself to clear the appropriate bit.
	Make sure the parent IRQ is masked as it can cause issues with UART if not.

Affected files ...

.. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#5 (text+ko) ====

@@ -501,6 +501,7 @@
 int
 arm_get_next_irq(void)
 {
+	uint32_t intpnd;
 	int irq;
 
 	if ((irq = bus_space_read_4(&s3c2xx0_bs_tag,
@@ -509,8 +510,10 @@
 		/* Clear the pending bit */
 		bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
 		    INTCTL_SRCPND, (1 << irq));
+		intpnd = bus_space_read_4(&s3c2xx0_bs_tag,
+		    s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTPND);
 		bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
-		    INTCTL_INTPND, (1 << irq));
+		    INTCTL_INTPND, intpnd);
 
 		switch (irq) {
 		case S3C24X0_INT_ADCTC:
@@ -600,6 +603,8 @@
 			/* We don't know which other IRQ to unmask */
 			return;
 		}
+		arm_mask_irq(irq);
+		return;
 	}
 	mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh,
 	    INTCTL_INTMSK);