d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[iwm] Remove OpenBSD-specific comment. Beautify pci cfg space accesses.

Browse Source 
Obtained from:	dragonflybsd.git 710fdd011c30a1bd9f53b87c843fb8907c4a6cfd
This commit is contained in:
Adrian Chadd 2017-02-22 04:27:07 +00:00
parent c5727c468f
commit e5beb03bc6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/iwm/if_iwm.c
View File

@ -3511,11 +3511,6 @@ iwm_mvm_rx_tx_cmd(struct iwm_softc *sc,
if (--ring->queued < IWM_TX_RING_LOMARK) {
sc->qfullmsk &= ~(1 << ring->qid);
if (sc->qfullmsk == 0) {
/*
* Well, we're in interrupt context, but then again
* I guess net80211 does all sorts of stunts in
* interrupt context, so maybe this is no biggie.
*/
iwm_start(sc);
}
}
@ -6020,6 +6015,9 @@ iwm_dev_check(device_t dev)
}
}
/* PCI registers */
#define PCI_CFG_RETRY_TIMEOUT 0x041
static int
iwm_pci_attach(device_t dev)
{
@ -6029,9 +6027,9 @@ iwm_pci_attach(device_t dev)
sc = device_get_softc(dev);
/* Clear device-specific "PCI retry timeout" register (41h). */
reg = pci_read_config(dev, 0x40, sizeof(reg));
pci_write_config(dev, 0x40, reg & ~0xff00, sizeof(reg));
/* We disable the RETRY_TIMEOUT register (0x41) to keep
* PCI Tx retries from interfering with C3 CPU state */
pci_write_config(dev, PCI_CFG_RETRY_TIMEOUT, 0x00, 1);
/* Enable bus-mastering and hardware bug workaround. */
pci_enable_busmaster(dev);
@ -6539,11 +6537,12 @@ iwm_resume(device_t dev)
{
struct iwm_softc *sc = device_get_softc(dev);
int do_reinit = 0;
uint16_t reg;
/* Clear device-specific "PCI retry timeout" register (41h). */
reg = pci_read_config(dev, 0x40, sizeof(reg));
pci_write_config(dev, 0x40, reg & ~0xff00, sizeof(reg));
/*
* We disable the RETRY_TIMEOUT register (0x41) to keep
* PCI Tx retries from interfering with C3 CPU state.
*/
pci_write_config(dev, PCI_CFG_RETRY_TIMEOUT, 0x00, 1);
iwm_init_task(device_get_softc(dev));
IWM_LOCK(sc);