From patchwork Thu Aug 27 12:47:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 7084451 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E139ABEEC1 for ; Thu, 27 Aug 2015 12:47:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02D82208BB for ; Thu, 27 Aug 2015 12:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09EBF2062F for ; Thu, 27 Aug 2015 12:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932213AbbH0MrO (ORCPT ); Thu, 27 Aug 2015 08:47:14 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:34605 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932197AbbH0MrK (ORCPT ); Thu, 27 Aug 2015 08:47:10 -0400 Received: by laba3 with SMTP id a3so11642307lab.1 for ; Thu, 27 Aug 2015 05:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3Ra5wqVzJ/t1I5Nmlimeh29oXDosrHoSoqc5254C31s=; b=Fu3+yFDLsMausagzjkU5iuC9ORUxfsxW5aVv0QNDblKiEZHbQJAkU9A3s0+fDbQyym 1fFa0ABgFjAJ5rtEa2FW7fMD5Iaxbs1ZDGjupMlLLx7KSkAcFvnnOSnMfZ3PkwFhP3oJ v9GYbx+wOsbSkCCCfLxUQm3Z1jUSXy/Z3OZXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3Ra5wqVzJ/t1I5Nmlimeh29oXDosrHoSoqc5254C31s=; b=kq3keDj8LFG0c4gjfSWeDTj3Sf/twAnZZ+h44EZYkqg4dKQHJcaWbwHcg1ZNIZeIXc 569XFqtwUEMxHMAtZCyFakyEcT8bNus43KsUOHjOWDqqzRg4vb2p2H9ZbGnashf0P2JV tT0aiBku8BYz6Y4FkPMduPeQMmgWU6huBq0fTJ+e9d8CiY56EllG8elqfV0hXbJ73h1Z YcaRWxlkSTA6w/rsvdc0HY9mxkU57JnrIXf5ngmOvNiY4EWh5bcHUPT/q1fXZVqnvCnV G5YXM8yDvbjM24hF2n6BFKSum226zt0/hskNdMU9dTpJtnW0UGkoBEJIaw7cAzhNcIit rS+g== X-Gm-Message-State: ALoCoQlbtXkie+G+Tu2tppmdp4eKCfd7RGV7/6rMi6Xm0Jfred/iq/W7iqDC4C0Tu9l2NeCvUC3FjSvx3kATp4fPdD3UPKkb4VdqY1KRMAUYVGMTXwEZmZdcGk28A0qcgwft2jEq7J01 X-Received: by 10.112.85.204 with SMTP id j12mr2090349lbz.47.1440679628861; Thu, 27 Aug 2015 05:47:08 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id g5sm554744laf.33.2015.08.27.05.47.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Aug 2015 05:47:07 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 2/2] ath10k: fix mu-mimo rx status reporting Date: Thu, 27 Aug 2015 14:47:33 +0200 Message-Id: <1440679653-20289-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440679653-20289-1-git-send-email-michal.kazior@tieto.com> References: <1440679653-20289-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 MU-MIMO Rx involves different interpretation of the VHT-SIG-A compared to SU-MIMO. The incorrect interpretation led ath10k to report VHT MCS values greater than 9 which subsequently prompted mac80211 to drop such frames. This effectively broke Rx with MU-MIMO in many cases and manifested with a kernel warning in the log which looked like this: [ 14.552520] WARNING: CPU: 2 PID: 0 at net/mac80211/rx.c:3578 ieee80211_rx+0x26c/0x940 [mac80211]() [ 14.552522] Rate marked as a VHT rate but data is invalid: MCS: 10, NSS: 2 ... call trace follows ... Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/htt_rx.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 1b7a04366256..8ba8fa9004cf 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -643,6 +643,8 @@ struct amsdu_subframe_hdr { __be16 len; } __packed; +#define GROUP_ID_IS_SU_MIMO(x) ((x) == 0 || (x) == 63) + static void ath10k_htt_rx_h_rates(struct ath10k *ar, struct ieee80211_rx_status *status, struct htt_rx_desc *rxd) @@ -650,6 +652,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, struct ieee80211_supported_band *sband; u8 cck, rate, bw, sgi, mcs, nss; u8 preamble = 0; + u8 group_id; u32 info1, info2, info3; info1 = __le32_to_cpu(rxd->ppdu_start.info1); @@ -692,10 +695,27 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, case HTT_RX_VHT_WITH_TXBF: /* VHT-SIG-A1 in info2, VHT-SIG-A2 in info3 TODO check this */ - mcs = (info3 >> 4) & 0x0F; - nss = ((info2 >> 10) & 0x07) + 1; bw = info2 & 3; sgi = info3 & 1; + group_id = (info2 >> 4) & 0x3F; + + if (GROUP_ID_IS_SU_MIMO(group_id)) { + mcs = (info3 >> 4) & 0x0F; + nss = ((info2 >> 10) & 0x07) + 1; + } else { + /* Hardware doesn't decode VHT-SIG-B into Rx descriptor + * so it's impossible to decode MCS. Also since + * firmware consumes Group Id Management frames host + * has no knowledge regarding group/user position + * mapping so it's impossible to pick the correct Nsts + * from VHT-SIG-A1. + * + * Bandwidth and SGI are valid so report the rateinfo + * on best-effort basis. + */ + mcs = 0; + nss = 1; + } status->rate_idx = mcs; status->vht_nss = nss;