From patchwork Thu Mar 2 00:56:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 9599379 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEB04600CB for ; Thu, 2 Mar 2017 00:56:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEF2E25D99 for ; Thu, 2 Mar 2017 00:56:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3B162856E; Thu, 2 Mar 2017 00:56:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4E6E928565 for ; Thu, 2 Mar 2017 00:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Date:Message-ID:Subject:From:To: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=0r2uqwu3kgLWweGR8r70eXtDNPdl+qR4scnmYgv0rmk=; b=lVvhnudgKkmUDE 5Egwkf0qSIdaA22L+NpH1VVeEjOBZY3cVy6tn2iuFw0gBrubJlurpG0qyg34uoxXNKl5qRnuAgLTj 3MnRmqK57t6bhD/Mn1IPSlzr/FxETAwgMkhZeYa5wdpVP2ZOSiqOJ9xbturhoN4g2H0RB7Cm14jqr b2jwGkpM8OEog0Yx6+2U8bXmr3wze2THmjKumgGh0f4/KrTLFeQw2mnqAabSsFsEfxBdZJrFk2Wfm Jzo572nk8yP+iiFbI3KfwyBRNWh3zonjuUcph+TO1b+rgKCu70Hwr8uY9/57H6xhzCX3BhtTSnFzQ CnWr3u9x8FOXKm4OwyXQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cjF2y-0006bT-6q; Thu, 02 Mar 2017 00:56:44 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cjF2v-0006aX-5D for ath10k@lists.infradead.org; Thu, 02 Mar 2017 00:56:42 +0000 Received: from [192.168.100.149] (firewall.candelatech.com [50.251.239.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail2.candelatech.com (Postfix) with ESMTPSA id 37B1240A5ED for ; Wed, 1 Mar 2017 16:56:19 -0800 (PST) To: ath10k From: Ben Greear Subject: ath10k bug in station mode with regard to TX-BEAMFORMER? Organization: Candela Technologies Message-ID: <8f2382ad-4778-f32d-762c-09c543e93afd@candelatech.com> Date: Wed, 1 Mar 2017 16:56:18 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170301_165641_244125_78C066C4 X-CRM114-Status: UNSURE ( 8.98 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 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-Virus-Scanned: ClamAV using ClamSMTP I have a user with an AP that advertises itself as a MU-BEAMFORMEE (and not MU-BEAMFORMER). My station firmware on 9984 is crashing because it tries to set up MU-MIMO tx logic as best as I can figure. Does the patch below look like a good idea? If so, I'll do it up official. Unfortunately, I don't have a good way to test this locally, so this is just based on my vague understanding of this feature... Thanks, Ben diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 219daaee..5aefc8a 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -5372,6 +5372,7 @@ static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif) { u32 value = 0; struct ath10k *ar = arvif->ar; + struct ieee80211_vif *vif = arvif->vif; int nsts; int sound_dim; @@ -5391,17 +5392,21 @@ static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif) if (!value) return 0; - if (ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) + if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) && + (vif->type != NL80211_IFTYPE_STATION)) value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER; - if (ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) + if ((ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) && + (vif->type != NL80211_IFTYPE_STATION)) value |= (WMI_VDEV_PARAM_TXBF_MU_TX_BFER | WMI_VDEV_PARAM_TXBF_SU_TX_BFER); - if (ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) + if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) && + (vif->type == NL80211_IFTYPE_STATION)) value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE; - if (ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) + if ((ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) && + (vif->type == NL80211_IFTYPE_STATION)) value |= (WMI_VDEV_PARAM_TXBF_MU_TX_BFEE | WMI_VDEV_PARAM_TXBF_SU_TX_BFEE);