diff options
author | marius <marius@FreeBSD.org> | 2015-02-08 20:44:44 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2015-02-08 20:44:44 +0000 |
commit | 6fdf43daea37e7cbaedeb3f1308b480bb6690eae (patch) | |
tree | ceacdcc3bb78c07250241d55f77c0d2132c46430 /sys/dev/bge/if_bge.c | |
parent | 9dc38ea5dcf15da6e80250c0018fce6495e579f3 (diff) | |
download | FreeBSD-src-6fdf43daea37e7cbaedeb3f1308b480bb6690eae.zip FreeBSD-src-6fdf43daea37e7cbaedeb3f1308b480bb6690eae.tar.gz |
MFC: r276299
- Make PCI_QUIRK_MSI_INTX_BUG work by using the ID of the actual PCI device
for the lookup.
- For devices affected by PCI_QUIRK_MSI_INTX_BUG, ensure PCIM_CMD_INTxDIS
is cleared when using MSI/MSI-X.
- Employ PCI_QUIRK_MSI_INTX_BUG for BCM5714(S)/BCM5715(S)/BCM5780(S) rather
than clearing PCIM_CMD_INTxDIS unconditionally for all devices in bge(4).
Diffstat (limited to 'sys/dev/bge/if_bge.c')
-rw-r--r-- | sys/dev/bge/if_bge.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 555df46..b8660a4 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -1937,11 +1937,9 @@ bge_chipinit(struct bge_softc *sc) /* * Disable memory write invalidate. Apparently it is not supported - * properly by these devices. Also ensure that INTx isn't disabled, - * as these chips need it even when using MSI. + * properly by these devices. */ - PCI_CLRBIT(sc->bge_dev, BGE_PCI_CMD, - PCIM_CMD_INTxDIS | PCIM_CMD_MWIEN, 4); + PCI_CLRBIT(sc->bge_dev, BGE_PCI_CMD, PCIM_CMD_MWIEN, 4); /* Set the timer prescaler (always 66 MHz). */ CSR_WRITE_4(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ); |