Skip to content

Commit 4a1aca5

Browse files
mj22226hauke
mj22226
authored and
hauke
committed
mac80211: realtek: rtw88: sync with v6.16
Renamed 046..051 pending patches with the merged tag/hash. Two patches were skipped, they make use of WQ_BH present since v6.14: torvalds/linux@13221be torvalds/linux@3e3aa56 Manually refreshed 062-v6.14-wifi-rtw88-Add-support-for-LED-blinking.patch Manually refreshed 063-v6.14-wifi-rtw88-add-RTW88_LEDS-depends-on-LEDS_CLASS-to-K.patch Manually backported 090-v6.15-wifi-rtw88-Enable-the-new-RTL8814AE-RTL8814AU-driver.patch git log --no-merges --pretty=oneline --abbrev-commit 4c2c372de...0daa521a drivers/net/wireless/realtek/rtw88: 4c2c372de2e1 wifi: rtw88: fix the 'para' buffer size to avoid reading out of bounds f24d0d8c3cd7 wifi: rtw88: Fix the random "error beacon valid" messages for USB 80fe0bc1659c wifi: rtw88: usb: Upload the firmware in bigger chunks 490340faddea wifi: rtw88: usb: Reduce control message timeout to 500 ms b7f0cc647e52 wifi: rtw88: rtw8822bu VID/PID for BUFFALO WI-U2-866DM 2c17afde9ff6 wifi: rtw88: Handle RTL8723D(S) with blank efuse 0ffa1ba81b35 wifi: rtw88: Fix RX aggregation settings for RTL8723DS 20d3c19bd8f9 wifi: rtw88: do not ignore hardware read error during DPK fc5f5a0ec463 wifi: rtw88: sdio: call rtw_sdio_indicate_tx_status unconditionally b2effcdc2379 wifi: rtw88: sdio: map mgmt frames to queue TX_DESC_QSEL_MGMT 581cf3a9cb61 wifi: rtw88: Fix the module names printed in dmesg b8d49bb8d16a wifi: rtw88: Don't set SUPPORTS_AMSDU_IN_AMPDU for RTL8814AU 0d2a88690e58 wifi: rtw88: Set AMPDU factor to hardware for RTL8814A dcbb7bb3a364 wifi: rtw88: usb: Enable RX aggregation for RTL8814AU bf1103654df9 wifi: rtw88: usb: Enable switching the RTL8814AU to USB 3 625fbc16524a wifi: rtw88: usb: Remove redundant 'flush_workqueue()' calls 5c4cf36c538b wifi: rtw88: sdio: Remove redundant 'flush_workqueue()' calls d58ad77d5cc2 wifi: rtw88: Add __nonstring annotations for unterminated strings deb3ddeb1865 wifi: rtw88: Enable the new RTL8814AE/RTL8814AU drivers bad060e8a425 wifi: rtw88: Add rtw8814au.c dad8e8793102 wifi: rtw88: Add rtw8814ae.c 1a7545784642 wifi: rtw88: Add rtw8814a.{c,h} e38246889cc9 wifi: rtw88: Add rtw8814a_table.c (part 2/2) f4debfcb1b3c wifi: rtw88: Add rtw8814a_table.c (part 1/2) 679ec431477c wifi: rtw88: Add some definitions for RTL8814AU c374281f8285 wifi: rtw88: Extend rtw_debugfs_get_tx_pwr_tbl() for RTL8814AU cfebabdd351e wifi: rtw88: Extend rtw_debugfs_get_phy_info() for RTL8814AU 8b42c46cf665 wifi: rtw88: Extend rtw_phy_config_swing_table() for RTL8814AU 053a7aace020 wifi: rtw88: Fix rtw_rx_phy_stat() for RTL8814AU 6be7544d19fc wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU c7eea1ba05ca wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU 86d04f8f991a wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 e66bca16638e wifi: rtw88: Fix rtw_mac_power_switch() for RTL8814AU 80c4668d024f wifi: rtw88: Add support for Mercusys MA30N and D-Link DWA-T185 rev. A1 9f00e2218e15 wifi: rtw88: Fix rtw_update_sta_info() for RTL8814AU 0f98a5959657 wifi: rtw88: Extend TX power stuff for 3-4 spatial streams ad815f392003 wifi: rtw88: Rename RTW_RATE_SECTION_MAX to RTW_RATE_SECTION_NUM e66f3b5c7535 wifi: rtw88: Constify some more structs and arrays 8f0076726b66 wifi: rtw88: Extend rtw_fw_send_ra_info() for RTL8814AU d80e7d9b6ba3 wifi: rtw88: Extend rf_base_addr and rf_sipi_addr for RTL8814AU 62f726848da4 wifi: rtw88: Extend struct rtw_pwr_track_tbl for RTL8814AU 9e8243025cc0 wifi: rtw88: Fix download_firmware_validate() for RTL8814AU 8425f5c8f04d wifi: rtw88: Fix __rtw_download_firmware() for RTL8814AU 105dc94233e4 wifi: rtw88: Fix a typo of debug message in rtw8723d_iqk_check_tx_failed() 0d1d165eff9d wifi: rtw88: Don't use static local variable in rtw8821c_set_tx_power_index_by_rate 00451eb3bec7 wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate b4bfbc50b1b9 wifi: rtw88: add RTW88_LEDS depends on LEDS_CLASS to Kconfig 4b6652bc6d8d wifi: rtw88: Add support for LED blinking fb2fcfbe5eef wifi: rtw88: sdio: Fix disconnection after beacon loss a806a8160a0f wifi: rtw88: 8703b: Fix RX/TX issues 5ad483955acc wifi: rtw88: Delete rf_type member of struct rtw_sta_info 5b1b9545262b wifi: rtw88: Add USB PHY configuration not backported (3e3aa566dd18 wifi: rtw88: usb: Preallocate and reuse the RX skbs) not backported (13221be72034 wifi: rtw88: Handle C2H_ADAPTIVITY in rtw_fw_c2h_cmd_handle() ) e9048e2935f7 wifi: rtw88: usb: Copy instead of cloning the RX skb 74a72c367573 wifi: rtw88: 8821a/8812a: Set ptct_efuse_size to 0 59ab27a9f20f wifi: rtw88: 8812a: Support RFE type 2 Signed-off-by: Marty Jones <[email protected]> Link: openwrt/openwrt#19052 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent b44f85f commit 4a1aca5

