From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 18 Jul 2008 03:52:01 +0000 (+0000)
Subject: Pre-2.0 release, MFC some driver fixes related to interrupt management.
X-Git-Tag: v2.0.1~74
X-Git-Url: https://repo.or.cz/w/dragonfly.git/commitdiff_plain/ab2a75f9cf5ed2b3d92d5a39a2a847c02032e822

Pre-2.0 release, MFC some driver fixes related to interrupt management.
---

diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c
index 2868c185c9..433838003e 100644
--- a/sys/bus/firewire/fwohci.c
+++ b/sys/bus/firewire/fwohci.c
@@ -33,7 +33,7 @@
  * 
  * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.72 2004/01/22 14:41:17 simokawa Exp $
  * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.1.2.19 2003/05/01 06:24:37 simokawa Exp $
- * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.18 2008/05/20 18:23:33 dillon Exp $
+ * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.18.2.1 2008/07/18 03:52:01 dillon Exp $
  */
 
 #define ATRQ_CH 0
@@ -1966,19 +1966,25 @@ sidout:
 #ifndef ACK_ALL
 		OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_PW_ERR);
 #endif
+		/* permanently mask unsupported interrupt source */
+		OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_PW_ERR);
 		device_printf(fc->dev, "posted write error\n");
 	}
 	if((stat & OHCI_INT_ERR )){
 #ifndef ACK_ALL
 		OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_ERR);
 #endif
+		/* permanently mask unsupported interrupt source */
+		OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_ERR);
 		device_printf(fc->dev, "unrecoverable error\n");
 	}
 	if((stat & OHCI_INT_PHY_INT)) {
 #ifndef ACK_ALL
 		OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_PHY_INT);
 #endif
-		device_printf(fc->dev, "phy int\n");
+		/* permanently mask unsupported interrupt source */
+		OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_PHY_INT);
+		/*device_printf(fc->dev, "phy int\n");*/
 	}
 
 	return;