diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-11-16 09:52:32 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-11-16 09:52:32 +0000 |
| commit | 04ff6503a6913923896c17eec5af905fbced51a6 (patch) | |
| tree | dce2e43ade08a43d5e55ace20778c3f35601f305 /sys/dev/pci/if_iwn.c | |
| parent | f7de61181b30cfa282707ed880a111cc502d701c (diff) | |
clear pending interrupts in the driver attach routine.
otherwise the chip comes up with the RF_TOGGLED bit set which triggers
an if_stop() call if a shared interrupt occurs.
Diffstat (limited to 'sys/dev/pci/if_iwn.c')
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index e208aa9f469..47f1f333188 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.33 2008/11/16 09:50:02 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.34 2008/11/16 09:52:31 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -421,6 +421,8 @@ iwn_attach(struct device *parent, struct device *self, void *aux) /* Power OFF adapter. */ iwn_apm_stop(sc); + /* Clear pending interrupts. */ + IWN_WRITE(sc, IWN_INT, 0xffffffff); printf(", MIMO %dT%dR, %.4s, address %s\n", sc->ntxchains, sc->nrxchains, sc->eeprom_domain, ether_sprintf(ic->ic_myaddr)); @@ -4820,7 +4822,7 @@ iwn_hw_init(struct iwn_softc *sc) const struct iwn_hal *hal = sc->sc_hal; int error, qid; - /* Clear any pending interrupts. */ + /* Clear pending interrupts. */ IWN_WRITE(sc, IWN_INT, 0xffffffff); if ((error = hal->apm_init(sc)) != 0) { @@ -4886,7 +4888,7 @@ iwn_hw_init(struct iwn_softc *sc) IWN_WRITE(sc, IWN_UCODE_GP1_CLR, IWN_UCODE_GP1_RFKILL); IWN_WRITE(sc, IWN_UCODE_GP1_CLR, IWN_UCODE_GP1_CMD_BLOCKED); - /* Clear any pending interrupts. */ + /* Clear pending interrupts. */ IWN_WRITE(sc, IWN_INT, 0xffffffff); /* Enable interrupt coalescing. */ IWN_WRITE(sc, IWN_INT_COALESCING, 512 / 8); |