From owner-svn-src-user@FreeBSD.ORG Mon Sep 12 02:00:52 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 E24CC1065680;
Mon, 12 Sep 2011 02:00:52 +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 B94428FC18;
Mon, 12 Sep 2011 02:00:52 +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 p8C20qWu005333;
Mon, 12 Sep 2011 02:00:52 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8C20q8k005331;
Mon, 12 Sep 2011 02:00:52 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109120200.p8C20q8k005331@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 12 Sep 2011 02:00:52 +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: r225500 -
user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416
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" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2011 02:00:53 -0000
Author: adrian
Date: Mon Sep 12 02:00:52 2011
New Revision: 225500
URL: http://svn.freebsd.org/changeset/base/225500
Log:
.. and add the last missing piece from last night's commit:
* Actually follow through on setting up those flags. unfortunately ctl0 was
being 0'ed and I didn't pick up on it. This correctly sets CLRDMASK, VEOL and
INTREQ.
Modified:
user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Mon Sep 12 01:38:24 2011 (r225499)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Mon Sep 12 02:00:52 2011 (r225500)
@@ -378,14 +378,9 @@ ar5416ChainTxDesc(struct ath_hal *ah, st
OS_MEMZERO(ds->ds_hw, AR5416_DESC_TX_CTL_SZ);
/*
- * XXX VEOL should only be for the last descriptor in the chain.
- * XXX I'm not sure if clrdestmask is ok in intermediary descs or
- * XXX required at the end of a sub-frame.
- */
- ads->ds_ctl0 = (pktLen & AR_FrameLen)
-// | (flags & HAL_TXDESC_VEOL ? AR_VEOL : 0)
-// | (flags & HAL_TXDESC_CLRDMASK ? AR_ClrDestMask : 0)
- | (flags & HAL_TXDESC_INTREQ ? AR_TxIntrReq : 0);
+ * Note: VEOL should only be for the last descriptor in the chain.
+ */
+ ads->ds_ctl0 = 0; /* XXX TODO: optimise uncached descriptor writes */
ads->ds_ctl1 = (type << AR_FrameType_S)
| (isaggr ? (AR_IsAggr | AR_MoreAggr) : 0);
ads->ds_ctl2 = 0;
@@ -402,15 +397,24 @@ ar5416ChainTxDesc(struct ath_hal *ah, st
}
if (firstSeg) {
+ ads->ds_ctl0 |= (pktLen & AR_FrameLen)
+ | (flags & HAL_TXDESC_CLRDMASK ? AR_ClrDestMask : 0)
+ | (flags & HAL_TXDESC_INTREQ ? AR_TxIntrReq : 0)
+ ;
ads->ds_ctl1 |= segLen | (lastSeg ? 0 : AR_TxMore);
} else if (lastSeg) { /* !firstSeg && lastSeg */
- ads->ds_ctl0 = 0;
+ ads->ds_ctl0 = 0
+ | (flags & HAL_TXDESC_VEOL ? AR_VEOL : 0)
+ | (flags & HAL_TXDESC_INTREQ ? AR_TxIntrReq : 0)
+ ;
ads->ds_ctl1 |= segLen;
} else { /* !firstSeg && !lastSeg */
/*
* Intermediate descriptor in a multi-descriptor frame.
*/
- ads->ds_ctl0 = 0;
+ ads->ds_ctl0 = 0
+ | (flags & HAL_TXDESC_INTREQ ? AR_TxIntrReq : 0)
+ ;
ads->ds_ctl1 |= segLen | AR_TxMore;
}
ds_txstatus[0] = ds_txstatus[1] = 0;