From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 14 Jun 2005 14:19:22 +0000 (+0000)
Subject: Resource allocate now turns on port / memory bit in the PCI command reg,
X-Git-Tag: v2.0.1~6973
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0c5ea1ad154ce56b30a518e77e313ef0c1a95974

Resource allocate now turns on port / memory bit in the PCI command reg,
so stop doing it by hand.
---

diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 8af07b7ce1..95257b7d26 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.39 2005/06/13 21:24:03 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.40 2005/06/14 14:19:22 joerg Exp $
  *
  */
 
@@ -1459,7 +1459,6 @@ bge_probe(device_t dev)
 static int
 bge_attach(device_t dev)
 {
-	uint32_t command;
 	struct ifnet *ifp;
 	struct bge_softc *sc;
 	uint32_t hwcfg = 0;
@@ -1475,14 +1474,6 @@ bge_attach(device_t dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-	if (!(command & PCIM_CMD_MEMEN)) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		return(error);
-	}
 
 	rid = BGE_PCI_BAR0;
 	sc->bge_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index 15bce22399..c210b41bd8 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
- * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.33 2005/06/13 22:10:56 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.34 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -1776,23 +1776,6 @@ static int dc_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-#ifdef DC_USEIOSPACE
-	if (!(command & PCIM_CMD_PORTEN)) {
-		device_printf(dev, "failed to enable I/O ports!\n");
-		error = ENXIO;
-		return(error);
-	}
-#else
-	if (!(command & PCIM_CMD_MEMEN)) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		return(error);
-	}
-#endif
 
 	rid = DC_RID;
 	sc->dc_res = bus_alloc_resource_any(dev, DC_RES, &rid, RF_ACTIVE);
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index ce851541f8..c6af965778 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.24 2005/06/12 15:55:59 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.25 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -786,11 +786,7 @@ rl_attach(device_t dev)
 		pci_write_config(dev, RL_PCI_INTLINE, irq, 4);
 	}
 
