Enable the memory arbiter before turning off the PXE restart. This

prevents NMI's from happening when resetting the chip on some
hardware I have seen.

Mis-behaving box made available by:	John Cagle <john.cagle@hp.com>
This commit is contained in:
Paul Saab 2004-04-06 18:28:15 +00:00
parent 6e46025ebf
commit a7b0c31480

View File

@ -2553,6 +2553,10 @@ bge_reset(sc)
pci_write_config(dev, BGE_PCI_CMD, command, 4);
bge_writereg_ind(sc, BGE_MISC_CFG, (65 << 1));
/* Enable memory arbiter. */
if (sc->bge_asicrev != BGE_ASICREV_BCM5705)
CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE);
/*
* Prevent PXE restart: write a magic number to the
* general communications memory at 0xB50.
@ -2590,10 +2594,6 @@ bge_reset(sc)
DELAY(10);
}
/* Enable memory arbiter. */
if (sc->bge_asicrev != BGE_ASICREV_BCM5705)
CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE);
/* Fix up byte swapping */
CSR_WRITE_4(sc, BGE_MODE_CTL, BGE_MODECTL_BYTESWAP_NONFRAME|
BGE_MODECTL_BYTESWAP_DATA);