RTW88: remove patches upstreamed
6.1.y Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
This commit is contained in:
parent
8be75c7528
commit
b0bb6b4e31
@ -12522,122 +12522,6 @@ index 298663b03580..0c1c1ff31085 100644
|
||||
--
|
||||
2.43.2
|
||||
|
||||
From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001
|
||||
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
||||
Date: Fri, 1 Mar 2024 00:35:09 +0200
|
||||
Subject: [PATCH v2 3/4] wifi: rtw88: 8821c: Fix beacon loss and disconnect
|
||||
|
||||
Tenda U9 V2.0, which contains RTL8811CU, is practically unusable because
|
||||
of frequent disconnections:
|
||||
|
||||
Feb 23 14:46:45 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-BEACON-LOSS
|
||||
Feb 23 14:46:46 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-DISCONNECTED
|
||||
bssid=90:55:de:__:__:__ reason=4 locally_generated=1
|
||||
|
||||
Feb 23 14:46:52 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-CONNECTED
|
||||
- Connection to 90:55:de:__:__:__ completed [id=0 id_str=]
|
||||
Feb 23 14:46:54 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-BEACON-LOSS
|
||||
Feb 23 14:46:55 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-DISCONNECTED
|
||||
bssid=90:55:de:__:__:__ reason=4 locally_generated=1
|
||||
|
||||
Feb 23 14:47:01 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-CONNECTED
|
||||
- Connection to 90:55:de:__:__:__ completed [id=0 id_str=]
|
||||
Feb 23 14:47:04 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-BEACON-LOSS
|
||||
Feb 23 14:47:05 ideapad2 wpa_supplicant[427]: wlp3s0f3u2: CTRL-EVENT-DISCONNECTED
|
||||
bssid=90:55:de:__:__:__ reason=4 locally_generated=1
|
||||
|
||||
This is caused by a mistake in the chip initialisation. This version of
|
||||
the chip requires loading an extra AGC table right after the main one,
|
||||
but the extra table is being loaded at the wrong time, in
|
||||
rtw_chip_board_info_setup().
|
||||
|
||||
Move the extra AGC table loading to the right place, in
|
||||
rtw_phy_load_tables().
|
||||
|
||||
The rtw_chip_board_info_setup() can only do "software" things, and
|
||||
rtw_phy_load_tables() can really do IO.
|
||||
|
||||
Fixes: 5d6651fe8583 ("rtw88: 8821c: support RFE type2 wifi NIC")
|
||||
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
||||
---
|
||||
v2:
|
||||
- Add more information in the commit message.
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/main.c | 2 --
|
||||
drivers/net/wireless/realtek/rtw88/phy.c | 3 +++
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
index 6d22628129d0..ffba6b88f392 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/main.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/main.c
|
||||
@@ -2032,8 +2032,6 @@ static int rtw_chip_board_info_setup(struct rtw_dev *rtwdev)
|
||||
rtw_phy_setup_phy_cond(rtwdev, hal->pkg_type);
|
||||
|
||||
rtw_phy_init_tx_power(rtwdev);
|
||||
- if (rfe_def->agc_btg_tbl)
|
||||
- rtw_load_table(rtwdev, rfe_def->agc_btg_tbl);
|
||||
rtw_load_table(rtwdev, rfe_def->phy_pg_tbl);
|
||||
rtw_load_table(rtwdev, rfe_def->txpwr_lmt_tbl);
|
||||
rtw_phy_tx_power_by_rate_config(hal);
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
|
||||
index 128e75a81bf3..37ef80c9091d 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/phy.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/phy.c
|
||||
@@ -1761,12 +1761,15 @@ static void rtw_load_rfk_table(struct rtw_dev *rtwdev)
|
||||
|
||||
void rtw_phy_load_tables(struct rtw_dev *rtwdev)
|
||||
{
|
||||
+ const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev);
|
||||
const struct rtw_chip_info *chip = rtwdev->chip;
|
||||
u8 rf_path;
|
||||
|
||||
rtw_load_table(rtwdev, chip->mac_tbl);
|
||||
rtw_load_table(rtwdev, chip->bb_tbl);
|
||||
rtw_load_table(rtwdev, chip->agc_tbl);
|
||||
+ if (rfe_def->agc_btg_tbl)
|
||||
+ rtw_load_table(rtwdev, rfe_def->agc_btg_tbl);
|
||||
rtw_load_rfk_table(rtwdev);
|
||||
|
||||
for (rf_path = 0; rf_path < rtwdev->hal.rf_path_num; rf_path++) {
|
||||
--
|
||||
2.43.2
|
||||
|
||||
From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001
|
||||
Date: Fri, 1 Mar 2024 00:35:58 +0200
|
||||
Subject: [PATCH v2 4/4] wifi: rtw88: 8821c: Fix false alarm count
|
||||
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
||||
|
||||
total_fa_cnt is supposed to include cck_fa_cnt and ofdm_fa_cnt, not just
|
||||
ofdm_fa_cnt.
|
||||
|
||||
Fixes: 960361238b86 ("rtw88: 8821c: add false alarm statistics")
|
||||
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
||||
---
|
||||
v2:
|
||||
- No change.
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
index 429bb420b056..fe5d8e188350 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
|
||||
@@ -773,9 +773,9 @@ static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev)
|
||||
|
||||
dm_info->cck_fa_cnt = cck_fa_cnt;
|
||||
dm_info->ofdm_fa_cnt = ofdm_fa_cnt;
|
||||
+ dm_info->total_fa_cnt = ofdm_fa_cnt;
|
||||
if (cck_enable)
|
||||
dm_info->total_fa_cnt += cck_fa_cnt;
|
||||
- dm_info->total_fa_cnt = ofdm_fa_cnt;
|
||||
|
||||
crc32_cnt = rtw_read32(rtwdev, REG_CRC_CCK);
|
||||
dm_info->cck_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
|
||||
--
|
||||
2.43.2
|
||||
|
||||
From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001
|
||||
From: Larry Finger <Larry.Finger@gmail.com>
|
||||
Date: Tue, 27 Feb 2024 02:34:40 +0000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user