mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
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:
parent
6e46025ebf
commit
a7b0c31480
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=127949
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user