Module Name: src
Committed By: msaitoh
Date: Thu Jun 3 00:05:36 UTC 2010
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Fix DMA setting for read/write on conventional PCI bus devices.
This bug was added in rev. 1.166. Sorry...
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/dev/pci/if_bge.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.184 src/sys/dev/pci/if_bge.c:1.185
--- src/sys/dev/pci/if_bge.c:1.184 Tue May 11 09:08:12 2010
+++ src/sys/dev/pci/if_bge.c Thu Jun 3 00:05:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.184 2010/05/11 09:08:12 njoly Exp $ */
+/* $NetBSD: if_bge.c,v 1.185 2010/06/03 00:05:36 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.184 2010/05/11 09:08:12 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.185 2010/06/03 00:05:36 msaitoh Exp $");
#include "vlan.h"
#include "rnd.h"
@@ -1842,7 +1842,7 @@
/* Conventional PCI bus: 256 bytes for read and write. */
DPRINTFN(4, ("(%s: PCI 2.2 DMA setting)\n",
device_xname(sc->bge_dev)));
- dma_rw_ctl = (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) |
+ dma_rw_ctl |= (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) |
(0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT);
if (BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5705 &&
BGE_ASICREV(sc->bge_chipid) != BGE_ASICREV_BCM5750)
