projects / openwrt / staging / linusw.git / blob
? search:


bc2710a57de900cfd3d88ecbc07fd8c9e5552438
[openwrt/staging/linusw.git] /
1 From patchwork Wed Sep 18 21:20:50 2024
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: 13807213
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 4B2B11CB312
13 for <linux-wireless@vger.kernel.org>; Wed, 18 Sep 2024 21:21:14 +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=1726694475; cv=none;
18 b=uo8JC/iAnxSCZyXzNFarViwWJNwY+JldG9aDgn6LOK7yCxMusODCN3rw4mSCs0sLxHrfxFouDKWpiKeM7hGb/fzQzU2eh6bHNvzhjOqaTjAsJo7sVGj4L2QK1UPb2ZxMke35L51ztNTVhAc7IS17sn6blDZnU+1+RGRKXskHc78=
19 ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
20 s=arc-20240116; t=1726694475; c=relaxed/simple;
21 bh=nhEu2OadboIpWVwShgMmYabjiVuEo2mUKJhJlcUzvgI=;
22 h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
23 MIME-Version:Content-Type;
24 b=iPc43CIgA4O9RfgxO3cfBBvDShW3nh4Q/MVoL1JTtx8u/9t1CeFY7KstjtKiPdJ6vxx0yhZwXcwCRFfbZdfRduyybDRKPmgqN/VogzkwizBSFWBL41H02pCvee2mV3poTyZz9CnCJ5L7An5k7ARI3Eo6EwsgaAYIncO/tU2Jsao=
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=iXyzdRBT; 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="iXyzdRBT"
37 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1])
38 by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id
39 48I90GrT001584;
40 Wed, 18 Sep 2024 21:21:09 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 aj0umwCwR0cGrc/Vc7qz7QRYcnU4amMo6KwLL9RZRaA=; b=iXyzdRBTMie5qv2n
45 KocnG3cRtZjxDUMbNTj+in3o4zrIU5RFumLb3ZmgpbCZD9jcmxkc9fcTdtwxUz8e
46 LTodO1mKSkqtOufy45keXIYYJN3lxfFsZtA5bcmG+QCJZJmPaTpMaf9L9Us9e+JZ
47 Ngjh4JNR3UIXn5+UvNGrRNEWeAlCrwf9Z5bWl1mQmwmkVVuH3nMu1IyPidF3tzRk
48 AdQTPkPtpnoGlYwEWL/noPAYTf4OuZrqPCAj31iBfZvq2RjAdWtPx/ayYEQsNKCu
49 xoBLKjb8hppxfGqn06TpV73nTxvhEDwnwBTwfgrr+xVeKvwz6Mrh8aoYBdUeFUAh
50 OiuxDA==
51 Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com
52 [129.46.96.20])
53 by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41n4hf38cn-1
54 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
55 Wed, 18 Sep 2024 21:21:08 +0000 (GMT)
56 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com
57 [10.47.209.196])
58 by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id
59 48ILL7e8005093
60 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
61 Wed, 18 Sep 2024 21:21:07 GMT
62 Received: from ath12k-linux1.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, 18 Sep 2024 14:21:07 -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 V8 3/9] wifi: ath12k: move HE MCS mapper to a separate
75 function
76 Date: Wed, 18 Sep 2024 14:20:50 -0700
77 Message-ID: <20240918212056.4137076-4-quic_pradeepc@quicinc.com>
78 X-Mailer: git-send-email 2.34.1
79 In-Reply-To: <20240918212056.4137076-1-quic_pradeepc@quicinc.com>
80 References: <20240918212056.4137076-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-ORIG-GUID: zHmCiFNBcWNOH7v_I9cuj0l6gmfKvBVa
93 X-Proofpoint-GUID: zHmCiFNBcWNOH7v_I9cuj0l6gmfKvBVa
94 X-Proofpoint-Virus-Version: vendor=baseguard
95 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29
96 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01
97 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
98 priorityscore=1501 mlxscore=0
99 suspectscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015
100 mlxlogscore=999 adultscore=0 malwarescore=0 phishscore=0 impostorscore=0
101 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000
102 definitions=main-2409180140
103
104 Refactor the HE MCS mapper functionality in
105 ath12k_mac_copy_he_cap() into a new function.
106
107 This helps improve readability, extensibility and will be used
108 when adding support for 160 MHz bandwidth in subsequent patches.
109
110 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
111
112 Co-developed-by: Muna Sinada <quic_msinada@quicinc.com>
113 Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
114 Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
115 Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
116 ---
117 drivers/net/wireless/ath/ath12k/mac.c | 22 ++++++++++++++--------
118 1 file changed, 14 insertions(+), 8 deletions(-)
119
120 --- a/drivers/net/wireless/ath/ath12k/mac.c
121 +++ b/drivers/net/wireless/ath/ath12k/mac.c
122 @@ -5518,12 +5518,24 @@ static __le16 ath12k_mac_setup_he_6ghz_c
123 return cpu_to_le16(bcap->he_6ghz_capa);
124 }
125
126 +static void ath12k_mac_set_hemcsmap(struct ath12k_band_cap *band_cap,
127 + struct ieee80211_sta_he_cap *he_cap)
128 +{
129 + struct ieee80211_he_mcs_nss_supp *mcs_nss = &he_cap->he_mcs_nss_supp;
130 +
131 + mcs_nss->rx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
132 + mcs_nss->tx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
133 + mcs_nss->rx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
134 + mcs_nss->tx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
135 + mcs_nss->rx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
136 + mcs_nss->tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
137 +}
138 +
139 static void ath12k_mac_copy_he_cap(struct ath12k_band_cap *band_cap,
140 int iftype, u8 num_tx_chains,
141 struct ieee80211_sta_he_cap *he_cap)
142 {
143 struct ieee80211_he_cap_elem *he_cap_elem = &he_cap->he_cap_elem;
144 - struct ieee80211_he_mcs_nss_supp *mcs_nss = &he_cap->he_mcs_nss_supp;
145
146 he_cap->has_he = true;
147 memcpy(he_cap_elem->mac_cap_info, band_cap->he_cap_info,
148 @@ -5561,13 +5573,7 @@ static void ath12k_mac_copy_he_cap(struc
149 break;
150 }
151
152 - mcs_nss->rx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
153 - mcs_nss->tx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
154 - mcs_nss->rx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
155 - mcs_nss->tx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
156 - mcs_nss->rx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
157 - mcs_nss->tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
158 -
159 + ath12k_mac_set_hemcsmap(band_cap, he_cap);
160 memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
161 if (he_cap_elem->phy_cap_info[6] &
162 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT)
Staging tree of Linus Walleij