From 44eb3e2424b2d5934e46d2087795c4a083537f41 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Mon, 9 Oct 2023 07:49:23 -0400 Subject: [PATCH] patch: misc: rtw88: 6.1: `wireless-next 2023-10-06` Signed-off-by: Patrick Yavitz --- ...less-realtek-rtw88-upstream-wireless.patch | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/patch/misc/rtw88/6.1/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch b/patch/misc/rtw88/6.1/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch index 1ac5c54c3f..3db243c0fb 100644 --- a/patch/misc/rtw88/6.1/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch +++ b/patch/misc/rtw88/6.1/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch @@ -1,9 +1,9 @@ -From 2340ec2730f468b99c7263852399ee95d8601539 Mon Sep 17 00:00:00 2001 +From 9255e64129b3bdeec16e17645b4e7a793f73b586 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Sun, 27 Aug 2023 20:20:39 -0400 +Date: Sun, 8 Oct 2023 09:41:11 -0400 Subject: [PATCH] drivers: net: wireless: realtek: rtw88: upstream wireless -wireless-next: 2023-08-25: backport: linux-6.1.y +wireless-next: 2023-10-06: backport: linux-6.1.y Signed-off-by: Patrick Yavitz --- @@ -11,7 +11,7 @@ Signed-off-by: Patrick Yavitz drivers/net/wireless/realtek/rtw88/Makefile | 30 + drivers/net/wireless/realtek/rtw88/bf.c | 13 +- drivers/net/wireless/realtek/rtw88/coex.c | 3 +- - drivers/net/wireless/realtek/rtw88/debug.c | 74 +- + drivers/net/wireless/realtek/rtw88/debug.c | 78 +- drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 121 +- drivers/net/wireless/realtek/rtw88/fw.h | 26 +- @@ -26,7 +26,7 @@ Signed-off-by: Patrick Yavitz drivers/net/wireless/realtek/rtw88/ps.c | 11 +- drivers/net/wireless/realtek/rtw88/reg.h | 15 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 40 + - drivers/net/wireless/realtek/rtw88/rtw8723d.h | 19 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 20 +- .../net/wireless/realtek/rtw88/rtw8723ds.c | 41 + .../net/wireless/realtek/rtw88/rtw8723du.c | 36 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 49 +- @@ -49,7 +49,8 @@ Signed-off-by: Patrick Yavitz drivers/net/wireless/realtek/rtw88/usb.h | 100 ++ drivers/net/wireless/realtek/rtw88/util.c | 100 ++ drivers/net/wireless/realtek/rtw88/util.h | 11 +- - 42 files changed, 4149 insertions(+), 275 deletions(-) + include/linux/mmc/sdio_ids.h | 10 + + 43 files changed, 4162 insertions(+), 277 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723ds.c create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723du.c create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821cs.c @@ -325,7 +326,7 @@ index a82476f47a7c..86467d2f8888 100644 } diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c -index 9ebe544e51d0..f8ba133baff0 100644 +index 9ebe544e51d0..35bc37a3c469 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.c +++ b/drivers/net/wireless/realtek/rtw88/debug.c @@ -144,7 +144,9 @@ static int rtw_debugfs_get_rf_read(struct seq_file *m, void *v) @@ -560,6 +561,18 @@ index 9ebe544e51d0..f8ba133baff0 100644 } static int rtw_debugfs_get_dm_cap(struct seq_file *m, void *v) +@@ -1191,9 +1233,9 @@ static struct rtw_debugfs_priv rtw_debug_priv_dm_cap = { + #define rtw_debugfs_add_core(name, mode, fopname, parent) \ + do { \ + rtw_debug_priv_ ##name.rtwdev = rtwdev; \ +- if (!debugfs_create_file(#name, mode, \ ++ if (IS_ERR(debugfs_create_file(#name, mode, \ + parent, &rtw_debug_priv_ ##name,\ +- &file_ops_ ##fopname)) \ ++ &file_ops_ ##fopname))) \ + pr_debug("Unable to initialize debugfs:%s\n", \ + #name); \ + } while (0) diff --git a/drivers/net/wireless/realtek/rtw88/debug.h b/drivers/net/wireless/realtek/rtw88/debug.h index 066792dd96af..a9149c6c2b48 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.h @@ -2215,10 +2228,10 @@ index 0a4f770fcbb7..c575476a0020 100644 .is_pwr_by_rate_dec = true, .max_power_index = 0x3f, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.h b/drivers/net/wireless/realtek/rtw88/rtw8723d.h -index 4641f6e047b4..3642a2c7f80c 100644 +index 4641f6e047b4..2434e2480cbe 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723d.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.h -@@ -41,6 +41,19 @@ struct rtw8723de_efuse { +@@ -41,6 +41,20 @@ struct rtw8723de_efuse { u8 sub_device_id[2]; }; @@ -2227,6 +2240,7 @@ index 4641f6e047b4..3642a2c7f80c 100644 + u8 vender_id[2]; /* 0x100 */ + u8 product_id[2]; /* 0x102 */ + u8 usb_option; /* 0x104 */ ++ u8 res5[2]; /* 0x105 */ + u8 mac_addr[ETH_ALEN]; /* 0x107 */ +}; + @@ -2238,7 +2252,7 @@ index 4641f6e047b4..3642a2c7f80c 100644 struct rtw8723d_efuse { __le16 rtl_id; u8 rsvd[2]; -@@ -69,7 +82,11 @@ struct rtw8723d_efuse { +@@ -69,7 +83,11 @@ struct rtw8723d_efuse { u8 rfe_option; u8 country_code[2]; u8 res[3]; @@ -2991,7 +3005,7 @@ index 000000000000..975e81c824f2 +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cu.c b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c new file mode 100644 -index 000000000000..af28ca09d41f +index 000000000000..157d5102a4b1 --- /dev/null +++ b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c @@ -0,0 +1,44 @@ @@ -3022,7 +3036,7 @@ index 000000000000..af28ca09d41f +}; +MODULE_DEVICE_TABLE(usb, rtw_8822cu_id_table); + -+static int rtw8822bu_probe(struct usb_interface *intf, ++static int rtw8822cu_probe(struct usb_interface *intf, + const struct usb_device_id *id) +{ + return rtw_usb_probe(intf, id); @@ -3031,7 +3045,7 @@ index 000000000000..af28ca09d41f +static struct usb_driver rtw_8822cu_driver = { + .name = "rtw_8822cu", + .id_table = rtw_8822cu_id_table, -+ .probe = rtw8822bu_probe, ++ .probe = rtw8822cu_probe, + .disconnect = rtw_usb_disconnect, +}; +module_usb_driver(rtw_8822cu_driver); @@ -6135,21 +6149,6 @@ index 0c23b5069be0..f8399128a9a3 100644 static inline u8 *get_hdr_bssid(struct ieee80211_hdr *hdr) { __le16 fc = hdr->frame_control; --- -2.39.2 - -From b9bff5dfe07eb22dd2423f30eeef920d5f0b65ac Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Sun, 27 Aug 2023 16:04:14 -0400 -Subject: [PATCH] include: linux: mmc: sdio_ids.h - -Realtek SDIO vendor id's - -Signed-off-by: Patrick Yavitz ---- - include/linux/mmc/sdio_ids.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 74f9d9a6d330..f30a4e564754 100644 --- a/include/linux/mmc/sdio_ids.h