From owner-svn-src-user@FreeBSD.ORG Tue Sep 27 03:27:55 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C48A106564A; Tue, 27 Sep 2011 03:27:55 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D74AC8FC14; Tue, 27 Sep 2011 03:27:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8R3RsnF002810; Tue, 27 Sep 2011 03:27:54 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8R3Rslw002808; Tue, 27 Sep 2011 03:27:54 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201109270327.p8R3Rslw002808@svn.freebsd.org> From: Adrian Chadd Date: Tue, 27 Sep 2011 03:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225771 - user/adrian/if_ath_tx/sys/dev/ath X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Sep 2011 03:27:55 -0000 Author: adrian Date: Tue Sep 27 03:27:54 2011 New Revision: 225771 URL: http://svn.freebsd.org/changeset/base/225771 Log: Add some KTR probes to help me figure out interrupt and RXEOL related issues are hiding. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Tue Sep 27 03:20:52 2011 (r225770) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Tue Sep 27 03:27:54 2011 (r225771) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -101,6 +102,9 @@ __FBSDID("$FreeBSD$"); #include #endif +#define ATH_KTR_INTR KTR_SPARE4 +#define ATH_KTR_ERR KTR_SPARE3 + /* * ATH_BCBUF determines the number of vap's that can transmit @@ -1367,6 +1371,7 @@ ath_intr(void *arg) */ ath_hal_getisr(ah, &status); /* NB: clears ISR too */ DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status); + CTR1(ATH_KTR_INTR, "ath_intr: mask=0x%.8x", status); status &= sc->sc_imask; /* discard unasked for bits */ /* Short-circuit un-handled interrupts */ @@ -1412,6 +1417,7 @@ ath_intr(void *arg) } if (status & HAL_INT_RXEOL) { int imask = sc->sc_imask; + CTR0(ATH_KTR_ERR, "ath_intr: RXEOL"); /* * NB: the hardware should re-read the link when * RXE bit is written, but it doesn't work at @@ -1475,6 +1481,7 @@ ath_intr(void *arg) } if (status & HAL_INT_RXORN) { /* NB: hal marks HAL_INT_FATAL when RXORN is fatal */ + CTR0(ATH_KTR_ERR, "ath_intr: RXORN"); sc->sc_stats.ast_rxorn++; } } @@ -3658,6 +3665,7 @@ ath_rx_proc(void *arg, int npending) u_int64_t tsf; int npkts = 0; + CTR1(ATH_KTR_INTR, "ath_rx_proc: pending=%d", npending); DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending); ngood = 0; nf = ath_hal_getchannoise(ah, sc->sc_curchan); @@ -4031,6 +4039,8 @@ rx_next: if (ngood) sc->sc_lastrx = tsf; + CTR2(ATH_KTR_INTR, "ath_rx_proc: npkts=%d, ngood=%d", npkts, ngood); + /* Queue DFS tasklet if needed */ if (ath_dfs_tasklet_needed(sc, sc->sc_curchan)) taskqueue_enqueue_fast(sc->sc_tq, &sc->sc_dfstask); @@ -4042,6 +4052,7 @@ rx_next: */ if (sc->sc_kickpcu) { sc->sc_kickpcu = 0; + CTR0(ATH_KTR_ERR, "ath_rx_proc: kickpcu"); /* * XXX this causes a 3ms delay; and shuts down a lof * XXX is it really needed? Or is it just enough to