Date: Sun, 15 Mar 2015 20:17:25 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280056 - head/sys/dev/wpi Message-ID: <201503152017.t2FKHP2s053922@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sun Mar 15 20:17:25 2015 New Revision: 280056 URL: https://svnweb.freebsd.org/changeset/base/280056 Log: Fix panics in wpi_tx_done() when powersave is enabled PR: kern/197143 Submitted by: Andriy Voskoboinyk <s3erios@gmail.com> Modified: head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:15:10 2015 (r280055) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:17:25 2015 (r280056) @@ -1024,6 +1024,11 @@ wpi_update_rx_ring(struct wpi_softc *sc) { struct wpi_rx_ring *ring = &sc->rxq; + if (ring->update != 0) { + /* Wait for INT_WAKEUP event. */ + return; + } + if (WPI_READ(sc, WPI_UCODE_GP1) & WPI_UCODE_GP1_MAC_SLEEP) { DPRINTF(sc, WPI_DEBUG_PWRSAVE, "%s: wakeup request\n", __func__); @@ -1179,6 +1184,11 @@ fail: wpi_free_tx_ring(sc, ring); static void wpi_update_tx_ring(struct wpi_softc *sc, struct wpi_tx_ring *ring) { + if (ring->update != 0) { + /* Wait for INT_WAKEUP event. */ + return; + } + if (WPI_READ(sc, WPI_UCODE_GP1) & WPI_UCODE_GP1_MAC_SLEEP) { DPRINTF(sc, WPI_DEBUG_PWRSAVE, "%s (%d): requesting wakeup\n", __func__, ring->qid);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503152017.t2FKHP2s053922>