mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Remove enabling Data FIFO protection with indirect memory access.

Browse Source 
r165114 added that code and that change ignored the same logic
committed in r135772. In addition, data FIFO protection should be
selectively enabled instead of applying to all PCIe devices.
While I'm here add BCM5785 to devices that do not require this
fix.
This commit is contained in:
Pyun YongHyeon 2010-07-14 21:47:49 +00:00
parent 43fe7d458a
commit a5ad2f1541
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=210083
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/bge/if_bge.c
View File

@ -3246,11 +3246,6 @@ bge_reset(struct bge_softc *sc)
DELAY(10);
}
if (sc->bge_flags & BGE_FLAG_PCIE) {
reset = bge_readmem_ind(sc, 0x7C00);
bge_writemem_ind(sc, 0x7C00, reset | (1 << 25));
}
/* Fix up byte swapping. */
CSR_WRITE_4(sc, BGE_MODE_CTL, BGE_DMA_SWAP_OPTIONS |
BGE_MODECTL_BYTESWAP_DATA);
@ -3275,7 +3270,9 @@ bge_reset(struct bge_softc *sc)
/* XXX: Broadcom Linux driver. */
if (sc->bge_flags & BGE_FLAG_PCIE &&
sc->bge_chipid != BGE_CHIPID_BCM5750_A0) {
sc->bge_chipid != BGE_CHIPID_BCM5750_A0 &&
sc->bge_asicrev != BGE_ASICREV_BCM5785) {
/* Enable Data FIFO protection. */
val = CSR_READ_4(sc, 0x7C00);
CSR_WRITE_4(sc, 0x7C00, val | (1 << 25));
}