Module Name: src
Committed By: jakllsch
Date: Tue Nov 2 16:56:47 UTC 2010
Modified Files:
src/sys/dev/pci: if_nfe.c
Log Message:
Explicitly set PCI_COMMAND_MASTER_ENABLE.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_nfe.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/dev/pci/if_nfe.c
diff -u src/sys/dev/pci/if_nfe.c:1.51 src/sys/dev/pci/if_nfe.c:1.52
--- src/sys/dev/pci/if_nfe.c:1.51 Mon Apr 5 07:20:26 2010
+++ src/sys/dev/pci/if_nfe.c Tue Nov 2 16:56:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.51 2010/04/05 07:20:26 joerg Exp $ */
+/* $NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.51 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -219,7 +219,7 @@
const char *intrstr;
struct ifnet *ifp;
bus_size_t memsize;
- pcireg_t memtype;
+ pcireg_t memtype, csr;
char devinfo[256];
int mii_flags = 0;
@@ -258,6 +258,10 @@
sc->sc_dmat = pa->pa_dmat;
+ csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+ csr |= PCI_COMMAND_MASTER_ENABLE;
+ pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
+
sc->sc_flags = 0;
switch (PCI_PRODUCT(pa->pa_id)) {