File tree

62 files changed

+31355
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+31355
-36
lines changed

package/kernel/mac80211/patches/rtl/046-wifi-rtw88-8821au-Add-additional-devices-to-the-USB_.patch renamed to package/kernel/mac80211/patches/rtl/046-v6.14-wifi-rtw88-8821au-Add-additional-devices-to-the-USB_.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
From ff5a1c94e53c0d24f610c2c30add82f75b728737 Mon Sep 17 00:00:00 2001
2-
From: Larry Finger <Larry.Finger@gmail.com>
1+
From 7b5ce65d90187f0944e70dc5741aa0edfac926f4 Mon Sep 17 00:00:00 2001
2+
From: Larry Finger <Larry.Finger@lwfinger.net>
33
Date: Wed, 6 Nov 2024 15:55:31 +0200
4-
Subject: [PATCH 1/6] wifi: rtw88: 8821au: Add additional devices to the
5-
USB_DEVICE list
4+
Subject: [PATCH] wifi: rtw88: 8821au: Add additional devices to the USB_DEVICE
5+
list
66

77
These are the entries that Nick Morrow provided. From
88
https://github.com/morrownr/8821au-20210708
99

1010
Signed-off-by: Larry Finger <[email protected]>
1111
Signed-off-by: Bitterblue Smith <[email protected]>
12+
Signed-off-by: Ping-Ke Shih <[email protected]>
13+
Link: https://patch.msgid.link/[email protected]
1214
---
1315
.../net/wireless/realtek/rtw88/rtw8821au.c | 52 ++++++++++++++++++-
1416
1 file changed, 51 insertions(+), 1 deletion(-)

