diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-08-06 10:42:55 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-08-06 10:42:55 +0000 |
| commit | 939e6d47367841cb1f3ca05dbfb46c0f17c07331 (patch) | |
| tree | 5cc76a57a3e09c36773c542617a9de5fd08ff433 /sys/dev | |
| parent | 7c1408d22756d2f2d504e2b5f34682da72ada74d (diff) | |
Backout r1.274, william@ has tracked down watchdog timeouts with
his BCM5703 A2 to this commit.
Original commit message was: "Set the DMA read watermark to 4 on the
BCM5703 chipset in PCI-X mode. This is needed to prevent some TX
timeouts. From Brad. Tested by myself on BCM5703 B0 on PCI-X 64/66".
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 8512fe7bf1e..1714844d443 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.277 2009/07/21 13:09:41 naddy Exp $ */ +/* $OpenBSD: if_bge.c,v 1.278 2009/08/06 10:42:54 sthen Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -1226,10 +1226,6 @@ bge_chipinit(struct bge_softc *sc) /* 1536 bytes for read, 384 bytes for write. */ dma_rw_ctl |= BGE_PCIDMARWCTL_RD_WAT_SHIFT(7) | BGE_PCIDMARWCTL_WR_WAT_SHIFT(3); - } else if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5703) { - /* 512 bytes for read, 384 bytes for write. */ - dma_rw_ctl |= BGE_PCIDMARWCTL_RD_WAT_SHIFT(4) | - BGE_PCIDMARWCTL_WR_WAT_SHIFT(3); } else { /* 384 bytes for read and write. */ dma_rw_ctl |= BGE_PCIDMARWCTL_RD_WAT_SHIFT(3) | |