From patchwork Sat Feb 15 21:58:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865832 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BF57E56C for ; Sat, 15 Feb 2025 21:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656742; cv=none; b=WiDw0PuSdoBjzgkcXRuRS8u5LUa1o/pBk/b4KYxIMPDFjsiwS0B1SU3QuvhqwXBL7eYUqod4lAOmTW9wvGCvUYk/fzfA01Lr8lInQwAJYDl2ZYjptIhIlijgPdwRxf/mNRtqAjQ3N4n48Qz0tobY7y8tCUdq/T2HIA3LeFOVn/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656742; c=relaxed/simple; bh=bPh5aX1KMufNygTF+jz98s8+8yq2lFeEf+WX1wnXL1w=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=bEG1B4UPwLz49sV00A4DwXfO0ga+/KEE6ODf95BkxlYo9EuM10lBQoACnrUdfeRTtyg4MKFowcmzPm5am0mJk6sbd/E27sU3RIqaZ+vazsgg9kMp4wD7BLSBgTfe2RENWNu2z/wws2AkI0loIrXlcTH/ZfKQuswbZmXnnp6XkRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ogk8FT+g; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ogk8FT+g" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-abb7a6ee2deso87866066b.0 for ; Sat, 15 Feb 2025 13:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656739; x=1740261539; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=LyaXH8Duwq8+kKiyVhkjUhKETvgb1TWs8NiKCV6pHJo=; b=Ogk8FT+g7xKLuL2CDmJHC1JWmT5vUGeKrwj2PNK2l/YVkVL38dLNKOMMYThAzrpl2y OlqYTq0VYtSdZPpW+aBzLACEN1jldHpnB3TNW2mYWOepJ9Y+QN0zEAVZSs3XCrN0Quuu orJudGjWNeMzcp2Z+GB83CfzEYnN9dtVEsO0FCEOPX9acjV+bay/1NIhtLeMeVuSie/i jeI6MSmFERUtZbt/rYmBmX9z0ParWnn1/PiYOmCNSdN7f1TSBT1bbrSGjrGYX/x7QxGT HSNclSidVvBuXrEipTj8qTEI3wxwjiPPnHdQIsfagCT8Ba+tU/9yuRu4nmcilJbCohcG F9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656739; x=1740261539; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LyaXH8Duwq8+kKiyVhkjUhKETvgb1TWs8NiKCV6pHJo=; b=uFcY1MnD8U7NEpdRSXRPO068bHIGuhsf/8U0j9cQ0Eg4GtFPgaYptneEngm1eNEY4h ZvX8oDjk2ziE3LR3BGd2DWXemZCt6LEeR2Bm1ofySfFuwm3uYLNMEp1aaBouu4gRZFpV NSYLCJDitf97VUuqOTQNlqU2thzPDRxZ7IzA4F/jkAesUEN3GbNdUywV6E/NOVmtmbG3 nl0G4jZZUUUS86/KoeiZdFtZZz+BI4zH2EaWi4I6I7dxXHcFCPQSnwoNYojaGKh7hyoI pboOYlDqNABtXrF5GQI6HE80p6raU61qbJtxpiyuJT1Y0gVkfnv9YkaJs1VyWOFG3xfD p9IA== X-Gm-Message-State: AOJu0YxTcFaM/bSju0A2St86h++mrWGorKQhtGfyXfIa+NuUIavaf5Ga juVWL5l27HTwTdQNcfO3+PNnn3BKEEr61GyzcBIYsjlwFduHLbXu/5h06A== X-Gm-Gg: ASbGncswLdJPD16gdNc0B8YPxWQPJ2UzfvflEhlO0boir+kcCRURP8BInJsMsumlfhz qRlhPLY08ReeTadVPwXhoUY+07dsSHTiTKUNhO91Y8G5kTviBEQcM9liPEGtGLDMJJBzxOVELe9 merNfOVCvKt2aIn1i2lJtISSALnCH6cehZzPGg4IibKtT/cKc88AJr89ZD7Zc+T0wJ/NWFO03wM ve8MDub/t5FIvfpWxvY0dY0PJmlvHWCuelDPqKtt772AWDRa/xyKZhzrJ5Du6LkBQXLX/rOmu2Q p8cweNIqInoaCC9ygh48gyu1 X-Google-Smtp-Source: AGHT+IEH+l2A4h0QdbbA+9bNrXMBX6hDFbpSp54sX5thTxycbv82OuEUeY7VC1mhTD5Okqr/accmKg== X-Received: by 2002:a17:906:6a03:b0:aae:8495:e064 with SMTP id a640c23a62f3a-abb70d77263mr413037866b.40.1739656738483; Sat, 15 Feb 2025 13:58:58 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba5325b58bsm591583366b.74.2025.02.15.13.58.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 13:58:58 -0800 (PST) Message-ID: <749490ce-6663-4c82-bdf2-8df1e237fd74@gmail.com> Date: Sat, 15 Feb 2025 23:58:56 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 1/8] wifi: rtw88: Fix rtw_mac_power_switch() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> rtw_mac_power_switch() checks bit 8 of REG_SYS_STATUS1 to see if the chip is powered on. This bit appears to be always on in the RTL8814AU, so ignore it. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Fix indentation. --- drivers/net/wireless/realtek/rtw88/mac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c index 63edf6461de8..0491f501c138 100644 --- a/drivers/net/wireless/realtek/rtw88/mac.c +++ b/drivers/net/wireless/realtek/rtw88/mac.c @@ -291,6 +291,7 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) if (rtw_read8(rtwdev, REG_CR) == 0xea) cur_pwr = false; else if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB && + chip->id != RTW_CHIP_TYPE_8814A && (rtw_read8(rtwdev, REG_SYS_STATUS1 + 1) & BIT(0))) cur_pwr = false; else From patchwork Sat Feb 15 21:59:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865518 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BECEE56C for ; Sat, 15 Feb 2025 21:59:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656768; cv=none; b=XYe4W4PwxFxM5wb45gw+8jI0yMOw30hb1YSiaYpnTf79RwheOgMz4aFizUp6hTg97IQMOKpw8efnYCwVDX5xX93N5vjj1if3ugfjlLQWFfKSJkODjVvhARahC11J0/KqABAn77IxJ90Z82gEHTYf9ueG9D71Nd3CUujbXegMejQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656768; c=relaxed/simple; bh=lpaIeRy5838Rysfr9zYAhfeANwvaxqxLzWRBATGFemY=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=MzFQ71JW1U8gRyUvRvxjwkymRkSGkVLThpGO9EqeHcGuXKL9goeYjRvcxJ14aeVHozQlQucD/QVLjIYOzhsJkthQoBLfc6ccu3djyOfFUJ9Kg3Kw/2hzOGrsKrpNipTTCn06fQE/jr2dgYHSPOGVer2rzzHSQOjJYEwYYDrZPh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ghXp9jPY; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ghXp9jPY" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5e050b1491eso52327a12.0 for ; Sat, 15 Feb 2025 13:59:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656765; x=1740261565; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=N9xT4cuLlJ+K8+8PmJXgCZwV44cEbTnclU9WvsKTO0s=; b=ghXp9jPYVy67GpMCyY4Jwy07UBYNzPwJ58KBA0uyGO2j7Yiz0fk+4vL+8KEbNkVkrI wC9JBptFfL6zE2bHiBBH3L2z2GQ3d3rU+Jn0rXHkq6mFJ+mbPkbaK/v5+LQGSBi4Qv3G RgqcEjrrm9K63FZocKSnQtGiYIWKc4lzKumfHCx+crlWlB4p4+UXMriFiOBd456bvYFN 2WIgYdidg8XK45jYhHhFLG3V0ZGIH2smjNb8v7gIIQ/B6stcy9UhoHmEnszG6CSCvSs5 fi2bjdHObP/EJK3DNpiTeMKUrS1FOoSFyyJ1pPlbat+bcKVUZPsTbnCi0h1WYsHd9sFD QtwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656765; x=1740261565; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=N9xT4cuLlJ+K8+8PmJXgCZwV44cEbTnclU9WvsKTO0s=; b=mfYefFwb/va5bbRr5ThdMXh9UYrS8fcjt7aUaLwqCpZewzWUyK5vYkfLoEWQifhpET 9TR/qt07T2F7l1kT0U8B6BtdHZgD0eLpxBZMFjMJKaa2J8icCC+LTJl/9vNlRJ6+8o6N fMbkkQdkpfsjor5DWJiVhqJ3Htq6V6qXLJwBqX6Y2BBqaRFvN+b+hNOv/GgZhIaTi71Y z+8HB97g8nPYSp9YPQmPrBxhyvuhaaCfJnpTTs0Pp+92j4hVB46VwugqvoRS+AKoSU6Q kv8pt179Bagn4hL9hMvxkF7O5GUCTYnRAjTjq9+7pC8JYolIkt7OZ7foj5AX6tiww9uM oguQ== X-Gm-Message-State: AOJu0YyVhYIT+LcY8te5ekS0j/+FvmcTvVH/BbkBchUFFpwEm9azzzeO x7iaOmObV64OhLfRxQiC8rxgEU4y6XlMVPSGSSk4redChFiCTmti/hfy3g== X-Gm-Gg: ASbGncsBMu3OrEvzXbN+++gyX33iYOlGezMwD5bWTwW2sz8hatmBdV7aCcpreVUVRrK xUM9b0ClivUfqQ0bPjZVEM9qbHt8hsTR31WI9c9cHa6HLvAHsS2bjiGlCaW7jEBpCTsjggfhoLB N8TWsZkESELtZkKNcV4gldo1Ze3niDwc2k/8LWgB1XdTCe+dRtm1x8CI3/Mu6CPR+F1CBmSG8RC lcY8lYepmDM/79v9EbZ3Oifa+86jPObsEOKqwK+ZzpKB+0inde1YlqnexDWMAwR/Kve8M47Ji82 wjJ6TLm7hejOvT+ruu4pYJZ5 X-Google-Smtp-Source: AGHT+IHw9A1kPSMueAIPZ5zgJtUMTrzOBxZdC8xCr02//0uusUNpDfIzxBNq6PxFVeDWut0wb/NnDg== X-Received: by 2002:a05:6402:42cb:b0:5dc:92a9:8a5 with SMTP id 4fb4d7f45d1cf-5e037224506mr4175744a12.6.1739656764532; Sat, 15 Feb 2025 13:59:24 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1c4692sm5023359a12.31.2025.02.15.13.59.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 13:59:23 -0800 (PST) Message-ID: <9bb25bb0-ee46-4390-af6c-6bbd9edf3121@gmail.com> Date: Sat, 15 Feb 2025 23:59:22 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 2/8] wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> This function translates the rate number reported by the hardware into something mac80211 can understand. It was ignoring the 3SS and 4SS HT rates. Translate them too. Also set *nss to 0 for the HT rates, just to make sure it's initialised. Signed-off-by: Bitterblue Smith --- v2: - Set *nss for the HT rates. --- drivers/net/wireless/realtek/rtw88/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/util.c b/drivers/net/wireless/realtek/rtw88/util.c index e222d3c01a77..9baafea65d64 100644 --- a/drivers/net/wireless/realtek/rtw88/util.c +++ b/drivers/net/wireless/realtek/rtw88/util.c @@ -101,8 +101,9 @@ void rtw_desc_to_mcsrate(u16 rate, u8 *mcs, u8 *nss) *nss = 4; *mcs = rate - DESC_RATEVHT4SS_MCS0; } else if (rate >= DESC_RATEMCS0 && - rate <= DESC_RATEMCS15) { + rate <= DESC_RATEMCS31) { *mcs = rate - DESC_RATEMCS0; + *nss = 0; } } From patchwork Sat Feb 15 22:00:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865831 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B50F153803 for ; Sat, 15 Feb 2025 22:00:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656829; cv=none; b=bGjAyrfYSMi4Jwi2zvWF+v2k2g76Zv6g4PaXzQdx8yfi9JBJFk0hriEIQzuuQjrEt5o3sz2eoywzZUdQLY7XSzWMbnyd7/ckhWdxjhJFXWsu/dErmmn2GTsB9RYOMDkv4EATgc+hp4ov615hLCKTY4D2xNefWNcdGir4HhvIG5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656829; c=relaxed/simple; bh=S0qMUJ6XSJJkzXl8EPzk0cQghbNyHbEQ2fDm/vBz90I=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=Ik/4JuAftqq/Og6sarrv7YqXVEEzK6YShsVf3AHorowvUxg18pMPn6VLOodiVEfDt3lT9HfwOa6Hl/+jAwcWJ/Uf65M3sD4KENkC3zmZRbpDgzoHwf8YZx5rDGtsG0ukCjPHCHBzf+OegIkWXiQISCLi+Ar6GTO5o8P9Od70pwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kp3EWUwT; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kp3EWUwT" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-aaec111762bso727098566b.2 for ; Sat, 15 Feb 2025 14:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656826; x=1740261626; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=uGG6dmGTzJ+8pUiGHLaAE4SoVCuq+G9S7DsnSuwYi5g=; b=Kp3EWUwTPLnNy2lwUMqvI8OExAbjaW5hX2DNCknqIxHg8+lT8MmGrhcba/vFYOaGdz 0FV3C4VNHL56QQGxntV1ti76qVI40hELy3+C/cFrDbcToicbZemKwdNeZLO+4tJyVyF3 1XVRlgWPoICcZK+ZMYxyoNLJ7mgSN80Dp6ZVJiliJIYIBrVP3upvLAloetD1WyhkVHTX tfgJf9k9633M1loKirZDqpxXkYg88jvagNfhODR+guJK/KgnIiwCmFL9GgoOU92JYaIn t3C5RiGZQM2SUBpZhTM4ADt/nA0e1qajLZcQQ3GZnyaZFtecNLvaYVmRKEQkKb3dAdgT 5Fcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656826; x=1740261626; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uGG6dmGTzJ+8pUiGHLaAE4SoVCuq+G9S7DsnSuwYi5g=; b=toDNiFEdWWcoSVScDZlsiGHexTkfUq6nwnZuK1FKnLNUXuXn2WFV4cKNNf+wBTPycb mM/t6Md8AO4eOta3IIC9+Yr83PiUGHifCii86ISWQvp6XHiIdAKNHIxgaA0EbK6Axxfb /xGwa/JDKTZ8OrF2nL3U4UhtnRj5zb8wEMyw/8o1phbhb+PxK7g0DxwjKC2iDOc2Nau/ sxUTXf4C1T8Vblt2rOz4I7eKxdr/MwOEFduL68KWvaTHPc5jw5RPUNu4Qs3MYDZytZfF Azo/IDZus/Jz9uuD4KjrcCT0zfys1HojVAH+Qom1qNMiSptgTDYTsuIu6ATSUUn/1yrL rhJA== X-Gm-Message-State: AOJu0Yx4rVgW4QPuex7CANRlQsuEq7/z78aAYuPdPZADft2DrE4NFHmf QSzyUxnSVBDz/z8YTx8npgc4ofBE4kvD1Q+0HBDGd8eEm0kpVbHWiPhT+A== X-Gm-Gg: ASbGncvGmYZ/NcQzROVGU36egubRkngUuDwf+NFa6uTh79BzA3MxYrE2YvSBWcpF7QO U6iSp8P+V7CercvnOD/uAQg+fWUw3/lBKKA5w8DaUteYTSA1YjYMmQOjXsRzu4I949o2sJWTeI4 6EJN9Wj60Q61ijLZ20sETOPu27QvgfcJ3y4FiU7A7Wk2Gl7XK+Xw/o5rIaEIB5/6RC3ZZnCVoXo A9/QwSj5RkNpBLgkRyPFWnzSmrA4lx3pJkVsNubxw9ASPhwr201aYaN+MdIDuqbkIvqxitRy1Ce AZ0vZbb2O/MZmXApVJGbGaTX X-Google-Smtp-Source: AGHT+IHPoWyP39Xq1ur2J9cpBGHPQnl5ZA6hiAyRYIzLa07bMkGDj3BzD9KfuA19uLAG0iktKfon2g== X-Received: by 2002:a17:906:c154:b0:ab3:7812:ba69 with SMTP id a640c23a62f3a-abb70bfc710mr500834566b.5.1739656826065; Sat, 15 Feb 2025 14:00:26 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba533998d4sm600387066b.130.2025.02.15.14.00.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:00:25 -0800 (PST) Message-ID: <178f6dae-b72b-4f73-bac1-4678dcc1062b@gmail.com> Date: Sun, 16 Feb 2025 00:00:24 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 3/8] wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Set the RX mask and the highest RX rate according to the number of spatial streams the chip can receive. For RTL8814AU that is 3. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Add Acked-by. --- drivers/net/wireless/realtek/rtw88/main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index e4f9b744f24d..3319bb5044c3 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1565,6 +1565,7 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev, { const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; + int i; ht_cap->ht_supported = true; ht_cap->cap = 0; @@ -1584,17 +1585,11 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev, ht_cap->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; ht_cap->ampdu_density = chip->ampdu_density; ht_cap->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; - if (efuse->hw_cap.nss > 1) { - ht_cap->mcs.rx_mask[0] = 0xFF; - ht_cap->mcs.rx_mask[1] = 0xFF; - ht_cap->mcs.rx_mask[4] = 0x01; - ht_cap->mcs.rx_highest = cpu_to_le16(300); - } else { - ht_cap->mcs.rx_mask[0] = 0xFF; - ht_cap->mcs.rx_mask[1] = 0x00; - ht_cap->mcs.rx_mask[4] = 0x01; - ht_cap->mcs.rx_highest = cpu_to_le16(150); - } + + for (i = 0; i < efuse->hw_cap.nss; i++) + ht_cap->mcs.rx_mask[i] = 0xFF; + ht_cap->mcs.rx_mask[4] = 0x01; + ht_cap->mcs.rx_highest = cpu_to_le16(150 * efuse->hw_cap.nss); } static void rtw_init_vht_cap(struct rtw_dev *rtwdev, From patchwork Sat Feb 15 22:00:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865516 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90CF6DF59 for ; Sat, 15 Feb 2025 22:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656849; cv=none; b=VpnvvLvXpJKdUwwxRhaBckoUIFWAsj+4GdjjAmXnNIq1Zi4V0xLVUoiKZP8joAsFn3/9z0JTdvM8TAvdLyliYzy23qa1WHrM65pWxVzXEJJJQ1kImslHAJBy8pPYFRoNjhG1fHAM1oFYZfa+dJv5lDnM/tck3qwSXuPmSBbAw34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656849; c=relaxed/simple; bh=woYRf/0nObaiJVrU9nvK8m28s6R0czNTkwB5qE/0rRs=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=UXeutM0HsgE0VMpqDi9lt/pKvwF7L9uil4ov45IiIVBzKqvn2WiVIC+lNVv06J8Lsma1RCqSFK5GtCMcRaWz2/3Lsd8WNIUe3vLIPJk9iYPins/eDWpf43AHJlwsYqs/toQ2LHRJ4nAO5FDfEh9AY9sR6ATrezpBXWW8v/UO6QA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P/0bi4JQ; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P/0bi4JQ" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-aaf0f1adef8so644009266b.3 for ; Sat, 15 Feb 2025 14:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656846; x=1740261646; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=E9OzYdLEusS0eEvaALGex5cqjmm2MMWeU/B3AEikGbQ=; b=P/0bi4JQKweEFEtB5CiUcRjLwfi7ELnEi6dN0m0FTLDGCf/Dr+ODIAHG/ho0zlyrC9 NQRvdoQ3TEog0XTIkh9XDhas22colWGYqGvk95xa9pu9jcRV8jv164V2scXgNROdwF5b 3mpeROcdgRZKLyygfI/QMY2HcizWWfNAw0btn5z/0EOUCAX9f1dXkoUOU2yAEwyci/ic Xzk31SQKqNpmvpSlfy2iDS//+jwI3CE3wEWwkuyA0OFijQiG/mdX3hORuda52KJNrAEb y5wlvvtrnEVpqooeX9g9XoEr+2wSEMn3zoRXswtCW3ujFOmyAg9VA5w7CyW0vf9QGtpt Uw1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656846; x=1740261646; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=E9OzYdLEusS0eEvaALGex5cqjmm2MMWeU/B3AEikGbQ=; b=R4vKvLcnEKcKeWtqzPA4tpQ/qCgJZC8SFk2LM11UtMRVVV9FT0xAFmj5xwrXmsWIbB RP9V6Co5Cx7TfBMqUmc71GfCo5hOyAT2f14HWZ7o4nO93og/JC5RzAr3wIdxtv4Xt07a 2h7JaK6MQID5PL74CrDa238V6Wojw1dH2B+PR8NBVMRNGa4KWAdZ01ry1Be0TXxirrMG KmNFKi6ic5Fh1iEgFIoyObTuo7exwjEWNjiJBZB+k9x0Mg+QOyXKM2eXmmDgqEfIxXTt Vwa0mAdsIQO1TVB2asRaYPrlFZmrZmA0YeVFMGjK9FOpTGXeIN5vMBiFovoxAewvmoty q9TQ== X-Gm-Message-State: AOJu0Yykquqf2sDSKg27nyaKBuKQP2l7IA4J4n46VWn9biQYg1n8omzB JItqqi6cjUAOOixsAxXToEA7VHhqKwKW1z1vsZLSTettMFbLnKxis0PkuA== X-Gm-Gg: ASbGncu+qa5FjgEOTspRLNMsa4/SQzBMlg3zen46IFBQhxPL1ejz+NuqaGMLU2nPU7T 9rtcWScurc72GV4q2yZU4LFiTNsb7YIM9NhuDcamzoteKO8TGDJLVkZZoF/xX91+WfltCG4fBjA PxRxPJM2S+wuV+PMmuaTjwnQirxUaAfksI4vNKef671Hu/sxBAZROZ5leYv+iGh5gCxoMHAo6ae fSh9iX5H0iZ4ji9oWND2K+ab3eQewOJZtIWkCJrBPgMVOT+fk40Q8KbnkBKIfaa7Qy2HjsHZkaQ 0phHSedX7U6xnSKvJK5yf+/s X-Google-Smtp-Source: AGHT+IGSFgZaBDUkuY8p8C/34ZGOUs4lf/2Sojc18MnrcFH1DYpdGRduDjBjtoWKZW0NBkpT6zlHAQ== X-Received: by 2002:a17:907:784b:b0:aba:6055:9f5b with SMTP id a640c23a62f3a-abb70c01eadmr380748466b.2.1739656845627; Sat, 15 Feb 2025 14:00:45 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba532832d1sm592239166b.81.2025.02.15.14.00.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:00:45 -0800 (PST) Message-ID: <377e675b-3962-4f88-823a-5ca74eeee50b@gmail.com> Date: Sun, 16 Feb 2025 00:00:44 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 4/8] wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> 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 --- v2: - Add Acked-by. --- 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 3319bb5044c3..959f56a3cc1a 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1596,8 +1596,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) @@ -1620,21 +1621,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; From patchwork Sat Feb 15 22:01:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865830 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B103EDF59 for ; Sat, 15 Feb 2025 22:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656872; cv=none; b=qBN/KtayHJtStW8P2BzGCvr42O7j78Xaa39dT7ASJ5P6Nd9qY+yi1AwYaIEnCwFwH9jGOfvMZr8tmQnqboT4Y6sMeUpVCk5Km5sa0Qvxu8DdgM6dFnHC6KVRKQ0hPmqMEeCpL+2YRRsYRnTpKjzt4OoNtCMnJ0nzcQ/dehyFSJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656872; c=relaxed/simple; bh=xk49ZIwGuxW0Q5PokUgBkC/aDIfkgg63KeVXrcZ3GuM=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=mtTvjLj1goosxI5/Q1ovDj/R+8tLmQV8YC2zPd0toFyUUCySIkp6UvLA5zGA8TLhsVyXSAv3WlTmSrohIu/6Eaeq5QCaqwHDR+8hBSjKXIH1kSgs2POz1tEml3OkFbPZ+FNc2RK+QKWs+Cagdz0gjeO685Rh1jkKghxr2apgT8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mNyolPjQ; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mNyolPjQ" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-aaecf50578eso640946266b.2 for ; Sat, 15 Feb 2025 14:01:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656869; x=1740261669; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=WKADQsjdIUyLj1/vlyebuvRMnaHtf5UNyRZSD9It72Q=; b=mNyolPjQH9yAXOyT69FywYvBfEiVY0HwotaGgAsOXlK5SYPIGjBSC3dzMREfHfJdAM FfHsdVbUe+qlvKGewWpE6oZp6GvI75lTlak0SXFvD4o2Kn4vVrvoDY4gyFrvu6S/3nOk 6RMtWlGhT9UWYiYqmWucf/yPdIE5ZT8ztBDtb4P319yTxOgT4tMNH9IYUgTfXRcVqXRg c9yvixkYWqyW5z1mM1HotIwponJy18dLj2UGFB114SoiR1uSP0gEiRhJx+sUA6S9SeBo SM58sIOsBP7YDcLzejgaKpJ3EuwVchRxDb6cvhx+JNsr7d3Z7LOgst781n3OiDac6eTT Kixw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656869; x=1740261669; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WKADQsjdIUyLj1/vlyebuvRMnaHtf5UNyRZSD9It72Q=; b=C6mQPY+8Vp0Qw9B123hPb2TS6xrFAYMWO/hr8tZMlWMhzcSbz2Z1TI54XY9YWQc4Q6 4PwF1xeUmDPBBQBUGYO4VNZkZUQZ6wBp1l3X0j9u8wVsuicpGKSbWwmOq6vfEMPdV+eB BFzNDv/2+6XfRFcsQNHLhRwpjoqHE5tCrpHZlQQeJmE8HfHven1Vsy8yfg+NXFQvjUWB xO2Z5uhwcaBoA65jeG3jWF83AJJqU1XtNDPMoe0MMzHnejZi5IHL5gnXGdzQSPiOVSVn kfSlXZrMv1koMmME8fUuxfHcPtyqa6c+ixKW6Ok+Rol17GMqwpz1M7/31W70SA0h95Dg 1cVg== X-Gm-Message-State: AOJu0Yy4ZvYFCes1iUYd9R4i5YBvamn63NapsVo01loD5+Zt43S5YuWJ 8cY5SvmWTftUnBCYHqIo8QWG0Yap7W7CBCAaUSMdIQhGwlFpWVHzKe+KAg== X-Gm-Gg: ASbGncsarG12BFV6YQHqkLfAmgeSMyzXpAtGb5LmlV78eIGjCJfDu4Put+7JeH8t5Yb 9MiA8LEdkDt2YK5tU3Rvsu58Hb072ysKgJOL84b5/aGQAyaP1tnmVl9mruTm6QbWTC0O+7yZlt8 CsjEDb1C48rioT3Ak/jdM0orELYdJGHIfJe6xpRhyUHwAHPPjF2MUuKKrB1CzrhKVt5izo3bSCp eVRWFxkeQPy1YMZmkt+llFWbDdYB1rHotQqIf6vdIFAEjXuQSn+wP6ZKPod/KP5G/f7EywLgZtk B4XBBC7zcMpF5Wpo/doi3ksW X-Google-Smtp-Source: AGHT+IHYTfhAU06Rsuy63VnyfhOqhgM0PC+TJUOvkyesNcICCQxLLW9qSVzWSNtr0vel0sINg0nXMw== X-Received: by 2002:a17:907:6d09:b0:ab7:cb84:ecd6 with SMTP id a640c23a62f3a-abb70e0d0ecmr362322566b.56.1739656868921; Sat, 15 Feb 2025 14:01:08 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba53231fd5sm595226366b.26.2025.02.15.14.01.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:01:08 -0800 (PST) Message-ID: <00360b4f-e7bf-4550-a0be-9c8d8aa13b8d@gmail.com> Date: Sun, 16 Feb 2025 00:01:07 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 5/8] wifi: rtw88: Fix rtw_rx_phy_stat() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Record statistics for the 3SS rates too. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Add Acked-by. --- drivers/net/wireless/realtek/rtw88/main.h | 7 +++++++ drivers/net/wireless/realtek/rtw88/rx.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index 24ac749271cc..c15e0f55d09a 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -386,6 +386,9 @@ enum rtw_evm { RTW_EVM_1SS, RTW_EVM_2SS_A, RTW_EVM_2SS_B, + RTW_EVM_3SS_A, + RTW_EVM_3SS_B, + RTW_EVM_3SS_C, /* keep it last */ RTW_EVM_NUM }; @@ -403,6 +406,10 @@ enum rtw_snr { RTW_SNR_2SS_B, RTW_SNR_2SS_C, RTW_SNR_2SS_D, + RTW_SNR_3SS_A, + RTW_SNR_3SS_B, + RTW_SNR_3SS_C, + RTW_SNR_3SS_D, /* keep it last */ RTW_SNR_NUM }; diff --git a/drivers/net/wireless/realtek/rtw88/rx.c b/drivers/net/wireless/realtek/rtw88/rx.c index 90fc8a5fa89e..8b0afaaffaa0 100644 --- a/drivers/net/wireless/realtek/rtw88/rx.c +++ b/drivers/net/wireless/realtek/rtw88/rx.c @@ -73,6 +73,12 @@ static void rtw_rx_phy_stat(struct rtw_dev *rtwdev, rate_ss_evm = 2; evm_id = RTW_EVM_2SS_A; break; + case DESC_RATEMCS16...DESC_RATEMCS23: + case DESC_RATEVHT3SS_MCS0...DESC_RATEVHT3SS_MCS9: + rate_ss = 3; + rate_ss_evm = 3; + evm_id = RTW_EVM_3SS_A; + break; default: rtw_warn(rtwdev, "unknown pkt rate = %d\n", pkt_stat->rate); return; From patchwork Sat Feb 15 22:01:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865515 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C10E6DF59 for ; Sat, 15 Feb 2025 22:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656909; cv=none; b=jvD28wjyaJDpRCjj4HL4usAwzGDqcCNiAOKgjpzCCSaX6eObKI8iGdhg6Cd2emlXUCewGI7vYp1l+L069U7J4veKL+X5F5k8mK84RLpX2rS9MN+L0BG3OAmJ7fW2vkwdV+QWdCAyZJKp++7FRmor/kPNoFSabSCoozxLPTbpM2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656909; c=relaxed/simple; bh=9orFKUd8pqRjiHdFEjGCqYrAloXTMjgVuLzIRT4qouY=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=se2rJnhCbv5a7/bcJvPZ10fSaA9YXM9DFRH3Q2PXgtexmFB14kJz7POGy5r4PGTEzluorsGLKaBzdSS9/eSoBCFW5N+RBtqCvEtZdsKHs/xkO/cfIkJ6085xv2WJXH/5pfS2lTcQbaPF5yA8Dyv3KCceDT/BS9loNrJFWKrN6Ys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LYSpJVxc; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LYSpJVxc" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5ded46f323fso3766669a12.1 for ; Sat, 15 Feb 2025 14:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656906; x=1740261706; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=XgSX5JlBtiwZpFD92J9X1UP69I5uT1pZoLx/NaC6sEo=; b=LYSpJVxckn4F0PVbb42yOhyNEN0G4TjTfQdnPBIC1bbQRhT8PissqIe4cWAxe40Wzq xci8htZ5GRDz99ysc3Y1/7ue/Y8ViAFlSMe1T0HprJIPAHhSQV9zososbLkb/39efDtz x8a8/2VrrDXChC07V+iV63wCrRk12nwhRPVK3dTDGi795xkNLjcQKCUPZ8CFngSPS5mq gsX1DhGZkuUuLZgD+bhJrbVWCFHO7Kkq+ePGHIgm07zq6P7u+01p1rMBAX7+udC1z21l 6zrr9YVlXaTSi0DaSJQuIcX/1sE8Y/CM49W4/sNQNM9jKRUtGguo89XtNS+iy9wSQ+Sm taLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656906; x=1740261706; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XgSX5JlBtiwZpFD92J9X1UP69I5uT1pZoLx/NaC6sEo=; b=os9ul8NQoatVRwU6krilAp1/7yCGo8LosSx1Rhx//5uXK6EVJxBp9lsL1U+97y5R9I gxtY/UNhoxWH29MB0hjy1ryts3pRhzVN9XqMKwO9M6q6uDcCkXOxIygkWl3Tl8C4Td2z cKLavtfmSIgm5fok6fa3iLFgJsNu2R7v5EqFY1ayY9zQpUTRunBjKckRoSYArXMmaUvn 736bVUUdD9+As/A5ULFVLiaiQcp/apbr3WEleKZLUuAND+fy8pWxESkwni42+Jqd9GA2 yTA8G4UYM8hbeqDel8eKGROGaLmjQTktEE4FoA++podfzb0QGPhtcdJNfZw8LkjtsLFk 7i4w== X-Gm-Message-State: AOJu0YzMCeMXgnpLw/sbHPnlz/xppbIVvlWI2Dxxey/2Jthb31wzSMj/ 3zM4z2tpClgNvaxTM0zjkO+Tc625wbAfIthyhuPOnrBm14Xt+W323Dv7Vg== X-Gm-Gg: ASbGncvOe3nIBlyb0e1ZU6c6edLqm2pP1RUVS5onCdamk0//buimQkmFN2+O5pNYPZK 5cPR6jWm+FfeH5plPOwJdDLSNlawyfnpVbxteeyoYw15YZ0cjnbrHN2e/8PpN0Kq2MNSpzo0niw jURKaH1DjA0CgAc5lr072r55CKnO7LoSsNskfo9tEvmV8OeUK0o98U8MUSJCtkINK1byIvYBHV8 2hwkKYSQoNrxsy4y3VOzj8SByac4Wps3NojZklzaq8aiE9owP1I44d/AHb6FonYhgYEsBuWqTZz ZbnGuQhIE6GMbjGT7M3QMCNO X-Google-Smtp-Source: AGHT+IEB+xQp44fEkwJW+UznTxgHG857tIvHx03Nl5RtnwGBHC46sqrfdPen3vSU1zzc/+pQGUYw5A== X-Received: by 2002:a05:6402:4609:b0:5da:d76:7b2e with SMTP id 4fb4d7f45d1cf-5e035f55d88mr4259735a12.0.1739656905894; Sat, 15 Feb 2025 14:01:45 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece287d3fsm4976396a12.72.2025.02.15.14.01.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:01:44 -0800 (PST) Message-ID: <11927c36-05b4-4655-911b-9d40da8a9250@gmail.com> Date: Sun, 16 Feb 2025 00:01:43 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 6/8] wifi: rtw88: Extend rtw_phy_config_swing_table() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Select the TX power tracking tables for RF paths C and D as well. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Add Acked-by. --- drivers/net/wireless/realtek/rtw88/phy.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c index b487457d2215..55be0d8e0c28 100644 --- a/drivers/net/wireless/realtek/rtw88/phy.c +++ b/drivers/net/wireless/realtek/rtw88/phy.c @@ -2458,32 +2458,56 @@ void rtw_phy_config_swing_table(struct rtw_dev *rtwdev, swing_table->n[RF_PATH_A] = tbl->pwrtrk_2g_ccka_n; swing_table->p[RF_PATH_B] = tbl->pwrtrk_2g_cckb_p; swing_table->n[RF_PATH_B] = tbl->pwrtrk_2g_cckb_n; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_2g_cckc_p; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_2g_cckc_n; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_2g_cckd_p; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_2g_cckd_n; } else { swing_table->p[RF_PATH_A] = tbl->pwrtrk_2ga_p; swing_table->n[RF_PATH_A] = tbl->pwrtrk_2ga_n; swing_table->p[RF_PATH_B] = tbl->pwrtrk_2gb_p; swing_table->n[RF_PATH_B] = tbl->pwrtrk_2gb_n; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_2gc_p; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_2gc_n; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_2gd_p; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_2gd_n; } } else if (IS_CH_5G_BAND_1(channel) || IS_CH_5G_BAND_2(channel)) { swing_table->p[RF_PATH_A] = tbl->pwrtrk_5ga_p[RTW_PWR_TRK_5G_1]; swing_table->n[RF_PATH_A] = tbl->pwrtrk_5ga_n[RTW_PWR_TRK_5G_1]; swing_table->p[RF_PATH_B] = tbl->pwrtrk_5gb_p[RTW_PWR_TRK_5G_1]; swing_table->n[RF_PATH_B] = tbl->pwrtrk_5gb_n[RTW_PWR_TRK_5G_1]; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_5gc_p[RTW_PWR_TRK_5G_1]; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_5gc_n[RTW_PWR_TRK_5G_1]; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_5gd_p[RTW_PWR_TRK_5G_1]; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_5gd_n[RTW_PWR_TRK_5G_1]; } else if (IS_CH_5G_BAND_3(channel)) { swing_table->p[RF_PATH_A] = tbl->pwrtrk_5ga_p[RTW_PWR_TRK_5G_2]; swing_table->n[RF_PATH_A] = tbl->pwrtrk_5ga_n[RTW_PWR_TRK_5G_2]; swing_table->p[RF_PATH_B] = tbl->pwrtrk_5gb_p[RTW_PWR_TRK_5G_2]; swing_table->n[RF_PATH_B] = tbl->pwrtrk_5gb_n[RTW_PWR_TRK_5G_2]; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_5gc_p[RTW_PWR_TRK_5G_2]; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_5gc_n[RTW_PWR_TRK_5G_2]; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_5gd_p[RTW_PWR_TRK_5G_2]; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_5gd_n[RTW_PWR_TRK_5G_2]; } else if (IS_CH_5G_BAND_4(channel)) { swing_table->p[RF_PATH_A] = tbl->pwrtrk_5ga_p[RTW_PWR_TRK_5G_3]; swing_table->n[RF_PATH_A] = tbl->pwrtrk_5ga_n[RTW_PWR_TRK_5G_3]; swing_table->p[RF_PATH_B] = tbl->pwrtrk_5gb_p[RTW_PWR_TRK_5G_3]; swing_table->n[RF_PATH_B] = tbl->pwrtrk_5gb_n[RTW_PWR_TRK_5G_3]; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_5gc_p[RTW_PWR_TRK_5G_3]; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_5gc_n[RTW_PWR_TRK_5G_3]; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_5gd_p[RTW_PWR_TRK_5G_3]; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_5gd_n[RTW_PWR_TRK_5G_3]; } else { swing_table->p[RF_PATH_A] = tbl->pwrtrk_2ga_p; swing_table->n[RF_PATH_A] = tbl->pwrtrk_2ga_n; swing_table->p[RF_PATH_B] = tbl->pwrtrk_2gb_p; swing_table->n[RF_PATH_B] = tbl->pwrtrk_2gb_n; + swing_table->p[RF_PATH_C] = tbl->pwrtrk_2gc_p; + swing_table->n[RF_PATH_C] = tbl->pwrtrk_2gc_n; + swing_table->p[RF_PATH_D] = tbl->pwrtrk_2gd_p; + swing_table->n[RF_PATH_D] = tbl->pwrtrk_2gd_n; } } EXPORT_SYMBOL(rtw_phy_config_swing_table); From patchwork Sat Feb 15 22:02:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865829 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D48EADF59 for ; Sat, 15 Feb 2025 22:02:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656940; cv=none; b=pUXK/6FG399HiBCJ9b920USkkoDi6j18PvQrPB1u6pSwhvljErBdOQqWrY4WhIZ6+tVp4biG20lTuvDIV8Pmae8ySaGBn2taTki3L283gYD9sj2HZPDCvphTRmAmiZWAJLdGXA1jVOgJ+XnQu7xHa9wdLWIzrNUt/+Qqvm7fBlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656940; c=relaxed/simple; bh=GGyBcXrbK+aFVu2AjbF2Cy35l5vYUMWaH5JE7HjahDs=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=imx4focn6xmUKBl9R3sFvzqGww0qQEfMnTP4RxE1r6zqQpEQpY1ZH+PuPZqRi96qO3F/RjhDpp1sIa9VIErp1zDlkG1supbitZFqgUpbSL2+HSJgxiTlPSxNYsra8W3hxjbSf91ll+CoiYypueZOWqkn5uHRdLtugmmYHlelwgI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PT+oV5Bc; arc=none smtp.client-ip=209.85.208.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PT+oV5Bc" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5ded51d31f1so5014867a12.3 for ; Sat, 15 Feb 2025 14:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656935; x=1740261735; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=OB3SYmN/D6AjxtJoKKJMS0GHweLv2UwfM/ppjlpc7Zk=; b=PT+oV5BcLpvt/K1T1sEWX7XKgMeGS7xjo0sX2qAeTHBMbtZrYhLIE3UAFfTl9Rhes8 zKYB1+V4ljAAv0yJyvCP0E7lPxr0cvIubP0Xy6w+BjM01lyVbEfwSgC2QuqIpI0g9T1K rrIAanolnl+e/3d2Bq/bPuXvOUM1aOGmOUGJsfPnNB6wX8T8BMX81BBIKhY2CVAxbOgL r0185nlSAd2edsnikIp2aL1DKWEBjD+eLDBgufQhn4Fj8WEwLqAKUCGq6J/sx9lbTeBF C/jCB66ZdJ+qFg852BD76PXgWyBdfdl9972KOnfHF7vquLNkt/0a6Be7JvjLP5qur+9E piyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656935; x=1740261735; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OB3SYmN/D6AjxtJoKKJMS0GHweLv2UwfM/ppjlpc7Zk=; b=gatps1f6d2B+R6cbaDRBK2jtepDAgH+1iNb1mVTKkmtPXdnyUX6kEZVYK13xquyOV9 zFF3yn0CtCff1s/WmBftHTv5f+4CGjtoSvWT4lHdC7scbNw4pNB+PfWANov5QsQUVzMO SZGpuH279lKUeufzw6mYbGOQvD478uJ/M5lRE35kq//Wx5ukjriyyz63uhhOfi3GNUJv zUu+cBW5Y4FJKkUyWAGYHlM8EpYVHUZR57HIoa3CPnIOWXRsTAL8q6SIyvyuvK9m2qFf jo+R8oz+RKaeGjM5tH7K2e3NaKwTPKky9kMGwM7NB1PVt8Q+ciBh3S+yKJoWPTkJATC1 phmQ== X-Gm-Message-State: AOJu0YyGrx+UMLwt4rwmm3v5dd+mkHIt7UovwOL5Zbpqc5iVya42s2GV GhFq5y6UQbxgZNbCZe9iA40QVbQ5/ZCKuQyr/Gg/z3BXjpuRcwXxa/VopQ== X-Gm-Gg: ASbGncv8/TM5ogHHWR8Z7IsqG9AHVVdAasq25TWzTvvCEsA4xSsqHd7NUsfar9db7Gh L3pjgTTFMLMEGAioHf+PYpgTCO1nwIAo243WetmyIxkdxQrg0w96oyq1wbjO4rnzjiK0/GHBLC4 7H7prNTNWBOW4CPeGqJmf/WdrP0Gk6U/gy24RGdH87eUaY6InQABVQdzdb6hdA+qepGszDZi9U7 0TLPkoagYKvguUzsrKiVmhA1zoutjXe247//vUIexkinpMl1gdKt5KlGzpf6npjrKorqpH79fSN Xf8Z5gKUkj4VBMEtSfcpsuY6 X-Google-Smtp-Source: AGHT+IGLGorY0F5coP8G+VEy9p823hqKqxtBGYlMl8FUe1N7deNMYHobbme1RasvMmU/u47IA/iHdQ== X-Received: by 2002:a05:6402:270e:b0:5de:bc13:6c65 with SMTP id 4fb4d7f45d1cf-5e0360bc7f2mr4031357a12.14.1739656934872; Sat, 15 Feb 2025 14:02:14 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dedddd5b82sm3465707a12.30.2025.02.15.14.02.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:02:13 -0800 (PST) Message-ID: Date: Sun, 16 Feb 2025 00:02:12 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 7/8] wifi: rtw88: Extend rtw_debugfs_get_phy_info() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Print information about the 3rd and 4th RF paths and about the 3rd spatial stream. Also, fix a small bug: don't show the average SNR and EVM for the OFDM and HT/VHT rates when the rate is actually CCK 11M. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Add Acked-by. --- drivers/net/wireless/realtek/rtw88/debug.c | 37 +++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c index 364ec0436d0f..1adb03d1210a 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.c +++ b/drivers/net/wireless/realtek/rtw88/debug.c @@ -654,10 +654,10 @@ static void rtw_print_rate(struct seq_file *m, u8 rate) case DESC_RATE6M...DESC_RATE54M: rtw_print_ofdm_rate_txt(m, rate); break; - case DESC_RATEMCS0...DESC_RATEMCS15: + case DESC_RATEMCS0...DESC_RATEMCS31: rtw_print_ht_rate_txt(m, rate); break; - case DESC_RATEVHT1SS_MCS0...DESC_RATEVHT2SS_MCS9: + case DESC_RATEVHT1SS_MCS0...DESC_RATEVHT4SS_MCS9: rtw_print_vht_rate_txt(m, rate); break; default: @@ -849,20 +849,28 @@ static int rtw_debugfs_get_phy_info(struct seq_file *m, void *v) last_cnt->num_qry_pkt[rate_id + 9]); } - seq_printf(m, "[RSSI(dBm)] = {%d, %d}\n", + seq_printf(m, "[RSSI(dBm)] = {%d, %d, %d, %d}\n", dm_info->rssi[RF_PATH_A] - 100, - dm_info->rssi[RF_PATH_B] - 100); - seq_printf(m, "[Rx EVM(dB)] = {-%d, -%d}\n", + dm_info->rssi[RF_PATH_B] - 100, + dm_info->rssi[RF_PATH_C] - 100, + dm_info->rssi[RF_PATH_D] - 100); + seq_printf(m, "[Rx EVM(dB)] = {-%d, -%d, -%d, -%d}\n", dm_info->rx_evm_dbm[RF_PATH_A], - dm_info->rx_evm_dbm[RF_PATH_B]); - seq_printf(m, "[Rx SNR] = {%d, %d}\n", + dm_info->rx_evm_dbm[RF_PATH_B], + dm_info->rx_evm_dbm[RF_PATH_C], + dm_info->rx_evm_dbm[RF_PATH_D]); + seq_printf(m, "[Rx SNR] = {%d, %d, %d, %d}\n", dm_info->rx_snr[RF_PATH_A], - dm_info->rx_snr[RF_PATH_B]); - seq_printf(m, "[CFO_tail(KHz)] = {%d, %d}\n", + dm_info->rx_snr[RF_PATH_B], + dm_info->rx_snr[RF_PATH_C], + dm_info->rx_snr[RF_PATH_D]); + seq_printf(m, "[CFO_tail(KHz)] = {%d, %d, %d, %d}\n", dm_info->cfo_tail[RF_PATH_A], - dm_info->cfo_tail[RF_PATH_B]); + dm_info->cfo_tail[RF_PATH_B], + dm_info->cfo_tail[RF_PATH_C], + dm_info->cfo_tail[RF_PATH_D]); - if (dm_info->curr_rx_rate >= DESC_RATE11M) { + if (dm_info->curr_rx_rate >= DESC_RATE6M) { seq_puts(m, "[Rx Average Status]:\n"); seq_printf(m, " * OFDM, EVM: {-%d}, SNR: {%d}\n", (u8)ewma_evm_read(&ewma_evm[RTW_EVM_OFDM]), @@ -875,6 +883,13 @@ static int rtw_debugfs_get_phy_info(struct seq_file *m, void *v) (u8)ewma_evm_read(&ewma_evm[RTW_EVM_2SS_B]), (u8)ewma_snr_read(&ewma_snr[RTW_SNR_2SS_A]), (u8)ewma_snr_read(&ewma_snr[RTW_SNR_2SS_B])); + seq_printf(m, " * 3SS, EVM: {-%d, -%d, -%d}, SNR: {%d, %d, %d}\n", + (u8)ewma_evm_read(&ewma_evm[RTW_EVM_3SS_A]), + (u8)ewma_evm_read(&ewma_evm[RTW_EVM_3SS_B]), + (u8)ewma_evm_read(&ewma_evm[RTW_EVM_3SS_C]), + (u8)ewma_snr_read(&ewma_snr[RTW_SNR_3SS_A]), + (u8)ewma_snr_read(&ewma_snr[RTW_SNR_3SS_B]), + (u8)ewma_snr_read(&ewma_snr[RTW_SNR_3SS_C])); } seq_puts(m, "[Rx Counter]:\n"); From patchwork Sat Feb 15 22:02:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 865514 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02F2DDF59 for ; Sat, 15 Feb 2025 22:02:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656978; cv=none; b=IprxORHhXDYzjh2LjWNJ4AD6Jr31tUZyEVaCA5/cNtkQqWa3OpQN4DPonOrDP5cS8lfhltYlkRJ7zqVJepQYr3kGY0nSxxFRBJUn6qw147U56x2RgBeReIGxknuMX2IoIgsX2j8MuEoJBHP0cVXtDQgjllTarys3mwhi75uYKgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739656978; c=relaxed/simple; bh=67Rc8NpXjFsPum9Ra4nFA7haM+YGxAMxKJlJUQTkzlw=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=dA0LSkyuEsfmR58SDn16SgNtxfB2pRJheBSYk4qNFMReA+ZxEaE48uXk8dDOivVvI+QAZ0cah99wA9XDGd8NxpYPAPGMF7g/TlpzBzggg+fX1qx7p2oYD58CH9A+LFpvtsE1VHy0QNJ1kwiaCfncAF75wHE41d2u3Z3MXmhWj8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WjPIM89L; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WjPIM89L" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5e0452f859cso500626a12.2 for ; Sat, 15 Feb 2025 14:02:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739656974; x=1740261774; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=tgYSZiV154BnCTr1HG6T5PPWEN74oa3N7N//QpWvHK8=; b=WjPIM89L1lla23eBywyju4xUBkBoSaCpJoWDGvzgCdYoKAZVZPyvHdoeROxTbfjcsI nDXjiXIPJJnSdfiZsNovBZu4q4J5FkfEdUXpXYH88odyjQRBRXQCjZEAhFzcKQ6ocRe/ 1+Wkb/aeGElhsAxqSHWpp0HpRtWlynkZ8JqhpX2jdxKhqQxcgYOKBMd2KShPCqKJYSt5 yIETA0oD4Y+uAPqGZNWlGfO/RAN8rzCnU5nSFfjzSILAkSwpJQCVga1MrPgn0Og1Rmm2 xB1+27wFivBifCegPq7pjYUM+RnkUnbik7lA4Darylgin791gJyqMVvZq2kVH90takGb CYaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739656974; x=1740261774; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tgYSZiV154BnCTr1HG6T5PPWEN74oa3N7N//QpWvHK8=; b=BS1gTzH0gs756QtmH7we7zoJciIjZbi7fbcC9Pdya3gyh8EchicO0OSLBLmlVzLW1n Gr+YNnE/ID2DFyChqrOAP9VlHR6G4JzAfXcL00D4bCqpofEctp4HhZqRuo0Vg8+bf7Tz ccbNZGpeitT8yxNXq2iJrnO1rFU1kYhnI2PRSu8QYaH7419IK7S5XGSqmPw4Zp6KOqgW PjJONbHzLsSV1HmwyTb7WE27OMaEtGtMri/lTZ9gN0u7QRleR2cEjFEHSjrc/lxsfF1c wNbLGVp7EfLfgVkNY6N9LdRGIq6HRMHI2PBuEt6f7Q9mAowLDsWdR7Y+HEL6UEtYYE/A ANdQ== X-Gm-Message-State: AOJu0Yzt5G4Nj/+dN4TnRk4FlmoX4TiOy4SoWU3clXnsP37W4Ckb0QtB HaYMjomW70EHeH1B2uxq3CeBBXDQz0FVzFHrZ19DmK+yvfrNYlid2SZYMQ== X-Gm-Gg: ASbGncvIIguqSzysczSN8msFvE5J1R3VEixKJlBzVjiBKHUlNuL8tqARQV24YVpZcfc zycBeXS2KpNpf6jPjjAxDTCn64YxsurYwRtsfvlzNOcyh0bkpBbyFBjHx2mThd07XtrlRB3PVGA /T5JXNXb2kUMU6vCaIhDUBMvG6r+Ou7Atnqny8OHKM/vX3MMrogCaN3R6UZ8Mn+ZUw7XU0pKXby Gz1VyMLnQNqhUAylJMxcE5ohD/efp2AOFMrxtyqsjpBhln8JzQUozh52+Iw1mnlJt3yiIAbIuCO PImPjIVjNR3bhN06+1l+j35s X-Google-Smtp-Source: AGHT+IHYQn+bDRTnvYy3tUvO5uXq/Gqet9vE6G4erFZ1Vx+RxrUDfvVQ2ylgx6/vw2iaETMkTUTjlw== X-Received: by 2002:a05:6402:13c9:b0:5d3:e45d:ba91 with SMTP id 4fb4d7f45d1cf-5e0361916c7mr4801529a12.32.1739656974197; Sat, 15 Feb 2025 14:02:54 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1d3744sm5271065a12.42.2025.02.15.14.02.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Feb 2025 14:02:53 -0800 (PST) Message-ID: Date: Sun, 16 Feb 2025 00:02:51 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 8/8] wifi: rtw88: Extend rtw_debugfs_get_tx_pwr_tbl() for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Content-Language: en-US In-Reply-To: <12ab9180-45e9-40e5-98e0-6ef7b6c463d5@gmail.com> Make it print the TX power details for all RF paths, not just A and B, and for all the rates supported by the chip, not just 1SS and 2SS rates. Also skip the RF paths and rates not supported by the chip. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Print only information about the RF paths and spatial streams the chip actually has. --- drivers/net/wireless/realtek/rtw88/debug.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c index 1adb03d1210a..b67d69b01f87 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.c +++ b/drivers/net/wireless/realtek/rtw88/debug.c @@ -692,9 +692,11 @@ static int rtw_debugfs_get_tx_pwr_tbl(struct seq_file *m, void *v) { struct rtw_debugfs_priv *debugfs_priv = m->private; struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + struct rtw_power_params pwr_param = {0}; struct rtw_hal *hal = &rtwdev->hal; + u8 nss = rtwdev->efuse.hw_cap.nss; u8 path, rate, bw, ch, regd; - struct rtw_power_params pwr_param = {0}; + u8 max_ht_rate, max_rate; mutex_lock(&rtwdev->mutex); bw = hal->current_band_width; @@ -707,19 +709,23 @@ static int rtw_debugfs_get_tx_pwr_tbl(struct seq_file *m, void *v) seq_printf(m, "%-4s %-10s %-9s %-9s (%-4s %-4s %-4s) %-4s\n", "path", "rate", "pwr", "base", "byr", "lmt", "sar", "rem"); + max_ht_rate = DESC_RATEMCS0 + nss * 8 - 1; + + if (rtwdev->chip->vht_supported) + max_rate = DESC_RATEVHT1SS_MCS0 + nss * 10 - 1; + else + max_rate = max_ht_rate; + mutex_lock(&hal->tx_power_mutex); - for (path = RF_PATH_A; path <= RF_PATH_B; path++) { + for (path = RF_PATH_A; path < hal->rf_path_num; path++) { /* there is no CCK rates used in 5G */ if (hal->current_band_type == RTW_BAND_5G) rate = DESC_RATE6M; else rate = DESC_RATE1M; - /* now, not support vht 3ss and vht 4ss*/ - for (; rate <= DESC_RATEVHT2SS_MCS9; rate++) { - /* now, not support ht 3ss and ht 4ss*/ - if (rate > DESC_RATEMCS15 && - rate < DESC_RATEVHT1SS_MCS0) + for (; rate <= max_rate; rate++) { + if (rate > max_ht_rate && rate <= DESC_RATEMCS31) continue; rtw_get_tx_power_params(rtwdev, path, rate, bw,