package/kernel/mac80211/patches/rtl/047-wifi-rtw88-8812au-Add-more-device-IDs.patch renamed to package/kernel/mac80211/patches/rtl/047-v6.14-wifi-rtw88-8812au-Add-more-device-IDs.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
From d21ad2e4edfb64d3f32685607a457576eea3c5cd Mon Sep 17 00:00:00 2001
1+
From 1ee6ff9ae3c1a9eda9081f9db04f85d3a7352d38 Mon Sep 17 00:00:00 2001
22
From: Nick Morrow <[email protected]>
33
Date: Wed, 6 Nov 2024 15:57:10 +0200
4-
Subject: [PATCH 2/6] wifi: rtw88: 8812au: Add more device IDs
4+
Subject: [PATCH] wifi: rtw88: 8812au: Add more device IDs
55

66
From https://github.com/morrownr/8812au-20210820.
77

88
Signed-off-by: Nick Morrow <[email protected]>
99
Signed-off-by: Bitterblue Smith <[email protected]>
10+
Signed-off-by: Ping-Ke Shih <[email protected]>
11+
Link: https://patch.msgid.link/[email protected]
1012
---
1113
.../net/wireless/realtek/rtw88/rtw8812au.c | 68 ++++++++++++++++++-
1214
1 file changed, 67 insertions(+), 1 deletion(-)

package/kernel/mac80211/patches/rtl/051-wifi-rtw88-Add-additional-USB-IDs-for-RTL8812BU.patch renamed to package/kernel/mac80211/patches/rtl/048-v6.14-wifi-rtw88-Add-additional-USB-IDs-for-RTL8812BU.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
From acadf3a63b39ad03167a633fa3cea8c0fc2ab87f Mon Sep 17 00:00:00 2001
1+
From d4c4903508f9e1b2bfec88f777718484e27343fb Mon Sep 17 00:00:00 2001
22
From: Nick Morrow <[email protected]>
33
Date: Thu, 7 Nov 2024 08:28:46 +0800
4-
Subject: [PATCH 6/6] wifi: rtw88: Add additional USB IDs for RTL8812BU
4+
Subject: [PATCH] wifi: rtw88: Add additional USB IDs for RTL8812BU
55

66
Add three additional USB IDs found in
77
https://github.com/morrownr/88x2bu-20210702
88
to support more RTL8812BU devices.
99

1010
Signed-off-by: Nick Morrow <[email protected]>
1111
Signed-off-by: Zenm Chen <[email protected]>
12-
Signed-off-by: Mikhail Novosyolov <[email protected]>
12+
Reviewed-by: Mikhail Novosyolov <[email protected]>
13+
Signed-off-by: Ping-Ke Shih <[email protected]>
14+
Link: https://patch.msgid.link/[email protected]
1315
---
1416
drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 6 ++++++
1517
1 file changed, 6 insertions(+)

package/kernel/mac80211/patches/rtl/048-wifi-rtw88-usb-Support-USB-3-with-RTL8812AU.patch renamed to package/kernel/mac80211/patches/rtl/049-v6.14-wifi-rtw88-usb-Support-USB-3-with-RTL8812AU.patch

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
From 213dfa630285bb0241f3eaeb778db8ff128f10ba Mon Sep 17 00:00:00 2001
1+
From 82a35723a67c29f685d7b518962154a73b7163a2 Mon Sep 17 00:00:00 2001
22
From: Bitterblue Smith <[email protected]>
3-
Date: Fri, 8 Nov 2024 01:41:08 +0200
4-
Subject: [PATCH 3/6] wifi: rtw88: usb: Support USB 3 with RTL8812AU
3+
Date: Thu, 14 Nov 2024 17:46:08 +0200
4+
Subject: [PATCH] wifi: rtw88: usb: Support USB 3 with RTL8812AU
55

66
Add the function to automatically switch the RTL8812AU into USB 3 mode.
77

88
Signed-off-by: Bitterblue Smith <[email protected]>
9+
Signed-off-by: Ping-Ke Shih <[email protected]>
10+
Link: https://patch.msgid.link/[email protected]
911
---
10-
drivers/net/wireless/realtek/rtw88/usb.c | 34 ++++++++++++++++++++++--
11-
1 file changed, 32 insertions(+), 2 deletions(-)
12+
drivers/net/wireless/realtek/rtw88/usb.c | 44 ++++++++++++++++++++++--
13+
1 file changed, 42 insertions(+), 2 deletions(-)
1214

