diff options
| author | jdp <jdp@FreeBSD.org> | 2002-09-22 18:27:29 +0000 |
|---|---|---|
| committer | jdp <jdp@FreeBSD.org> | 2002-09-22 18:27:29 +0000 |
| commit | 5e52f98750fa60ef2bf52bbade38a374ed46804d (patch) | |
| tree | a5e0012a7a853cf192be35014fbc2023e80b8b19 /sys/dev/bge | |
| parent | 6306db002328289fa589613b46d5064cd08662bc (diff) | |
| download | FreeBSD-src-5e52f98750fa60ef2bf52bbade38a374ed46804d.zip FreeBSD-src-5e52f98750fa60ef2bf52bbade38a374ed46804d.tar.gz | |
Set up the BCM570x chip's DMA Read/Write Control register more
correctly. This fixes the "watchdog timeout -- resetting" errors
seen on Dell 2650 systems.
MFC after: 1 month
Diffstat (limited to 'sys/dev/bge')
| -rw-r--r-- | sys/dev/bge/if_bge.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index d3771f9..b112242 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -1017,8 +1017,16 @@ bge_chipinit(sc) BGE_MEMWIN_WRITE(sc, i, 0); /* Set up the PCI DMA control register. */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x0F, 4); + if (pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & + BGE_PCISTATE_PCI_BUSMODE) { + /* Conventional PCI bus */ + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, + BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x3F000F, 4); + } else { + /* PCI-X bus */ + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, + BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x1B000F, 4); + } /* * Set up general mode register. |
