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

o acknowledge interrupts early in the interrupt handler

Browse Source 
o stop processing interrupts after a firmware fatal error or a radio kill
o clarify the possible values for the 'antenna' sysctl.
o by default, let the firmware do antenna diversity.
  the  firmware will periodically switch to another antenna to evaluate the
  signal quality.
This commit is contained in:
Damien Bergamini 2006-03-10 20:35:09 +00:00
parent bef9529d24
commit 389fb0b432
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/iwi/if_iwi.c
View File

@ -401,7 +401,7 @@ iwi_attach(device_t dev)
*/ */
sc->dwelltime = 100; sc->dwelltime = 100;
sc->bluetooth = 1; sc->bluetooth = 1;
sc->antenna = 0; sc->antenna = 2;
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "radio", SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "radio",
@ -419,12 +419,14 @@ iwi_attach(device_t dev)
"channel dwell time (ms) for AP/station scanning"); "channel dwell time (ms) for AP/station scanning");
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "bluetooth", SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
CTLFLAG_RW, &sc->bluetooth, 0, "bluetooth coexistence"); "bluetooth", CTLFLAG_RW, &sc->bluetooth, 0,
"bluetooth coexistence");
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "antenna", SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "antenna",
CTLFLAG_RW, &sc->antenna, 0, "antenna (0=auto)"); CTLFLAG_RW, &sc->antenna, 0,
"antenna (0=auto,1=A,3=B,2=diversity)");
/* /*
* Hook our interrupt after all initialization is complete. * Hook our interrupt after all initialization is complete.
@ -1417,11 +1419,14 @@ iwi_intr(void *arg)
/* disable interrupts */ /* disable interrupts */
CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0);
/* acknowledge interrupts */
CSR_WRITE_4(sc, IWI_CSR_INTR, r);
if (r & (IWI_INTR_FATAL_ERROR | IWI_INTR_PARITY_ERROR)) { if (r & (IWI_INTR_FATAL_ERROR | IWI_INTR_PARITY_ERROR)) {
device_printf(sc->sc_dev, "fatal error\n"); device_printf(sc->sc_dev, "fatal error\n");
sc->sc_ic.ic_ifp->if_flags &= ~IFF_UP; sc->sc_ic.ic_ifp->if_flags &= ~IFF_UP;
iwi_stop(sc); iwi_stop(sc);
r = 0; /* don't process more interrupts */
} }
if (r & IWI_INTR_FW_INITED) { if (r & IWI_INTR_FW_INITED) {
@ -1433,6 +1438,7 @@ iwi_intr(void *arg)
DPRINTF(("radio transmitter turned off\n")); DPRINTF(("radio transmitter turned off\n"));
sc->sc_ic.ic_ifp->if_flags &= ~IFF_UP; sc->sc_ic.ic_ifp->if_flags &= ~IFF_UP;
iwi_stop(sc); iwi_stop(sc);
r = 0; /* don't process more interrupts */
} }
if (r & IWI_INTR_CMD_DONE) if (r & IWI_INTR_CMD_DONE)
@ -1453,9 +1459,6 @@ iwi_intr(void *arg)
if (r & IWI_INTR_RX_DONE) if (r & IWI_INTR_RX_DONE)
iwi_rx_intr(sc); iwi_rx_intr(sc);
/* acknowledge interrupts */
CSR_WRITE_4(sc, IWI_CSR_INTR, r);
/* re-enable interrupts */ /* re-enable interrupts */
CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK); CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, IWI_INTR_MASK);
@ -2451,7 +2454,7 @@ iwi_init(void *priv)
hdr = (const struct iwi_firmware_hdr *)fp->data; hdr = (const struct iwi_firmware_hdr *)fp->data;
if (fp->datasize < sizeof *hdr + le32toh(hdr->bootsz) + if (fp->datasize < sizeof *hdr + le32toh(hdr->bootsz) +
le32toh(hdr->ucodesz) + le32toh(hdr->fwsz)) { le32toh(hdr->ucodesz) + le32toh(hdr->mainsz)) {
device_printf(sc->sc_dev, device_printf(sc->sc_dev,
"firmware image too short: %d bytes\n", fp->datasize); "firmware image too short: %d bytes\n", fp->datasize);
goto fail2; goto fail2;
@ -2500,7 +2503,7 @@ iwi_init(void *priv)
fw = (const char *)fp->data + sizeof *hdr + le32toh(hdr->bootsz) + fw = (const char *)fp->data + sizeof *hdr + le32toh(hdr->bootsz) +
le32toh(hdr->ucodesz); le32toh(hdr->ucodesz);
if (iwi_load_firmware(sc, fw, le32toh(hdr->fwsz)) != 0) { if (iwi_load_firmware(sc, fw, le32toh(hdr->mainsz)) != 0) {
device_printf(sc->sc_dev, "could not load main firmware\n"); device_printf(sc->sc_dev, "could not load main firmware\n");
goto fail2; goto fail2;
} }

2
sys/dev/iwi/if_iwireg.h
View File

@ -132,7 +132,7 @@ struct iwi_firmware_hdr {
uint32_t version; uint32_t version;
uint32_t bootsz; uint32_t bootsz;
uint32_t ucodesz; uint32_t ucodesz;
uint32_t fwsz; uint32_t mainsz;
} __packed; } __packed;
struct iwi_hdr { struct iwi_hdr {