From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 50659286D7F; Mon, 5 May 2025 22:28:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484134; cv=none; b=LKbnnqXrZatjrnFtDSzO4jMDfz6Z1SeL7iIC3pAvpooxAN51WTMudejRgYdQ5OLCXGkiuoz+TY0YnokVY8eAzf3D58W5UVjGwnrzBUNfZIwwvjnK33Mq01qgSSp83+UeMbVFUpdl/GUd2FqI/bn1pmpSF3UxpjHkgj2uDMzBmbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484134; c=relaxed/simple; bh=lDI5lXxLJd+kuu69lqmhxv2yEnROS6JyMbozAYDSWLE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MdDkchZigga8jZTeMud29ZTNwfX/ioJ7IGIR1SWjefD4lh2yYYQ9SA9AYmNXX87R6/SvxxxJwhW5ngJ51xfwGUJexAu/1D2+JgIhmaof795vBYbfEwmBQpW5C6NcqzPLhFxqwPSf9hblDDf7SEwlE6/YRTG1F47+HuTiRjmngtk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oyGyno7+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oyGyno7+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69471C4CEED; Mon, 5 May 2025 22:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484134; bh=lDI5lXxLJd+kuu69lqmhxv2yEnROS6JyMbozAYDSWLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oyGyno7+3G1vIxMiCE4ZEDSqngUs0o2OgqyMDJLU3B02OjajWVl1/yv7U9Ro5Dn/p bbjW4qW53Mw0DqYWQG/DgIxlMjxxoQlcBQIyMnPJ00d+zLJZgz6Gk4fnDOJbHVo9Y9 2be73wu3vQoXh7R/rzYef6+zYoUtxDCoZjE5EzJzkT48SV4tJeqIilT7a6gx6gp43p whs8XtICYzVX4kpwr61YGPXSRvKLLstNMyNhIEKbcqI23BCwfQSfxSLG4iG+roz1Rp Bql2y04q9UQOd00OSi+nJWmIqsLxDN5+32beMcI3eyxIJh+9m+IysISA3693dsaqBP IrdWbKaR6W9Dg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bitterblue Smith , Ping-Ke Shih , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 364/642] wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU Date: Mon, 5 May 2025 18:09:40 -0400 Message-Id: <20250505221419.2672473-364-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Bitterblue Smith [ Upstream commit 6be7544d19fcfcb729495e793bc6181f85bb8949 ] Set the MCS maps and the highest rates according to the number of spatial streams the chip has. For RTL8814AU that is 3. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/e86aa009-b5bf-4b3a-8112-ea5e3cd49465@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/main.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 0cee0fd8c0ef0..d66abb31f091b 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1597,8 +1597,9 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev, struct ieee80211_sta_vht_cap *vht_cap) { struct rtw_efuse *efuse = &rtwdev->efuse; - u16 mcs_map; + u16 mcs_map = 0; __le16 highest; + int i; if (efuse->hw_cap.ptcl != EFUSE_HW_CAP_IGNORE && efuse->hw_cap.ptcl != EFUSE_HW_CAP_PTCL_VHT) @@ -1621,21 +1622,15 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev, if (rtw_chip_has_rx_ldpc(rtwdev)) vht_cap->cap |= IEEE80211_VHT_CAP_RXLDPC; - mcs_map = IEEE80211_VHT_MCS_SUPPORT_0_9 << 0 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 4 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 6 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 8 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 10 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 | - IEEE80211_VHT_MCS_NOT_SUPPORTED << 14; - if (efuse->hw_cap.nss > 1) { - highest = cpu_to_le16(780); - mcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 << 2; - } else { - highest = cpu_to_le16(390); - mcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED << 2; + for (i = 0; i < 8; i++) { + if (i < efuse->hw_cap.nss) + mcs_map |= IEEE80211_VHT_MCS_SUPPORT_0_9 << (i * 2); + else + mcs_map |= IEEE80211_VHT_MCS_NOT_SUPPORTED << (i * 2); } + highest = cpu_to_le16(390 * efuse->hw_cap.nss); + vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map); vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map); vht_cap->vht_mcs.rx_highest = highest; -- 2.39.5