forked from Openwrt-EcoNet/openwrt
903566c2d6
Previous commits missed some refreshing Signed-off-by: Mantas Pucka <mantas@8devices.com> Link: https://github.com/openwrt/openwrt/pull/18512 Signed-off-by: Robert Marko <robimarko@gmail.com>
163 lines
7.7 KiB
Diff
163 lines
7.7 KiB
Diff
From patchwork Wed Sep 18 21:20:50 2024
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
|
|
X-Patchwork-Id: 13807213
|
|
X-Patchwork-Delegate: quic_jjohnson@quicinc.com
|
|
Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com
|
|
[205.220.180.131])
|
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
|
(No client certificate requested)
|
|
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B2B11CB312
|
|
for <linux-wireless@vger.kernel.org>; Wed, 18 Sep 2024 21:21:14 +0000 (UTC)
|
|
Authentication-Results: smtp.subspace.kernel.org;
|
|
arc=none smtp.client-ip=205.220.180.131
|
|
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
|
|
t=1726694475; cv=none;
|
|
b=uo8JC/iAnxSCZyXzNFarViwWJNwY+JldG9aDgn6LOK7yCxMusODCN3rw4mSCs0sLxHrfxFouDKWpiKeM7hGb/fzQzU2eh6bHNvzhjOqaTjAsJo7sVGj4L2QK1UPb2ZxMke35L51ztNTVhAc7IS17sn6blDZnU+1+RGRKXskHc78=
|
|
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
|
|
s=arc-20240116; t=1726694475; c=relaxed/simple;
|
|
bh=nhEu2OadboIpWVwShgMmYabjiVuEo2mUKJhJlcUzvgI=;
|
|
h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
|
|
MIME-Version:Content-Type;
|
|
b=iPc43CIgA4O9RfgxO3cfBBvDShW3nh4Q/MVoL1JTtx8u/9t1CeFY7KstjtKiPdJ6vxx0yhZwXcwCRFfbZdfRduyybDRKPmgqN/VogzkwizBSFWBL41H02pCvee2mV3poTyZz9CnCJ5L7An5k7ARI3Eo6EwsgaAYIncO/tU2Jsao=
|
|
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
|
|
dmarc=pass (p=none dis=none) header.from=quicinc.com;
|
|
spf=pass smtp.mailfrom=quicinc.com;
|
|
dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com
|
|
header.b=iXyzdRBT; arc=none smtp.client-ip=205.220.180.131
|
|
Authentication-Results: smtp.subspace.kernel.org;
|
|
dmarc=pass (p=none dis=none) header.from=quicinc.com
|
|
Authentication-Results: smtp.subspace.kernel.org;
|
|
spf=pass smtp.mailfrom=quicinc.com
|
|
Authentication-Results: smtp.subspace.kernel.org;
|
|
dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com
|
|
header.b="iXyzdRBT"
|
|
Received: from pps.filterd (m0279869.ppops.net [127.0.0.1])
|
|
by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id
|
|
48I90GrT001584;
|
|
Wed, 18 Sep 2024 21:21:09 GMT
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=
|
|
cc:content-transfer-encoding:content-type:date:from:in-reply-to
|
|
:message-id:mime-version:references:subject:to; s=qcppdkim1; bh=
|
|
aj0umwCwR0cGrc/Vc7qz7QRYcnU4amMo6KwLL9RZRaA=; b=iXyzdRBTMie5qv2n
|
|
KocnG3cRtZjxDUMbNTj+in3o4zrIU5RFumLb3ZmgpbCZD9jcmxkc9fcTdtwxUz8e
|
|
LTodO1mKSkqtOufy45keXIYYJN3lxfFsZtA5bcmG+QCJZJmPaTpMaf9L9Us9e+JZ
|
|
Ngjh4JNR3UIXn5+UvNGrRNEWeAlCrwf9Z5bWl1mQmwmkVVuH3nMu1IyPidF3tzRk
|
|
AdQTPkPtpnoGlYwEWL/noPAYTf4OuZrqPCAj31iBfZvq2RjAdWtPx/ayYEQsNKCu
|
|
xoBLKjb8hppxfGqn06TpV73nTxvhEDwnwBTwfgrr+xVeKvwz6Mrh8aoYBdUeFUAh
|
|
OiuxDA==
|
|
Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com
|
|
[129.46.96.20])
|
|
by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41n4hf38cn-1
|
|
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
|
|
Wed, 18 Sep 2024 21:21:08 +0000 (GMT)
|
|
Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com
|
|
[10.47.209.196])
|
|
by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id
|
|
48ILL7e8005093
|
|
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
|
|
Wed, 18 Sep 2024 21:21:07 GMT
|
|
Received: from ath12k-linux1.qualcomm.com (10.80.80.8) by
|
|
nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server
|
|
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
|
|
15.2.1544.9; Wed, 18 Sep 2024 14:21:07 -0700
|
|
From: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
|
|
To: <ath12k@lists.infradead.org>
|
|
CC: <linux-wireless@vger.kernel.org>,
|
|
Pradeep Kumar Chitrapu
|
|
<quic_pradeepc@quicinc.com>,
|
|
Muna Sinada <quic_msinada@quicinc.com>,
|
|
"Jeff
|
|
Johnson" <quic_jjohnson@quicinc.com>
|
|
Subject: [PATCH V8 3/9] wifi: ath12k: move HE MCS mapper to a separate
|
|
function
|
|
Date: Wed, 18 Sep 2024 14:20:50 -0700
|
|
Message-ID: <20240918212056.4137076-4-quic_pradeepc@quicinc.com>
|
|
X-Mailer: git-send-email 2.34.1
|
|
In-Reply-To: <20240918212056.4137076-1-quic_pradeepc@quicinc.com>
|
|
References: <20240918212056.4137076-1-quic_pradeepc@quicinc.com>
|
|
Precedence: bulk
|
|
X-Mailing-List: linux-wireless@vger.kernel.org
|
|
List-Id: <linux-wireless.vger.kernel.org>
|
|
List-Subscribe: <mailto:linux-wireless+subscribe@vger.kernel.org>
|
|
List-Unsubscribe: <mailto:linux-wireless+unsubscribe@vger.kernel.org>
|
|
MIME-Version: 1.0
|
|
X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To
|
|
nalasex01a.na.qualcomm.com (10.47.209.196)
|
|
X-QCInternal: smtphost
|
|
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800
|
|
signatures=585085
|
|
X-Proofpoint-ORIG-GUID: zHmCiFNBcWNOH7v_I9cuj0l6gmfKvBVa
|
|
X-Proofpoint-GUID: zHmCiFNBcWNOH7v_I9cuj0l6gmfKvBVa
|
|
X-Proofpoint-Virus-Version: vendor=baseguard
|
|
engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29
|
|
definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01
|
|
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
|
|
priorityscore=1501 mlxscore=0
|
|
suspectscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015
|
|
mlxlogscore=999 adultscore=0 malwarescore=0 phishscore=0 impostorscore=0
|
|
classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000
|
|
definitions=main-2409180140
|
|
|
|
Refactor the HE MCS mapper functionality in
|
|
ath12k_mac_copy_he_cap() into a new function.
|
|
|
|
This helps improve readability, extensibility and will be used
|
|
when adding support for 160 MHz bandwidth in subsequent patches.
|
|
|
|
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
|
|
|
|
Co-developed-by: Muna Sinada <quic_msinada@quicinc.com>
|
|
Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
|
|
Signed-off-by: Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com>
|
|
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
|
|
---
|
|
drivers/net/wireless/ath/ath12k/mac.c | 22 ++++++++++++++--------
|
|
1 file changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath12k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath12k/mac.c
|
|
@@ -5519,12 +5519,24 @@ static __le16 ath12k_mac_setup_he_6ghz_c
|
|
return cpu_to_le16(bcap->he_6ghz_capa);
|
|
}
|
|
|
|
+static void ath12k_mac_set_hemcsmap(struct ath12k_band_cap *band_cap,
|
|
+ struct ieee80211_sta_he_cap *he_cap)
|
|
+{
|
|
+ struct ieee80211_he_mcs_nss_supp *mcs_nss = &he_cap->he_mcs_nss_supp;
|
|
+
|
|
+ mcs_nss->rx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
|
|
+ mcs_nss->tx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
|
|
+ mcs_nss->rx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
+ mcs_nss->tx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
+ mcs_nss->rx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
+ mcs_nss->tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
+}
|
|
+
|
|
static void ath12k_mac_copy_he_cap(struct ath12k_band_cap *band_cap,
|
|
int iftype, u8 num_tx_chains,
|
|
struct ieee80211_sta_he_cap *he_cap)
|
|
{
|
|
struct ieee80211_he_cap_elem *he_cap_elem = &he_cap->he_cap_elem;
|
|
- struct ieee80211_he_mcs_nss_supp *mcs_nss = &he_cap->he_mcs_nss_supp;
|
|
|
|
he_cap->has_he = true;
|
|
memcpy(he_cap_elem->mac_cap_info, band_cap->he_cap_info,
|
|
@@ -5562,13 +5574,7 @@ static void ath12k_mac_copy_he_cap(struc
|
|
break;
|
|
}
|
|
|
|
- mcs_nss->rx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
|
|
- mcs_nss->tx_mcs_80 = cpu_to_le16(band_cap->he_mcs & 0xffff);
|
|
- mcs_nss->rx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
- mcs_nss->tx_mcs_160 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
- mcs_nss->rx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
- mcs_nss->tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff);
|
|
-
|
|
+ ath12k_mac_set_hemcsmap(band_cap, he_cap);
|
|
memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
|
|
if (he_cap_elem->phy_cap_info[6] &
|
|
IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT)
|