diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-04 18:49:22 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-04 18:49:22 +0000 |
| commit | d02e01d3748812514171275a9d8e1e6e2806fb52 (patch) | |
| tree | 000dc0180978c56ade142bd0575543836a510797 /sys | |
| parent | 3ed7390c658f968bccf33efc8116bafff26a9dd9 (diff) | |
Replace iwm's ioctl tsleep/wakeup BUSY flag dance with an rwlock.
ok tedu
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 26 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwmvar.h | 7 |
2 files changed, 15 insertions, 18 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index cf7ff19896b..b1ffd27096d 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.124 2016/09/04 17:01:59 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.125 2016/09/04 18:49:21 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -114,6 +114,7 @@ #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/rwlock.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/systm.h> @@ -6204,19 +6205,16 @@ iwm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) struct ifreq *ifr; int s, err = 0; - s = splnet(); /* * Prevent processes from entering this function while another * process is tsleep'ing in it. */ - while ((sc->sc_flags & IWM_FLAG_BUSY) && err == 0) - err = tsleep(&sc->sc_flags, PCATCH, "iwmioc", 0); - if (err) { - splx(s); + err = rw_enter(&sc->ioctl_rwl, RW_WRITE | RW_INTR); + if (err) return err; - } - sc->sc_flags |= IWM_FLAG_BUSY; + + s = splnet(); switch (cmd) { case SIOCSIFADDR: @@ -6258,9 +6256,9 @@ iwm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } } - sc->sc_flags &= ~IWM_FLAG_BUSY; - wakeup(&sc->sc_flags); splx(s); + rw_exit(&sc->ioctl_rwl); + return err; } @@ -7041,6 +7039,7 @@ iwm_attach(struct device *parent, struct device *self, void *aux) sc->sc_dmat = pa->pa_dmat; task_set(&sc->sc_eswk, iwm_endscan_cb, sc); + rw_init(&sc->ioctl_rwl, "iwmioctl"); err = pci_get_capability(sc->sc_pct, sc->sc_pcitag, PCI_CAP_PCIEXPRESS, &sc->sc_cap_off, NULL); @@ -7359,18 +7358,15 @@ iwm_init_task(void *arg1) struct ifnet *ifp = &sc->sc_ic.ic_if; int s; + rw_enter_write(&sc->ioctl_rwl); s = splnet(); - while (sc->sc_flags & IWM_FLAG_BUSY) - tsleep(&sc->sc_flags, 0, "iwmpwr", 0); - sc->sc_flags |= IWM_FLAG_BUSY; iwm_stop(ifp, 0); if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == IFF_UP) iwm_init(ifp); - sc->sc_flags &= ~IWM_FLAG_BUSY; - wakeup(&sc->sc_flags); splx(s); + rw_exit(&sc->ioctl_rwl); } void diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index e2933c927a9..fa79dac72d3 100644 --- a/sys/dev/pci/if_iwmvar.h +++ b/sys/dev/pci/if_iwmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmvar.h,v 1.20 2016/09/02 15:45:17 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.21 2016/09/04 18:49:21 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -283,8 +283,7 @@ struct iwm_rx_ring { #define IWM_FLAG_HW_INITED 0x02 #define IWM_FLAG_STOPPED 0x04 #define IWM_FLAG_RFKILL 0x08 -#define IWM_FLAG_BUSY 0x10 -#define IWM_FLAG_SCANNING 0x20 +#define IWM_FLAG_SCANNING 0x10 struct iwm_ucode_status { uint32_t uc_error_event_table; @@ -440,6 +439,8 @@ struct iwm_softc { */ int sc_generation; + struct rwlock ioctl_rwl; + int sc_cap_off; /* PCIe caps */ const char *sc_fwname; |