From patchwork Wed Sep 2 11:20:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 7111381 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 689DFBEEC1 for ; Wed, 2 Sep 2015 11:21:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 948C220653 for ; Wed, 2 Sep 2015 11:21:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F355720638 for ; Wed, 2 Sep 2015 11:21:36 +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 1ZX66W-0003Gy-0r; Wed, 02 Sep 2015 11:21:24 +0000 Received: from mail-lb0-x230.google.com ([2a00:1450:4010:c04::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZX66T-0003EJ-Ob for ath10k@lists.infradead.org; Wed, 02 Sep 2015 11:21:22 +0000 Received: by lbbmp1 with SMTP id mp1so4021778lbb.1 for ; Wed, 02 Sep 2015 04:20:56 -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=3vbBMXJ8ja22CwxibSkRvpHzJpQsN6yvifDgfSjaSxk=; b=IQAn32lEunpmkYE0DeHzAExgpX7DLv/5W33yy/DG2Ea0iybt3Vdlr4xwlPwGbCcn+J Crv2lZuKQJAVH2qytksNCHydf+xYZf4ok2Elu5qTyLuqLJTUZgmzuSBD00AkocrHckil 6gHXUWjrUDfCjoL/iDPi4zXNVK6x30UfNjlXc= 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=3vbBMXJ8ja22CwxibSkRvpHzJpQsN6yvifDgfSjaSxk=; b=M2n2IA49E0Q4Yfw76Uas3NwGUaAOb4mr37WjWnuP0B0kJdKFVY+uKzTurVGubUa4ct ZHHdny8s9uezCoxNaKopNSboYkY/6TTcUsG+lmnBobTNJlpD1H8Pk7szEarrKZzpnyOs UpxBKBYl+m2DS7uAlzyC7wudNb1kF4A+r6kQ1XQn9qKAcitV1l+dc7xnloIzu2Dc+mXh FDO4Mm5KZdEraRS5T9uZq2YDbNruDGlG56rr5rMkTHTy9XWk2FfCFYWzSyhQslkonDQ9 ABga5iXCl/nL5G3qs/tBR4Qxojje9Qlbh66cqg1jJrHlYvQz3F0WZyscI57sP0WckiA9 QFzA== X-Gm-Message-State: ALoCoQnHaKm8rtllghkSLvVH2jYQ2+ZpTBk28gl27SDwAGdvtn+eS5Q+k/P+v+BEF6SG/jqPhGw4ee2IjbqTroOfQq4NdSVYwxr6tHSKus93sZ2K80F/O/DQnCbsq55ZcAyWxZfcAQEIVZYiimGj7NbOPtFuYdwl9pbKkzWG4CzsmewjZ7fOWSrj8uFo815uZ4S6S9IxDew/ X-Received: by 10.112.161.40 with SMTP id xp8mr15271872lbb.71.1441192856521; Wed, 02 Sep 2015 04:20:56 -0700 (PDT) Received: from uw000975.eu.tieto.com ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id yf5sm5480047lab.1.2015.09.02.04.20.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Sep 2015 04:20:56 -0700 (PDT) From: Bartosz Markowski To: ath10k@lists.infradead.org Subject: [PATCH 2/2] ath10k: fix beamformer VHT sounding dimensions capability Date: Wed, 2 Sep 2015 13:20:20 +0200 Message-Id: <1441192820-8403-2-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1441192820-8403-1-git-send-email-bartosz.markowski@tieto.com> References: <1441192820-8403-1-git-send-email-bartosz.markowski@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150902_042121_990110_90AB932C X-CRM114-Status: GOOD ( 14.28 ) X-Spam-Score: -2.7 (--) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, Bartosz Markowski MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 Similarly to the VHT STS, this is supposed to be propagated by firmware. In case it's not, use the default value, but as last resort. Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/mac.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 25c20d18021a..db3be8f794e4 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4080,11 +4080,27 @@ static int ath10k_mac_get_vht_cap_bf_sts(struct ath10k *ar) return nsts; } +static int ath10k_mac_get_vht_cap_bf_sound_dim(struct ath10k *ar) +{ + int sound_dim = ar->vht_cap_info; + sound_dim &= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK; + sound_dim >>=IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT; + + /* If the sounding dimension is not advertised by the firmware, + * let's use a default value of 1 + */ + if (sound_dim == 0) + return 1; + + return sound_dim; +} + static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif) { u32 value = 0; struct ath10k *ar = arvif->ar; int nsts; + int sound_dim; if (ath10k_wmi_get_txbf_conf_scheme(ar) != WMI_TXBF_CONF_BEFORE_ASSOC) return 0; @@ -4094,9 +4110,10 @@ static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif) IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE)) value |= SM(nsts, WMI_TXBF_STS_CAP_OFFSET); + sound_dim = ath10k_mac_get_vht_cap_bf_sound_dim(ar); if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) - value |= SM((ar->num_rf_chains - 1), WMI_BF_SOUND_DIM_OFFSET); + value |= SM(sound_dim, WMI_BF_SOUND_DIM_OFFSET); if (!value) return 0; @@ -6830,7 +6847,7 @@ static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar) if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) { - val = ar->num_rf_chains - 1; + val = ath10k_mac_get_vht_cap_bf_sound_dim(ar); val <<= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT; val &= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK;