Skip to contentSkip to conversation

wifi: rtw89: update 8852C firmware format version 2 and etc

PATCH In review Ping-Ke Shih 1 participant 6 messages Apr 16, 2025 – Apr 26, 2025 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Ping-Ke Shih

author maintainer
#0 lore raw

cover wifi: rtw89: update 8852C firmware format version 2 and etc

First patch is to update RTL8852C supported firmware format to 2. This is because firmware v0.27.125.0 uses new format that old driver can't recognize, so increase format number to 2 after the firmware, and only the latest driver with this patch can use the new firmware.

Patches 2/4 and 4/4 are to correct settings for field issues.

Patch 3/4 is to limit TX power of UK under regulation depending on platform certified.

Kuan-Chung Chen (2):
wifi: rtw89: 8922a: fix TX fail with wrong VCO setting
wifi: rtw89: set pre-calculated antenna matrices for HE trigger frame

Ping-Ke Shih (1):
wifi: rtw89: 8852c: update supported firmware format to 2

Zong-Zhe Yang (1):
wifi: rtw89: regd: indicate if regd_UK TX power settings follow
regd_ETSI

 drivers/net/wireless/realtek/rtw89/core.c         | 13 ++++++++++++-
 drivers/net/wireless/realtek/rtw89/core.h         | 11 +++++++++--
 drivers/net/wireless/realtek/rtw89/debug.c        |  3 +++
 drivers/net/wireless/realtek/rtw89/regd.c         |  1 +
 drivers/net/wireless/realtek/rtw89/rtw8852c.c     |  2 +-
 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c |  5 -----
 6 files changed, 26 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 1/4 wifi: rtw89: 8852c: update supported firmware format to 2

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.

---
 drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -1
index a8fd573d5048..9a2235f28e24 100644
@@ -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"
Signature · 1 line
2.25.1
author maintainer
#2 lore raw

Re: [PATCH rtw-next 1/4] wifi: rtw89: 8852c: update supported firmware format to 2

Quoted 6 lines · Ping-Ke Shih

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.

4 patch(es) applied to rtw-next branch of rtw.git, thanks.

603f4c71cc5d wifi: rtw89: 8852c: update supported firmware format to 2 20aac091a15d wifi: rtw89: 8922a: fix TX fail with wrong VCO setting f64801d6f15e wifi: rtw89: regd: indicate if regd_UK TX power settings follow regd_ETSI 3e03579821ee wifi: rtw89: set pre-calculated antenna matrices for HE trigger frame

---
https://github.com/pkshih/rtw.git

author maintainer
#3 lore raw

PATCH 2/4 wifi: rtw89: 8922a: fix TX fail with wrong VCO setting

In reply to Ping-Ke Shih

From: Kuan-Chung Chen <[email protected]>

An incorrect Voltage Controlled Oscillator (VCO) setting may cause Synthesizer (SYN) unlock, which may lead to a failure in the TX authentication request.

---
 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c +0 -5
index c4c93f836a2f..1659ea64ade1 100644
@@ -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:
Signature · 1 line
2.25.1
author maintainer
#4 lore raw

PATCH 3/4 wifi: rtw89: regd: indicate if regd_UK TX power settings follow regd_ETSI

In reply to Ping-Ke Shih

From: Zong-Zhe Yang <[email protected]>

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.

---
 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(-)
drivers/net/wireless/realtek/rtw89/core.h +9 -2
index d49e06f81ba4..aea223940db3 100644
@@ -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,
drivers/net/wireless/realtek/rtw89/debug.c +3 -0
index a7ef9cb9c6fe..10e011827379 100644
@@ -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;
 }
drivers/net/wireless/realtek/rtw89/regd.c +1 -0
index 49e9540f2049..6dd37de59682 100644
@@ -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;
Signature · 1 line
2.25.1
author maintainer
#5 lore raw

PATCH 4/4 wifi: rtw89: set pre-calculated antenna matrices for HE trigger frame

In reply to Ping-Ke Shih

From: Kuan-Chung Chen <[email protected]>

Pre-calculated antenna matrices can improve 160MHz uplink OFDMA performance, but they are only needed for the HE trigger frame.

---
 drivers/net/wireless/realtek/rtw89/core.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +12 -1
index 869728922def..255109462517 100644
@@ -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;
Signature · 1 line
2.25.1