Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp1637225rwn; Thu, 15 Sep 2022 20:40:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7UYvdbUSBnrzui7KxxWSiWYPCiNoilu/mK5MuQSIf6q1E86csin9e3AC9safuF0HysFKAY X-Received: by 2002:a05:6a00:2392:b0:549:be0:cd3c with SMTP id f18-20020a056a00239200b005490be0cd3cmr3344806pfc.8.1663299601293; Thu, 15 Sep 2022 20:40:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663299601; cv=none; d=google.com; s=arc-20160816; b=sKZfRCLYyVsoYIULamc9X4DIke4ufSJ7G9QMlml4OblsXZEMtKqUR8yUxO++Ic8Xl0 ClR83q8lZwaGOlQoCZ0fkzhO6z9OSfbtfl+ymx2phGDLVYhAU1DS12n7vxXollhSNIL8 3XXzfO/rmlEWUxZagRa/BP6KuZirMnNUP0ND2pfYHBO5gWplJQDwaKTI1wAVkFtDUtzl eJspX3C1wwbqqrbut9mutOqnIRwMujw+8hRl7plvesORTkkNjSWMWI1bGEV0fuGun6/e I0DiWDzUkhDD9jE0tAG89l3ars6EasxJ/l5uMYFiej4b1YxyB7sCenClVmRpwl2YdivU QbeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :authenticated-by; bh=aLZq+Ud7jpyCkT/FWMEql4yAWTy8TLG2M8wjYVtPhKc=; b=poW4vbc0Vf5+fBcSDt1J/IsYLqPzFlQi/ze15aRfL2YYrrapBZTuVQ1UjBVObn3jZQ pODq1i7ksIkQRCkV07dSBCcKy+d0vq4XK/3kmylLSVuWqlUcbJUHDPCmVs8g02VNMCJ3 o/SSz0bIfShQsxGHE8U6wBAVIQ0FvCVcVAUBEXcUg7Nadfm69rFVYbb3vYq9ii/CfQ7G zCzUeHQKwMLvHay2EVDppBlsEh87COJ16XfcS+r9rgYRat9TygAR4cYai4INZ4v3zHC+ ZeYW3jUV43xWEOeFyePHtqLbqihGfu6kmZrLptl9ODhEg0xOeJ1IX22nf9gSWfBPa52x x/Fg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g23-20020a63fa57000000b00429b4bd247asi19465338pgk.397.2022.09.15.20.39.53; Thu, 15 Sep 2022 20:40:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229773AbiIPDjX (ORCPT + 64 others); Thu, 15 Sep 2022 23:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbiIPDi7 (ORCPT ); Thu, 15 Sep 2022 23:38:59 -0400 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C6E499DB4B for ; Thu, 15 Sep 2022 20:38:57 -0700 (PDT) Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.77 with qID 28G3cSIG1003881, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/2.81/5.90) with ESMTPS id 28G3cSIG1003881 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Fri, 16 Sep 2022 11:38:28 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36505.realtek.com.tw (172.21.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 16 Sep 2022 11:38:50 +0800 Received: from localhost (172.21.69.188) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Fri, 16 Sep 2022 11:38:49 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH 2/7] wifi: rtw89: mac: set NAV upper to 25ms Date: Fri, 16 Sep 2022 11:38:06 +0800 Message-ID: <20220916033811.13862-3-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220916033811.13862-1-pkshih@realtek.com> References: <20220916033811.13862-1-pkshih@realtek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.21.69.188] X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-KSE-ServerInfo: RTEXMBS04.realtek.com.tw, 9 X-KSE-AntiSpam-Interceptor-Info: trusted connection X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Deterministic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 09/16/2022 02:51:00 X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: =?big5?B?Q2xlYW4sIGJhc2VzOiAyMDIyLzkvMTUgpFWkyCAxMDo1NzowMA==?= X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled X-KSE-ServerInfo: RTEXH36505.realtek.com.tw, 9 X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org NAV upper register is to limit the maximum NAV value to prevent unexpected NAV, but the old setting is too small to reflect NAV from AP transmiting big MPDU at once. Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/net/wireless/realtek/rtw89/reg.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c index 7da0c1aa96cb9..209d17a012634 100644 --- a/drivers/net/wireless/realtek/rtw89/mac.c +++ b/drivers/net/wireless/realtek/rtw89/mac.c @@ -1936,7 +1936,7 @@ static int nav_ctrl_init(struct rtw89_dev *rtwdev) rtw89_write32_set(rtwdev, R_AX_WMAC_NAV_CTL, B_AX_WMAC_PLCP_UP_NAV_EN | B_AX_WMAC_TF_UP_NAV_EN | B_AX_WMAC_NAV_UPPER_EN); - rtw89_write32_mask(rtwdev, R_AX_WMAC_NAV_CTL, B_AX_WMAC_NAV_UPPER_MASK, NAV_12MS); + rtw89_write32_mask(rtwdev, R_AX_WMAC_NAV_CTL, B_AX_WMAC_NAV_UPPER_MASK, NAV_25MS); return 0; } diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h index ffebb24de7054..32605841c98c4 100644 --- a/drivers/net/wireless/realtek/rtw89/reg.h +++ b/drivers/net/wireless/realtek/rtw89/reg.h @@ -2618,6 +2618,7 @@ #define B_AX_WMAC_TF_UP_NAV_EN BIT(16) #define B_AX_WMAC_NAV_UPPER_MASK GENMASK(15, 8) #define NAV_12MS 0xBC +#define NAV_25MS 0xC4 #define B_AX_WMAC_RTS_RST_DUR_MASK GENMASK(7, 0) #define R_AX_RXTRIG_TEST_USER_2 0xCCB0 -- 2.25.1