From patchwork Wed Apr 16 08:12:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 881838 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (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 B089822DF80 for ; Wed, 16 Apr 2025 08:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791207; cv=none; b=goLrB6k2vmi953kRFMIK/epTnf6htqfBgm5afUv/i0cnVouPp/RavF7lrlL9X24fDi3HTN+IBDUWB4KONCklafG3qLDOu4cOkkpYG5GPTHy25LAhkoneFMVfvIaIR5XgtIVLbz8Q2S9nz7DYbYID2qhIDrOUxsq1YW8A+EpPsN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791207; c=relaxed/simple; bh=xekqQMc3xD4P9U1MW2vmFtRJQYjW06CDfxu1AIaYt20=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WLuC+m9fHIZQXXFB1a6O9BtrsnAreIyYb4017tCldJ94p2gVIhEEIB6H64PLPWMcuvIrJaUSYsGZDusSTvGvCKUUvV/zLixGoUUJBpNsFR/G99V/YL9WR3hbnxFRGrV8wVaT/3JaBGH6t2FOr/sW+K7sV4HaXICo3qJ7npyo2vI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=nBASj8om; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="nBASj8om" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 53G8DGLr82935254, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1744791196; bh=xekqQMc3xD4P9U1MW2vmFtRJQYjW06CDfxu1AIaYt20=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=nBASj8omt/6ElzHzuuajvkbCj6i8eOqgEVBK+FVM1N/Yr4DIHIeqf5mNRiyDU6HJL 4n9MrSQaVLjJ/mRFWKS2FDBUjrmcKPhJN53fDDh+kGCI+TqPSoDad/Be+UY2xiG41W 42B/fQPXIG2UlUkBGWyXS4kd338O/9yMXCWYl5BkRAWmKjSrNxP3g6h708asymClNh SUltkfz2BBjQiv2EEMTxGXM8V8Ig7Ys3sQZ4RqCbhxcMEOoBZ2rnNUBIvx381P/hG5 4d8oQjuOlADXrTibsPUTD89EGhdr1JD6v2kNr8Aff+4RWYHyGj4s+/fjLgL4w/KQ82 N9AswGw6Jq4ag== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 53G8DGLr82935254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Apr 2025 16:13:16 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 16 Apr 2025 16:13:16 +0800 Received: from [127.0.1.1] (172.21.69.94) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 16 Apr 2025 16:13:15 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH rtw-next 1/4] wifi: rtw89: 8852c: update supported firmware format to 2 Date: Wed, 16 Apr 2025 16:12:38 +0800 Message-ID: <20250416081241.36138-2-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250416081241.36138-1-pkshih@realtek.com> References: <20250416081241.36138-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) After firmware 0.27.125.0, it adds more fields to support firmware secure boot. Though current driver has supported the format, old driver can't recognize the new format, increase firmware format to 2 to avoid failed to load the firmware by old driver. Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c index a8fd573d5048..9a2235f28e24 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c @@ -15,7 +15,7 @@ #include "sar.h" #include "util.h" -#define RTW8852C_FW_FORMAT_MAX 1 +#define RTW8852C_FW_FORMAT_MAX 2 #define RTW8852C_FW_BASENAME "rtw89/rtw8852c_fw" #define RTW8852C_MODULE_FIRMWARE \ RTW8852C_FW_BASENAME "-" __stringify(RTW8852C_FW_FORMAT_MAX) ".bin" From patchwork Wed Apr 16 08:12:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 882287 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (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 5555122FE05 for ; Wed, 16 Apr 2025 08:13:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791209; cv=none; b=PNIechGNkQIq8UXYlMIWdGePtZshHKh5hX8ek6fLtPgVP1W9r36BukThio4SsFXnk3hm6c+cpKGpglsBZt2VAp4HKWriFkmByaxodZRIjqr/pVjlXFIhhXA1qgTsqEMmIIlW/N+e+sNBLV/5W27Lld3fQUFh1y9Yv7Tcaxy0Dh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791209; c=relaxed/simple; bh=5WnhDchFQeIMrIyFrr/y2nJArm9CdgFD4U/rkenDEIQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cOMxBFFnd3wNvzG3y72ShiyjHS1BSP+k0gZmxL5btPc+OdBfUlRpAM0lRw0SczWDd1LWlsoozObRhZnGHRj0O6LTqDH20li65KRjnz1iX10RJEx1Lx+3T/xzxFozu7UR/L0gi/fSnmAavrgqaodo5VGw7PVu5GEpI40owiz9gZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=EcUOz9l1; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="EcUOz9l1" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 53G8DJVo82935257, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1744791199; bh=5WnhDchFQeIMrIyFrr/y2nJArm9CdgFD4U/rkenDEIQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=EcUOz9l1Hkv5wLNqVg+9TDpx7/G5F4D2skiTCBlKrwJWGtKxHIIHhWZPySvzW2w3t QP58okzgf3QzfAhjyO07jpbND0ANUHWErTYE3X7iIX9hXwRHwlMOXesuDVA/liB0/l 1IrOPhu7paEHLziHvBVkMmMXcjqySIYajB5STXemEjQxizqgZI3z+7yc8SKf11neug uR0/kNVoTYNKI9hXJqA+jdlDRCikJBKKlMLNJRc1XOThw2TZCBbVnsbI6nnmtKbjTR +L3A/O6sD7o4JJoKdfeiX2kb4QmDdzT6Yfh5kC8EwMdAWqXHVH6MdOxqrqNIcRWKCK hLReoFwfrvfGA== Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 53G8DJVo82935257 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Apr 2025 16:13:19 +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_256_GCM_SHA384) id 15.1.2507.39; Wed, 16 Apr 2025 16:13:19 +0800 Received: from [127.0.1.1] (172.21.69.94) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 16 Apr 2025 16:13:18 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH rtw-next 2/4] wifi: rtw89: 8922a: fix TX fail with wrong VCO setting Date: Wed, 16 Apr 2025 16:12:39 +0800 Message-ID: <20250416081241.36138-3-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250416081241.36138-1-pkshih@realtek.com> References: <20250416081241.36138-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) From: Kuan-Chung Chen An incorrect Voltage Controlled Oscillator (VCO) setting may cause Synthesizer (SYN) unlock, which may lead to a failure in the TX authentication request. Signed-off-by: Kuan-Chung Chen Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c b/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c index c4c93f836a2f..1659ea64ade1 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c @@ -77,11 +77,6 @@ void rtw8922a_ctl_band_ch_bw(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, RR_CFGCH_BAND0 | RR_CFGCH_CH); rf_reg[path][i] |= u32_encode_bits(central_ch, RR_CFGCH_CH); - if (band == RTW89_BAND_2G) - rtw89_write_rf(rtwdev, path, RR_SMD, RR_VCO2, 0x0); - else - rtw89_write_rf(rtwdev, path, RR_SMD, RR_VCO2, 0x1); - switch (band) { case RTW89_BAND_2G: default: From patchwork Wed Apr 16 08:12:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 882288 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (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 B090822F155 for ; Wed, 16 Apr 2025 08:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791207; cv=none; b=MxKGtT1KsJcQvHYeOfQIuyloN0StpNdO8qPQbUwV+TwChmZD1sUC4H1tx0+IUBT+diCj6S6LJFDQnYvNkztsP4bIJ9pn35zZxv2h4nJD/1xPLQM40p88uT+Vy26YGpgo3FiwjnVWEtFJdns6IvTwtwpumdKbAl121o5oRw1O2Rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791207; c=relaxed/simple; bh=2ktkKv6m++HwjL8NJfOgVt2ZfVdgAJOpHkJ8e5hYw08=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aPe6niTDckMbLKXPVRpZvhJXjDFrnwABPoJ74kxeynZg4GPnFQqNdai/ck7Wy8H92vVHn6e7ISXYUNf4xcHst1r5Dy7KWU12SXB7TbwoRRJwhgDT8PBypTOOgA3EsbImI6dpU3uLt7qxtftSV7AlUiEZGKCe4QCskmemEQN1Is4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=MhAW0UAG; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="MhAW0UAG" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 53G8DMVP02935264, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1744791202; bh=2ktkKv6m++HwjL8NJfOgVt2ZfVdgAJOpHkJ8e5hYw08=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=MhAW0UAGZnyUDehZ6VRgDibfwAgrbIgaXzYKMQsQ+HVfFa7PK0qLqpo+DB/lIYrAV 7DcGjtPex4hI3wYodXVrI+WvMi1iV/h68FfG5hP4sRgrb4YsX54rQX0E6w5x1IvGCM AOymZRCawFX/RdAbXbeQWQrJLxdzboPwM28L8Sjo0aZhbZD+vuW1xtxAdbd5OM+36Z 1Hll88PM4qsN9wT8Fe3KWluEVHqxWcKynkW4eivLVHQXxPAJD46s3jxTsUNVQt84EM L9EA0BqWDiU2MWELIpPUK2IG/j3GroIdhPd9jR4msT8bWgRKN4FPvuIrFtD5qp0KLA sXboZSa1Si5gw== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 53G8DMVP02935264 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Apr 2025 16:13:22 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 16 Apr 2025 16:13:22 +0800 Received: from [127.0.1.1] (172.21.69.94) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 16 Apr 2025 16:13:22 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH rtw-next 3/4] wifi: rtw89: regd: indicate if regd_UK TX power settings follow regd_ETSI Date: Wed, 16 Apr 2025 16:12:40 +0800 Message-ID: <20250416081241.36138-4-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250416081241.36138-1-pkshih@realtek.com> References: <20250416081241.36138-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) From: Zong-Zhe Yang Before adopting regd_UK TX power settings, some certifications are needed and might be platform-level. Without that, should adopt regd_ETSI TX power settings. But for now, there is no way to inform driver of it yet. So, add a flag first. But for now, comprehensively use regd_ETSI TX power settings to restrict regd_UK. Plan to define an ACPI DSM function to inform driver whether to use regd_UK own TX power settings or not afterwards. Signed-off-by: Zong-Zhe Yang Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.h | 11 +++++++++-- drivers/net/wireless/realtek/rtw89/debug.c | 3 +++ drivers/net/wireless/realtek/rtw89/regd.c | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index d49e06f81ba4..aea223940db3 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -5267,6 +5267,8 @@ struct rtw89_regulatory_info { const struct rtw89_regd *regd; enum rtw89_reg_6ghz_power reg_6ghz_power; struct rtw89_reg_6ghz_tpe reg_6ghz_tpe; + bool txpwr_uk_follow_etsi; + DECLARE_BITMAP(block_unii4, RTW89_REGD_MAX_COUNTRY_NUM); DECLARE_BITMAP(block_6ghz, RTW89_REGD_MAX_COUNTRY_NUM); DECLARE_BITMAP(block_6ghz_sp, RTW89_REGD_MAX_COUNTRY_NUM); @@ -6885,9 +6887,14 @@ static inline void rtw89_load_txpwr_table(struct rtw89_dev *rtwdev, static inline u8 rtw89_regd_get(struct rtw89_dev *rtwdev, u8 band) { - const struct rtw89_regd *regd = rtwdev->regulatory.regd; + const struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; + const struct rtw89_regd *regd = regulatory->regd; + u8 txpwr_regd = regd->txpwr_regd[band]; + + if (regulatory->txpwr_uk_follow_etsi && txpwr_regd == RTW89_UK) + return RTW89_ETSI; - return regd->txpwr_regd[band]; + return txpwr_regd; } static inline void rtw89_ctrl_btg_bt_rx(struct rtw89_dev *rtwdev, bool en, diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c index a7ef9cb9c6fe..10e011827379 100644 --- a/drivers/net/wireless/realtek/rtw89/debug.c +++ b/drivers/net/wireless/realtek/rtw89/debug.c @@ -857,11 +857,14 @@ static ssize_t __print_txpwr_map(struct rtw89_dev *rtwdev, char *buf, size_t buf static int __print_regd(struct rtw89_dev *rtwdev, char *buf, size_t bufsz, const struct rtw89_chan *chan) { + const struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory; char *p = buf, *end = buf + bufsz; u8 band = chan->band_type; u8 regd = rtw89_regd_get(rtwdev, band); p += scnprintf(p, end - p, "%s\n", rtw89_regd_get_string(regd)); + p += scnprintf(p, end - p, "\t(txpwr UK follow ETSI: %s)\n", + str_yes_no(regulatory->txpwr_uk_follow_etsi)); return p - buf; } diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c index 49e9540f2049..6dd37de59682 100644 --- a/drivers/net/wireless/realtek/rtw89/regd.c +++ b/drivers/net/wireless/realtek/rtw89/regd.c @@ -636,6 +636,7 @@ int rtw89_regd_setup(struct rtw89_dev *rtwdev) } regulatory->reg_6ghz_power = RTW89_REG_6GHZ_POWER_DFLT; + regulatory->txpwr_uk_follow_etsi = true; if (!wiphy) return -EINVAL; From patchwork Wed Apr 16 08:12:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 881837 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (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 5A3E322FF59 for ; Wed, 16 Apr 2025 08:13:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791210; cv=none; b=DyDDy6fAneq7MifMAGOMuMWDGrWvPw8zJ1JuxFTv2WSGM/wwMseOKtyJmgMi2t2ORdaHpo789Mq3Sot9dbcDIf+9096eu8JJ/HW79YieKGBEj/oI7vPnAXQYw9llh6Xt0x+AQxT42yDOYXinyujYIu+zEr+pP6pFnuqOsH3Mnoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744791210; c=relaxed/simple; bh=myBTwmQfeAtcuQRXQBe6PpizN8cdvypBXXqJ6lIf3LQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JEVM5Y/MYKNe4/FdN5hnX3P7IcTebj9khhFNuqwQUkBj22DKnI6NMuhDN7KelOFoeD7zCEZCDtGxhLSMnHTkzFYhRLY6R9wcqCQCyA7P9GtmMztelWp7Q7mhRlv+ZHNThm8L4eu3+tJ7GVbf7ukzJ/rQwzHkXLfR+9W/KjlJeUg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=dE9ozqHd; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="dE9ozqHd" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 53G8DQa142935268, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1744791206; bh=myBTwmQfeAtcuQRXQBe6PpizN8cdvypBXXqJ6lIf3LQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=dE9ozqHd1IaV8bk1wKQ20ZxYDN5XeHbgjloeuH4MTEql3j2kyHt1XlQiAEsVnrja5 ey5dtq18FNpGlHqLyszhib/SCeHahWPgWdQ96tOJqfLN68Swt6hnT/PVZe3BqhQ80o y7+ZxZv4NNdEWuDRDXYl0IutziGL4rG0Xrk3AogCoH5bHGspt1WAvPHeUJib9Ht2ho uIofQsfU0EHFVAnan1cENrTCLLifOTnzJO9f8xxaZ/RQVcxE0tLREV7nKP7okr3SNH RwyRY7D39hXg0KVNAhNwRqedEjEL7EKheWDhXjS+LrZ/mZd7omZNO3rOqKWbDarTFR sstUda++LS4bw== Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 53G8DQa142935268 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Apr 2025 16:13:26 +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_256_GCM_SHA384) id 15.1.2507.39; Wed, 16 Apr 2025 16:13:26 +0800 Received: from [127.0.1.1] (172.21.69.94) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 16 Apr 2025 16:13:25 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH rtw-next 4/4] wifi: rtw89: set pre-calculated antenna matrices for HE trigger frame Date: Wed, 16 Apr 2025 16:12:41 +0800 Message-ID: <20250416081241.36138-5-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250416081241.36138-1-pkshih@realtek.com> References: <20250416081241.36138-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) From: Kuan-Chung Chen Pre-calculated antenna matrices can improve 160MHz uplink OFDMA performance, but they are only needed for the HE trigger frame. Signed-off-by: Kuan-Chung Chen Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index 869728922def..255109462517 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -2060,10 +2060,21 @@ static void rtw89_stats_trigger_frame(struct rtw89_dev *rtwdev, break; if (aid == vif->cfg.aid) { - enum nl80211_he_ru_alloc rua = rtw89_he_rua_to_ru_alloc(tf_rua >> 1); + enum nl80211_he_ru_alloc rua; rtwvif->stats.rx_tf_acc++; rtwdev->stats.rx_tf_acc++; + + /* The following only required for HE trigger frame, but we + * cannot use UL HE-SIG-A2 reserved subfield to identify it + * since some 11ax APs will fill it with all 0s, which will + * be misunderstood as EHT trigger frame. + */ + if (bss_conf->eht_support) + break; + + rua = rtw89_he_rua_to_ru_alloc(tf_rua >> 1); + if (tf_bw == IEEE80211_TRIGGER_ULBW_160_80P80MHZ && rua <= NL80211_RATE_INFO_HE_RU_ALLOC_106) rtwvif_link->pwr_diff_en = true;