From patchwork Mon Dec 8 17:17:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 5457781 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB430BEEA8 for ; Mon, 8 Dec 2014 17:18:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 157FB20172 for ; Mon, 8 Dec 2014 17:18:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A4F920142 for ; Mon, 8 Dec 2014 17:18:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xy1ww-0000Zv-CU; Mon, 08 Dec 2014 17:18:18 +0000 Received: from wolverine02.qualcomm.com ([199.106.114.251]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xy1wt-0000JI-Jq for ath10k@lists.infradead.org; Mon, 08 Dec 2014 17:18:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1418059095; x=1449595095; h=subject:to:from:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=CkwXG7xMN13ID4zcgLey19cavxZhJPCzMdtHmHRE6I0=; b=ao0jjl7ReK5AchKqXuUQKLlyP9JmPqNrfLPepOVUQH48b2fMLFbL2E9X pr2gR/EGRFzLU2oPt2B5fnkqPNTQNL56e6xrUOic+PtEhsiXJs1Bo95Rb F3XVHPaBF5P4nLe1JqN4eAu/AMbp8DHFFq9NOpm0pyGj1ssb1kZTMb/8j o=; X-IronPort-AV: E=McAfee;i="5600,1067,7645"; a="183935088" Received: from ironmsg04-lv.qualcomm.com ([10.47.202.184]) by wolverine02.qualcomm.com with ESMTP; 08 Dec 2014 09:17:51 -0800 X-IronPort-AV: E=Sophos;i="5.07,539,1413270000"; d="scan'208";a="26673140" Received: from nalasexr01g.na.qualcomm.com ([10.49.56.53]) by ironmsg04-lv.qualcomm.com with ESMTP/TLS/RC4-SHA; 08 Dec 2014 09:17:51 -0800 Received: from potku.adurom.net (10.80.80.8) by NALASEXR01G.na.qualcomm.com (10.49.56.53) with Microsoft SMTP Server (TLS) id 15.0.913.22; Mon, 8 Dec 2014 09:17:40 -0800 Subject: [HACK PATCH 4/4] ath10k: tx To: From: Kalle Valo Date: Mon, 8 Dec 2014 19:17:37 +0200 Message-ID: <20141208171737.1001.63200.stgit@potku.adurom.net> In-Reply-To: <20141208170804.1001.1804.stgit@potku.adurom.net> References: <20141208170804.1001.1804.stgit@potku.adurom.net> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01D.na.qualcomm.com (10.85.0.84) To NALASEXR01G.na.qualcomm.com (10.49.56.53) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141208_091815_794346_7831EC34 X-CRM114-Status: GOOD ( 11.37 ) X-Spam-Score: -5.1 (-----) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Michal Kazior Signed-off-by: Michal Kazior Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/Kconfig | 8 ++++++++ drivers/net/wireless/ath/ath10k/core.h | 4 ++++ drivers/net/wireless/ath/ath10k/htt_tx.c | 12 ++++++++++++ drivers/net/wireless/ath/ath10k/mac.c | 21 +++++++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig index 72acb822bb11..1bac2e94c3a9 100644 --- a/drivers/net/wireless/ath/ath10k/Kconfig +++ b/drivers/net/wireless/ath/ath10k/Kconfig @@ -45,3 +45,11 @@ config ATH10K_DFS_CERTIFIED ---help--- This option enables DFS support for initiating radiation on ath10k. + +config ATH10K_802_3_FORMAT + bool "ath10k 802.3 frame format" + depends on ATH10K + default n + ---help--- + This option enables HIGHLY EXPERIMENTAL 802.3 frame format + support in ath10k. If it breaks, you get to keep both pieces. diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index f4a4d3c346aa..c5c33a56a03e 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -82,6 +82,10 @@ struct ath10k_skb_cb { u8 eid; u8 vdev_id; +#ifdef CONFIG_ATH10K_802_3_FORMAT + bool is_8023; +#endif + struct { u8 tid; u16 freq; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index a1bda41fb543..a340444bc64c 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -467,11 +467,15 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) prefetch_len = min(htt->prefetch_len, msdu->len); prefetch_len = roundup(prefetch_len, 4); +#ifdef CONFIG_ATH10K_802_3_FORMAT + use_frags = true; +#else /* Since HTT 3.0 there is no separate mgmt tx command. However in case * of mgmt tx using TX_FRM there is not tx fragment list. Instead of tx * fragment list host driver specifies directly frame pointer. */ use_frags = htt->target_version_major < 3 || !ieee80211_is_mgmt(hdr->frame_control); +#endif skb_cb->htt.txbuf = dma_pool_alloc(htt->tx_pool, GFP_ATOMIC, &paddr); @@ -527,8 +531,16 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) prefetch_len); skb_cb->htt.txbuf->htc_hdr.flags = 0; +#ifdef CONFIG_ATH10K_802_3_FORMAT + flags0 |= SM(ATH10K_HW_TXRX_ETHERNET, + HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE); + flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; + +#else + if (!ieee80211_has_protected(hdr->frame_control)) flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; +#endif flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 3ab09470438f..d7ccb0531a48 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2364,6 +2364,23 @@ static void ath10k_tx(struct ieee80211_hw *hw, struct ieee80211_key_conf *key = info->control.hw_key; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +#ifdef CONFIG_ATH10K_802_3_FORMAT + if (likely(info->is_8023)) { + int ret; + + ATH10K_SKB_CB(skb)->vdev_id = 0; + ATH10K_SKB_CB(skb)->is_8023 = true; + ATH10K_SKB_CB(skb)->htt.is_offchan = false; + ATH10K_SKB_CB(skb)->htt.tid = skb->priority & + IEEE80211_QOS_CTL_TAG1D_MASK; + + ret = ath10k_htt_tx(&ar->htt, skb); + if (unlikely(ret < 0)) + ieee80211_free_txskb(hw, skb); + return; + } +#endif + /* We should disable CCK RATE due to P2P */ if (info->flags & IEEE80211_TX_CTL_NO_CCK_RATE) ath10k_dbg(ar, ATH10K_DBG_MAC, "IEEE80211_TX_CTL_NO_CCK_RATE\n"); @@ -2372,6 +2389,10 @@ static void ath10k_tx(struct ieee80211_hw *hw, ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr); ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif); +#ifdef CONFIG_ATH10K_802_3_FORMAT + ATH10K_SKB_CB(skb)->is_8023 = false; +#endif + /* it makes no sense to process injected frames like that */ if (vif && vif->type != NL80211_IFTYPE_MONITOR) { ath10k_tx_h_nwifi(hw, skb);