package/kernel/mac80211/patches/ath11k/101-wifi-ath11k-Remove-disabling-of-80-80-and-160-MHz.patch

   1 From patchwork Mon Apr 17 20:22:27 2023
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 X-Patchwork-Submitter: Muna Sinada <quic_msinada@quicinc.com>
   6 X-Patchwork-Id: 13214540
   7 X-Patchwork-Delegate: kvalo@adurom.com
   8 Return-Path: <linux-wireless-owner@vger.kernel.org>
   9 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
  10         aws-us-west-2-korg-lkml-1.web.codeaurora.org
  11 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
  12         by smtp.lore.kernel.org (Postfix) with ESMTP id 8C359C77B76
  13         for <linux-wireless@archiver.kernel.org>;
  14  Mon, 17 Apr 2023 20:26:40 +0000 (UTC)
  15 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
  16         id S230070AbjDQU0j (ORCPT
  17         <rfc822;linux-wireless@archiver.kernel.org>);
  18         Mon, 17 Apr 2023 16:26:39 -0400
  19 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53306 "EHLO
  20         lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
  21         with ESMTP id S229914AbjDQU0h (ORCPT
  22         <rfc822;linux-wireless@vger.kernel.org>);
  23         Mon, 17 Apr 2023 16:26:37 -0400
  24 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com
  25  [205.220.180.131])
  26         by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67CE24C33
  27         for <linux-wireless@vger.kernel.org>;
  28  Mon, 17 Apr 2023 13:26:24 -0700 (PDT)
  29 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1])
  30         by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id
  31  33HIsf5q010173;
  32         Mon, 17 Apr 2023 20:22:47 GMT
  33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com;
  34  h=from : to : cc :
  35  subject : date : message-id : mime-version : content-type; s=qcppdkim1;
  36  bh=FGtbeAR6pG0KxyEKVLIRzkq1RXlKfaVfRT1iixzMcII=;
  37  b=jSdZBeFj4RAdCiUPrL/F9n+ufnpxT1pJNfZuA0tfEnUf54SCGUuHT5LtRdojYVh31YSS
  38  aAGDRFvl7tIKqq/c6h4tm7SDdlhWF+MU3sH1YJNrwDeMAUZD+RnviJjo+GfgnEtp9+z7
  39  PA75vGkpKiuMh6M8QFYB+/XxrJmx/XJBNESfMdAjBuMXnQf4S2yJ/IMwSxPkYKMU3lC6
  40  DNnUAcgC/8wawYt8T1d8gKWq5CgWls4i1quveZghsbGUuL01i7SRXdKVianDJJsHEa0G
  41  /brUp6LMMeJUgEI8wBfFAtcknzN0ADMVEqsJr+AHvQXnb1iHZyafl6BAeupXNS+Yi+fJ sw==
  42 Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com
  43  [129.46.96.20])
  44         by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3q171gh1hb-1
  45         (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256
  46  verify=NOT);
  47         Mon, 17 Apr 2023 20:22:47 +0000
  48 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com
  49  [10.47.209.196])
  50         by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id
  51  33HKMjHs007640
  52         (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256
  53  verify=NOT);
  54         Mon, 17 Apr 2023 20:22:46 GMT
  55 Received: from msinada-linux.qualcomm.com (10.80.80.8) by
  56  nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server
  57  (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
  58  15.2.986.42; Mon, 17 Apr 2023 13:22:44 -0700
  59 From: Muna Sinada <quic_msinada@quicinc.com>
  60 To: <ath11k@lists.infradead.org>
  61 CC: <linux-wireless@vger.kernel.org>,
  62         Muna Sinada <quic_msinada@quicinc.com>,
  63         P Praneesh <quic_ppranees@quicinc.com>
  64 Subject: [PATCH] wifi: ath11k: Remove disabling of 80+80 and 160 MHz
  65 Date: Mon, 17 Apr 2023 13:22:27 -0700
  66 Message-ID: <1681762947-13882-1-git-send-email-quic_msinada@quicinc.com>
  67 X-Mailer: git-send-email 2.7.4
  68 MIME-Version: 1.0
  69 X-Originating-IP: [10.80.80.8]
  70 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To
  71  nalasex01a.na.qualcomm.com (10.47.209.196)
  72 X-QCInternal: smtphost
  73 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800
  74  signatures=585085
  75 X-Proofpoint-GUID: wqGG1zw0KpXNYk_yFYb16HwLWt9V-6o4
  76 X-Proofpoint-ORIG-GUID: wqGG1zw0KpXNYk_yFYb16HwLWt9V-6o4
  77 X-Proofpoint-Virus-Version: vendor=baseguard
  78  engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
  79  definitions=2023-04-17_13,2023-04-17_01,2023-02-09_01
  80 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
  81  priorityscore=1501 mlxscore=0
  82  mlxlogscore=796 suspectscore=0 impostorscore=0 bulkscore=0 spamscore=0
  83  clxscore=1015 phishscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0
  84  classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
  85  definitions=main-2304170181
  86 Precedence: bulk
  87 List-ID: <linux-wireless.vger.kernel.org>
  88 X-Mailing-List: linux-wireless@vger.kernel.org
  89
  90 This is a regression fix for 80+80 and 160 MHz support bits being
  91 cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz
  92 capability flags and assign valid center frequency 2 similar to
  93 VHT80_80.
  94
  95 Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware")
  96 Reported-by: Robert Marko <robert.marko@sartura.hr>
  97 Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299
  98 Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
  99 Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
 100 Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
 101 ---
 102  drivers/net/wireless/ath/ath11k/mac.c | 4 ----
 103  drivers/net/wireless/ath/ath11k/wmi.c | 3 ++-
 104  2 files changed, 2 insertions(+), 5 deletions(-)
 105
 106 --- a/drivers/net/wireless/ath/ath11k/mac.c
 107 +++ b/drivers/net/wireless/ath/ath11k/mac.c
 108 @@ -5585,10 +5585,6 @@ static int ath11k_mac_copy_he_cap(struct
 109
 110                 he_cap_elem->mac_cap_info[1] &=
 111                         IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK;
 112 -               he_cap_elem->phy_cap_info[0] &=
 113 -                       ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
 114 -               he_cap_elem->phy_cap_info[0] &=
 115 -                       ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;
 116
 117                 he_cap_elem->phy_cap_info[5] &=
 118                         ~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK;
 119 --- a/drivers/net/wireless/ath/ath11k/wmi.c
 120 +++ b/drivers/net/wireless/ath/ath11k/wmi.c
 121 @@ -871,7 +871,8 @@ static void ath11k_wmi_put_wmi_channel(s
 122
 123                 chan->band_center_freq2 = arg->channel.band_center_freq1;
 124
 125 -       } else if (arg->channel.mode == MODE_11AC_VHT80_80) {
 126 +       } else if ((arg->channel.mode == MODE_11AC_VHT80_80) ||
 127 +                  (arg->channel.mode == MODE_11AX_HE80_80)) {
 128                 chan->band_center_freq2 = arg->channel.band_center_freq2;
 129         } else {
 130                 chan->band_center_freq2 = 0;