git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From patchwork Wed May 21 22:45:34 2025
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 X-Patchwork-Submitter: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
   6 X-Patchwork-Id: 14096123
   7 X-Patchwork-Delegate: quic_jjohnson@quicinc.com
   8 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com
   9  [205.220.180.131])
  10         (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
  11         (No client certificate requested)
  12         by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3C04239581
  13         for <linux-wireless@vger.kernel.org>; Wed, 21 May 2025 22:45:57 +0000 (UTC)
  14 Authentication-Results: smtp.subspace.kernel.org;
  15  arc=none smtp.client-ip=205.220.180.131
  16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
  17         t=1747867561; cv=none;
  18  b=JUfYB6YNOea3E6luldlHf63eW7OUVXEtawJXGCeH7nt9iIJpG0ODfz3v+Zl+gtQtUZ1ELh/UAhCubbThHH30w661eEN5+cQarbiqdd1cN5dnkAsmZUNSD6l//QpurFV6Wsvv4Nr2fYgyuAVHf9JDoITZKNEbIki68J7WTV+fieU=
  19 ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
  20         s=arc-20240116; t=1747867561; c=relaxed/simple;
  21         bh=e6/wBkUC5dKwNLeEqNLmC/3pJt4EcGfxZRx+zntD5Ek=;
  22         h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
  23          MIME-Version:Content-Type;
  24  b=bg3Y4gdyPqhSKZtqqeN+SjMvTgg+BVUsyqAvkS3YPjV+C7dPwxcByNFjDRsuBqwHuSvgolo2ISExqyfJkgT6Flp4H+hriFJHcMdI0WmDf9NrBPI+E07JvNLDvP5X59C6pSrqpjXYngUV6AvPCJL7ynVBFF80h0neCm0IRu8Ur8w=
  25 ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
  26  dmarc=pass (p=none dis=none) header.from=quicinc.com;
  27  spf=pass smtp.mailfrom=quicinc.com;
  28  dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com
  29  header.b=LbIprPEi; arc=none smtp.client-ip=205.220.180.131
  30 Authentication-Results: smtp.subspace.kernel.org;
  31  dmarc=pass (p=none dis=none) header.from=quicinc.com
  32 Authentication-Results: smtp.subspace.kernel.org;
  33  spf=pass smtp.mailfrom=quicinc.com
  34 Authentication-Results: smtp.subspace.kernel.org;
  35         dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com
  36  header.b="LbIprPEi"
  37 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1])
  38         by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id
  39  54LIdAVE024983;
  40         Wed, 21 May 2025 22:45:54 GMT
  41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=
  42         cc:content-transfer-encoding:content-type:date:from:in-reply-to
  43         :message-id:mime-version:references:subject:to; s=qcppdkim1; bh=
  44         oR9JZ4DE7PwiZ/DcP72BpK9yTZspsBeRbWSrP3w24nY=; b=LbIprPEif55TZs6Z
  45         ZsvTaIhFDxESbkxn/avX548dzh51JY3wFWHowpcPEnJJdIE1oNPWkxrPo0hHkyUb
  46         UICPtIHoZHdMwN/uHPyglzBnBLNP82LGLHZI5eHx6jVz4INyCFm1Gmof8YNLLIo/
  47         pTKj4Qx3OO0jH6zSnAoKIIg39v5TWetjVZbL2qbNR+GImD0RtoefBQxRgyJWn11r
  48         O3ycFAW9xlW8wYJql07vue+hM3MWNtk5EPqF70c7JrrmMAYvTyOFuP0Kaf11szIB
  49         mF4bMyb+bb1/QA6moW7LDIoDBWEjCLINcTdGUPTnwnfBWlxZJhZoMqzU9ZuZgvsR
  50         1UjthA==
  51 Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com
  52  [129.46.96.20])
  53         by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf4vc5x-1
  54         (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
  55         Wed, 21 May 2025 22:45:54 +0000 (GMT)
  56 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com
  57  [10.47.209.196])
  58         by NALASPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id
  59  54LMjrWL023291
  60         (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
  61         Wed, 21 May 2025 22:45:53 GMT
  62 Received: from ath12k-linux2.qualcomm.com (10.80.80.8) by
  63  nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server
  64  (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
  65  15.2.1544.9; Wed, 21 May 2025 15:45:52 -0700
  66 From: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
  67 To: <ath12k@lists.infradead.org>
  68 CC: <linux-wireless@vger.kernel.org>,
  69         Pradeep Kumar Chitrapu
  70         <quic_pradeepc@quicinc.com>,
  71         Muna Sinada <quic_msinada@quicinc.com>,
  72         "Jeff
  73  Johnson" <quic_jjohnson@quicinc.com>
  74 Subject: [PATCH ath-next V14 4/9] wifi: ath12k: generate rx and tx mcs maps
  75  for supported HE mcs
  76 Date: Wed, 21 May 2025 15:45:34 -0700
  77 Message-ID: <20250521224539.355985-5-quic_pradeepc@quicinc.com>
  78 X-Mailer: git-send-email 2.43.0
  79 In-Reply-To: <20250521224539.355985-1-quic_pradeepc@quicinc.com>
  80 References: <20250521224539.355985-1-quic_pradeepc@quicinc.com>
  81 Precedence: bulk
  82 X-Mailing-List: linux-wireless@vger.kernel.org
  83 List-Id: <linux-wireless.vger.kernel.org>
  84 List-Subscribe: <mailto:linux-wireless+subscribe@vger.kernel.org>
  85 List-Unsubscribe: <mailto:linux-wireless+unsubscribe@vger.kernel.org>
  86 MIME-Version: 1.0
  87 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To
  88  nalasex01a.na.qualcomm.com (10.47.209.196)
  89 X-QCInternal: smtphost
  90 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800
  91  signatures=585085
  92 X-Proofpoint-GUID: mYgnUwiU6CWGXCKmK4mo491eQG1yf62Y
  93 X-Proofpoint-ORIG-GUID: mYgnUwiU6CWGXCKmK4mo491eQG1yf62Y
  94 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIxMDIyNiBTYWx0ZWRfX1nkoUF8smaXX
  95  IWIOVUfe7hMPdAVBJy7J1imFvumQnVaEdoZ98Hgv5FTjeK2Ebgl2R2fohvg1z4LsyCLnU8qfg96
  96  1OdC0+PM8u7DhRIEnk7H2EZt0UJoJRxlc7daiIvimTjbBLu53yfgzses5Gth0zLCzoih5ffW/H5
  97  1h2tf1ZE4W6AmHjQJc+WE0P3RhBMdl286VT/kc0ko03He0+5/QdxsynqL2e4svB4f3035pzXOEK
  98  dUS4nBFSZJXuBkq0d//SizRJgH9egq51A/OVPm8om04qEcOK3x9OmrrborAen5I0iuLaqAMMBXa
  99  nlUKQ4fpPRovjAByevo6BIIwB698Nmo72bZcFiWOocONR92lAssB6pFXJnuwOC6VQ7MJE7DKc0x
 100  5UnlyGSMzMAM7cQXuGFk1AK16e6Tu/rC5YA6A4ogDKajrcBGepxGFKcZ+xK4+BwuwgI4Qysv
 101 X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682e57a2 cx=c_pps
 102  a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17
 103  a=GEpy-HfZoHoA:10 a=dt9VzEwgFbYA:10 a=COk6AnOGAAAA:8 a=WmtfbAKxhnfIJFSrnnQA:9
 104  a=TjNXssC_j7lpFel5tvFf:22
 105 X-Proofpoint-Virus-Version: vendor=baseguard
 106  engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40
 107  definitions=2025-05-21_07,2025-05-20_03,2025-03-28_01
 108 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
 109  phishscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 spamscore=0
 110  bulkscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxscore=0
 111  impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc=
 112  route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000
 113  definitions=main-2505210226
 114
 115 Generate rx and tx mcs maps in ath12k_mac_set_hemcsmap() based
 116 on number of supported tx/rx chains and set them in supported
 117 mcs/nss for HE capabilities.
 118
 119 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
 120
 121 Co-developed-by: Muna Sinada <quic_msinada@quicinc.com>
 122 Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
 123 Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
 124 Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
 125 ---
 126  drivers/net/wireless/ath/ath12k/mac.c | 40 ++++++++++++++++++++-------
 127  1 file changed, 30 insertions(+), 10 deletions(-)
 128
 129 --- a/drivers/net/wireless/ath/ath12k/mac.c
 130 +++ b/drivers/net/wireless/ath/ath12k/mac.c
 131 @@ -7339,20 +7339,40 @@ static __le16 ath12k_mac_setup_he_6ghz_c
 132         return cpu_to_le16(bcap->he_6ghz_capa);
 133  }
 134
 135 -static void ath12k_mac_set_hemcsmap(struct ath12k_band_cap *band_cap,
 136 +static void ath12k_mac_set_hemcsmap(struct ath12k *ar,
 137 +                                   struct ath12k_pdev_cap *cap,
 138                                     struct ieee80211_sta_he_cap *he_cap)
 139  {
 140         struct ieee80211_he_mcs_nss_supp *mcs_nss = &he_cap->he_mcs_nss_supp;
 141 +       u16 txmcs_map, rxmcs_map;
 142 +       u32 i;
 143
 144 -       mcs_nss->rx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
 145 -       mcs_nss->tx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
 146 -       mcs_nss->rx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
 147 -       mcs_nss->tx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
 148 -       mcs_nss->rx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
 149 -       mcs_nss->tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
 150 +       rxmcs_map = 0;
 151 +       txmcs_map = 0;
 152 +       for (i = 0; i < 8; i++) {
 153 +               if (i < ar->num_tx_chains &&
 154 +                   (ar->cfg_tx_chainmask >> cap->tx_chain_mask_shift) & BIT(i))
 155 +                       txmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2);
 156 +               else
 157 +                       txmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2);
 158 +
 159 +               if (i < ar->num_rx_chains &&
 160 +                   (ar->cfg_rx_chainmask >> cap->tx_chain_mask_shift) & BIT(i))
 161 +                       rxmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2);
 162 +               else
 163 +                       rxmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2);
 164 +       }
 165 +
 166 +       mcs_nss->rx_mcs_80 = cpu_to_le16(rxmcs_map & 0xffff);
 167 +       mcs_nss->tx_mcs_80 = cpu_to_le16(txmcs_map & 0xffff);
 168 +       mcs_nss->rx_mcs_160 = cpu_to_le16(rxmcs_map & 0xffff);
 169 +       mcs_nss->tx_mcs_160 = cpu_to_le16(txmcs_map & 0xffff);
 170 +       mcs_nss->rx_mcs_80p80 = cpu_to_le16(rxmcs_map & 0xffff);
 171 +       mcs_nss->tx_mcs_80p80 = cpu_to_le16(txmcs_map & 0xffff);
 172  }
 173
 174 -static void ath12k_mac_copy_he_cap(struct ath12k_band_cap *band_cap,
 175 +static void ath12k_mac_copy_he_cap(struct ath12k *ar,
 176 +                                  struct ath12k_band_cap *band_cap,
 177                                    int iftype, u8 num_tx_chains,
 178                                    struct ieee80211_sta_he_cap *he_cap)
 179  {
 180 @@ -7396,7 +7416,7 @@ static void ath12k_mac_copy_he_cap(struc
 181                 break;
 182         }
 183
 184 -       ath12k_mac_set_hemcsmap(band_cap, he_cap);
 185 +       ath12k_mac_set_hemcsmap(ar, &ar->pdev->cap, he_cap);
 186         memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
 187         if (he_cap_elem->phy_cap_info[6] &
 188             IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT)
 189 @@ -7586,7 +7606,7 @@ static int ath12k_mac_copy_sband_iftype_
 190
 191                 data[idx].types_mask = BIT(i);
 192
 193 -               ath12k_mac_copy_he_cap(band_cap, i, ar->num_tx_chains, he_cap);
 194 +               ath12k_mac_copy_he_cap(ar, band_cap, i, ar->num_tx_chains, he_cap);
 195                 if (band == NL80211_BAND_6GHZ) {
 196                         data[idx].he_6ghz_capa.capa =
 197                                 ath12k_mac_setup_he_6ghz_cap(cap, band_cap);