From owner-p4-projects@FreeBSD.ORG  Wed Feb 22 19:46:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A052516A432; Wed, 22 Feb 2006 19:46:03 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2CF0B16A42A
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 19:46:03 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EAC0643D46
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 19:46:02 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1MJk2JV075040
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 19:46:02 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1MJk2xv075037
	for perforce@freebsd.org; Wed, 22 Feb 2006 19:46:02 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 22 Feb 2006 19:46:02 GMT
Message-Id: <200602221946.k1MJk2xv075037@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92225 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: Wed, 22 Feb 2006 19:46:04 -0000

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

Change 92225 by imp@imp_Speedy on 2006/02/22 19:45:34

	Disable interrupts in pio attachment.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91.c#10 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91.c#10 (text+ko) ====

@@ -274,14 +274,6 @@
 	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xe24, 0xffffffff);
 	/* DIsable all interrupts for DBGU */
 	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x20c, 0xffffffff);
-	/* Disable all interrupts for PIOA */
-	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x444, 0xffffffff);
-	/* Disable all interrupts for PIOB */
-	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x644, 0xffffffff);
-	/* Disable all interrupts for PIOC */
-	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0x844, 0xffffffff);
-	/* Disable all interrupts for PIOD */
-	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xa44, 0xffffffff);
 	/* Disable all interrupts for the SDRAM controller */
 	bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xfa8, 0xffffffff);
 	/* XXX call a function here */

==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#4 (text+ko) ====

@@ -121,8 +121,9 @@
 	AT91_PIO_LOCK_INIT(sc);
 
 	/*
-	 * Activate the interrupt
+	 * Activate the interrupt, but disable all interrupts in the hardware
 	 */
+	WR4(sc, PIO_IDR, 0xffffffff);
 	err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
 	    at91_pio_intr, sc, &sc->intrhand);
 	if (err) {