From owner-svn-src-head@FreeBSD.ORG Tue Jul 10 18:17:04 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 640E7106566C; Tue, 10 Jul 2012 18:17:04 +0000 (UTC) (envelope-from buganini@gmail.com) Received: from mail-qa0-f54.google.com (mail-qa0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id DABF78FC08; Tue, 10 Jul 2012 18:17:03 +0000 (UTC) Received: by qaat11 with SMTP id t11so457942qaa.13 for ; Tue, 10 Jul 2012 11:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=hO3B7buQ6CXfY9etA7Ams7IwOG+8NoXr5CsFo/Lxxg0=; b=zd2TXy894kN50Min1GXtGcMCxcN0SsB3KDLr4svtOLEqB+cnKJMqQOY9iYwYCzoidk 6AHx5bKE1Yw58oJypu6N3b68T7p8ZfK0XBeZ33XTJhFyF1YKRs9Jp/e96UJYHv4LCYch e8DRQONUCnu3emuVesXCvL/1OzuRBx0jAtNeem5MqJ9g9Yn8BKmDx1MNZYiBmLvXJn3c Ay+KLykA6vxKxoI+UJAHH1+llxwCEstWYq574lMz1XoMsXb1tsUQDkU53+Rib1cCIyad +x7czKeTlwWaCtpNuW2jtLlUdTN4CEWTxqfaP9rktxUioyQPOLOvPgJikMXMXGR6e8iE lmzA== MIME-Version: 1.0 Received: by 10.229.137.145 with SMTP id w17mr23972353qct.27.1341944222898; Tue, 10 Jul 2012 11:17:02 -0700 (PDT) Received: by 10.229.247.19 with HTTP; Tue, 10 Jul 2012 11:17:02 -0700 (PDT) In-Reply-To: <201207100743.q6A7hWBI067812@svn.freebsd.org> References: <201207100743.q6A7hWBI067812@svn.freebsd.org> Date: Wed, 11 Jul 2012 02:17:02 +0800 Message-ID: From: Buganini To: Adrian Chadd Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r238343 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 18:17:04 -0000 /usr/src/sys/dev/ath/if_ath.c: In function 'ath_intr': /usr/src/sys/dev/ath/if_ath.c:1628: error: 'HAL_INT_RXHP' undeclared (first use in this function) /usr/src/sys/dev/ath/if_ath.c:1628: error: (Each undeclared identifier is reported only once /usr/src/sys/dev/ath/if_ath.c:1628: error: for each function it appears in.) /usr/src/sys/dev/ath/if_ath.c:1628: error: 'HAL_INT_RXLP' undeclared (first use in this function) /usr/src/sys/dev/ath/if_ath.c: In function 'ath_init': /usr/src/sys/dev/ath/if_ath.c:1880: error: 'HAL_INT_RXHP' undeclared (first use in this function) /usr/src/sys/dev/ath/if_ath.c:1880: error: 'HAL_INT_RXLP' undeclared (first use in this function) 2012/7/10 Adrian Chadd : > Author: adrian > Date: Tue Jul 10 07:43:31 2012 > New Revision: 238343 > URL: http://svn.freebsd.org/changeset/base/238343 > > Log: > Flip on EDMA RX of both HP and LP queue frames. > > Yes, this is in the legacy interrupt path. The NIC does support > MSI but I haven't yet sat down and written that code. > > Modified: > head/sys/dev/ath/if_ath.c > > Modified: head/sys/dev/ath/if_ath.c > ============================================================================== > --- head/sys/dev/ath/if_ath.c Tue Jul 10 06:50:19 2012 (r238342) > +++ head/sys/dev/ath/if_ath.c Tue Jul 10 07:43:31 2012 (r238343) > @@ -1621,7 +1621,11 @@ ath_intr(void *arg) > /* bump tx trigger level */ > ath_hal_updatetxtriglevel(ah, AH_TRUE); > } > - if (status & HAL_INT_RX) { > + /* > + * Handle both the legacy and RX EDMA interrupt bits. > + * Note that HAL_INT_RXLP is also HAL_INT_RXDESC. > + */ > + if (status & (HAL_INT_RX | HAL_INT_RXHP | HAL_INT_RXLP)) { > sc->sc_stats.ast_rx_intr++; > taskqueue_enqueue(sc->sc_tq, &sc->sc_rxtask); > } > @@ -1867,6 +1871,14 @@ ath_init(void *arg) > sc->sc_imask = HAL_INT_RX | HAL_INT_TX > | HAL_INT_RXEOL | HAL_INT_RXORN > | HAL_INT_FATAL | HAL_INT_GLOBAL; > + > + /* > + * Enable RX EDMA bits. Note these overlap with > + * HAL_INT_RX and HAL_INT_RXDESC respectively. > + */ > + if (sc->sc_isedma) > + sc->sc_imask |= (HAL_INT_RXHP | HAL_INT_RXLP); > + > /* > * Enable MIB interrupts when there are hardware phy counters. > * Note we only do this (at the moment) for station mode. > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"