From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 3 Jul 2012 06:27:19 +0000 (+0800)
Subject: bge: BGE_PCI_MISC_CTL resides in PCI configuration space
X-Git-Tag: v3.2.0~700
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/91336132a779e3e2becee7eeb0945c30c0c207b4

bge: BGE_PCI_MISC_CTL resides in PCI configuration space
---

diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 7b92f0bd3e..e7e99c56a6 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -3362,7 +3362,7 @@ bge_init(void *xsc)
 	BGE_SETBIT(sc, BGE_MODE_CTL, BGE_MODECTL_STACKUP);
 
 	/* Enable host interrupts if polling(4) is not enabled. */
-	BGE_SETBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_CLEAR_INTA);
+	PCI_SETBIT(sc->bge_dev, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_CLEAR_INTA, 4);
 #ifdef DEVICE_POLLING
 	if (ifp->if_flags & IFF_POLLING)
 		bge_disable_intr(sc);
@@ -4287,7 +4287,8 @@ bge_enable_intr(struct bge_softc *sc)
 	/*
 	 * Unmask the interrupt when we stop polling.
 	 */
-	BGE_CLRBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
+	PCI_CLRBIT(sc->bge_dev, BGE_PCI_MISC_CTL,
+	    BGE_PCIMISCCTL_MASK_PCI_INTR, 4);
 
 	/*
 	 * Trigger another interrupt, since above writing
@@ -4305,7 +4306,8 @@ bge_disable_intr(struct bge_softc *sc)
 	/*
 	 * Mask the interrupt when we start polling.
 	 */
-	BGE_SETBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
+	PCI_SETBIT(sc->bge_dev, BGE_PCI_MISC_CTL,
+	    BGE_PCIMISCCTL_MASK_PCI_INTR, 4);
 
 	/*
 	 * Acknowledge possible asserted interrupt.