From patchwork Mon Feb 17 23:28:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978783 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.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 9FEAC748F for ; Mon, 17 Feb 2025 23:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739834945; cv=none; b=otTyfsWavicOW+ahJc1OleCZn4wcCPSU5ma+4NCbWaeKiVbCzJ0rtoOhfzUJhyqbK54EIpDvsfBvKwGNyQ1lfzKWb5dj6RzEQ9FMJj3dUpDM0OhdzNq7lyacuXapQfWPqZj26H+xrslQHa9kbOl7kJoVxpRrKBtsW/aAGzw5YVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739834945; c=relaxed/simple; bh=mWAON8Ri/EFtRcbRq1K739SpKiVbj5M1B0ystpR3XgE=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=o9VwcgYqC+ldzu7pMuL+LrUKc3jBNQKpSq6kwdm4eII8XtUoezH0ga9XF9CiPvQbA7jG4mIl5KMHg3uMVlcZJbWXDxVeFyceF4xJukXc9DmSM/JnOF3MKWr5c3d+h6iF1uOrOxFukysfD4RhRvukZFYL5N0Zu7ZMt885t0FUS1E= 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=TPErnW48; arc=none smtp.client-ip=209.85.208.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="TPErnW48" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5ded51d31f1so7938612a12.3 for ; Mon, 17 Feb 2025 15:29:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739834942; x=1740439742; 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=Z4yN3GJKIrid0LbO1BVVrkFjsUHAqNN5obsVl6EkmWQ=; b=TPErnW48Rogt0Fb8D9hTbep2kEtsUtxpUNu7nI7AZmJKanjU1cVi2fRFtN/zzWKIpb Uptj16eYTw/DGFayyTaHR99A/FE8TIWmwnz6YdaQaxObdkmPzpzy3fgiSyVrdbMHR8Im kk7SCGgFCuaKE8cXSBIyrVLzMmGRjfobfL+rwkGgh65JpbwLZjpBg57TfYbwWzSgSw1o LaPASHBFma1tRirJZUuBnm2Gy+5iWn5ywg90notdJjXjbb5dAbpBtHADRsZMzpO1wBUM TM63EVAikOxgl1Qc+/M2ywsHI5RzDDEe2l3r5ndBqyKylbV2L3zMY0A77HbhQ5ZakUwh xy1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739834942; x=1740439742; 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=Z4yN3GJKIrid0LbO1BVVrkFjsUHAqNN5obsVl6EkmWQ=; b=O1HuLkCjkveRf7XgBK3CHs8XvK7okL79OtSmECJ2X5/KYAGKkzw7Ra80fG8AGCPXdI CCgjJle9eJ0WtGLu/2cqRkoZB/C1JpLa85wgirnjU3qyyDrrmMVAk7UnrXOA//Tj9oOO debqYD7LRnTWYpwIQT5Y7UADJFi00KVoek5fxv4+OqdaepQDKX2kBEmis0bplIOXVSGR JEwJJEwOQPvVQ2H14kGl+e23Gb/DI8GhhXrxStIfYIm0pEu7mf4qMAU8ELIsGdO6A5Ce XHlaNsi2tGavEz9Vqmap8WXfDzscgb4LsQTaVieKLLjExgYGEDT/NSc6GQ+n74ZTIjHS ysaA== X-Gm-Message-State: AOJu0YxHKFhnvWoQXr7ZZvqQoF5tm5AIz2OiZKCHG38Yx6a5lFzlhipS WQwj0XiByG0F883c1kv81zJO4afv4+nG/5is1H3rGDaxN5PisI4BGaJTNQ== X-Gm-Gg: ASbGncvvWcwkneEGEtwerSACik+jjWR3q6Zu949SXvsN9JbWM7Gt71GetskAT9GI82n vM7XSC0h17L2vxji6zvtTWHlB58rYYmGl9mbEFCAOZW6P9rl40tspPvmv8yGj5QhyamjENDrpN3 Shr+cvJif42WUtvL7GSlZ9i6770ShXhQQNS4OFZ/Maz1GL2+bN/5abQH70wiVTmmdP9mSzuuSUV 5Vlm3yIDVKn9cvjSKYEHAZjnXkg4T7pCOLOEVztpbuWsYxwUyJpxRFpZR/VnpR0n1uOPV3CzEna JzMlWEQHBdpBwqMar9Lmywro X-Google-Smtp-Source: AGHT+IGOw75kAGFyfC9XX3c+o4xGU3GVrbuQbnUmGEqp1R1GndZAog8lfrGHjlY38kjyy9BO5nNfug== X-Received: by 2002:a05:6402:3488:b0:5d3:cff5:634f with SMTP id 4fb4d7f45d1cf-5e0361c1eacmr11579614a12.24.1739834941716; Mon, 17 Feb 2025 15:29:01 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece287d3fsm7699935a12.72.2025.02.17.15.28.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:29:00 -0800 (PST) Message-ID: <2f0fcffb-3067-4d95-a68c-f2f3a5a47921@gmail.com> Date: Tue, 18 Feb 2025 01:28:59 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - Add Acked-by. --- 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 Mon Feb 17 23:29:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978784 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (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 08F38748F for ; Mon, 17 Feb 2025 23:29:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739834998; cv=none; b=h/GQrv8foSjf9nb7Vs4OeNU8hroUyR7adaiFwXzJ5kVT9S/GBm22BmLEOPBWRvevP+5u/d0+qmenedntruVL29gjH3qGJ/lY6J3xsd4Yi+7tzreAU/90tmDfqFz4Ls9A2vlc2niCHotNdEP+V6CYXjNc5WfS8xDnLDDANQmDix0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739834998; c=relaxed/simple; bh=ObRENpelm1V9RBMnvyRMw9Qa4B6xC7JneM41L/v5rQo=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=Snd7mC1Y9CdRlZNxBWSYpuFWT3HyB/nvvrvTw3fp5kzofRVKFr80L+x1wzdne4i8ltL2y+Noj7Z3QlIreNTtM1v1SHXMN8nofJfC4Tr4sZ9GZFFNvytT+Kzt2J/pXnEaMbhBUr6MHbjJ9MqCm3BcP0DCs/FCYhp2h1ApO1rFN8I= 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=lgegO3BN; arc=none smtp.client-ip=209.85.218.47 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="lgegO3BN" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-ab7c07e8b9bso838802366b.1 for ; Mon, 17 Feb 2025 15:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739834995; x=1740439795; 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=ss7xXIBn5ZqlmKZfmSDWl73Dfw49B4HhLbiWoBrZjJs=; b=lgegO3BNjLzHSL/TOkkxJkKnlVFMZdbPuO0scWooVvHh4x5c88k4OVFWGJF7EBW33/ vtxu8P3k5M7lAX9FxJMnH2EReQFtmAz4t2LFbQ79KNPoERxE5vx4Oe16G8XpAAnJTDRO l1Cy4YQY8ZLrv0hS+Ck9eCE1jB7y9hijZF+ZdTC+dFzycR7ozCVAwVx9s04kjDuQSet3 MlXNJadVT0igVmEVhECVf3L/tTPEtPoljSm7MWqwZme1Dig8MC02QGIFwoIr2sPlYVyY Z0D4ilSKENCbfMoYb2yW/1zH39uhE7M1bs/tVt+zSgeB8krjwDiRszRhIO1dAMgnLgLC 7d7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739834995; x=1740439795; 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=ss7xXIBn5ZqlmKZfmSDWl73Dfw49B4HhLbiWoBrZjJs=; b=VafhRETVB+AmkdtwU0L3+2NzDgXT8jwc6MZEU2lGo0tuSx1zFzB5HBWZDvGtqlII2Z HRLQD13TdX4f3OMQN7SBdvvwui+JqZ3DJmjO/4EEiyDGCatIQZj9FBgd/HbZM9A5eR0i mx5nakfWO2ooDItSnYBaR/IYZ+XGvRv6fH6HMMmKIXQTaiSp9gKgnww2pYoJHApUUlQf Uq6LiJzwGX8wPNMgq8nX8+ZKwdR8GbblwwGIJBM05f6avO74NZKxj6AgzajrLIDC7Frg xX4w/VV3yklGygaksTtN/vCEexRfp1MjF1hb2I0fuQSroNrvmSfMlRfmFr5fH0peIjUv WtcA== X-Gm-Message-State: AOJu0YwAZ/IZXLflRGNBZFq4R449VJI2i5QKBRiE2/h3Zgvn4c9wzeuu 1Q/eVNVuWEfXt1YPCmJq1oiStDZtzhEq3HI7mi7M/kemLHdckOCqZgmf0A== X-Gm-Gg: ASbGncufb16K7LxF6tWqCY+phwLipW7Bu/hK9WVyDtMBp2R2JOPau4iE9eFd4g7mNuv feqPr+eUu+Jy5+w+2nOx2iF9/d48w45cMkv0muhap8ZdisHVutAJ+A3D84+XBW44ILYLThfAKir GxppY6HUsA297/fXAtEYSyR0SzaYUIO4AasgCUE4g0Jlfi35hU+bgGrev5heHwQkjM9TRrov2tY 6XR9HERPQznw1PR1SW26fHr2Z9+dbHwhPNM/h8TwWU+DeNZtiKiDA5xt1klHdWc5C2WD2gLsV95 tcadmTx8Fd1Mrsh1kK8JkWK3 X-Google-Smtp-Source: AGHT+IGmFvmeq5EkU/AhK6W/KGM9aXDjql5H/hFuUQGbKnBJJEmlUzXIn2ut5UsdRVZZUmbn1jWTFg== X-Received: by 2002:a17:906:6a03:b0:aae:8495:e064 with SMTP id a640c23a62f3a-abb70d77263mr1268098666b.40.1739834995056; Mon, 17 Feb 2025 15:29:55 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba53397f47sm953858766b.127.2025.02.17.15.29.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:29:54 -0800 (PST) Message-ID: Date: Tue, 18 Feb 2025 01:29:52 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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 Acked-by: Ping-Ke Shih --- v2: - Set *nss for the HT rates. v3: - Set *nss before *mcs. --- 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..66819f694405 100644 --- a/drivers/net/wireless/realtek/rtw88/util.c +++ b/drivers/net/wireless/realtek/rtw88/util.c @@ -101,7 +101,8 @@ 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) { + *nss = 0; *mcs = rate - DESC_RATEMCS0; } } From patchwork Mon Feb 17 23:30: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: 13978785 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.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 076FB15666D for ; Mon, 17 Feb 2025 23:30:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835027; cv=none; b=EH0h2LHnidwnQ+exRTkkGMOHG5V4rszP+dAIAz4Wmg8pYn+eXlN+irPFvfhUekX3AGtqTl66F/wDMQGKQ85NX1zouPa3P5I9UBoG6mbPw4CiLdPtfGpfqrfHA4CTSCnfCanwbYS74oiNe/Lyf0eAnZPqGDuCd1uwQYmDpmtAZ4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835027; c=relaxed/simple; bh=L7s/xVzWav7A+A4+SC5tb/GuohHsIa0GQMI4T3FxcyA=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=IJ9vaKsmAJhVRBoXl067oM9/b/+YmIlk3tTaG7/U1A4rqcKxolbMzyBdPc7iC/7JmVhZKEz+fqQ6m0zF+ySzBk4G9AzyeiSQGHtzN8k3KvvvdL+ClosGwdGD1HM2fTFKP5JO6GPUZ797rJxW8Kq55MDKAvRHkNRzEOtUko70HJ0= 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=KDqiJIhD; arc=none smtp.client-ip=209.85.218.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="KDqiJIhD" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-abb86beea8cso382811266b.1 for ; Mon, 17 Feb 2025 15:30:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835024; x=1740439824; 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=OeWGgBgHpSFhRZt2LzxzC17j6aq9n9QClPuevSZwi1I=; b=KDqiJIhDyJMKmxlFlWJCj1G9jbVmjg0+8oP16U5U6IVDLNJOsN+szZzflwqaTXTeC8 ZGhkZP5/k9w5eItstJRvRmscWyQH037QSyyK+9F7LgNNoHyre+DURCwz3yMksCMKuxjy vqXxhCpnec67J3hJ+xJKgVv9KrUaHcW+TZZY/pvOTYINE/hZ2qEd8FcSF7WeEwqiwoVk vusbZzua+7iDp/x3MixMmuLmxsKTYJzAuTavonMNEsLAjRn63A6ThhQmp2QmX07uSPW+ OsxcUANPRgvpnpcetPIyiuoPIuRaKJk5/IS+eLgoLd4V93rfplu6+5jSai6BV1Th8DOx qsKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835024; x=1740439824; 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=OeWGgBgHpSFhRZt2LzxzC17j6aq9n9QClPuevSZwi1I=; b=b3ftb76oFtC8lxvAHuOJKfs5OK8KJjs6eU1EqBpeoM3KYuhRLclbPJqzvX7Vg++GZI RJMH/fYNkcVHz+r5hqGo9WrqQjsuRqZII74XbxNQ/ApvCanU4EDQe3zhpl4rbbySxvba L3avwO+hkOUXDrgOch6cgkaK/1yEXkrngH5pVzWnpfpzTOP0d7A+3tKHNPWLkkLaRXJ7 l2j3KbXsvRsHfrIWRGeB6AXUQdBS/ndFJPHLJhSmxWVbB91PdMdSs7fCD2TASNicOL0U mqbVzmEHrIahJ1oUZxnBTOCjOphxqStH+vWCTGAyAw43roADF+087QYXoENlTUyXimyR K9sQ== X-Gm-Message-State: AOJu0YwPkhYF7wjsoAH47x6rDGBF49Emk4VRb7shVxZ/5lAw2SjrI1rw kAekHv8U3tV0rRhgVQ83y/ER8bNwq5UqGKjK6MdV2PhcPq4sd8XtLIEhDQ== X-Gm-Gg: ASbGncvDlCNtH2irVHH3nH0y+trdluYxDcUJ7+evq41R93nOyCLn6uLki26jveinrcc ox39UvKzWqCN/3GRKpXFXJjZhPKDO9KhNDMiTS8WPmSUJzxNW47Q5Fm8HsgNorxE3mnix/zB+XY +vjUXrx4oInRhhvrOJxY7cIsCoxN1li2/eaJM6ToBhNwr0/oDBzBhYECXQzysVtmUnwu9jH8PAA QMdaGz7cPa1hic83ZT5fqU9Ew9a+VIk5ersq28R7EKYES6rtYPNSzu9WIkfzWtQUW7F4agySm/l 52ZpE0Cg908iKJPz4gtEmztg X-Google-Smtp-Source: AGHT+IEX7O9wbD5BtBl9jCMP33goBEbbNIT/UuJ8cImTauo/A9BKztvAxPY7TuC9WIHrpivG+j+Jvw== X-Received: by 2002:a17:906:2651:b0:abb:b0f1:2e40 with SMTP id a640c23a62f3a-abbb0f1487fmr203041966b.9.1739835024139; Mon, 17 Feb 2025 15:30:24 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abb9e44b7fasm241299266b.120.2025.02.17.15.30.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:30:23 -0800 (PST) Message-ID: <4e786f50-ed1c-4387-8b28-e6ff00e35e81@gmail.com> Date: Tue, 18 Feb 2025 01:30: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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - No change. --- 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 Mon Feb 17 23:30:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978788 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 0787015666D for ; Mon, 17 Feb 2025 23:30:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835054; cv=none; b=ljrCIEK9O2A9ei42viYbLee1jyPDm+UGv/S4pAevcfHUDeRHKZmJE5hXzYxOD/51BbpiE2oAHgGP5k9eSzJnX0XSwnXncaZxT6h9to36YD/+k4qRn0cVoX8zlGbE0Kmg2fbWvffBl/EBwASDoY4dzTqSXCDanZ5xAJCoGiEbpBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835054; c=relaxed/simple; bh=i508IQ9BIulfXt0/xMP6knSCCB2j1mSPLSL6LM2R8Uw=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=RgT7cKaUqZdIln2XilUPGYskhKRXLpNducId9AdHS6Orwuzd60ltUAUddDAEusamIjTMOUg93qxdYMKFLvwpQx6IoYl1Zp+7mUzXjNqsTMkbZq79onJuzeu3aMbdJxIxj3oGPn9NIi+wvO7utL6LeNIXmVzraw0OJDCv+kjZRqE= 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=m1pDD2ZT; arc=none smtp.client-ip=209.85.208.47 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="m1pDD2ZT" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso9031140a12.3 for ; Mon, 17 Feb 2025 15:30:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835051; x=1740439851; 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=j9+0WbLdJmq9JwU/NA/F6n/jrHoGCq84n462D9F9BKE=; b=m1pDD2ZTxMF/XnOoSubrd1Vm4BhoetI16v+orKQIi9pkOcYJItyagrLxfbb9Q8KsEl hj8W5Y6PAVmDK/R4bhWVMZqcQ/U2bba7Yk64vWiJ/dsYQ4hJTQRWPCYgwg/esoB3v5vo RUNBzpu1WtZRDwRKP78OuCgsuPWyJ4uwWxDIwQZq37eWkUqqdorAkBuNMWWQJI1cw2Z2 VJ1ZfnqJJt2zhqqI6tP2IX6jEckWncak76v083u5OCRXxk+pwUMF+XYGm0lnAkJmzVgb DB2ra2sxMapShKI5KRS9yacoeR9agoX/BWg4kkhJnManJmBdcoYHHnoPfe9QQWN/kkUN Zz6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835051; x=1740439851; 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=j9+0WbLdJmq9JwU/NA/F6n/jrHoGCq84n462D9F9BKE=; b=ZRbAZWD6258T5jcicb2UgGhvh+w5maPnOfBDyE3hr7lbXDbMz4rF9Jce+2uCk7ION9 rsTrem5Tv0C7+RWEFm/hqSCnqFbH1CwH5ZCe5TAnq1bTU8eCZ8dJkLoUpy94yIvcB5CK kV7XdPrWc1lJSc/Z5aErgT6HIdCRba+LLacwqrKIg/k3qSHU6zxCakWcyETnnvQcwIbe XLIU4vdHO9z+pBLOrwjY+b4U2wbxIonsS5M+GyATKfoDeuBKfi6rpwLe7u82IyDsvuwH ehEwKX7AEzSvQygl83TWpXRx82kdRpKH2IL3fWUpq4ytDr7umzQNPCiVR7vVlXLFbgth a/QQ== X-Gm-Message-State: AOJu0YwX696dnMEjyU9YDc4FDYtgHjrNn83wP2nYYL8VDosHENWoWkFi oqeZoJvBLezS7Bwc8bCgBvkssYVsZnDmWWKaS7It4vphX49vUG7ss/IvfQ== X-Gm-Gg: ASbGncuwb5sbhGv2uDLzp2voU+FoPVgz7UrIPahkGY0vQwZlpFHJG88ChoQIbVhFxIH SUPDIvA/NouWLlxAN5PK3jU5llayc2dxWmj99C86leU0+Doe35SmAIce83Iz3xR+X0FhkgF3mL8 YkehQjj9k09L2vQamKBEsATmUO2/q0VGG4aN6RnHwXK9HYBmvCJF8kp4r59mxllYWutPkgLOwQB U9qCx9jD/EL0bLsMyq7AGgpEYcZgdIWVej4UzNGwT4Yx1YzRB3/+wbGmU4H/h7tK8HxywMj/dee OSXSHoSglnrwpFrgKqnopOt8 X-Google-Smtp-Source: AGHT+IFNPqx3skx+PUSf59DLKdKTAC5aw6OohH8Ht88WNibhDLpybP87ixEM6c5ckXPEMBtWwjU8QA== X-Received: by 2002:a05:6402:2114:b0:5da:b64:e5d4 with SMTP id 4fb4d7f45d1cf-5e0361ca74fmr10449718a12.25.1739835051034; Mon, 17 Feb 2025 15:30:51 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece270b17sm7805694a12.62.2025.02.17.15.30.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:30:50 -0800 (PST) Message-ID: Date: Tue, 18 Feb 2025 01:30:48 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - No change. --- 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 Mon Feb 17 23:31:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978789 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.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 8A67115666D for ; Mon, 17 Feb 2025 23:31:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835080; cv=none; b=ePkO6FN4nKjtEaJavuy+EZPWQPE6gsFyKZ9xpXwUvjy4glhTtocGSDNw8m4XyD3ZqDTux4PaRkXEez2d3eTy4ACGRf4YsGKiCA+5m785oKRaP11z+b7C/Ty4qBkScBS15ZlW5kNb4zx0Tqlzym6c7zxxS6kdVrW2O/uJLqS5Qa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835080; c=relaxed/simple; bh=CxrkcZKE4VXQPi2QTsOFsi71IG/Ky29WMT54QPm8cQE=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=gRmeFyTYJvsa87wkS0mnkhiP2P6L37P1OFaAh2jQQ77FgmwiSlJZwRSn84FATaixjRIWUgn4WCPnX9W0Voicj9AijB2+asPtmAiqVAfru6evlVS5nQUVUj2V7mUhkSUvHwlXSO/8sSLNLmad8Zoo4aDDPXsej6iojwDlY9CaqPk= 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=jqlcly+m; arc=none smtp.client-ip=209.85.218.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="jqlcly+m" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-aaf3c3c104fso806876666b.1 for ; Mon, 17 Feb 2025 15:31:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835077; x=1740439877; 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=TsK6bNM5LqoZMcp+twKiN43bkararPMEamGn+YryHi8=; b=jqlcly+mHvlTipCY0agjnP2R7PxRmSHJgr5W6TEXCswpl2NPzMQKW3r+3Nrw9J28y0 xz0rDYVnQ3l+3E3UViTNc1ukvB2V69BZz4O4xuXIab5tTIq/WsNyoUpbpWKfC8leeu6A 68pYChK2+7HrB930qcs/JtNyuG1139kWWV05fBiFsV5K1TsWr60YnutmmftYQxIrReYR /in+ttkUgLvshyw0mD53BC7A2EFwWQFDWRueOqeZdmhoOgIpDAr3KI3UJ+VzVHjLQgA4 MLbGZj2ZEW0JVCufVc5NMkQAHqsnXR+oM+EV6gFlWz6NKETKYK5GWpO/xdpnWWfQBHX6 qP0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835077; x=1740439877; 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=TsK6bNM5LqoZMcp+twKiN43bkararPMEamGn+YryHi8=; b=lEa0YWiGbC9HjZnvN9t2w0F+HciCjpCO+h+SuViHrKFitTWZDBO6YOaalVdsqZ5JgZ aDWV6nfWm8BepHVI9RPF+Kegfa1cPd1U+HpqHf2KekRRQ5HLYnSVKKHpWDEqeGjnA805 7m2I2Y7+MF9RUJhaNUMrukKlNMo0vEgaQ6SQ7XmimkhUUdHT4nYBjnVeasg1sKgGjJyo pDY9HfH8hpgxBRLdQO4DIPkgKtVRmF42vmUiH7V0Rmcqwn9jQCzxWnCR39Ns41woVT73 I6KLmzE9gwfKH2mwGdpVm09Ds0on6zqbfmwa9jvBOO1ZqKewCakHiCQdx6uuO2YbCcNP aSpA== X-Gm-Message-State: AOJu0YxVhVbpU7BOaOEnBWDPjdW1M9806pc8uKLNqpVhDGoSKsCZ3bQH QgzTSeSs3zHw/lVNpWGXMPoww7BDWLZWQuF9tL84Gg/fYs8HtFGSJo8ZCg== X-Gm-Gg: ASbGncs3YM1T0WqjUzSwW8VEfGrf9+L1Htyuc0l0bjmhgGHA9grJfKT36Kf63AmeEZJ tzS/Y2EBLeTybI28Brz0ir39a1P78csEO56v0RS5+twqr8/NzrELwceG/CHo+p1weqNvljYUbO3 KZirbRB3jK8KxOLpwZJzBz0RJohC7nLchKJ5r95/OnmITgTLLxKIwc9iLSTyfrBKbHijsYgkU0h +WsJWY2n1vX9Gq8KZM91b6KM+6NRtD+iRBEZ42OuE+12AJ5DYxljNDEGbGrmfsnoRbU2BMqf/Gj 152C/0cg9BgAlfL5OvZdeo6O X-Google-Smtp-Source: AGHT+IHZVHO0HTl8KOGDW2jVnE4PULmD2NFQlMGWSiQ18AJfXezct1qLMeRObQyxyUvyFe6gq15orw== X-Received: by 2002:a17:907:72c8:b0:abb:33ff:c5f4 with SMTP id a640c23a62f3a-abb70d679bbmr1252581666b.36.1739835076650; Mon, 17 Feb 2025 15:31:16 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba532322b9sm959505266b.37.2025.02.17.15.31.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:31:15 -0800 (PST) Message-ID: <39e3c7cf-37ed-4c0e-af00-dcd9eab351f0@gmail.com> Date: Tue, 18 Feb 2025 01:31:13 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Record statistics for the 3SS rates too. Signed-off-by: Bitterblue Smith Acked-by: Ping-Ke Shih --- v2: - Add Acked-by. v3: - No change. --- 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 Mon Feb 17 23:31: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: 13978790 X-Patchwork-Delegate: pkshih@realtek.com 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 2AA1B15666D for ; Mon, 17 Feb 2025 23:31:55 +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=1739835116; cv=none; b=dLHAPFc75Mf0nk6TAV1lT3lgnPfdYwp0R2vFVnxKB7esb5QgK9uWXIf3TtEjEeajW8AAvdKjRCbwBShZ+twkQ1axaHfA/g/AWaMMxCJCa/KfsKi8DvqYDaECER7XtnuSuju+v4gOVcyIox/5YmizqIMRzzRegWrE8tqTC3p+uN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835116; c=relaxed/simple; bh=jokbDHz0CUJ0CmtHFimD+XYpo8uAS3BkuZB9tPg+yu0=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=IjW9EnD/aguWdAOvAVr9po2x2QRUu/+RCQ+YzJTmTZBc4W604oZOtGM4frj5eldFhhSDpg6p/PKMf8JTQTX6kku6tSTyTXcLY7cb0U6qquQR11yTLaYPAUcC4TcMmSXhPkgrBmN8C3E/r1QcIUdYK4q6KmuGpNhfHh0trfykoFc= 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=Fiynd5H8; 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="Fiynd5H8" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-abadccdfe5aso574182266b.0 for ; Mon, 17 Feb 2025 15:31:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835113; x=1740439913; 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=TXn0E312stjAPoplpuzfblOhCJFbCZSNVcXgpY5Gpb8=; b=Fiynd5H8BQfTmqpnHpkU8RqhSusuEYMV6ZXx4ZkKl90YFkYE68eqpD0P0r7DnO8FGQ rZxewVOWVnuHf+W7Ksi3gvUv8kK42gBFPE6PQaYcF1IWhWAEhI36G5jdee9PwlO4eV1d MxKVN5nnyK6/0YPjs5fueSeEq5N/SR/gt90yYTwfg3u4cGdDOOpZKNlo+X6yzym7qMGy n29rjpSUCDsNu80woKji7yCC1hz4/srof0uwv9CfXDzqQw8iCpBthSgzK83DVp57QK0m /4W15BgqvJA64O0NXioCrSuXv0R4LRKV9j36YqQUAoxZ+Quza4r5HxzUk5lJLPPC+cjB GZUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835113; x=1740439913; 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=TXn0E312stjAPoplpuzfblOhCJFbCZSNVcXgpY5Gpb8=; b=DqV5kVrID5Vz9UCur734AIBLlPQfH5VzcIbFCdPl2QJlakB5MS9T0temANdZjYer1I pqRbB8O9TfIImHwLD5LIWg0Z//RcQhk8J8ugDi6qyLK3TOlSfberEXuAX1ZLwuHIlgPC df4ezc2GtPWNd4rqQC0KKKaXjmU8bI8+uKlgn1oMCpOSerK2uNEaIMBad9tPaxcB2ZXh LYMs12OG7iKHYmfcx8a7z9Lr7LtWOt/gV4sd/oO0tAYnOGtNaRyhB/g2iRzrt6DWsKqH YGRbqyQYKb5EUkznsRBWxUlyZcepJuJ/ZYZ0RaBMHB4GkCFWhP+VMRG6d3PXKjqFkXST z3UQ== X-Gm-Message-State: AOJu0YyFXLeMFqOTsksy4GFh16HDlaO9CCDx3tOQcIAnkUTEXqOWNbul 0j+2F/pFM43XTVbH5AECWMSOKITj83QwDCsXa6tweDL0e0tK0csfQ0IIrw== X-Gm-Gg: ASbGncuRpk5O5OXLU7Ap7aQA9MMrHYb3jJol7/6tQerqlnVZrT2RVOo7izxlS7fLgbU wsSFgKdSrZdc/9cAOLP+ADHZFO43vOehJlaz8dnEMXRMdB2+ewRyPtDbcWbBWxWHwpkqIbv7FJl eUV3F0A8SrljZJcWrgkXeCrS3OO1uTYtwrpIENHiBTZpaSDUXKWezaT9KeCPsuVSTx3ZBxGjgBv cn9fk9oQM8xYi+WHD29xEN8jb4pqb5knxZWHAFAFpimGScrNNQxRTv1ffYV2GvKgKEPeIfdcVCK OZ8NBgFsvjf54baQXNX1mqvx X-Google-Smtp-Source: AGHT+IG3YM4UAtJzCEkfYoCuvVval7a0tKAEcj+IdK9hzpkF+V+imLVquwQtslyxAI9fpGOvsqjqtg== X-Received: by 2002:a17:907:9716:b0:ab9:5544:5eb3 with SMTP id a640c23a62f3a-abb70b354e7mr1068716766b.26.1739835113348; Mon, 17 Feb 2025 15:31:53 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abbac60d938sm131984966b.147.2025.02.17.15.31.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:31:52 -0800 (PST) Message-ID: Date: Tue, 18 Feb 2025 01:31: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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - No change. --- 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 Mon Feb 17 23:32:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978791 X-Patchwork-Delegate: pkshih@realtek.com 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 D797015666D for ; Mon, 17 Feb 2025 23:32:19 +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=1739835141; cv=none; b=BUjBD3hO3iXt706NsQ9ina0I3Nb2CxsWbbHo0SOxGKYCEuR3EEJVPSusfncUNUqXKaiVMWscfFlwDK8+gpR+W8qCJ9XI/4xlC9pbouAPi+zCdeSTsvdoz3PvC4bkC42I3P9xv4d37ObFncIV8rED7rVQ5/mceErWfw2ScV/q1u8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835141; c=relaxed/simple; bh=KKPK28GkhPHcnf2YJXUIA3CvApVQ9JI7h4oh1eQrEFM=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=NFqlfd9TRR60r3kFIYpL5AaXOp6kFkDhDVc3gNMTONQtMrrx6NDy0vM9sXy51ei6IA46/zdLC7z6bIQ2sC6dnxXdjnoPxAp5D1XACrs1PxiEkx8uH0ZhC/AyYPQc1IYkfZdDvU51DkV4/FhuUFgW02qvzA4/QODiVEv3iF6uL38= 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=JV7Yz9zw; 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="JV7Yz9zw" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5e0452f859cso3035890a12.2 for ; Mon, 17 Feb 2025 15:32:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835138; x=1740439938; 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=8JHtu3gWiPwMihPPm+h3WIQAJyj7ggSzm9jjAZ3Cr5s=; b=JV7Yz9zw4s7/ipKEpr6JEGkoIAWtn2pN0fZZCEKy74VLj1W/3aR6Xuf1wQtn2+6mNn vWF0ew0gF7qMNrbXdZblaCDV0pwOdmqOCUatDnrPXTIkp9Yhg5WT4S6K+VLGbn1cqGo9 eemf/495km448LC3SlFiM2aGLC9a9e6cRvZjxxLCsZuj/7IYSrS2qdybAsCOZvad9Nhp XB4bDZP0oqlcVjhz7wZDgqkEzz7PUNQ290Ui0AQG4aIuu14PWw0Hxo8Apj+O2FL8CB25 2Ne83UErhulrs7bRCRhlU/I3/p69jcCrC7SrPgif9VOhnXAPumU5lgBWB5v6UjG6zpeK jyGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835138; x=1740439938; 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=8JHtu3gWiPwMihPPm+h3WIQAJyj7ggSzm9jjAZ3Cr5s=; b=o4iFr+yLJAbFXLMt6PE0un3A+QiqcjyHBFXEc0YD8V/KU5DWO6Y4Ce9F3vvai8A+4J Eggkiu8lrJsz0/KQwuMRACvVowJ8odmcDMwblZbEwqetO684/USnlR/0e9tTnM2YUIww idS+ccNFkQ9Nm+EruIOqk9IiW3vztBWK2vfrd8f3XrqFM8I2Jh8ziNBJL6CvapVdRGMe Cr4YAZLzJ86QsQB6g4vK1Qlq+tRJvVwvref+UveQI68a+kRkYG2Gv+diWHTH2L5WN6ga 7iElpdIqBomBemlW3E91nPb1zO7cK9GB68cZd4Z/F00ao9tlbi/VXEOFkiT+WpX5b+QC aG1g== X-Gm-Message-State: AOJu0Yze2XPEHATaJBRDUhhM4j5O/iGzpoynyyDEaLl+LPunA2br5Or9 ecHOcpmlz74qM4enKeS9/jXH8wWMWqTMuoolsSlFEtTQmrqRouevslhyBA== X-Gm-Gg: ASbGncs/QyBGSC2yidAeAzaSIsOrcXjLOrs+CiMbwOSR88mSzJair2kpodmGbf+c11F CMfJHKW+anS+HkVmf232xzNRCZcbvk4erlRMCUYxtWRVdtHC1tpZU+7LC8AQ5H0/U6FuPDAao+c A5czQTRIJlj2gL/LsEbHRgFMJNnrPd/8XaCAzmN6wdI2gIE9hRDqDp/UyfDAESIpnDquX1Ok3xg YJcJPdh0LvwU4etMq0rGaQgBdpPn//bYSlHPqBNciWeunJd/1q3yTDMtmeuP1/m8NTYn10Y/kiD 0eqwHTawp6PRZOQf2kOrrvw3 X-Google-Smtp-Source: AGHT+IEXd/hyxrEWm4cI5jFtwEw3b3iqDxPVr/dcQ2RuPzOx1uiPJ5lATEUCB7+eDQ0qicH6ZiAOTg== X-Received: by 2002:a05:6402:50cb:b0:5de:5718:296 with SMTP id 4fb4d7f45d1cf-5e0360318a7mr10634832a12.13.1739835138020; Mon, 17 Feb 2025 15:32:18 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece2721d9sm7971822a12.56.2025.02.17.15.32.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:32:17 -0800 (PST) Message-ID: <7c8e94e2-e034-40f3-bdaf-b000018b5573@gmail.com> Date: Tue, 18 Feb 2025 01:32:15 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - No change. --- 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 Mon Feb 17 23:32:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 13978792 X-Patchwork-Delegate: pkshih@realtek.com Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.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 0FBFF15666D for ; Mon, 17 Feb 2025 23:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835175; cv=none; b=a48elyaeGkQ42kAqblhvRRqXPwTCKiEjGGJffodF09m1uZLbARgyKHP12UNdKTrdojngFAjuuJKqAbIJmoQa/Am3mo7GTyppHVqtPJS4L5CNv6pLafPpHadP5QYVNeTB/Vkc17I7cJmwT19tDjwXQeW22hp1Wmlh3AvmmBRA8o0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739835175; c=relaxed/simple; bh=lB0c1W1JU23BHHUYdYSSLG1Hi6OxB24fHCmNRz8XMy4=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=cgHUpG4B2TIxVzGE+kHeJU7WZxTU6bYgsdB4lc82dxCKapfIRhql6yLRGhKViOIlQL7xTs+/AelgV6A61Fg7LE+tkplf6IU/++dU9qMdI4r8BOvdWZ5FoXK0kQLDOOpYDBZK/+FkU4SGyDFKVxUZ49tA+BXPKDmJkn/ezROYpsk= 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=e0Ry838z; arc=none smtp.client-ip=209.85.218.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="e0Ry838z" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-abb7a6ee2deso356323966b.0 for ; Mon, 17 Feb 2025 15:32:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739835172; x=1740439972; 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=nQk+fHekPzTN5pyREc7BNKcXMbKg0FM3oukANhwhDtE=; b=e0Ry838zHKmERud9K2dceXYjDdwzSsoPg14VW6TolSh677ayI2T8BsG6Xe23If7DVd rh2RLsfQjJ3bmlQACE+cq6w9V1MSaIzBH9pRpXJIvKzcCkm710hNFWrKvu5X8KJ3XGxv CVOSXRuvX/iWuggrWg5GmFBV7YjBGFhhfdSl0SCLlieR7JZZ3U9by4TN0QhHNUR63v2x nnznuyuJsjKzMlRO5YZsdL/4GvMHii+qUk4C5uYyWrE2SgWZX+rZuEzW9GakO43cs+Eb 9YyhuFXwTzmVC1JDDEgkbTxCRenPd6U3Tu8xr4/K2FEIk+f7U10R001YGrS+gPbI1wuM z54Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739835172; x=1740439972; 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=nQk+fHekPzTN5pyREc7BNKcXMbKg0FM3oukANhwhDtE=; b=ZLgZfGVajKjZzNVy9aXaxweD6X67P/cv1NxVgHsa2P8E8vX/V3UKMlHTlBuysHhaCt 7paWWVfO0w1dxrfdM2dtQvb9OsokrKF01Wy42RJ5bajm2l/nZJciu7VLI4eihFxrqKvX gB+6mIqhe2Kw9Gx0j5ybg+7xkp3RUObUXOHWJD64qa2bkGyuczk1hBLzzrmIuS2aKDEx Iq93jjaNQZRSPhEa5oHQub0qq4mqOMMJ7K+EC76Jm+S4MueX+rNQWGL/K0YtbcZZl8bX YKBseuJUQUb5/RRemBa+LLpiWBs29nA5WvB6h9lkkAVbrwgPEdTz0FHvGV0ZLwhP7Chz LOcQ== X-Gm-Message-State: AOJu0YzoCyU0Plk3+sPJdmUsUXwy3NaWZ2h+lt7s0/HGcQBYQklJ7N6D u9N9RcE3wEOeQGYnzzUYFdUu5rFGv1rMS9+QH1SupO+RtCq3w/M25OcEVw== X-Gm-Gg: ASbGncve0vA/8MN1zKzBNwmG6s0tE5swZlZSDWgFQ9B2a6idVtTGCs07fc5PQcEBJy8 5cvCbE0iCOL/mqxcWe3vWaFDMR5RWamqidktcWOLIk8OvIRNwrwGoIa2UuCwtNBqIPEK4XVBUP5 fBr08fwpTURScHJDxuNikOHGxh6dsN4CX40RYtzPxkTty7s6F6urGlSKUOA4eGnXcr5QnANBhL7 NNKDpUJTvkKWj+7EZALwt37fonxHfBbDf6a6cRX496+b8tsSZS6bYLrLeEShaByjbqDfrUA0Tfx 2FEGVLWywu0Sh1j6F0FqunSA X-Google-Smtp-Source: AGHT+IEixf5kS0fWf1d82oVYg4oR7UvYjFDbI6CZXjTkwxiUtu+6AV03Zuhh05EtD0hr/4lrZ8M48A== X-Received: by 2002:a17:907:1b12:b0:ab7:bfb1:99c3 with SMTP id a640c23a62f3a-abb70e323cdmr1302123066b.53.1739835172232; Mon, 17 Feb 2025 15:32:52 -0800 (PST) Received: from [192.168.0.50] ([79.119.240.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abbbc841eb0sm4050166b.128.2025.02.17.15.32.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 15:32:51 -0800 (PST) Message-ID: Date: Tue, 18 Feb 2025 01:32:49 +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 v3 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: <3908a496-d687-40fb-a1af-6add5c7e1dd4@gmail.com> Content-Language: en-US In-Reply-To: <3908a496-d687-40fb-a1af-6add5c7e1dd4@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. v3: - Add Acked-by. --- 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,