1315
--- a/drivers/net/wireless/realtek/rtw88/usb.c
1416
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
@@ -45,24 +47,38 @@ Signed-off-by: Bitterblue Smith <[email protected]>
4547
static int rtw_usb_switch_mode_new(struct rtw_dev *rtwdev)
4648
{
4749
enum usb_device_speed cur_speed;
48-
@@ -983,7 +1009,8 @@ static int rtw_usb_switch_mode(struct rt
50+
@@ -979,11 +1005,22 @@ static int rtw_usb_switch_mode_new(struc
51+
return 1;
52+
}
53+
54+
+static bool rtw_usb3_chip_old(u8 chip_id)
55+
+{
56+
+ return chip_id == RTW_CHIP_TYPE_8812A;
57+
+}
58+
+
59+
+static bool rtw_usb3_chip_new(u8 chip_id)
60+
+{
61+
+ return chip_id == RTW_CHIP_TYPE_8822C ||
62+
+ chip_id == RTW_CHIP_TYPE_8822B;
63+
+}
64+
+
65+
static int rtw_usb_switch_mode(struct rtw_dev *rtwdev)
4966
{
5067
u8 id = rtwdev->chip->id;
5168

5269
- if (id != RTW_CHIP_TYPE_8822C && id != RTW_CHIP_TYPE_8822B)
53-
+ if (id != RTW_CHIP_TYPE_8822C && id != RTW_CHIP_TYPE_8822B &&
54-
+ id != RTW_CHIP_TYPE_8812A)
70+
+ if (!rtw_usb3_chip_new(id) && !rtw_usb3_chip_old(id))
5571
return 0;
5672

5773
if (!rtwdev->efuse.usb_mode_switch) {
58-
@@ -998,7 +1025,10 @@ static int rtw_usb_switch_mode(struct rt
74+
@@ -998,7 +1035,10 @@ static int rtw_usb_switch_mode(struct rt
5975
return 0;
6076
}
6177

6278
- return rtw_usb_switch_mode_new(rtwdev);
63-
+ if (id == RTW_CHIP_TYPE_8812A)
79+
+ if (rtw_usb3_chip_old(id))
6480
+ return rtw_usb_switch_mode_old(rtwdev);
65-
+ else /* RTL8822CU, RTL8822BU */
81+
+ else
6682
+ return rtw_usb_switch_mode_new(rtwdev);
6783
}
6884

package/kernel/mac80211/patches/rtl/050-wifi-rtlwifi-rtl8821ae-phy-restore-removed-code-to-f.patch renamed to package/kernel/mac80211/patches/rtl/050-v6.14-wifi-rtlwifi-rtl8821ae-phy-restore-removed-code-to-f.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
From 927dcd0ab53f39ee00a2d1f204b5aac77e28fcf9 Mon Sep 17 00:00:00 2001
1+
From 5e5903a442bb889a62a0f5d89ac33e53ab08592c Mon Sep 17 00:00:00 2001
22
From: Colin Ian King <[email protected]>
33
Date: Wed, 6 Nov 2024 15:46:42 +0000
4-
Subject: [PATCH 5/6] wifi: rtlwifi: rtl8821ae: phy: restore removed code to
5-
fix infinite loop
4+
Subject: [PATCH] wifi: rtlwifi: rtl8821ae: phy: restore removed code to fix
5+
infinite loop
66

77
A previous clean-up fix removed the assignment of v2 inside a while loop
88
that turned it into an infinite loop. Fix this by restoring the assignment
@@ -12,6 +12,8 @@ Fixes: cda37445718d ("wifi: rtlwifi: rtl8821ae: phy: remove some useless code")
1212
Signed-off-by: Colin Ian King <[email protected]>
1313
Tested-by: Ping-Ke Shih <[email protected]>
1414
Reviewed-by: Su Hui <[email protected]>
15+
Signed-off-by: Ping-Ke Shih <[email protected]>
16+
Link: https://patch.msgid.link/[email protected]
1517
---
1618
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 4 +++-
1719
1 file changed, 3 insertions(+), 1 deletion(-)

package/kernel/mac80211/patches/rtl/049-wifi-rtw88-usb-Enable-RX-aggregation-for-8821au-8812.patch renamed to package/kernel/mac80211/patches/rtl/051-v6.14-wifi-rtw88-usb-Enable-RX-aggregation-for-8821au-8812.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 2b38362bd3b8e0a3691f0a8e82444a54f702e384 Mon Sep 17 00:00:00 2001
1+
From ce5dea83ee8f945203144fb891fdcb978216e45a Mon Sep 17 00:00:00 2001
22
From: Bitterblue Smith <[email protected]>
3-
Date: Fri, 8 Nov 2024 01:43:50 +0200
4-
Subject: [PATCH 4/6] wifi: rtw88: usb: Enable RX aggregation for 8821au/8812au
3+
Date: Thu, 14 Nov 2024 17:48:09 +0200
4+
Subject: [PATCH] wifi: rtw88: usb: Enable RX aggregation for 8821au/8812au
55

66
USB RX aggregation improves the RX speed on certain ARM systems, like
77
the NanoPi NEO Core2. With RTL8811AU, before: 30 Mbps, after: 224 Mbps.
@@ -13,13 +13,15 @@ of 7 RTL8812AU frequently tries to aggregate more frames than will fit
1313
in 32768 bytes. Use a size of 6 instead.
1414

1515
Signed-off-by: Bitterblue Smith <[email protected]>
16+
Signed-off-by: Ping-Ke Shih <[email protected]>
17+
Link: https://patch.msgid.link/[email protected]
1618
---
17-
drivers/net/wireless/realtek/rtw88/usb.c | 30 ++++++++++++++++++++++++
18-
1 file changed, 30 insertions(+)
19+
drivers/net/wireless/realtek/rtw88/usb.c | 28 ++++++++++++++++++++++++
20+
1 file changed, 28 insertions(+)
1921

2022
--- a/drivers/net/wireless/realtek/rtw88/usb.c
2123
+++ b/drivers/net/wireless/realtek/rtw88/usb.c
22-
@@ -789,6 +789,32 @@ static void rtw_usb_dynamic_rx_agg_v1(st
24+
@@ -789,6 +789,30 @@ static void rtw_usb_dynamic_rx_agg_v1(st
2325
rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, val16);
2426
}
2527

@@ -29,19 +31,17 @@ Signed-off-by: Bitterblue Smith <[email protected]>
2931
+ u8 size, timeout;
3032
+ u16 val16;
3133
+
32-
+ if (rtwusb->udev->speed == USB_SPEED_SUPER) {
34+
+ if (!enable) {
35+
+ size = 0x0;
36+
+ timeout = 0x1;
37+
+ } else if (rtwusb->udev->speed == USB_SPEED_SUPER) {
3338
+ size = 0x6;
3439
+ timeout = 0x1a;
3540
+ } else {
3641
+ size = 0x5;
3742
+ timeout = 0x20;
3843
+ }
3944
+
40-
+ if (!enable) {
41-
+ size = 0x0;
42-
+ timeout = 0x1;
43-
+ }
44-
+
4545
+ val16 = u16_encode_bits(size, BIT_RXDMA_AGG_PG_TH) |
4646
+ u16_encode_bits(timeout, BIT_DMA_AGG_TO_V1);
4747
+
@@ -52,7 +52,7 @@ Signed-off-by: Bitterblue Smith <[email protected]>
5252
static void rtw_usb_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable)
5353
{
5454
switch (rtwdev->chip->id) {
55-
@@ -797,6 +823,10 @@ static void rtw_usb_dynamic_rx_agg(struc
55+
@@ -797,6 +821,10 @@ static void rtw_usb_dynamic_rx_agg(struc
5656
case RTW_CHIP_TYPE_8821C:
5757
rtw_usb_dynamic_rx_agg_v1(rtwdev, enable);
5858
break;

0 commit comments

Comments
 (0)