From owner-svn-src-all@freebsd.org Tue Apr 26 04:41:01 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19794B1CE9E; Tue, 26 Apr 2016 04:41:01 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5519129B; Tue, 26 Apr 2016 04:41:00 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3Q4f0li045898; Tue, 26 Apr 2016 04:41:00 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3Q4exZD045896; Tue, 26 Apr 2016 04:40:59 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201604260440.u3Q4exZD045896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 26 Apr 2016 04:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298612 - head/sys/dev/iwm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2016 04:41:01 -0000 Author: adrian Date: Tue Apr 26 04:40:59 2016 New Revision: 298612 URL: https://svnweb.freebsd.org/changeset/base/298612 Log: [iwm] implement suspend/resume through ieee80211_{suspend,resume}_all This allows wifi to associate correctly after a suspend/resume cycle. Yes, I'm using this now day to day. Tested: * Intel 7260AC, STA mode Modified: head/sys/dev/iwm/if_iwm.c head/sys/dev/iwm/if_iwmvar.h Modified: head/sys/dev/iwm/if_iwm.c ============================================================================== --- head/sys/dev/iwm/if_iwm.c Tue Apr 26 03:24:28 2016 (r298611) +++ head/sys/dev/iwm/if_iwm.c Tue Apr 26 04:40:59 2016 (r298612) @@ -4934,6 +4934,8 @@ iwm_init_task(void *arg1) static int 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). */ @@ -4941,17 +4943,33 @@ iwm_resume(device_t dev) pci_write_config(dev, 0x40, reg & ~0xff00, sizeof(reg)); iwm_init_task(device_get_softc(dev)); + IWM_LOCK(sc); + if (sc->sc_flags & IWM_FLAG_DORESUME) { + sc->sc_flags &= ~IWM_FLAG_DORESUME; + do_reinit = 1; + } + IWM_UNLOCK(sc); + + if (do_reinit) + ieee80211_resume_all(&sc->sc_ic); + return 0; } static int iwm_suspend(device_t dev) { + int do_stop = 0; struct iwm_softc *sc = device_get_softc(dev); - if (sc->sc_ic.ic_nrunning > 0) { + do_stop = !! (sc->sc_ic.ic_nrunning > 0); + + ieee80211_suspend_all(&sc->sc_ic); + + if (do_stop) { IWM_LOCK(sc); iwm_stop(sc); + sc->sc_flags |= IWM_FLAG_DORESUME; IWM_UNLOCK(sc); } Modified: head/sys/dev/iwm/if_iwmvar.h ============================================================================== --- head/sys/dev/iwm/if_iwmvar.h Tue Apr 26 03:24:28 2016 (r298611) +++ head/sys/dev/iwm/if_iwmvar.h Tue Apr 26 04:40:59 2016 (r298612) @@ -405,6 +405,7 @@ struct iwm_softc { #define IWM_FLAG_STOPPED (1 << 2) #define IWM_FLAG_RFKILL (1 << 3) #define IWM_FLAG_BUSY (1 << 4) +#define IWM_FLAG_DORESUME (1 << 5) struct intr_config_hook sc_preinit_hook; struct callout sc_watchdog_to;