From patchwork Fri Oct 1 04:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 12529687 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEC1CC433FE for ; Fri, 1 Oct 2021 04:01:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACD5761A50 for ; Fri, 1 Oct 2021 04:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236646AbhJAECo (ORCPT ); Fri, 1 Oct 2021 00:02:44 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:56470 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231709AbhJAECm (ORCPT ); Fri, 1 Oct 2021 00:02:42 -0400 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id ACEED402CC for ; Fri, 1 Oct 2021 04:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1633060854; bh=JZ+2UXfp4vFdd/kQjFqruaoyOogczScH1wvAY/k8T5w=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=UVio0W0Dx5nXnZ6AYI75Q6bIyp1WII8SyuOpaF+UGuhwVgctw/etKJL/9qAdBBEvz 27Sr+Rwbg7eQXMCVIiob+5XkuNS2srja0Zx+thjb8YRENGQM9D2AejB+rV9EJKkyNe 8TyC/El1deJj098w01ubxkRJlrwm8Yd4SESGXson1FfeCn7c41siedrT2Yb1pwDZp7 rnrIWcrPBvqoZXS1htWaH0KOyzD23WBv1Ugew7MvY10z0tBv/uQ3Vent/PJNHr/k9r QCIshux7+Apvka8/CShDfbRJDPBFS47JrT6kt7cR0trdHrM9PTiFfjSjTMd6On3npE VFB1Jbe1cQ3dw== Received: by mail-pf1-f200.google.com with SMTP id t4-20020a62ea04000000b0044b333f5d1bso5192266pfh.20 for ; Thu, 30 Sep 2021 21:00:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JZ+2UXfp4vFdd/kQjFqruaoyOogczScH1wvAY/k8T5w=; b=ExzKxGfVI7AlXHolwPqigwxAaYrIlEi0c59MGjuOv9id/faVF43GbELY4C7pZU4sY1 U/+gr0BmyG0i2y/zu4e7M+fBxDucyH8RsekpSgyPanjL9YAEGANm0LKXR//GFSvztsEc xldVMXkaq0wl8ZZQfCcBCJcmp/864+a/2qn78NtAjLx6pyPyO17+q6Du0Oz9Z3jB6vDl zvoj5JLF290oTPDEwGez0x3Q+kM15J9fL4tQknnDidl5p2UduNH5oAglE8shNsPCJteK Cp7++nJxBsvFY7tWduPxvrFmPWEl61tuu8LLC26O8pO4nPlhMdLZfJ9xrVvdCy6zxM52 SLFw== X-Gm-Message-State: AOAM530CiNya5wFnm8CmPX9JLTJzmtp/fWpnDsFCczxLc/7qfQolGZcG Lc2TPrSZqFKadrR6j1KG014Kv19nDKGXkv71gy4/MUq7MTBQxuwkUsMtXIadXQljuCkTfYKQy1g LaL8o/NZeIlfyZ3iZCR0/L6iUrj5nwm6V8Q== X-Received: by 2002:a17:902:b583:b0:13d:e495:187a with SMTP id a3-20020a170902b58300b0013de495187amr7761245pls.9.1633060852994; Thu, 30 Sep 2021 21:00:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXdD/7zf8TEYKayuEFwFBsIgspnLZKaY5dIG+yY+dNHkcpE08ZwconX4SzR9J4F9l68crIXw== X-Received: by 2002:a17:902:b583:b0:13d:e495:187a with SMTP id a3-20020a170902b58300b0013de495187amr7761220pls.9.1633060852688; Thu, 30 Sep 2021 21:00:52 -0700 (PDT) Received: from localhost.localdomain (2001-b400-e255-baca-c7f7-191a-11a1-0473.emome-ip6.hinet.net. [2001:b400:e255:baca:c7f7:191a:11a1:473]) by smtp.gmail.com with ESMTPSA id q1sm4672928pfu.4.2021.09.30.21.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 21:00:51 -0700 (PDT) From: Chris Chiu To: Jes.Sorensen@gmail.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org Cc: code@reto-schneider.ch, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Chiu Subject: [PATCH v2] rtl8xxxu: Use lower tx rates for the ack packet Date: Fri, 1 Oct 2021 12:00:44 +0800 Message-Id: <20211001040044.1028708-1-chris.chiu@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org According to the Realtek propritary driver and the rtw88 driver, the tx rates of the ack (includes block ack) are initialized with lower tx rates (no HT rates) which is set by the RRSR register value. In real cases, ack rate higher than current tx rate could lead to difficulty for the receiving end to receive management/control frames. The retransmission rate would be higher then expected when the driver is acting as receiver and the RSSI is not good. Cross out higer rates for ack packet before implementing dynamic rrsr configuration like the commit 4830872685f8 ("rtw88: add dynamic rrsr configuration"). Signed-off-by: Chris Chiu Acked-by: Jes Sorensen --- Changelog: v2: - Specify the dynamic rrsr commit for reference - Remove the unintentional twice reading of REG_RESPONSE_RATE_SET drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 +++++- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 774341b0005a..a42e2081b75f 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -4460,13 +4460,17 @@ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv) static void rtl8xxxu_set_basic_rates(struct rtl8xxxu_priv *priv, u32 rate_cfg) { + struct ieee80211_hw *hw = priv->hw; u32 val32; u8 rate_idx = 0; rate_cfg &= RESPONSE_RATE_BITMAP_ALL; val32 = rtl8xxxu_read32(priv, REG_RESPONSE_RATE_SET); - val32 &= ~RESPONSE_RATE_BITMAP_ALL; + if (hw->conf.chandef.chan->band == NL80211_BAND_5GHZ) + val32 &= RESPONSE_RATE_RRSR_INIT_5G; + else + val32 &= RESPONSE_RATE_RRSR_INIT_2G; val32 |= rate_cfg; rtl8xxxu_write32(priv, REG_RESPONSE_RATE_SET, val32); diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h index a2a31f374a82..438b65ba9640 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h @@ -516,6 +516,8 @@ #define REG_RESPONSE_RATE_SET 0x0440 #define RESPONSE_RATE_BITMAP_ALL 0xfffff #define RESPONSE_RATE_RRSR_CCK_ONLY_1M 0xffff1 +#define RESPONSE_RATE_RRSR_INIT_2G 0x15f +#define RESPONSE_RATE_RRSR_INIT_5G 0x150 #define RSR_1M BIT(0) #define RSR_2M BIT(1) #define RSR_5_5M BIT(2)