-	/*
-	 * Map control/status registers.
-	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, RL_RES);
 
 	rid = RL_RID; 
 	sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid, RF_ACTIVE);
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index b86edbc6c5..4e581c82d2 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.26 2005/06/14 12:46:31 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.27 2005/06/14 14:19:22 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -868,7 +868,6 @@ static int ste_probe(dev)
 static int ste_attach(dev)
 	device_t		dev;
 {
-	u_int32_t		command;
 	struct ste_softc	*sc;
 	struct ifnet		*ifp;
 	int			error = 0, rid;
@@ -913,23 +912,6 @@ static int ste_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-#ifdef STE_USEIOSPACE
-	if (!(command & PCIM_CMD_PORTEN)) {
-		device_printf(dev, "failed to enable I/O ports!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#else
-	if (!(command & PCIM_CMD_MEMEN)) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#endif
 
 	rid = STE_RID;
 	sc->ste_res = bus_alloc_resource_any(dev, STE_RES, &rid, RF_ACTIVE);
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 7c8e91ac15..4a7fb40b24 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.33 2005/06/14 13:53:25 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.34 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -1400,7 +1400,6 @@ ti_attach(device_t dev)
 	struct ti_softc *sc;
 	struct ifnet *ifp;
 	int error = 0, rid;
-	uint32_t command;
 	uint8_t eaddr[ETHER_ADDR_LEN];
 
 	sc = device_get_softc(dev);
@@ -1409,18 +1408,7 @@ ti_attach(device_t dev)
 	ifp->if_capabilities = IFCAP_HWCSUM;
 	ifp->if_capenable = ifp->if_capabilities;
 
-	/*
-	 * Map control/status registers.
-	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-	if ((command & PCIM_CMD_MEMEN) == 0) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		return(error);
-	}
 
 	/*
 	 * Initialize media before any possible error may occur,
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index a2fabd9915..1e68e3214d 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.29 2005/06/14 12:42:00 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.30 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -1102,7 +1102,6 @@ static int tl_attach(dev)
 	device_t		dev;
 {
 	int			i;
-	u_int32_t		command;
 	u_int16_t		did, vid;
 	struct tl_type		*t;
 	struct ifnet		*ifp;
@@ -1123,20 +1122,9 @@ static int tl_attach(dev)
 
 	KKASSERT(t->tl_name != NULL);
 
-	/*
-	 * Map control/status registers.
-	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef TL_USEIOSPACE
-	if (!(command & PCIM_CMD_PORTEN)) {
-		device_printf(dev, "failed to enable I/O ports!\n");
-		return(error);
-	}
-
 	rid = TL_PCI_LOIO;
 	sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
 		RF_ACTIVE);
@@ -1151,12 +1139,6 @@ static int tl_attach(dev)
 		    RF_ACTIVE);
 	}
 #else
-	if (!(command & PCIM_CMD_MEMEN)) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		return(error);
-	}
-
 	rid = TL_PCI_LOMEM;
 	sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index eecf6aefef..a231c6c6c3 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.25 2005/06/14 12:33:44 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.26 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -212,7 +212,6 @@ epic_attach(dev)
 {
 	struct ifnet *ifp;
 	epic_softc_t *sc;
-	u_int32_t command;
 	int error;
 	int i, rid, tmp;
 
@@ -237,25 +236,7 @@ epic_attach(dev)
 	ifq_set_maxlen(&ifp->if_snd, TX_RING_SIZE - 1);
 	ifq_set_ready(&ifp->if_snd);
 
-	/* Enable ports, memory and busmastering */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-#if defined(EPIC_USEIOSPACE)
-	if ((command & PCIM_CMD_PORTEN) == 0) {
-		device_printf(dev, "failed to enable I/O mapping!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#else
-	if ((command & PCIM_CMD_MEMEN) == 0) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#endif
 
 	rid = EPIC_RID;
 	sc->res = bus_alloc_resource_any(dev, EPIC_RES, &rid, RF_ACTIVE);
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index b28b245a69..2ded330a2a 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.29 2005/06/10 16:05:34 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.30 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -708,7 +708,6 @@ static int
 wb_attach(device_t dev)
 {
 	u_char eaddr[ETHER_ADDR_LEN];
-	uint32_t command;
 	struct wb_softc *sc;
 	struct ifnet *ifp;
 	int error = 0, rid;
@@ -738,27 +737,7 @@ wb_attach(device_t dev)
 		pci_write_config(dev, WB_PCI_INTLINE, irq, 4);
 	}
 
-	/*
-	 * Map control/status registers.
-	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-#ifdef WB_USEIOSPACE
-	if ((command & PCIM_CMD_PORTEN) == 0) {
-		device_printf(dev, "failed to enable I/O ports!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#else
-	if ((command & PCIM_CMD_MEMEN) == 0) {
-		device_printf(dev, "failed to enable memory mapping!\n");
-		error = ENXIO;
-		goto fail;
-	}
-#endif
 
 	rid = WB_RID;
 	sc->wb_res = bus_alloc_resource_any(dev, WB_RES, &rid, RF_ACTIVE);
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 8ea38449ea..c202c4a435 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.25 2005/06/06 15:42:18 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.26 2005/06/14 14:19:22 joerg Exp $
  */
 
 /*
@@ -1298,7 +1298,6 @@ xl_attach(dev)
 {
 	u_char			eaddr[ETHER_ADDR_LEN];
 	u_int16_t		xcvr[2];
-	u_int32_t		command;
 	struct xl_softc		*sc;
 	struct ifnet		*ifp;
 	int			media = IFM_ETHER|IFM_100_TX|IFM_FDX;
@@ -1387,16 +1386,6 @@ xl_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, SYS_RES_IOPORT);
-	pci_enable_io(dev, SYS_RES_MEMORY);
-	command = pci_read_config(dev, PCIR_COMMAND, 4);
-
-	if (!(command & PCIM_CMD_PORTEN) && !(command & PCIM_CMD_MEMEN)) {
-		device_printf(dev,
-		    "failed to enable I/O ports and memory mappings!\n");
-		error = ENXIO;
-		goto fail;
-	}
 
 	rid = XL_PCI_LOMEM;
 	res = SYS_RES_MEMORY;