Module Name: src
Committed By: jakllsch
Date: Sat Apr 16 13:47:20 UTC 2011
Modified Files:
src/sys/dev/pci: if_msk.c
Log Message:
Ensure PCI_COMMAND_MASTER_ENABLE.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/if_msk.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_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.35 src/sys/dev/pci/if_msk.c:1.36
--- src/sys/dev/pci/if_msk.c:1.35 Mon Apr 5 07:20:26 2010
+++ src/sys/dev/pci/if_msk.c Sat Apr 16 13:47:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.35 2010/04/05 07:20:26 joerg Exp $ */
+/* $NetBSD: if_msk.c,v 1.36 2011/04/16 13:47:20 jakllsch Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.35 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.36 2011/04/16 13:47:20 jakllsch Exp $");
#include "rnd.h"
@@ -1228,6 +1228,10 @@
sc->sc_dmatag = pa->pa_dmat;
+ command = 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, command);
+
sc->sk_type = sk_win_read_1(sc, SK_CHIPVER);
sc->sk_rev = (sk_win_read_1(sc, SK_CONFIG) >> 4);
