From patchwork Thu Mar 13 20:16:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 873383 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 E34F71F4297 for ; Thu, 13 Mar 2025 20:16:45 +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=1741897008; cv=none; b=luPEFTQz/HxCtPvBb+3vnaUG5ofctTJBrnlJK8jSraVuaAFNrh8UHx5xLiktm2VLrE1eujeY3rxXQka0PSzEESD7URO26/OQIhHzfzd9hIM1J8bHPK1GcYLu0m0jJJ7oyZXkVBr8fD83nAqSAcNFBm7X5rj+9QiM42PeExnwsWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897008; c=relaxed/simple; bh=x67tj4d4sGFh6pMNLKZLO1owKYl8+zRNeQo7k9U82Wo=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=cLTH23T4KaRpOOaZmxOSnVjVow3UzkrgrI5dDhs+pWvSIEycXva+7lZsGcUbJvhqNm3SBVoJ+hhaSA6PXvUg/6hXY7X3QC/OwIxbYCMVjiPVFjg/CC6HAmJTwbUMELYg2jdAQ7Dr1Em2bLsuwZ3AJU+siJp1GLcy8ZIrfh5Q4Oo= 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=FjwUEoe3; 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="FjwUEoe3" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5e614da8615so2659234a12.1 for ; Thu, 13 Mar 2025 13:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741897004; x=1742501804; 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=wurt4MgbZ3YF+714ARk9/Fo2sMYfuH9nOgbrs+dz6eo=; b=FjwUEoe3wBn3wibgBxG6ofF09OV84fty3cA7HE1kGUeyhbnvg20SxdjQHP42bG4qQm exsWN/wAQuco6IOK0xIk9IAWuTAa1qhI/rCIkiSFUg5nQBhSEmydxMeYVq2d0iRNGLXO Ydyr+MJpI0uDZc3vyOsXP7mssoiZzIFWtSOkTv50GWtxoimMmpxsEitkGnIpdEwOsPY7 +IkbkZeGNP8M4Ixvr12IkwJoECKIZ/Epg/sh2NnH+qMFMiaaVPTRIcRpBA8fdM7iL20J QzL2ddfM+jfXp60jYjFUuDpaBoIsluxn5qbkeirErTC2zug1JEzL0u0/o87kdsT1ogvh vaKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741897004; x=1742501804; 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=wurt4MgbZ3YF+714ARk9/Fo2sMYfuH9nOgbrs+dz6eo=; b=DOyQ5M/doPQgsaDBzeFrYKN4bi5bsKPyOEp2g2d4U7euCD4ZD3UCVCpR8rwwbOeOQj hWE0OvVLYwQkozW9RIC0/VoKDjFf0jJr/5K821pBRgJXocbD6YdDteCzfw+ksrOVDoQ9 ojSuCNJ15OZwCdQNJa/HHsQ9dE6vjYjerB7W4edQGh/XoRJwrD17u/FCruB12FErA/PJ JIPO+KYYlMz2ef1zFrud2yKvoJewW3SYQcpvZSv6NSMyloFDXenWV4TGCNNLKXDLPU3H oNqF+U/5tCBCjlBi1rjUyraqp1lxdCUjf1e/vJExxqTg43j1YNGN/2P9FHZVZrUQhZBa 914w== X-Gm-Message-State: AOJu0YwTRCUmFeHXRGhyLV5/+YXb6f2yrxbE6Eu2mfTI4KXXnmuzpNPq /gZp2F4jCfdL1AgVCHvL3+QHDKxmeUk72XgEsUN+xRUC2SMtkRY6tulUTQ== X-Gm-Gg: ASbGncsNWUyDxFGr7oKhgdzsJVJs+uMgceTSsDJL8EFxv2HkQFA84GPJ84AjOQA8QIB N5o1PV9YP/kT+mvC6YScUqvk4J/1hvEMma4q9fpZwVMLS+iy9LCXEhOxC4w/PG8/nAN89uOnfPz qJEbh3QP0fnlRfY7/GebuMyMMOeFu1E2trHv+HmO2+dFGh7JRFr98GPHVAz8oAN3U+/9OeNed+w K80ynBhaT4Xra8vssPatI5LRSQAqSaio93ZRocGhGXmhr/ou1cmV9MwYgMSyWSseSU0p9ftI6tl cNKx08CU/plz2kb9p4U3XKAB8/OVvwo2xrGxo/I7KYcy6LwcP7Z1XQ== X-Google-Smtp-Source: AGHT+IF7qpteoazS4G04wuXTl/n9k8FyMlt6JU+4vMlZkygV3EoFOMw0F3Ibo+o5Vz+hb1stTR4L6A== X-Received: by 2002:a05:6402:50d0:b0:5e5:310d:256e with SMTP id 4fb4d7f45d1cf-5e814ed9ee6mr3572682a12.14.1741897004036; Thu, 13 Mar 2025 13:16:44 -0700 (PDT) Received: from [192.168.0.50] ([79.119.240.155]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e816ad38b4sm1115200a12.60.2025.03.13.13.16.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 13:16:43 -0700 (PDT) Message-ID: <39d594a4-7099-4a6c-97be-51a7ab614777@gmail.com> Date: Thu, 13 Mar 2025 22:16:42 +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 rtw-next 1/4] wifi: rtw88: usb: Enable switching the RTL8814AU to USB 3 From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: Content-Language: en-US In-Reply-To: The Realtek wifi 5 devices which support USB 3 are weird: when first plugged in, they pretend to be USB 2. The driver needs to send some commands to the device, which make it disappear and come back as a USB 3 device. The method used to switch the RTL8812AU also works for the RTL8814AU. Signed-off-by: Bitterblue Smith --- drivers/net/wireless/realtek/rtw88/usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c index c8092fa0d9f1..a78f59fcde58 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -1094,7 +1094,8 @@ static int rtw_usb_switch_mode_new(struct rtw_dev *rtwdev) static bool rtw_usb3_chip_old(u8 chip_id) { - return chip_id == RTW_CHIP_TYPE_8812A; + return chip_id == RTW_CHIP_TYPE_8812A || + chip_id == RTW_CHIP_TYPE_8814A; } static bool rtw_usb3_chip_new(u8 chip_id) From patchwork Thu Mar 13 20:17:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 873809 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 9807F1F461C for ; Thu, 13 Mar 2025 20:17:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897058; cv=none; b=hGXOvxuWJy1beZwSgw5tAIHaAwKJYJgN1ExfzCzViQC/YyCZP9Dl2+TpausqAuyxglomPC8R4phVZtx+HVEVTQwArPKF17iihC0prQ2YWNANmKQVn9u9I9XHOW9wDhE9IhY8oWjsP7oL6EORJO4yr7jo7qJnff9rqH/SaE3OOqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897058; c=relaxed/simple; bh=AfaFkyGD3mkREAYunXHNH39o6ucwUpxQhKCl+8HQ3Yk=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=MQOcrizCnLo2vVFqcaSbYXaZpA8e01QckC0ZM1tBNfBT5/ZrAXQBCOhKO2EcBmCYf3dYMlIGwGi7voT/L5GUiOs44RGINsk99WDVYK6gNQrLjNjV0+Ungum8kZZg2X5R+wQ4u13x2sX+FHeC4ZKj/aFotG6Mb1L2WqHttpirVCs= 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=f1Pig4fh; arc=none smtp.client-ip=209.85.208.43 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="f1Pig4fh" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5e5e63162a0so2010742a12.3 for ; Thu, 13 Mar 2025 13:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741897055; x=1742501855; 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=CL+OJDnGYN/koRcEsjVUz4MdXxz06WXzKG7cUkYkqdk=; b=f1Pig4fhNoIf5ICRrCx6g+pVhZeMCmzeVcE1w1JDXYPXr5O4ZziDsvg7hs6H6FA7eQ ofrztqQ0wUVe8/n6W49rOEAnb2F2L0ohKZD1JmVDb58fBkeA91fzSUPfeSQkaGLSofsO mSZ3xQCRHDXUzOhDbYLT1/7xEvHM3FxCadJ9E6URvH7QkEeUn6TjLOOxaQt7Ahse+42Q iScIQDkVCBj3KPcZ5jMYOdMFV59OiO4/uGeQmFSpkmXuNQESAMqSUhVoELLR63C//wtL Iz/UTtC4T2qP20Y3GlMMId5Ri1eFEvO8ptNDny4eh/2VN5k5zpwojZKLLRrFjN+MeRnL EsXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741897055; x=1742501855; 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=CL+OJDnGYN/koRcEsjVUz4MdXxz06WXzKG7cUkYkqdk=; b=RscztXB6SD8eIOhI5KXBbludgHUWT86QMU9QKT/pUOiqF2bexAVdadBKxmK8r29Vt0 c0ha1ntl2WopRsppvVtAcE+tA9Gw9ir90AtRAN6agvlO1vr1GZdU17OCtRoRLkfen1Lz ba/3CikWYn59LlFrx0LPJpI13FQUE5IRgIopuvejYf6Va/Nv4ak/eEp4F/Gm625K9yg2 jlRMhbQBpXqiwLRg+93WaIpUpj3G1DjqhnL0CBzjhNr+VyFVp8sOjmls/FNEj+UumIgK P7OkOM51ah0bvZk0Hz9dMmSD/yBPcz84EhvrqzXkAq+VqxAbgPpDWq5QAE9WbF54g+YJ JqLg== X-Gm-Message-State: AOJu0Yx3UxZ9EqRxjVQsX8B61UgEE2w7D7yUpphPWpIuf0L+FvIVM0tL M/eMccwnqSUWVj5F7TefsJRwLgQMDg7kV0hmVx95NWGROJiapbN+Umsa4A== X-Gm-Gg: ASbGncu7L3wI4Qr/WI0L/kkwpvUzfCop0fJF6w/PGgLN2oBMMDl9tm4KmP3aKOf5FU/ BhTx9XDfXPtEnLl8LeQAP4ID7ZT+kwmU8qWuyShBhN1U/O0liY4nEuIgPkPGOAZbDD5BjLPZm0G rn39y3jVHZzr2M0jL/fr+jw0ZBZIKx4OQcm4JDpi7DOiDQeudnU536zukUjxRzm2N6RcVXW3gBA Ff49m+erLtbuEJ9EOGY/XC9+v2qE7xbbou/WRcDEpJQLmlfbp+mNVa5+xNdH6ECEAMAQDBv0cbL cJ9urfBz8UrD6L5EsdcDQbu5EiB68frW5g58Lwd+MTM8JYLfULx1QQ== X-Google-Smtp-Source: AGHT+IGxTM8L0LE+idZUJZQLTLkbx0U5qfWqfXICha66Khe4FN0KyRZLEC1LYpKBe9tK6vufQ34OwA== X-Received: by 2002:a05:6402:50c6:b0:5e7:8efa:ba13 with SMTP id 4fb4d7f45d1cf-5e89e6b1751mr50009a12.7.1741897054630; Thu, 13 Mar 2025 13:17:34 -0700 (PDT) Received: from [192.168.0.50] ([79.119.240.155]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e816afe1f6sm1037666a12.77.2025.03.13.13.17.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 13:17:34 -0700 (PDT) Message-ID: <1cf5d430-82c2-4b7c-96f3-035aa5b899fe@gmail.com> Date: Thu, 13 Mar 2025 22:17:33 +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 rtw-next 2/4] wifi: rtw88: usb: Enable RX aggregation for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: Content-Language: en-US In-Reply-To: Let the chip transfer several frames in a single USB Request Block. This is supposed to improve the RX speed. It can use the same code used for RTL8822CU, RTL8822BU, and RTL8821CU. Signed-off-by: Bitterblue Smith --- drivers/net/wireless/realtek/rtw88/usb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c index a78f59fcde58..54fb835e65e1 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -866,6 +866,7 @@ static void rtw_usb_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable) case RTW_CHIP_TYPE_8822C: case RTW_CHIP_TYPE_8822B: case RTW_CHIP_TYPE_8821C: + case RTW_CHIP_TYPE_8814A: rtw_usb_dynamic_rx_agg_v1(rtwdev, enable); break; case RTW_CHIP_TYPE_8821A: From patchwork Thu Mar 13 20:18: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: 873382 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 2513A1F463B for ; Thu, 13 Mar 2025 20:18:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897138; cv=none; b=oThJSCVXBfn8KhIiILnJu6j2nmxmeCYn/Ac0+HyevNBdPaHWoTS18DjZvQUUOFkRUlFwJ4fz/rImM9NWPKujc/9oF42ePIvvswHj6YdC1uvxSS5AeI/dcuBVeYiG4SAE75UGDpnVQF4XXaTbhbyAHkdVvJKQphHH8nmiAzDkwpE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897138; c=relaxed/simple; bh=e37sf8/fT/rYGX+m5VGvL1kbqgaMRT6r35qL0p+keuY=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=G+h/4ANwyLIxHNW1xJi3L3xWjE/10l9T2R82pgnNGips4RbYDz+oY+Nhm7+RGqYNDEjoRyjDnIfavJR/LPSCRsGdmKDkXzGItdLC8lWUePTLNrLk4LjzFuLDuiZe3vKu/fAiO71Orwl2/SyIsrg3kYuUjPFDvRA78lYuhJu2DwE= 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=gidlHq2C; arc=none smtp.client-ip=209.85.208.41 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="gidlHq2C" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5e5e8274a74so2285508a12.1 for ; Thu, 13 Mar 2025 13:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741897134; x=1742501934; 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=dTENzkWxxIM8acUHka698+woGh2MOTam2MW4l72Z+bY=; b=gidlHq2CZtPclZetm1t0NVtEeX2KdqfODTJ9emZSW+imjs6/vcEUPE1CO2Y8SmTQUI oMKkAeh5eZ9b8bHooLLl8uYO0LW4jReF2mgOAl6BuPdZp2EpJYYicJSEJ1tMDwGb/gsl LNgfd9BWXxjiUB4QUzZJi6MTxIdXcxRCETQYNPeyFxWCrxcfh/KtiONLQ4rSeWRBDfdn i7EtcQoNr2MqGR8obBIOgZJTCORaYf+J1vaDeQKGxlz1iEa6XOij0OL+wmX7284cszT6 5ku90rqIkP2+57MOj9j3FBeLCJKBlCrJoV1kUEgqQZxW8wSlz6HMmPqXe8gZs77hXEEq z2pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741897134; x=1742501934; 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=dTENzkWxxIM8acUHka698+woGh2MOTam2MW4l72Z+bY=; b=WxP0dg6AMOPg/9EgN7kwr9yk582ThiaYwvnxQRQld/N7uQIgsbpjsWME3s4XTPgjIf cMDnNS004XAIgAKbbV8rYK5AZ3zinLSyBgyIgSQ2YEiVHAF/GFlr+XPkeRKvE1dUwiRm fD1s5n6b6MwraYFHGTLwVOe4tzsnzvZaxfbPZrKhIGIFb3TuUNwz6eJMa47hKNOb5c6E I+WDUc6azD6d9GCB+4uWB0tyaVHP8go/F7lT2a/JvuN/RUjWc0YWFOPBB7lvIVaGB4tu D1gU6QctXi+t3w3/IUJx+wOCekOBzwIgBzQVMZIgYF74jZih6BYSZmzrP8PdiECi9Gzi 8snQ== X-Gm-Message-State: AOJu0YysPnPmMqdJBPkAy+nGDAeaTH5dpQovzdEk7zRojToRQOw3mT52 8BMKAdPDwy4OzED1VJy7lS8oHAtjNVSRc0tlN9oeTAg9udPS8ih7H1K/zw== X-Gm-Gg: ASbGncuxLe4OgaXxmoC9+iJ832Kx48TkXatX8/U1K3UKMo+Z53mv6H8BrKuWogWTZ6Z iNPD5oZZcrmu+TdIvx69y7zNIvbVBzaSR3bF08Ey2MerfnTtKIZRUAvHpgG6JEb0x+rpiX8PKk2 da9TLcRytwxEgwwtjJIOK2rGObtJaXUtztN4q3y/f0te8h7Af+Qa0fuyE1XtXDgb4CCE/au5+pU HYfixMBj6hloZsIaR6n1r6/BgQi2xZqXUBrMpkOF4LuCQvouyynChkrDrAolFEihUmYXu6H7mqw cbDUAEMfEvh/+wqZyq404jDHkql5supq/3yNEJDX1bunstMccPDIcg== X-Google-Smtp-Source: AGHT+IHB1bgJPXAHtW3JzQ+nbJuQUlJ2GMss2INR/O1rdNjDL+zeNvVBsUVZ/vcMVy6TAvXxk/RC8g== X-Received: by 2002:a05:6402:4301:b0:5e5:c847:1a56 with SMTP id 4fb4d7f45d1cf-5e89f154754mr71046a12.10.1741897134250; Thu, 13 Mar 2025 13:18:54 -0700 (PDT) Received: from [192.168.0.50] ([79.119.240.155]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e81692e67bsm1067793a12.15.2025.03.13.13.18.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 13:18:53 -0700 (PDT) Message-ID: <289795d5-49ae-4789-8f14-b2d016843a53@gmail.com> Date: Thu, 13 Mar 2025 22:18: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 rtw-next 3/4] wifi: rtw88: Set AMPDU factor to hardware From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: Content-Language: en-US In-Reply-To: Tell the chip the maximum AMPDU size supported by the AP. This greatly improves the TX speed of RTL8814AU in the 2.4 GHz band. Before: ~90 Mbps. After: ~300 Mbps. Add this configuration for all the chips, even if it only has an effect on RTL8814AU in my tests. Surely they all need this. Signed-off-by: Bitterblue Smith --- drivers/net/wireless/realtek/rtw88/mac80211.c | 2 ++ drivers/net/wireless/realtek/rtw88/main.c | 32 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 3 ++ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 8 +++++ drivers/net/wireless/realtek/rtw88/rtw8723x.h | 6 ++++ drivers/net/wireless/realtek/rtw88/rtw8812a.c | 11 +++++++ drivers/net/wireless/realtek/rtw88/rtw8814a.c | 8 +++++ drivers/net/wireless/realtek/rtw88/rtw8821a.c | 11 +++++++ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 6 ++++ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 6 ++++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 6 ++++ 13 files changed, 101 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 026fbf4ad9cc..77f9fbe1870c 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -396,6 +396,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, if (rtw_bf_support) rtw_bf_assoc(rtwdev, vif, conf); + rtw_set_ampdu_factor(rtwdev, vif, conf); + rtw_fw_beacon_filter_config(rtwdev, true, vif); } else { rtw_leave_lps(rtwdev); diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 959f56a3cc1a..bc2c1a5a30b3 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -2447,6 +2447,38 @@ void rtw_core_enable_beacon(struct rtw_dev *rtwdev, bool enable) } } +void rtw_set_ampdu_factor(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *bss_conf) +{ + const struct rtw_chip_ops *ops = rtwdev->chip->ops; + struct ieee80211_sta *sta; + u8 factor = 0xff; + + if (!ops->set_ampdu_factor) + return; + + rcu_read_lock(); + + sta = ieee80211_find_sta(vif, bss_conf->bssid); + if (!sta) { + rcu_read_unlock(); + rtw_warn(rtwdev, "%s: failed to find station %pM\n", + __func__, bss_conf->bssid); + return; + } + + if (sta->deflink.vht_cap.vht_supported) + factor = u32_get_bits(sta->deflink.vht_cap.cap, + IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK); + else if (sta->deflink.ht_cap.ht_supported) + factor = sta->deflink.ht_cap.ampdu_factor; + + rcu_read_unlock(); + + if (factor != 0xff) + ops->set_ampdu_factor(rtwdev, factor); +} + MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek 802.11ac wireless core module"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index 02343e059fd9..f410c554da58 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -878,6 +878,7 @@ struct rtw_chip_ops { u32 antenna_rx); void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable); void (*efuse_grant)(struct rtw_dev *rtwdev, bool enable); + void (*set_ampdu_factor)(struct rtw_dev *rtwdev, u8 factor); void (*false_alarm_statistics)(struct rtw_dev *rtwdev); void (*phy_calibration)(struct rtw_dev *rtwdev); void (*dpk_track)(struct rtw_dev *rtwdev); @@ -2272,4 +2273,6 @@ void rtw_update_channel(struct rtw_dev *rtwdev, u8 center_channel, void rtw_core_port_switch(struct rtw_dev *rtwdev, struct ieee80211_vif *vif); bool rtw_core_check_sta_active(struct rtw_dev *rtwdev); void rtw_core_enable_beacon(struct rtw_dev *rtwdev, bool enable); +void rtw_set_ampdu_factor(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *bss_conf); #endif diff --git a/drivers/net/wireless/realtek/rtw88/rtw8703b.c b/drivers/net/wireless/realtek/rtw88/rtw8703b.c index 1d232adbdd7e..47392edd3638 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c @@ -1904,6 +1904,7 @@ static const struct rtw_chip_ops rtw8703b_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8723x_cfg_ldo25, .efuse_grant = rtw8723x_efuse_grant, + .set_ampdu_factor = rtw8723x_set_ampdu_factor, .false_alarm_statistics = rtw8723x_false_alarm_statistics, .phy_calibration = rtw8703b_phy_calibration, .dpk_track = NULL, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c index 87715bd54860..5acddd80fed0 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c @@ -1404,6 +1404,7 @@ static const struct rtw_chip_ops rtw8723d_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8723x_cfg_ldo25, .efuse_grant = rtw8723x_efuse_grant, + .set_ampdu_factor = rtw8723x_set_ampdu_factor, .false_alarm_statistics = rtw8723x_false_alarm_statistics, .phy_calibration = rtw8723d_phy_calibration, .cck_pd_set = rtw8723d_phy_cck_pd_set, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723x.c b/drivers/net/wireless/realtek/rtw88/rtw8723x.c index 69f73cb5b4cd..3129493d610c 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723x.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723x.c @@ -374,6 +374,13 @@ static void __rtw8723x_efuse_grant(struct rtw_dev *rtwdev, bool on) } } +static void __rtw8723x_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + factor = min_t(u8, factor, IEEE80211_HT_MAX_AMPDU_32K); + + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, (8192 << factor) - 1); +} + static void __rtw8723x_false_alarm_statistics(struct rtw_dev *rtwdev) { struct rtw_dm_info *dm_info = &rtwdev->dm_info; @@ -704,6 +711,7 @@ const struct rtw8723x_common rtw8723x_common = { .cfg_ldo25 = __rtw8723x_cfg_ldo25, .set_tx_power_index = __rtw8723x_set_tx_power_index, .efuse_grant = __rtw8723x_efuse_grant, + .set_ampdu_factor = __rtw8723x_set_ampdu_factor, .false_alarm_statistics = __rtw8723x_false_alarm_statistics, .iqk_backup_regs = __rtw8723x_iqk_backup_regs, .iqk_restore_regs = __rtw8723x_iqk_restore_regs, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723x.h b/drivers/net/wireless/realtek/rtw88/rtw8723x.h index a99af527c92c..5d756c4933f0 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723x.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8723x.h @@ -140,6 +140,7 @@ struct rtw8723x_common { void (*cfg_ldo25)(struct rtw_dev *rtwdev, bool enable); void (*set_tx_power_index)(struct rtw_dev *rtwdev); void (*efuse_grant)(struct rtw_dev *rtwdev, bool on); + void (*set_ampdu_factor)(struct rtw_dev *rtwdev, u8 factor); void (*false_alarm_statistics)(struct rtw_dev *rtwdev); void (*iqk_backup_regs)(struct rtw_dev *rtwdev, struct rtw8723x_iqk_backup_regs *backup); @@ -398,6 +399,11 @@ static inline void rtw8723x_efuse_grant(struct rtw_dev *rtwdev, bool on) rtw8723x_common.efuse_grant(rtwdev, on); } +static inline void rtw8723x_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + rtw8723x_common.set_ampdu_factor(rtwdev, factor); +} + static inline void rtw8723x_false_alarm_statistics(struct rtw_dev *rtwdev) { rtw8723x_common.false_alarm_statistics(rtwdev); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8812a.c b/drivers/net/wireless/realtek/rtw88/rtw8812a.c index f9ba2aa2928a..88daab22cdd6 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8812a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8812a.c @@ -78,6 +78,16 @@ static void rtw8812a_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) { } +static void rtw8812a_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + u32 len; + + factor = min_t(u8, factor, IEEE80211_VHT_MAX_AMPDU_128K); + len = BIT(31) | ((8192 << factor) - 1); + + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, len); +} + static void rtw8812a_do_lck(struct rtw_dev *rtwdev) { u32 cont_tx, lc_cal, i; @@ -925,6 +935,7 @@ static const struct rtw_chip_ops rtw8812a_ops = { .set_tx_power_index = rtw88xxa_set_tx_power_index, .cfg_ldo25 = rtw8812a_cfg_ldo25, .efuse_grant = rtw88xxa_efuse_grant, + .set_ampdu_factor = rtw8812a_set_ampdu_factor, .false_alarm_statistics = rtw88xxa_false_alarm_statistics, .phy_calibration = rtw8812a_phy_calibration, .cck_pd_set = rtw88xxa_phy_cck_pd_set, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814a.c b/drivers/net/wireless/realtek/rtw88/rtw8814a.c index cfd35d40d46e..57d8920832a3 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8814a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8814a.c @@ -1332,6 +1332,13 @@ static void rtw8814a_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) { } +static void rtw8814a_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + factor = min_t(u8, factor, IEEE80211_VHT_MAX_AMPDU_256K); + + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, (8192 << factor) - 1); +} + static void rtw8814a_false_alarm_statistics(struct rtw_dev *rtwdev) { struct rtw_dm_info *dm_info = &rtwdev->dm_info; @@ -2051,6 +2058,7 @@ static const struct rtw_chip_ops rtw8814a_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8814a_cfg_ldo25, .efuse_grant = rtw8814a_efuse_grant, + .set_ampdu_factor = rtw8814a_set_ampdu_factor, .false_alarm_statistics = rtw8814a_false_alarm_statistics, .phy_calibration = rtw8814a_phy_calibration, .cck_pd_set = rtw8814a_phy_cck_pd_set, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821a.c b/drivers/net/wireless/realtek/rtw88/rtw8821a.c index f68239b07319..73e2bb4d5d79 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821a.c @@ -49,6 +49,16 @@ static void rtw8821a_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) { } +static void rtw8821a_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + u32 len; + + factor = min_t(u8, factor, IEEE80211_VHT_MAX_AMPDU_64K); + len = BIT(31) | ((8192 << factor) - 1); + + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, len); +} + #define CAL_NUM_8821A 3 #define MACBB_REG_NUM_8821A 8 #define AFE_REG_NUM_8821A 4 @@ -871,6 +881,7 @@ static const struct rtw_chip_ops rtw8821a_ops = { .set_tx_power_index = rtw88xxa_set_tx_power_index, .cfg_ldo25 = rtw8821a_cfg_ldo25, .efuse_grant = rtw88xxa_efuse_grant, + .set_ampdu_factor = rtw8821a_set_ampdu_factor, .false_alarm_statistics = rtw88xxa_false_alarm_statistics, .phy_calibration = rtw8821a_phy_calibration, .cck_pd_set = rtw88xxa_phy_cck_pd_set, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c index 0ade7f11cbd2..e99ea716b64f 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -719,6 +719,11 @@ static void rtw8821c_set_tx_power_index(struct rtw_dev *rtwdev) } } +static void rtw8821c_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, (8192 << factor) - 1); +} + static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev) { struct rtw_dm_info *dm_info = &rtwdev->dm_info; @@ -1668,6 +1673,7 @@ static const struct rtw_chip_ops rtw8821c_ops = { .set_antenna = NULL, .set_tx_power_index = rtw8821c_set_tx_power_index, .cfg_ldo25 = rtw8821c_cfg_ldo25, + .set_ampdu_factor = rtw8821c_set_ampdu_factor, .false_alarm_statistics = rtw8821c_false_alarm_statistics, .phy_calibration = rtw8821c_phy_calibration, .cck_pd_set = rtw8821c_phy_cck_pd_set, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c index b4934da88e33..ef08729b9f4a 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c @@ -1018,6 +1018,11 @@ static void rtw8822b_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) rtw_write8(rtwdev, REG_LDO_EFUSE_CTRL + 3, ldo_pwr); } +static void rtw8822b_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, (8192 << factor) - 1); +} + static void rtw8822b_false_alarm_statistics(struct rtw_dev *rtwdev) { struct rtw_dm_info *dm_info = &rtwdev->dm_info; @@ -2158,6 +2163,7 @@ static const struct rtw_chip_ops rtw8822b_ops = { .set_tx_power_index = rtw8822b_set_tx_power_index, .set_antenna = rtw8822b_set_antenna, .cfg_ldo25 = rtw8822b_cfg_ldo25, + .set_ampdu_factor = rtw8822b_set_ampdu_factor, .false_alarm_statistics = rtw8822b_false_alarm_statistics, .phy_calibration = rtw8822b_phy_calibration, .pwr_track = rtw8822b_pwr_track, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index 5e53e0db177e..baf519043d43 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -2809,6 +2809,11 @@ static void rtw8822c_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) rtw_write8(rtwdev, REG_ANAPARLDO_POW_MAC, ldo_pwr); } +static void rtw8822c_set_ampdu_factor(struct rtw_dev *rtwdev, u8 factor) +{ + rtw_write32(rtwdev, REG_AMPDU_MAX_LENGTH, (8192 << factor) - 1); +} + static void rtw8822c_false_alarm_statistics(struct rtw_dev *rtwdev) { struct rtw_dm_info *dm_info = &rtwdev->dm_info; @@ -4968,6 +4973,7 @@ static const struct rtw_chip_ops rtw8822c_ops = { .set_tx_power_index = rtw8822c_set_tx_power_index, .set_antenna = rtw8822c_set_antenna, .cfg_ldo25 = rtw8822c_cfg_ldo25, + .set_ampdu_factor = rtw8822c_set_ampdu_factor, .false_alarm_statistics = rtw8822c_false_alarm_statistics, .dpk_track = rtw8822c_dpk_track, .phy_calibration = rtw8822c_phy_calibration, From patchwork Thu Mar 13 20:20:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bitterblue Smith X-Patchwork-Id: 873808 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 76F0342AA9 for ; Thu, 13 Mar 2025 20:20:10 +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=1741897212; cv=none; b=UFHAa1OWn1zjUeyRwg3BrVga/6RSTykBEM+hVcpBTbid/Ztf5Kua21GLjngwWyshwpv3lLuaXD7fer916HWvP4nbfcSEKEaObCfQHwcCd4ltECDdx3LdeSbg1GvsnpWwADaMZKYl4rlEqlDQpZJRNOhwrr2fssfTR7a/ZdEGAxw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741897212; c=relaxed/simple; bh=srALS5zpDFQ8FdDl7bTGl11T2i9F4MoAQVr+hWs0b34=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=m17iwM8AHg3wAV7ZLnWV6cwnmlT1ftiKjlCoZvB8KlPJP2g0RDXMqXiEPbUY57/0Twnp/DzYfs4sEukkUnxI8MfkgrcFXXrZD/2c7nM7pNSwxgUKDSmS27h1Svd5IuLVxKbRPB4njCY4ifVaBPnvy4AmAs86uzQcn7ga7kFOla0= 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=hvO4MtQq; 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="hvO4MtQq" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5e614da8615so2664656a12.1 for ; Thu, 13 Mar 2025 13:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741897209; x=1742502009; 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=HN0MvMaE+fW87XKbX8FDINB7vpsyz6/+9Fj8lpX10YY=; b=hvO4MtQqq/mwmyPqOPMgIqsTUKTch5lG5gGin5aO9iP4+tDa2D8lSzhLmK6vAy2HPu EWKKzgUfbDbc7E4hzMCtxAE3E+3L3KxPcHABHgh+ABvcBU74hWGxhcPGU0yV6IcEtQAC Ci/HCe4Cccs4Y/3Kvo+x8SQqqJ2YQ1F6lxP0l1h0921qVFpGCqJvfXugxt1XYLDs2fOG ZIFqu8zx0xSkcwJL0LEITUNoGwWmENtoWYc/wzyDf0lVqOAeDZKep+lJw+1iby28GtIH vaKFzNHHqYrOqEm2wI8CjhoFjzIY0sO3X3I94MhHlgSFDz6xRQQ8T/nBVSzzxH6yspyY Gzyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741897209; x=1742502009; 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=HN0MvMaE+fW87XKbX8FDINB7vpsyz6/+9Fj8lpX10YY=; b=FpV5bErtIeKXuMUwhFfE1zngzIUBfUlpF2m/mFaldC+kbnvQN8Zc13ScCfynBViLAC Rwe3Vc13qfQba+Pwog3CwjIaGJJqC4yPe4t/kvt8AP3hk5OKAX5LWgk7A2LHChBtDGqP aCgeGtK4zp+XZFYxOwXiGxtlqecdeLNDhdsQGPEyMUs22uxNVIFwXgk2BrZTJlEezwrY Oylim4YQz7MSWpOy7xFFQYna0wcvSAXmtcVBe/VjrZLT/a/VFOktCt68FsI7IjgGf4di +f30hkKgmIrJlt+O1VO34SzsUR3i+RY1o4rBT4m9YP9s+97tMTvtZ6/hRXHeCWgyNKuK /0+A== X-Gm-Message-State: AOJu0YwI8xHn2oYbPcTDZxNPVNRN2uXY4gnM44CxQI9NiINgeZTZVaVd M/E9fVoDkqnWFvg+Bf2qpCmrNaVBpkH8vDzRVblPwVycJG5EhP0A2yrZDw== X-Gm-Gg: ASbGncvwSZ1pQlTu2YNQsyz5VhtCzOXMPJd8739hdvg/ZB+/x4XskNS4hNQ7mZXygYl lDyLbziGreeZy/Z0DRnaJDCcj/rcGAsz8HOsHJpfwyVJ44jHtbFI+8KLtY4K7xwuGaiparodiGp 0CVNZV+PAy8qlfSun+j+8+/pWSpaMmpFNBB7R+SUTnuY/5Yq9u2vL9Tzh/9FblwFKKUJh9PGT5T 661yHlYtl2Q6zsOIYpWV/TkqZEvDP/2qrONRrbcZlUNbNAssIBDtchJXnbG4J3Bo+HRnL/6xlQv gymp//8RP2KvFrJ+7HxsU5LUv5I0/PywmAZFYAJ9AtfiCvWWZx3rlg== X-Google-Smtp-Source: AGHT+IHiRf+hlcKQ9LtNxcatmt3DCY7NNc9eU7kUYxdDPEJh5oH4+kZ7k5SvF98qjSztdDnUExn5Jw== X-Received: by 2002:a05:6402:1ecc:b0:5e0:6e6c:e2b5 with SMTP id 4fb4d7f45d1cf-5e814dedc7dmr4526179a12.9.1741897208359; Thu, 13 Mar 2025 13:20:08 -0700 (PDT) Received: from [192.168.0.50] ([79.119.240.155]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e816ad3914sm1061241a12.64.2025.03.13.13.20.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 13:20:06 -0700 (PDT) Message-ID: <9f9a16a3-d326-4f48-9853-134751b63864@gmail.com> Date: Thu, 13 Mar 2025 22:20:04 +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 rtw-next 4/4] wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU From: Bitterblue Smith To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih References: Content-Language: en-US In-Reply-To: RTL8814AU doesn't work well with SUPPORTS_AMSDU_IN_AMPDU. The RX speed is noticeably lower and the VHT RX statistics are strange. Typical values with SUPPORTS_AMSDU_IN_AMPDU: Reverse mode, remote host 192.168.0.1 is sending [ 5] local 192.168.0.50 port 60710 connected to 192.168.0.1 port 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 74.6 MBytes 626 Mbits/sec [ 5] 1.00-2.00 sec 79.2 MBytes 665 Mbits/sec [ 5] 2.00-3.00 sec 84.9 MBytes 712 Mbits/sec [ 5] 3.00-4.00 sec 83.8 MBytes 703 Mbits/sec [ 5] 4.00-5.00 sec 85.9 MBytes 720 Mbits/sec [ 5] 5.00-6.00 sec 78.9 MBytes 662 Mbits/sec [ 5] 6.00-7.00 sec 81.2 MBytes 682 Mbits/sec [ 5] 7.00-8.00 sec 80.5 MBytes 675 Mbits/sec [ 5] 8.00-9.00 sec 79.4 MBytes 666 Mbits/sec [ 5] 9.00-10.00 sec 82.2 MBytes 689 Mbits/sec [ 5] 10.00-11.00 sec 82.0 MBytes 688 Mbits/sec [ 5] 11.00-12.00 sec 84.2 MBytes 707 Mbits/sec [ 5] 12.00-13.00 sec 71.0 MBytes 596 Mbits/sec [ 5] 13.00-14.00 sec 69.4 MBytes 582 Mbits/sec [ 5] 14.00-15.00 sec 80.2 MBytes 673 Mbits/sec [ 5] 15.00-16.00 sec 74.5 MBytes 625 Mbits/sec [Rx Counter]: * CCA (CCK, OFDM, Total) = (0, 2455, 2455) * False Alarm (CCK, OFDM, Total) = (0, 69, 69) * CCK cnt (ok, err) = (0, 0) * OFDM cnt (ok, err) = (1239, 2) * HT cnt (ok, err) = (0, 0) * VHT cnt (ok, err) = (21, 12109) The "VHT ok" number is not believable. And without SUPPORTS_AMSDU_IN_AMPDU: Reverse mode, remote host 192.168.0.1 is sending [ 5] local 192.168.0.50 port 50030 connected to 192.168.0.1 port 5201 [ ID] Interval Transfer Bitrate [ 5] 0.00-1.00 sec 70.5 MBytes 591 Mbits/sec [ 5] 1.00-2.00 sec 86.9 MBytes 729 Mbits/sec [ 5] 2.00-3.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 3.00-4.00 sec 97.4 MBytes 817 Mbits/sec [ 5] 4.00-5.00 sec 98.6 MBytes 827 Mbits/sec [ 5] 5.00-6.00 sec 96.9 MBytes 813 Mbits/sec [ 5] 6.00-7.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 7.00-8.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 8.00-9.00 sec 99.9 MBytes 838 Mbits/sec [ 5] 9.00-10.00 sec 99.2 MBytes 833 Mbits/sec [ 5] 10.00-11.00 sec 98.0 MBytes 822 Mbits/sec [ 5] 11.00-12.00 sec 98.1 MBytes 823 Mbits/sec [ 5] 12.00-13.00 sec 97.0 MBytes 814 Mbits/sec [ 5] 13.00-14.00 sec 98.2 MBytes 824 Mbits/sec [ 5] 14.00-15.00 sec 98.5 MBytes 826 Mbits/sec [ 5] 15.00-16.00 sec 97.4 MBytes 817 Mbits/sec [Rx Counter]: * CCA (CCK, OFDM, Total) = (0, 3860, 3860) * False Alarm (CCK, OFDM, Total) = (0, 2, 2) * CCK cnt (ok, err) = (0, 0) * OFDM cnt (ok, err) = (1486, 0) * HT cnt (ok, err) = (0, 0) * VHT cnt (ok, err) = (7399, 9118) Add a new member "amsdu_in_ampdu" in struct rtw_chip_info and use it to set SUPPORTS_AMSDU_IN_AMPDU only for the other chips. Signed-off-by: Bitterblue Smith --- drivers/net/wireless/realtek/rtw88/main.c | 3 ++- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8812a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8814a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index bc2c1a5a30b3..c4de5d114eda 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -2242,7 +2242,8 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw) ieee80211_hw_set(hw, SUPPORTS_PS); ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS); ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); - ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU); + if (rtwdev->chip->amsdu_in_ampdu) + ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU); ieee80211_hw_set(hw, HAS_RATE_CONTROL); ieee80211_hw_set(hw, TX_AMSDU); ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index f410c554da58..b0f1fabe9554 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -1230,6 +1230,7 @@ struct rtw_chip_info { u16 fw_fifo_addr[RTW_FW_FIFO_MAX]; const struct rtw_fwcd_segs *fwcd_segs; + bool amsdu_in_ampdu; u8 usb_tx_agg_desc_num; bool hw_feature_report; u8 c2h_ra_report_size; diff --git a/drivers/net/wireless/realtek/rtw88/rtw8812a.c b/drivers/net/wireless/realtek/rtw88/rtw8812a.c index 88daab22cdd6..34e052dd2e8b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8812a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8812a.c @@ -1086,6 +1086,7 @@ const struct rtw_chip_info rtw8812a_hw_spec = { .rfe_defs = rtw8812a_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8812a_rfe_defs), .rx_ldpc = false, + .amsdu_in_ampdu = true, .hw_feature_report = false, .c2h_ra_report_size = 4, .old_datarate_fb_limit = true, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814a.c b/drivers/net/wireless/realtek/rtw88/rtw8814a.c index 57d8920832a3..516444391c46 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8814a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8814a.c @@ -2197,6 +2197,7 @@ const struct rtw_chip_info rtw8814a_hw_spec = { .rx_ldpc = true, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .amsdu_in_ampdu = false, .usb_tx_agg_desc_num = 3, .hw_feature_report = false, .c2h_ra_report_size = 6, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821a.c b/drivers/net/wireless/realtek/rtw88/rtw8821a.c index 73e2bb4d5d79..fa4b1a53303b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821a.c @@ -1186,6 +1186,7 @@ const struct rtw_chip_info rtw8821a_hw_spec = { .rfe_defs = rtw8821a_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8821a_rfe_defs), .rx_ldpc = false, + .amsdu_in_ampdu = true, .hw_feature_report = false, .c2h_ra_report_size = 4, .old_datarate_fb_limit = true, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c index e99ea716b64f..9015625627a8 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -1996,6 +1996,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c index ef08729b9f4a..d631c7ade282 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c @@ -2537,6 +2537,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x1c, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index baf519043d43..910bd36b4974 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -5355,6 +5355,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, .dig_min = 0x20, + .amsdu_in_ampdu = true, .usb_tx_agg_desc_num = 3, .hw_feature_report = true, .c2h_ra_report_size = 7,