From patchwork Mon Jun 24 23:29:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pradeep Kumar Chitrapu X-Patchwork-Id: 11014395 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-2.web.codeaurora.org (Postfix) with ESMTP id AA51F6C5 for ; Mon, 24 Jun 2019 23:29:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9557F28B44 for ; Mon, 24 Jun 2019 23:29:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83DE028B4A; Mon, 24 Jun 2019 23:29:26 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 1624428B44 for ; Mon, 24 Jun 2019 23:29:26 +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-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=RV2AMGjJN7pLLuTYtHNMwjVjVtWjdQ5RPMzoazA/E3Y=; b=lCP ooV6ubtqH/wZEH0tqRMk+bZiyR0tzRo+QRh8Rifob3Um6/c5RTWZZaeilPRVyPd0za4l7tea54Y06 nX7ND5WkKJ2CobETF9DRXvaFjAimVcguexOSTtUHAbk4IbsWVZ1LqhTcsa2Nu/4dWhD1O8nPde6rn q+ZWszsu69018oUudvbjqaBhilL4sLs6QvXLd7MmQuxgmlZDWyaO3ouihLx4u/Dj/eAvJdUSXqQak AT4mIjnW/rOUoqlD51yLGUWqxrn6z4SxPFoq0JEAsecbN7O9iAFjNvLU0EJJdgRCsNwet7LVHgg+7 gPBNAc379ZJR0RO3bGNJtoV409sp02g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hfYOq-0000HH-Ui; Mon, 24 Jun 2019 23:29:24 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfYOo-0000Gq-8W for ath11k@lists.infradead.org; Mon, 24 Jun 2019 23:29:23 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 83167607C3; Mon, 24 Jun 2019 23:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561418960; bh=EAVA5CCM15SZyBZDjOBhWJoRxR/TZZCqVxWjh3PYEiE=; h=From:To:Cc:Subject:Date:From; b=JQSDS/fFHZRHaS+hHnCtSF7vZnVxtHNhVtCfEBWOlyJTUsH936Qd+dM7EwtG/xXhh e+hXkOSK0YcVi3jykcaHTZvL6wl2LEHJIelluHoGVyHcw92LMevITvtWbp9fy+MhfU 9SMWE6mZWsoxFlDMtd2JoTzulqoe24TQIYWc0BC0= Received: from pradeepc-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pradeepc@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id B3B9B601B4; Mon, 24 Jun 2019 23:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561418959; bh=EAVA5CCM15SZyBZDjOBhWJoRxR/TZZCqVxWjh3PYEiE=; h=From:To:Cc:Subject:Date:From; b=c7MWt0bk+heeUuLZHT7FFR0QQ0GnXsTqjurvioLy5b6ekfaQXsLRuPa/dEgXoA5vm WaChnUaDMSCKpSn9A7SmEr/YcJ3BWQTfvQ035d+b8eQPbpr932QLW71jw5Fk7Nub+Z N3un/XhbIiEJoJYN+yAE8BaboR1VW9wtZsdFghjM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B3B9B601B4 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=pradeepc@codeaurora.org From: Pradeep Kumar Chitrapu To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: set HE phymodes at vdev start by default Date: Tue, 25 Jun 2019 04:59:15 +0530 Message-Id: <1561418955-9119-1-git-send-email-pradeepc@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190624_162922_334420_73B7C169 X-CRM114-Status: UNSURE ( 8.30 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pradeep Kumar Chitrapu MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP phymode cannot be classified at vdev_start as driver wont be aware of operating mode (11n/11ac/11ax) at this point. So setting HE phymodes by default corresponding to bandwidth at vdev start will prevent FW assert when phymode configured for the connecting peer is greater than the phymode configured for the VDEV. phymode for each peer is configured appropriately at the time of peer association. Tested on IPQ8074. Suggested-by: Rajkumar Manoharan Signed-off-by: Pradeep Kumar Chitrapu --- drivers/net/wireless/ath/ath11k/mac.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 7a6c92760535..dccf4597d1ef 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -107,48 +107,26 @@ }; static const int -ath11k_phymodes[NUM_NL80211_BANDS][2][ATH11K_CHAN_WIDTH_NUM] = { +ath11k_phymodes[NUM_NL80211_BANDS][ATH11K_CHAN_WIDTH_NUM] = { [NL80211_BAND_2GHZ] = { - { [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11G, - [NL80211_CHAN_WIDTH_20] = MODE_11NG_HT20, - [NL80211_CHAN_WIDTH_40] = MODE_11NG_HT40, - [NL80211_CHAN_WIDTH_80] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_160] = MODE_UNKNOWN, - }, { - [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11G, + [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11AX_HE20_2G, [NL80211_CHAN_WIDTH_20] = MODE_11AX_HE20_2G, [NL80211_CHAN_WIDTH_40] = MODE_11AX_HE40_2G, [NL80211_CHAN_WIDTH_80] = MODE_11AX_HE80_2G, [NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_160] = MODE_UNKNOWN, - }, }, [NL80211_BAND_5GHZ] = { - { - [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11A, - [NL80211_CHAN_WIDTH_20] = MODE_11AC_VHT20, - [NL80211_CHAN_WIDTH_40] = MODE_11AC_VHT40, - [NL80211_CHAN_WIDTH_80] = MODE_11AC_VHT80, - [NL80211_CHAN_WIDTH_160] = MODE_11AC_VHT160, - [NL80211_CHAN_WIDTH_80P80] = MODE_11AC_VHT80_80, - }, { [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11A, + [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11AX_HE20, [NL80211_CHAN_WIDTH_20] = MODE_11AX_HE20, [NL80211_CHAN_WIDTH_40] = MODE_11AX_HE40, [NL80211_CHAN_WIDTH_80] = MODE_11AX_HE80, [NL80211_CHAN_WIDTH_160] = MODE_11AX_HE160, [NL80211_CHAN_WIDTH_80P80] = MODE_11AX_HE80_80, - }, }, }; @@ -4168,11 +4146,7 @@ static inline int ath11k_mac_vdev_setup_sync(struct ath11k *ar) arg.channel.band_center_freq1 = chandef->center_freq1; arg.channel.band_center_freq2 = chandef->center_freq2; arg.channel.mode = - ath11k_phymodes[chandef->chan->band][he_support][chandef->width]; - if (arg.channel.mode == MODE_11G && - chandef->chan->flags & IEEE80211_CHAN_NO_OFDM) - arg.channel.mode = MODE_11B; - WARN_ON(arg.channel.mode == MODE_UNKNOWN); + ath11k_phymodes[chandef->chan->band][chandef->width]; arg.channel.min_power = 0; arg.channel.max_power = chandef->chan->max_power * 2;