From owner-p4-projects@FreeBSD.ORG  Tue Nov 20 06:44:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 292BE16A469; Tue, 20 Nov 2007 06:44:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C928B16A468
	for <perforce@freebsd.org>; Tue, 20 Nov 2007 06:44:45 +0000 (UTC)
	(envelope-from kevlo@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B8C0D13C46B
	for <perforce@freebsd.org>; Tue, 20 Nov 2007 06:44:45 +0000 (UTC)
	(envelope-from kevlo@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAK6ijff017045
	for <perforce@freebsd.org>; Tue, 20 Nov 2007 06:44:45 GMT
	(envelope-from kevlo@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAK6ijPa017042
	for perforce@freebsd.org; Tue, 20 Nov 2007 06:44:45 GMT
	(envelope-from kevlo@freebsd.org)
Date: Tue, 20 Nov 2007 06:44:45 GMT
Message-Id: <200711200644.lAK6ijPa017042@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kevlo@freebsd.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 129272 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: Tue, 20 Nov 2007 06:44:46 -0000

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

Change 129272 by kevlo@kevlo_rtsl on 2007/11/20 06:44:12

	Use pci_enable_busmaster() to turn on busmaster

Affected files ...

.. //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#4 edit

Differences ...

==== //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#4 (text+ko) ====

@@ -110,36 +110,6 @@
 	return ENXIO;
 }
 
-static u_int32_t
-bwi_pci_setup(device_t dev)
-{
-	u_int32_t cmd;
-
-	/*
-	 * Enable memory mapping and bus mastering.
-	 */
-	cmd = pci_read_config(dev, PCIR_COMMAND, 4);
-	cmd |= PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN;
-	pci_write_config(dev, PCIR_COMMAND, cmd, 4);
-	cmd = pci_read_config(dev, PCIR_COMMAND, 4);
-	if ((cmd & PCIM_CMD_MEMEN) == 0) {
-		device_printf(dev, "failed to enable memory mapping\n");
-		return 0;
-	}
-	if ((cmd & PCIM_CMD_BUSMASTEREN) == 0) {
-		device_printf(dev, "failed to enable bus mastering\n");
-		return 0;
-	}
-
-	/*
-	 * Disable retry timeout to keep PCI Tx retries from
-	 * interfering with C3 CPU state.
-	 */
-	pci_write_config(dev, PCIR_RETRY_TIMEOUT, 0, 1);
-
-	return 1;
-}
-
 static int
 bwi_pci_attach(device_t dev)
 {
@@ -149,8 +119,10 @@
 
 	sc->sc_dev = dev;
 
-	if (!bwi_pci_setup(dev))
-		goto bad;
+	/*
+	 * Enable bus mastering.
+	 */
+	pci_enable_busmaster(dev);
 
 	/* 
 	 * Setup memory-mapping of PCI registers.
@@ -251,9 +223,6 @@
 {
 	struct bwi_pci_softc *psc = device_get_softc(dev);
 
-	if (!bwi_pci_setup(dev))
-		return ENXIO;
-
 	bwi_resume(&psc->sc_sc);
 
 	return (0);