Module Name: src
Committed By: skrll
Date: Mon Mar 10 09:35:18 UTC 2014
Modified Files:
src/sys/arch/arm/imx: imx51_tzic.c
Log Message:
Assume reads from hardware do something even if the result isn't required.
Hi htodd@!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx51_tzic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/imx51_tzic.c
diff -u src/sys/arch/arm/imx/imx51_tzic.c:1.5 src/sys/arch/arm/imx/imx51_tzic.c:1.6
--- src/sys/arch/arm/imx/imx51_tzic.c:1.5 Mon Mar 10 04:25:51 2014
+++ src/sys/arch/arm/imx/imx51_tzic.c Mon Mar 10 09:35:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $ */
+/* $NetBSD: imx51_tzic.c,v 1.6 2014/03/10 09:35:18 skrll Exp $ */
/*-
* Copyright (c) 2010 SHIMIZU Ryo <[email protected]>
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.6 2014/03/10 09:35:18 skrll Exp $");
#define _INTR_PRIVATE /* for arm/pic/picvar.h */
@@ -262,10 +262,14 @@ tzic_intr_init(struct tzic_softc * const
disable_interrupts(I32_bit|F32_bit);
+ (void) INTC_READ(tzic, TZIC_INTCNTL);
INTC_WRITE(tzic, TZIC_INTCNTL, INTCNTL_NSEN_MASK|INTCNTL_NSEN|INTCNTL_EN);
+ (void) INTC_READ(tzic, TZIC_INTCNTL);
INTC_WRITE(tzic, TZIC_PRIOMASK, SW_TO_HW_IPL(IPL_NONE));
+ (void) INTC_READ(tzic, TZIC_PRIOMASK);
INTC_WRITE(tzic, TZIC_SYNCCTRL, 0x00);
+ (void) INTC_READ(tzic, TZIC_SYNCCTRL);
/* route all interrupts to IRQ. secure interrupts are for FIQ */
for (i = 0; i < 4; i++)