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 436EC2EEBCC; Mon, 5 May 2025 23:10:51 +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=1746486652; cv=none; b=YF+7i9Oy8HxOoKJhdKmDaipjrRWp8ZoePLp7zTaSqT92tw4zyYXjm/SEmCvdB7rFkQwujVDmPPl0VMiMCsF5KW8C0bRovj966JuFat+HD5s10wXhJ6gl/+3fct07bh8NZA3obIG2owcDgbTsixgxPJO0m7u6rJX1gWYEAlzFm1o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486652; c=relaxed/simple; bh=lDkW0xEZ9elFVTKpmQgbN4fZNCsqxVXNzoUBSQ6F45Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jdWhsLwyjtPR0nZ8JvLTMLi9v1WN2GtQr74pxWd0jJi0aEEvq0iqMy+4aFNXUjya2GvgEwfMG47F7yXpH/cR4PvQOMwBOsqvsj6bqpmrf9ZQdrLrbB2YhCqq1hdR9cYoomn0veBZkPkLwG3qCWjkek7AbVabFhnY2QqHmyPYnRk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iWhXOJPR; 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="iWhXOJPR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47B8AC4CEE4; Mon, 5 May 2025 23:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486651; bh=lDkW0xEZ9elFVTKpmQgbN4fZNCsqxVXNzoUBSQ6F45Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWhXOJPRutq6Rm8ckT0jePYi4NIngsBRSTsR/Sr9dxFlH7BrvvEva7/IgFOiuoxGk iKAVcup9BIOGOwa8w1sGRtpXfrn/0jqj5FVwnhHYInu3yN7MSigoRwABxWJ7spsXVX hLgLpbZHJLayfMQVkC61Vz53vZQ+cWgVyIf3wUjBSA3pFGOe9qk//hL4iyaFpQYLDJ /q2g2Y6/OsEBJEj9WlVXtTjABtVNiyWCjAkfSyfxOFyP5KoNyzgd4zokrmeiOHGpzn AWxeY+sRDWu40VL0xgkCuMsaAQsbxx6T4DYg5qLzBICsN27GTNJpNqnuzC8Xq9hzmP XAazJ9AbEbmqQ== 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.1 136/212] wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU Date: Mon, 5 May 2025 19:05:08 -0400 Message-Id: <20250505230624.2692522-136-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-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.1.136 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 7c390c2c608d8..8a47cfb358b16 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1552,8 +1552,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) @@ -1576,21 +1577,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