diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index daef399d0f..c607ae1423 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -413,12 +413,13 @@ driver_rtl88x2bu() { driver_rtw88() { # Quite a few kernel families have KERNEL_DRIVERS_SKIP listing this driver. If so, this won't even be called. - # Upstream wireless RTW88 drivers (wireless-next-2023-08-25) + # Upstream wireless RTW88 drivers if linux-version compare "${version}" ge 6.1; then display_alert "Adding" "Upstream wireless RTW88 drivers" "info" - if linux-version compare "${version}" ge 6.1 && linux-version compare "${version}" lt 6.6; then # came in with 6.6.14 and 6.7.2 - process_patch_file "${SRC}/patch/misc/rtw88/${version}/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch" "applying" - fi + #if linux-version compare "${version}" ge 6.1 && linux-version compare "${version}" lt 6.6; then # came in with 6.6.14 and 6.7.2 + # process_patch_file "${SRC}/patch/misc/rtw88/${version}/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch" "applying" + #fi + process_patch_file "${SRC}/patch/misc/rtw88/${version}/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch" "applying" process_patch_file "${SRC}/patch/misc/rtw88/hack/002-rtw88-usb-make-work-queues-high-priority.patch" "applying" process_patch_file "${SRC}/patch/misc/rtw88/hack/003-rtw88-decrease-the-log-level-of-tx-report.patch" "applying" fi 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 f88dc0366d..ca8e56a0ad 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 38fa9757a42c9f5e94ecc17888c7a8e1f87339df Mon Sep 17 00:00:00 2001 +From 5844a1c1dfbefdc19ec3a9b6737031800838b9ac Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Mon, 20 Nov 2023 06:27:29 -0500 +Date: Thu, 29 Feb 2024 03:47:06 -0500 Subject: [PATCH] drivers: net: wireless: realtek: rtw88: upstream wireless -wireless-next: 2023-10-06: backport: linux-6.1.y +backport: linux-6.7.y: 6.7.4 Signed-off-by: Patrick Yavitz --- @@ -12,25 +12,28 @@ Signed-off-by: Patrick Yavitz 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.h | 1 + - drivers/net/wireless/realtek/rtw88/fw.c | 121 +- - drivers/net/wireless/realtek/rtw88/fw.h | 26 +- + drivers/net/wireless/realtek/rtw88/debug.h | 13 + + drivers/net/wireless/realtek/rtw88/fw.c | 195 ++- + drivers/net/wireless/realtek/rtw88/fw.h | 29 +- drivers/net/wireless/realtek/rtw88/hci.h | 9 +- drivers/net/wireless/realtek/rtw88/mac.c | 93 +- drivers/net/wireless/realtek/rtw88/mac.h | 1 - drivers/net/wireless/realtek/rtw88/mac80211.c | 57 +- drivers/net/wireless/realtek/rtw88/main.c | 193 ++- - drivers/net/wireless/realtek/rtw88/main.h | 45 +- + drivers/net/wireless/realtek/rtw88/main.h | 55 +- drivers/net/wireless/realtek/rtw88/pci.c | 65 +- drivers/net/wireless/realtek/rtw88/phy.c | 6 +- - drivers/net/wireless/realtek/rtw88/ps.c | 11 +- - drivers/net/wireless/realtek/rtw88/reg.h | 15 + + drivers/net/wireless/realtek/rtw88/ps.c | 13 +- + drivers/net/wireless/realtek/rtw88/reg.h | 38 + + drivers/net/wireless/realtek/rtw88/regd.c | 24 +- + drivers/net/wireless/realtek/rtw88/regd.h | 2 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 40 + 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 +- - drivers/net/wireless/realtek/rtw88/rtw8821c.h | 27 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 116 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 28 + + .../wireless/realtek/rtw88/rtw8821c_table.c | 1154 +++++++++---- .../net/wireless/realtek/rtw88/rtw8821cs.c | 36 + .../net/wireless/realtek/rtw88/rtw8821cu.c | 50 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 29 + @@ -39,18 +42,18 @@ Signed-off-by: Patrick Yavitz .../net/wireless/realtek/rtw88/rtw8822bu.c | 90 ++ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 34 + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 8 +- + .../wireless/realtek/rtw88/rtw8822c_table.c | 1239 ++++++-------- .../net/wireless/realtek/rtw88/rtw8822cs.c | 36 + .../net/wireless/realtek/rtw88/rtw8822cu.c | 44 + - drivers/net/wireless/realtek/rtw88/sdio.c | 1404 +++++++++++++++++ - drivers/net/wireless/realtek/rtw88/sdio.h | 178 +++ + drivers/net/wireless/realtek/rtw88/sdio.c | 1425 +++++++++++++++++ + drivers/net/wireless/realtek/rtw88/sdio.h | 178 ++ drivers/net/wireless/realtek/rtw88/tx.c | 137 +- drivers/net/wireless/realtek/rtw88/tx.h | 138 +- - drivers/net/wireless/realtek/rtw88/usb.c | 916 +++++++++++ + drivers/net/wireless/realtek/rtw88/usb.c | 913 +++++++++++ drivers/net/wireless/realtek/rtw88/usb.h | 100 ++ drivers/net/wireless/realtek/rtw88/util.c | 100 ++ drivers/net/wireless/realtek/rtw88/util.h | 11 +- - include/linux/mmc/sdio_ids.h | 10 + - 43 files changed, 4160 insertions(+), 275 deletions(-) + 46 files changed, 5725 insertions(+), 1329 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 @@ -562,7 +565,7 @@ index abd750c3c28e..35bc37a3c469 100644 static int rtw_debugfs_get_dm_cap(struct seq_file *m, void *v) diff --git a/drivers/net/wireless/realtek/rtw88/debug.h b/drivers/net/wireless/realtek/rtw88/debug.h -index 066792dd96af..a9149c6c2b48 100644 +index 066792dd96af..a03ced11bbe0 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.h +++ b/drivers/net/wireless/realtek/rtw88/debug.h @@ -24,6 +24,7 @@ enum rtw_debug_mask { @@ -573,11 +576,115 @@ index 066792dd96af..a9149c6c2b48 100644 RTW_DBG_ALL = 0xffffffff }; +@@ -47,11 +48,23 @@ void __rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, + + #define rtw_dbg(rtwdev, a...) __rtw_dbg(rtwdev, ##a) + ++static inline bool rtw_dbg_is_enabled(struct rtw_dev *rtwdev, ++ enum rtw_debug_mask mask) ++{ ++ return !!(rtw_debug_mask & mask); ++} ++ + #else + + static inline void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, + const char *fmt, ...) {} + ++static inline bool rtw_dbg_is_enabled(struct rtw_dev *rtwdev, ++ enum rtw_debug_mask mask) ++{ ++ return false; ++} ++ + #endif /* CONFIG_RTW88_DEBUG */ + + #define rtw_info(rtwdev, a...) dev_info(rtwdev->dev, ##a) diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c -index 0b5f903c0f36..a1b674e3caaa 100644 +index 0b5f903c0f36..acd78311c8c4 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.c +++ b/drivers/net/wireless/realtek/rtw88/fw.c -@@ -140,7 +140,7 @@ struct rtw_beacon_filter_iter_data { +@@ -17,6 +17,79 @@ + #include "phy.h" + #include "mac.h" + ++static const struct rtw_hw_reg_desc fw_h2c_regs[] = { ++ {REG_FWIMR, MASKDWORD, "FWIMR"}, ++ {REG_FWIMR, BIT_FS_H2CCMD_INT_EN, "FWIMR enable"}, ++ {REG_FWISR, MASKDWORD, "FWISR"}, ++ {REG_FWISR, BIT_FS_H2CCMD_INT, "FWISR enable"}, ++ {REG_HMETFR, BIT_INT_BOX_ALL, "BoxBitMap"}, ++ {REG_HMEBOX0, MASKDWORD, "MSG 0"}, ++ {REG_HMEBOX0_EX, MASKDWORD, "MSG_EX 0"}, ++ {REG_HMEBOX1, MASKDWORD, "MSG 1"}, ++ {REG_HMEBOX1_EX, MASKDWORD, "MSG_EX 1"}, ++ {REG_HMEBOX2, MASKDWORD, "MSG 2"}, ++ {REG_HMEBOX2_EX, MASKDWORD, "MSG_EX 2"}, ++ {REG_HMEBOX3, MASKDWORD, "MSG 3"}, ++ {REG_HMEBOX3_EX, MASKDWORD, "MSG_EX 3"}, ++ {REG_FT1IMR, MASKDWORD, "FT1IMR"}, ++ {REG_FT1IMR, BIT_FS_H2C_CMD_OK_INT_EN, "FT1IMR enable"}, ++ {REG_FT1ISR, MASKDWORD, "FT1ISR"}, ++ {REG_FT1ISR, BIT_FS_H2C_CMD_OK_INT, "FT1ISR enable "}, ++}; ++ ++static const struct rtw_hw_reg_desc fw_c2h_regs[] = { ++ {REG_FWIMR, MASKDWORD, "FWIMR"}, ++ {REG_FWIMR, BIT_FS_H2CCMD_INT_EN, "CPWM"}, ++ {REG_FWIMR, BIT_FS_HRCV_INT_EN, "HRECV"}, ++ {REG_FWISR, MASKDWORD, "FWISR"}, ++ {REG_FWISR, BIT_FS_H2CCMD_INT, "CPWM"}, ++ {REG_FWISR, BIT_FS_HRCV_INT, "HRECV"}, ++ {REG_CPWM, MASKDWORD, "REG_CPWM"}, ++}; ++ ++static const struct rtw_hw_reg_desc fw_core_regs[] = { ++ {REG_ARFR2_V1, MASKDWORD, "EPC"}, ++ {REG_ARFRH2_V1, MASKDWORD, "BADADDR"}, ++ {REG_ARFR3_V1, MASKDWORD, "CAUSE"}, ++ {REG_ARFR3_V1, BIT_EXC_CODE, "ExcCode"}, ++ {REG_ARFRH3_V1, MASKDWORD, "Status"}, ++ {REG_ARFR4, MASKDWORD, "SP"}, ++ {REG_ARFRH4, MASKDWORD, "RA"}, ++ {REG_FW_DBG6, MASKDWORD, "DBG 6"}, ++ {REG_FW_DBG7, MASKDWORD, "DBG 7"}, ++}; ++ ++static void _rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev, ++ const struct rtw_hw_reg_desc regs[], u32 size) ++{ ++ const struct rtw_hw_reg_desc *reg; ++ u32 val; ++ int i; ++ ++ for (i = 0; i < size; i++) { ++ reg = ®s[i]; ++ val = rtw_read32_mask(rtwdev, reg->addr, reg->mask); ++ ++ rtw_dbg(rtwdev, RTW_DBG_FW, "[%s]addr:0x%x mask:0x%x value:0x%x\n", ++ reg->desc, reg->addr, reg->mask, val); ++ } ++} ++ ++void rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev) ++{ ++ int i; ++ ++ if (!rtw_dbg_is_enabled(rtwdev, RTW_DBG_FW)) ++ return; ++ ++ _rtw_fw_dump_dbg_info(rtwdev, fw_h2c_regs, ARRAY_SIZE(fw_h2c_regs)); ++ _rtw_fw_dump_dbg_info(rtwdev, fw_c2h_regs, ARRAY_SIZE(fw_c2h_regs)); ++ for (i = 0 ; i < RTW_DEBUG_DUMP_TIMES; i++) { ++ rtw_dbg(rtwdev, RTW_DBG_FW, "Firmware Coredump %dth\n", i + 1); ++ _rtw_fw_dump_dbg_info(rtwdev, fw_core_regs, ARRAY_SIZE(fw_core_regs)); ++ } ++} ++ + static void rtw_fw_c2h_cmd_handle_ext(struct rtw_dev *rtwdev, + struct sk_buff *skb) + { +@@ -140,7 +213,7 @@ struct rtw_beacon_filter_iter_data { u8 *payload; }; @@ -586,7 +693,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 struct ieee80211_vif *vif) { struct rtw_beacon_filter_iter_data *iter_data = data; -@@ -308,13 +308,64 @@ void rtw_fw_c2h_cmd_isr(struct rtw_dev *rtwdev) +@@ -308,13 +381,65 @@ void rtw_fw_c2h_cmd_isr(struct rtw_dev *rtwdev) } EXPORT_SYMBOL(rtw_fw_c2h_cmd_isr); @@ -631,6 +738,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 + + if (ret) { + rtw_err(rtwdev, "failed to send h2c command\n"); ++ rtw_fw_dump_dbg_info(rtwdev); + return; + } + @@ -652,7 +760,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 int ret; rtw_dbg(rtwdev, RTW_DBG_FW, -@@ -322,7 +373,7 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, +@@ -322,7 +447,7 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, h2c[3], h2c[2], h2c[1], h2c[0], h2c[7], h2c[6], h2c[5], h2c[4]); @@ -661,7 +769,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 box = rtwdev->h2c.last_box_num; switch (box) { -@@ -344,7 +395,7 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, +@@ -344,7 +469,7 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, break; default: WARN(1, "invalid h2c mail box number\n"); @@ -670,7 +778,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 } ret = read_poll_timeout_atomic(rtw_read8, box_state, -@@ -353,19 +404,14 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, +@@ -353,19 +478,14 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, if (ret) { rtw_err(rtwdev, "failed to send h2c command\n"); @@ -693,7 +801,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 } void rtw_fw_h2c_cmd_dbg(struct rtw_dev *rtwdev, u8 *h2c) -@@ -377,15 +423,13 @@ static void rtw_fw_send_h2c_packet(struct rtw_dev *rtwdev, u8 *h2c_pkt) +@@ -377,15 +497,13 @@ static void rtw_fw_send_h2c_packet(struct rtw_dev *rtwdev, u8 *h2c_pkt) { int ret; @@ -710,7 +818,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 } void -@@ -475,6 +519,23 @@ void rtw_fw_query_bt_info(struct rtw_dev *rtwdev) +@@ -475,6 +593,23 @@ void rtw_fw_query_bt_info(struct rtw_dev *rtwdev) rtw_fw_send_h2c_command(rtwdev, h2c_pkt); } @@ -734,7 +842,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 void rtw_fw_wl_ch_info(struct rtw_dev *rtwdev, u8 link, u8 ch, u8 bw) { u8 h2c_pkt[H2C_PKT_SIZE] = {0}; -@@ -824,6 +885,16 @@ void rtw_fw_set_nlo_info(struct rtw_dev *rtwdev, bool enable) +@@ -824,6 +959,16 @@ void rtw_fw_set_nlo_info(struct rtw_dev *rtwdev, bool enable) rtw_fw_send_h2c_command(rtwdev, h2c_pkt); } @@ -751,7 +859,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 void rtw_fw_set_pg_info(struct rtw_dev *rtwdev) { struct rtw_lps_conf *conf = &rtwdev->lps_conf; -@@ -1390,6 +1461,10 @@ static void rtw_build_rsvd_page_iter(void *data, u8 *mac, +@@ -1390,6 +1535,10 @@ static void rtw_build_rsvd_page_iter(void *data, u8 *mac, struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; struct rtw_rsvd_page *rsvd_pkt; @@ -762,7 +870,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 list_for_each_entry(rsvd_pkt, &rtwvif->rsvd_page_list, vif_list) { if (rsvd_pkt->type == RSVD_BEACON) list_add(&rsvd_pkt->build_list, -@@ -1611,6 +1686,7 @@ void rtw_fw_update_beacon_work(struct work_struct *work) +@@ -1611,6 +1760,7 @@ void rtw_fw_update_beacon_work(struct work_struct *work) mutex_lock(&rtwdev->mutex); rtw_fw_download_rsvd_page(rtwdev); @@ -770,7 +878,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 mutex_unlock(&rtwdev->mutex); } -@@ -2152,11 +2228,19 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, +@@ -2152,11 +2302,19 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, } rtw_fw_set_scan_offload(rtwdev, &cs_option, rtwvif, &chan_list); out: @@ -791,7 +899,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_SCAN_OFFLOAD)) return; -@@ -2241,6 +2325,7 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb) +@@ -2241,6 +2399,7 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb) if (rtw_is_op_chan(rtwdev, chan)) { rtw_store_op_chan(rtwdev, false); ieee80211_wake_queues(rtwdev->hw); @@ -799,7 +907,7 @@ index 0b5f903c0f36..a1b674e3caaa 100644 } } else if (id == RTW_SCAN_NOTIFY_ID_PRESWITCH) { if (IS_CH_5G_BAND(chan)) { -@@ -2259,8 +2344,10 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb) +@@ -2259,8 +2418,10 @@ void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb) * if next channel is non-op channel. */ if (!rtw_is_op_chan(rtwdev, chan) && @@ -812,10 +920,19 @@ index 0b5f903c0f36..a1b674e3caaa 100644 rtw_dbg(rtwdev, RTW_DBG_HW_SCAN, diff --git a/drivers/net/wireless/realtek/rtw88/fw.h b/drivers/net/wireless/realtek/rtw88/fw.h -index a5a965803a3c..43ccdf9965ac 100644 +index a5a965803a3c..84e47c71ea12 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.h +++ b/drivers/net/wireless/realtek/rtw88/fw.h -@@ -81,6 +81,22 @@ struct rtw_c2h_adaptivity { +@@ -44,6 +44,8 @@ + #define RTW_OLD_PROBE_PG_CNT 2 + #define RTW_PROBE_PG_CNT 4 + ++#define RTW_DEBUG_DUMP_TIMES 10 ++ + enum rtw_c2h_cmd_id { + C2H_CCX_TX_RPT = 0x03, + C2H_BT_INFO = 0x09, +@@ -81,6 +83,22 @@ struct rtw_c2h_adaptivity { u8 option; } __packed; @@ -838,7 +955,7 @@ index a5a965803a3c..43ccdf9965ac 100644 enum rtw_rsvd_packet_type { RSVD_BEACON, RSVD_DUMMY, -@@ -525,6 +541,7 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) +@@ -525,6 +543,7 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) #define H2C_CMD_MEDIA_STATUS_RPT 0x01 #define H2C_CMD_SET_PWR_MODE 0x20 #define H2C_CMD_LPS_PG_INFO 0x2b @@ -846,7 +963,7 @@ index a5a965803a3c..43ccdf9965ac 100644 #define H2C_CMD_RA_INFO 0x40 #define H2C_CMD_RSSI_MONITOR 0x42 #define H2C_CMD_BCN_FILTER_OFFLOAD_P0 0x56 -@@ -550,6 +567,8 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) +@@ -550,6 +569,8 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) #define H2C_CMD_AOAC_GLOBAL_INFO 0x82 #define H2C_CMD_NLO_INFO 0x8C @@ -855,7 +972,7 @@ index a5a965803a3c..43ccdf9965ac 100644 #define SET_H2C_CMD_ID_CLASS(h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(7, 0)) -@@ -749,6 +768,9 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) +@@ -749,6 +770,9 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) #define SET_NLO_LOC_NLO_INFO(h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(23, 16)) @@ -865,7 +982,13 @@ index a5a965803a3c..43ccdf9965ac 100644 #define GET_FW_DUMP_LEN(_header) \ le32_get_bits(*((__le32 *)(_header) + 0x00), GENMASK(15, 0)) #define GET_FW_DUMP_SEQ(_header) \ -@@ -791,6 +813,7 @@ void rtw_fw_c2h_cmd_rx_irqsafe(struct rtw_dev *rtwdev, u32 pkt_offset, +@@ -786,11 +810,13 @@ static inline bool rtw_fw_feature_ext_check(struct rtw_fw_state *fw, + return !!(fw->feature_ext & feature); + } + ++void rtw_fw_dump_dbg_info(struct rtw_dev *rtwdev); + void rtw_fw_c2h_cmd_rx_irqsafe(struct rtw_dev *rtwdev, u32 pkt_offset, + struct sk_buff *skb); void rtw_fw_c2h_cmd_handle(struct rtw_dev *rtwdev, struct sk_buff *skb); void rtw_fw_send_general_info(struct rtw_dev *rtwdev); void rtw_fw_send_phydm_info(struct rtw_dev *rtwdev); @@ -873,7 +996,7 @@ index a5a965803a3c..43ccdf9965ac 100644 void rtw_fw_do_iqk(struct rtw_dev *rtwdev, struct rtw_iqk_para *para); void rtw_fw_inform_rfk_status(struct rtw_dev *rtwdev, bool start); -@@ -838,6 +861,7 @@ void rtw_fw_set_aoac_global_info_cmd(struct rtw_dev *rtwdev, +@@ -838,6 +864,7 @@ void rtw_fw_set_aoac_global_info_cmd(struct rtw_dev *rtwdev, u8 group_key_enc); void rtw_fw_set_nlo_info(struct rtw_dev *rtwdev, bool enable); @@ -881,7 +1004,7 @@ index a5a965803a3c..43ccdf9965ac 100644 void rtw_fw_update_pkt_probe_req(struct rtw_dev *rtwdev, struct cfg80211_ssid *ssid); void rtw_fw_channel_switch(struct rtw_dev *rtwdev, bool enable); -@@ -857,5 +881,5 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, +@@ -857,5 +884,5 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, bool enable); void rtw_hw_scan_status_report(struct rtw_dev *rtwdev, struct sk_buff *skb); void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb); @@ -1135,7 +1258,7 @@ index 3172aa5ac4de..58c3dccc14bb 100644 #define C2H_PKT_BUF 256 #define REPORT_BUF 128 diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c -index fabca307867a..a99b53d44267 100644 +index 0970d6bcba43..d8d68f16014e 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -43,7 +43,11 @@ static void rtw_ops_wake_tx_queue(struct ieee80211_hw *hw, @@ -1332,7 +1455,7 @@ index fabca307867a..a99b53d44267 100644 .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove, diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c -index 4c8164db4a9e..06469babab8c 100644 +index 4c8164db4a9e..4a33d2e47f33 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -18,6 +18,7 @@ @@ -1504,7 +1627,7 @@ index 4c8164db4a9e..06469babab8c 100644 release_firmware(wow_fw->firmware); destroy_workqueue(rtwdev->tx_wq); -+ del_timer_sync(&rtwdev->tx_report.purge_timer); ++ timer_delete_sync(&rtwdev->tx_report.purge_timer); spin_lock_irqsave(&rtwdev->tx_report.q_lock, flags); skb_queue_purge(&rtwdev->tx_report.queue); - skb_queue_purge(&rtwdev->coex.queue); @@ -1677,7 +1800,7 @@ index 4c8164db4a9e..06469babab8c 100644 MODULE_DESCRIPTION("Realtek 802.11ac wireless core module"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h -index f8714f449244..c42ef8294d59 100644 +index f8714f449244..b6bfd4c02e2d 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -88,7 +88,7 @@ enum rtw_supported_band { @@ -1689,7 +1812,19 @@ index f8714f449244..c42ef8294d59 100644 #define RTW_MAX_CHANNEL_WIDTH RTW_CHANNEL_WIDTH_80 enum rtw_bandwidth { -@@ -395,6 +395,15 @@ enum rtw_snr { +@@ -342,8 +342,10 @@ enum rtw_regulatory_domains { + RTW_REGD_UKRAINE = 7, + RTW_REGD_MEXICO = 8, + RTW_REGD_CN = 9, +- RTW_REGD_WW, ++ RTW_REGD_QATAR = 10, ++ RTW_REGD_UK = 11, + ++ RTW_REGD_WW, + RTW_REGD_MAX + }; + +@@ -395,6 +397,15 @@ enum rtw_snr { RTW_SNR_NUM }; @@ -1705,7 +1840,7 @@ index f8714f449244..c42ef8294d59 100644 enum rtw_wow_flags { RTW_WOW_FLAG_EN_MAGIC_PKT, RTW_WOW_FLAG_EN_REKEY_PKT, -@@ -502,12 +511,6 @@ struct rtw_txpwr_idx { +@@ -502,12 +513,6 @@ struct rtw_txpwr_idx { struct rtw_5g_txpwr_idx pwr_idx_5g; }; @@ -1718,7 +1853,20 @@ index f8714f449244..c42ef8294d59 100644 struct rtw_channel_params { u8 center_chan; u8 primary_chan; -@@ -725,9 +728,7 @@ struct rtw_ra_report { +@@ -519,6 +524,12 @@ struct rtw_hw_reg { + u32 mask; + }; + ++struct rtw_hw_reg_desc { ++ u32 addr; ++ u32 mask; ++ const char *desc; ++}; ++ + struct rtw_ltecoex_addr { + u32 ctrl; + u32 wdata; +@@ -725,9 +736,7 @@ struct rtw_ra_report { struct rtw_txq { struct list_head list; @@ -1728,7 +1876,7 @@ index f8714f449244..c42ef8294d59 100644 }; #define RTW_BC_MC_MACID 1 -@@ -745,7 +746,6 @@ struct rtw_sta_info { +@@ -745,7 +754,6 @@ struct rtw_sta_info { u8 rate_id; enum rtw_bandwidth bw_mode; enum rtw_rf_type rf_type; @@ -1736,7 +1884,7 @@ index f8714f449244..c42ef8294d59 100644 u8 stbc_en:2; u8 ldpc_en:2; bool sgi_enable; -@@ -794,6 +794,7 @@ struct rtw_bf_info { +@@ -794,6 +802,7 @@ struct rtw_bf_info { struct rtw_vif { enum rtw_net_type net_type; u16 aid; @@ -1744,7 +1892,7 @@ index f8714f449244..c42ef8294d59 100644 u8 mac_addr[ETH_ALEN]; u8 bssid[ETH_ALEN]; u8 port; -@@ -874,6 +875,10 @@ struct rtw_chip_ops { +@@ -874,6 +883,10 @@ struct rtw_chip_ops { bool is_tx2_path); void (*config_txrx_mode)(struct rtw_dev *rtwdev, u8 tx_path, u8 rx_path, bool is_tx2_path); @@ -1755,7 +1903,7 @@ index f8714f449244..c42ef8294d59 100644 /* for coex */ void (*coex_set_init)(struct rtw_dev *rtwdev); -@@ -1167,6 +1172,7 @@ struct rtw_chip_info { +@@ -1167,6 +1180,7 @@ struct rtw_chip_info { u32 txff_size; u32 rxff_size; u32 fw_rxff_size; @@ -1763,7 +1911,7 @@ index f8714f449244..c42ef8294d59 100644 u8 band; u8 page_size; u8 csi_buf_pg_num; -@@ -1504,8 +1510,6 @@ struct rtw_coex_stat { +@@ -1504,8 +1518,6 @@ struct rtw_coex_stat { }; struct rtw_coex { @@ -1772,7 +1920,7 @@ index f8714f449244..c42ef8294d59 100644 struct sk_buff_head queue; wait_queue_head_t wait; -@@ -1854,6 +1858,7 @@ struct rtw_fw_state { +@@ -1854,6 +1866,7 @@ struct rtw_fw_state { u16 h2c_version; u32 feature; u32 feature_ext; @@ -1780,7 +1928,7 @@ index f8714f449244..c42ef8294d59 100644 }; enum rtw_sar_sources { -@@ -1871,7 +1876,7 @@ enum rtw_sar_bands { +@@ -1871,7 +1884,7 @@ enum rtw_sar_bands { RTW_SAR_BAND_NR, }; @@ -1789,7 +1937,7 @@ index f8714f449244..c42ef8294d59 100644 * which might not re-use same format with array common. */ union rtw_sar_cfg { -@@ -1890,7 +1895,9 @@ struct rtw_hal { +@@ -1890,7 +1903,9 @@ struct rtw_hal { u8 cut_version; u8 mp_chip; u8 oem_id; @@ -1799,7 +1947,7 @@ index f8714f449244..c42ef8294d59 100644 u8 ps_mode; u8 current_channel; -@@ -1997,9 +2004,6 @@ struct rtw_dev { +@@ -1997,9 +2012,6 @@ struct rtw_dev { /* ensures exclusive access from mac80211 callbacks */ struct mutex mutex; @@ -1809,7 +1957,7 @@ index f8714f449244..c42ef8294d59 100644 /* watch dog every 2 sec */ struct delayed_work watch_dog_work; u32 watch_dog_cnt; -@@ -2023,10 +2027,8 @@ struct rtw_dev { +@@ -2023,10 +2035,8 @@ struct rtw_dev { struct rtw_tx_report tx_report; struct { @@ -1821,7 +1969,7 @@ index f8714f449244..c42ef8294d59 100644 u32 seq; } h2c; -@@ -2041,6 +2043,7 @@ struct rtw_dev { +@@ -2041,6 +2051,7 @@ struct rtw_dev { u8 sta_cnt; u32 rts_threshold; @@ -1829,7 +1977,7 @@ index f8714f449244..c42ef8294d59 100644 DECLARE_BITMAP(mac_id_map, RTW_MAX_MAC_ID_NUM); DECLARE_BITMAP(flags, NUM_OF_RTW_FLAGS); -@@ -2052,6 +2055,7 @@ struct rtw_dev { +@@ -2052,6 +2063,7 @@ struct rtw_dev { bool need_rfk; struct completion fw_scan_density; @@ -1837,7 +1985,7 @@ index f8714f449244..c42ef8294d59 100644 /* hci related data, must be last */ u8 priv[] __aligned(sizeof(void *)); -@@ -2193,4 +2197,7 @@ void rtw_set_txrx_1ss(struct rtw_dev *rtwdev, bool config_1ss); +@@ -2193,4 +2205,7 @@ void rtw_set_txrx_1ss(struct rtw_dev *rtwdev, bool config_1ss); void rtw_update_channel(struct rtw_dev *rtwdev, u8 center_channel, u8 primary_channel, enum rtw_supported_band band, enum rtw_bandwidth bandwidth); @@ -2036,7 +2184,7 @@ index bd7d05e08084..128e75a81bf3 100644 } diff --git a/drivers/net/wireless/realtek/rtw88/ps.c b/drivers/net/wireless/realtek/rtw88/ps.c -index 7ac35c368d7a..07e8cbd436cd 100644 +index 7ac35c368d7a..add5a20b8432 100644 --- a/drivers/net/wireless/realtek/rtw88/ps.c +++ b/drivers/net/wireless/realtek/rtw88/ps.c @@ -18,6 +18,7 @@ static int rtw_ips_pwr_up(struct rtw_dev *rtwdev) @@ -2068,7 +2216,23 @@ index 7ac35c368d7a..07e8cbd436cd 100644 return 0; } -@@ -321,8 +319,7 @@ static void __rtw_vif_recalc_lps(struct rtw_vif_recalc_lps_iter_data *data, +@@ -106,6 +104,7 @@ void rtw_power_mode_change(struct rtw_dev *rtwdev, bool enter) + */ + WARN(1, "firmware failed to ack driver for %s Deep Power mode\n", + enter ? "entering" : "leaving"); ++ rtw_fw_dump_dbg_info(rtwdev); + } + } + EXPORT_SYMBOL(rtw_power_mode_change); +@@ -166,6 +165,7 @@ static void rtw_fw_leave_lps_check(struct rtw_dev *rtwdev) + if (ret) { + rtw_write32_clr(rtwdev, REG_TCR, BIT_PWRMGT_HWDATA_EN); + rtw_warn(rtwdev, "firmware failed to leave lps state\n"); ++ rtw_fw_dump_dbg_info(rtwdev); + } + } + +@@ -321,8 +321,7 @@ static void __rtw_vif_recalc_lps(struct rtw_vif_recalc_lps_iter_data *data, data->found_vif = vif; } @@ -2079,7 +2243,7 @@ index 7ac35c368d7a..07e8cbd436cd 100644 __rtw_vif_recalc_lps(data, vif); } diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h -index 03bd8dc53f72..7c6c11d50ff3 100644 +index 03bd8dc53f72..1634f03784f1 100644 --- a/drivers/net/wireless/realtek/rtw88/reg.h +++ b/drivers/net/wireless/realtek/rtw88/reg.h @@ -87,6 +87,7 @@ @@ -2101,7 +2265,33 @@ index 03bd8dc53f72..7c6c11d50ff3 100644 #define BIT_SHIFT_TXDMA_BEQ_MAP 8 #define BIT_MASK_TXDMA_BEQ_MAP 0x3 #define BIT_TXDMA_BEQ_MAP(x) \ -@@ -282,10 +287,18 @@ +@@ -219,12 +224,25 @@ + #define REG_RXFF_BNDY 0x011C + #define REG_FE1IMR 0x0120 + #define BIT_FS_RXDONE BIT(16) ++#define REG_CPWM 0x012C ++#define REG_FWIMR 0x0130 ++#define BIT_FS_H2CCMD_INT_EN BIT(4) ++#define BIT_FS_HRCV_INT_EN BIT(5) ++#define REG_FWISR 0x0134 ++#define BIT_FS_H2CCMD_INT BIT(4) ++#define BIT_FS_HRCV_INT BIT(5) + #define REG_PKTBUF_DBG_CTRL 0x0140 + #define REG_C2HEVT 0x01A0 + #define REG_MCUTST_1 0x01C0 + #define REG_MCUTST_II 0x01C4 + #define REG_WOWLAN_WAKE_REASON 0x01C7 + #define REG_HMETFR 0x01CC ++#define BIT_INT_BOX0 BIT(0) ++#define BIT_INT_BOX1 BIT(1) ++#define BIT_INT_BOX2 BIT(2) ++#define BIT_INT_BOX3 BIT(3) ++#define BIT_INT_BOX_ALL (BIT_INT_BOX0 | BIT_INT_BOX1 | BIT_INT_BOX2 | \ ++ BIT_INT_BOX3) + #define REG_HMEBOX0 0x01D0 + #define REG_HMEBOX1 0x01D4 + #define REG_HMEBOX2 0x01D8 +@@ -282,10 +300,18 @@ #define REG_H2C_TAIL 0x0248 #define REG_H2C_READ_ADDR 0x024C #define REG_H2C_INFO 0x0254 @@ -2120,7 +2310,19 @@ index 03bd8dc53f72..7c6c11d50ff3 100644 #define REG_RXPKTNUM 0x02B0 #define REG_INT_MIG 0x0304 -@@ -365,6 +378,7 @@ +@@ -325,6 +351,11 @@ + #define BIT_EN_GNT_BT_AWAKE BIT(3) + #define BIT_EN_EOF_V1 BIT(2) + #define REG_DATA_SC 0x0483 ++#define REG_ARFR2_V1 0x048C ++#define REG_ARFRH2_V1 0x0490 ++#define REG_ARFR3_V1 0x0494 ++#define BIT_EXC_CODE GENMASK(6, 2) ++#define REG_ARFRH3_V1 0x0498 + #define REG_ARFR4 0x049C + #define BIT_WL_RFK BIT(0) + #define REG_ARFRH4 0x04A0 +@@ -365,6 +396,7 @@ #define BIT_SIFS_BK_EN BIT(12) #define REG_TXPAUSE 0x0522 #define BIT_AC_QUEUE GENMASK(7, 0) @@ -2128,7 +2330,7 @@ index 03bd8dc53f72..7c6c11d50ff3 100644 #define REG_RD_CTRL 0x0524 #define BIT_EDCCA_MSK_CNTDOWN_EN BIT(11) #define BIT_DIS_TXOP_CFE BIT(10) -@@ -397,6 +411,7 @@ +@@ -397,6 +429,7 @@ #define REG_TCR 0x0604 #define BIT_PWRMGT_HWDATA_EN BIT(7) #define BIT_TCR_UPDATE_TIMIE BIT(5) @@ -2136,6 +2338,118 @@ index 03bd8dc53f72..7c6c11d50ff3 100644 #define REG_RCR 0x0608 #define BIT_APP_FCS BIT(31) #define BIT_APP_MIC BIT(30) +@@ -533,11 +566,16 @@ + + #define REG_H2C_PKT_READADDR 0x10D0 + #define REG_H2C_PKT_WRITEADDR 0x10D4 ++#define REG_FW_DBG6 0x10F8 + #define REG_FW_DBG7 0x10FC + #define FW_KEY_MASK 0xffffff00 + + #define REG_CR_EXT 0x1100 + ++#define REG_FT1IMR 0x1138 ++#define BIT_FS_H2C_CMD_OK_INT_EN BIT(25) ++#define REG_FT1ISR 0x113c ++#define BIT_FS_H2C_CMD_OK_INT BIT(25) + #define REG_DDMA_CH0SA 0x1200 + #define REG_DDMA_CH0DA 0x1204 + #define REG_DDMA_CH0CTRL 0x1208 +diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c +index 2f547cbcf6da..7f3b2ea3f2a5 100644 +--- a/drivers/net/wireless/realtek/rtw88/regd.c ++++ b/drivers/net/wireless/realtek/rtw88/regd.c +@@ -70,16 +70,16 @@ static const struct rtw_regulatory rtw_reg_map[] = { + COUNTRY_REGD_ENT("BY", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("BZ", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("CA", RTW_REGD_IC, RTW_REGD_IC), +- COUNTRY_REGD_ENT("CC", RTW_REGD_ETSI, RTW_REGD_ETSI), ++ COUNTRY_REGD_ENT("CC", RTW_REGD_ACMA, RTW_REGD_ACMA), + COUNTRY_REGD_ENT("CD", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CF", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CG", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CH", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CI", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("CK", RTW_REGD_ETSI, RTW_REGD_ETSI), +- COUNTRY_REGD_ENT("CL", RTW_REGD_FCC, RTW_REGD_FCC), ++ COUNTRY_REGD_ENT("CL", RTW_REGD_CHILE, RTW_REGD_CHILE), + COUNTRY_REGD_ENT("CM", RTW_REGD_ETSI, RTW_REGD_ETSI), +- COUNTRY_REGD_ENT("CN", RTW_REGD_ETSI, RTW_REGD_ETSI), ++ COUNTRY_REGD_ENT("CN", RTW_REGD_CN, RTW_REGD_CN), + COUNTRY_REGD_ENT("CO", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("CR", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("CV", RTW_REGD_ETSI, RTW_REGD_ETSI), +@@ -106,7 +106,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { + COUNTRY_REGD_ENT("FO", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("FR", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("GA", RTW_REGD_ETSI, RTW_REGD_ETSI), +- COUNTRY_REGD_ENT("GB", RTW_REGD_ETSI, RTW_REGD_ETSI), ++ COUNTRY_REGD_ENT("GB", RTW_REGD_UK, RTW_REGD_UK), + COUNTRY_REGD_ENT("GD", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("GE", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("GF", RTW_REGD_ETSI, RTW_REGD_ETSI), +@@ -214,7 +214,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { + COUNTRY_REGD_ENT("PT", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("PW", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("PY", RTW_REGD_FCC, RTW_REGD_FCC), +- COUNTRY_REGD_ENT("QA", RTW_REGD_ETSI, RTW_REGD_ETSI), ++ COUNTRY_REGD_ENT("QA", RTW_REGD_QATAR, RTW_REGD_QATAR), + COUNTRY_REGD_ENT("RE", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("RO", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("RS", RTW_REGD_ETSI, RTW_REGD_ETSI), +@@ -234,7 +234,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { + COUNTRY_REGD_ENT("SN", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("SO", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("SR", RTW_REGD_FCC, RTW_REGD_FCC), +- COUNTRY_REGD_ENT("ST", RTW_REGD_FCC, RTW_REGD_FCC), ++ COUNTRY_REGD_ENT("ST", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("SV", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("SX", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("SZ", RTW_REGD_ETSI, RTW_REGD_ETSI), +@@ -253,7 +253,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { + COUNTRY_REGD_ENT("TV", RTW_REGD_ETSI, RTW_REGD_WW), + COUNTRY_REGD_ENT("TW", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("TZ", RTW_REGD_ETSI, RTW_REGD_ETSI), +- COUNTRY_REGD_ENT("UA", RTW_REGD_ETSI, RTW_REGD_ETSI), ++ COUNTRY_REGD_ENT("UA", RTW_REGD_UKRAINE, RTW_REGD_UKRAINE), + COUNTRY_REGD_ENT("UG", RTW_REGD_ETSI, RTW_REGD_ETSI), + COUNTRY_REGD_ENT("US", RTW_REGD_FCC, RTW_REGD_FCC), + COUNTRY_REGD_ENT("UY", RTW_REGD_FCC, RTW_REGD_FCC), +@@ -502,6 +502,14 @@ u8 rtw_regd_get(struct rtw_dev *rtwdev) + } + EXPORT_SYMBOL(rtw_regd_get); + ++bool rtw_regd_srrc(struct rtw_dev *rtwdev) ++{ ++ struct rtw_regd *regd = &rtwdev->regd; ++ ++ return rtw_reg_match(regd->regulatory, "CN"); ++} ++EXPORT_SYMBOL(rtw_regd_srrc); ++ + struct rtw_regd_alternative_t { + bool set; + u8 alt; +@@ -519,6 +527,8 @@ rtw_regd_alt[RTW_REGD_MAX] = { + DECL_REGD_ALT(RTW_REGD_UKRAINE, RTW_REGD_ETSI), + DECL_REGD_ALT(RTW_REGD_MEXICO, RTW_REGD_FCC), + DECL_REGD_ALT(RTW_REGD_CN, RTW_REGD_ETSI), ++ DECL_REGD_ALT(RTW_REGD_QATAR, RTW_REGD_ETSI), ++ DECL_REGD_ALT(RTW_REGD_UK, RTW_REGD_ETSI), + }; + + bool rtw_regd_has_alt(u8 regd, u8 *regd_alt) +diff --git a/drivers/net/wireless/realtek/rtw88/regd.h b/drivers/net/wireless/realtek/rtw88/regd.h +index 34cb13d0cd9e..3c5a6fd8e6dd 100644 +--- a/drivers/net/wireless/realtek/rtw88/regd.h ++++ b/drivers/net/wireless/realtek/rtw88/regd.h +@@ -68,4 +68,6 @@ int rtw_regd_init(struct rtw_dev *rtwdev); + int rtw_regd_hint(struct rtw_dev *rtwdev); + u8 rtw_regd_get(struct rtw_dev *rtwdev); + bool rtw_regd_has_alt(u8 regd, u8 *regd_alt); ++bool rtw_regd_srrc(struct rtw_dev *rtwdev); ++ + #endif diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c index 0a4f770fcbb7..c575476a0020 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c @@ -2343,7 +2657,7 @@ index 000000000000..322a805da76b +MODULE_DESCRIPTION("Realtek 802.11n wireless 8723du driver"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c -index 609a2b86330d..adf224618a2a 100644 +index 609a2b86330d..429bb420b056 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -26,6 +26,18 @@ static void rtw8821ce_efuse_parsing(struct rtw_efuse *efuse, @@ -2429,7 +2743,95 @@ index 609a2b86330d..adf224618a2a 100644 rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTDBG, BIT(6), 0x1); rtw_write_rf(rtwdev, RF_PATH_A, 0x64, 0xf, 0xf); } else { -@@ -1148,6 +1180,13 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) +@@ -349,6 +381,65 @@ static void rtw8821c_set_channel_rxdfir(struct rtw_dev *rtwdev, u8 bw) + } + } + ++static void rtw8821c_cck_tx_filter_srrc(struct rtw_dev *rtwdev, u8 channel, u8 bw) ++{ ++ struct rtw_hal *hal = &rtwdev->hal; ++ ++ if (channel == 14) { ++ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xe82c); ++ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x0000b81c); ++ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x0000); ++ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, 0x00003667); ++ ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); ++ } else if (channel == 13 || ++ (channel == 11 && bw == RTW_CHANNEL_WIDTH_40)) { ++ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xf8fe); ++ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x64b80c1c); ++ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x8810); ++ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, 0x01235667); ++ ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00027); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00027); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00029); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00026); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); ++ } else { ++ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xe82c); ++ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, ++ hal->ch_param[0]); ++ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, ++ hal->ch_param[1] & MASKLWORD); ++ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, ++ hal->ch_param[2]); ++ ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); ++ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); ++ } ++} ++ + static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, + u8 primary_ch_idx) + { +@@ -363,6 +454,13 @@ static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, + + rtw_write32_mask(rtwdev, REG_TXSCALE_A, 0xf00, 0x0); + rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x96a); ++ ++ if (rtw_regd_srrc(rtwdev)) { ++ rtw8821c_cck_tx_filter_srrc(rtwdev, channel, bw); ++ goto set_bw; ++ } ++ ++ /* CCK TX filter parameters for default case */ + if (channel == 14) { + rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x0000b81c); + rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x0000); +@@ -398,6 +496,7 @@ static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, + rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x412); + } + ++set_bw: + switch (bw) { + case RTW_CHANNEL_WIDTH_20: + default: +@@ -1148,6 +1247,13 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) dm_info->cck_pd_default + new_lvl * 2); } @@ -2443,7 +2845,7 @@ index 609a2b86330d..adf224618a2a 100644 static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8821c[] = { {0x0086, RTW_PWR_CUT_ALL_MSK, -@@ -1595,6 +1634,7 @@ static struct rtw_chip_ops rtw8821c_ops = { +@@ -1595,6 +1701,7 @@ static struct rtw_chip_ops rtw8821c_ops = { .config_bfee = rtw8821c_bf_config_bfee, .set_gid_table = rtw_bf_set_gid_table, .cfg_csi_rate = rtw_bf_cfg_csi_rate, @@ -2451,7 +2853,7 @@ index 609a2b86330d..adf224618a2a 100644 .coex_set_init = rtw8821c_coex_cfg_init, .coex_set_ant_switch = rtw8821c_coex_cfg_ant_switch, -@@ -1893,6 +1933,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { +@@ -1893,6 +2000,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .ptct_efuse_size = 96, .txff_size = 65536, .rxff_size = 16384, @@ -2460,7 +2862,7 @@ index 609a2b86330d..adf224618a2a 100644 .is_pwr_by_rate_dec = true, .max_power_index = 0x3f, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h -index 2698801fc35d..fcff31688c45 100644 +index 2698801fc35d..91ed921407bb 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h @@ -9,6 +9,26 @@ @@ -2511,3849 +2913,14 @@ index 2698801fc35d..fcff31688c45 100644 }; }; -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c -new file mode 100644 -index 000000000000..a359413369a4 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c -@@ -0,0 +1,36 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) Martin Blumenstingl -+ */ -+ -+#include -+#include -+#include -+#include "main.h" -+#include "rtw8821c.h" -+#include "sdio.h" -+ -+static const struct sdio_device_id rtw_8821cs_id_table[] = { -+ { -+ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, -+ SDIO_DEVICE_ID_REALTEK_RTW8821CS), -+ .driver_data = (kernel_ulong_t)&rtw8821c_hw_spec, -+ }, -+ {} -+}; -+MODULE_DEVICE_TABLE(sdio, rtw_8821cs_id_table); -+ -+static struct sdio_driver rtw_8821cs_driver = { -+ .name = "rtw_8821cs", -+ .probe = rtw_sdio_probe, -+ .remove = rtw_sdio_remove, -+ .id_table = rtw_8821cs_id_table, -+ .drv = { -+ .pm = &rtw_sdio_pm_ops, -+ .shutdown = rtw_sdio_shutdown, -+ } -+}; -+module_sdio_driver(rtw_8821cs_driver); -+ -+MODULE_AUTHOR("Martin Blumenstingl "); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821cs driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c -new file mode 100644 -index 000000000000..7a5cbdc31ef7 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c -@@ -0,0 +1,50 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#include -+#include -+#include "main.h" -+#include "rtw8821c.h" -+#include "usb.h" -+ -+static const struct usb_device_id rtw_8821cu_id_table[] = { -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ -+ {}, -+}; -+MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); -+ -+static int rtw_8821cu_probe(struct usb_interface *intf, -+ const struct usb_device_id *id) -+{ -+ return rtw_usb_probe(intf, id); -+} -+ -+static struct usb_driver rtw_8821cu_driver = { -+ .name = "rtw_8821cu", -+ .id_table = rtw_8821cu_id_table, -+ .probe = rtw_8821cu_probe, -+ .disconnect = rtw_usb_disconnect, -+}; -+module_usb_driver(rtw_8821cu_driver); -+ -+MODULE_AUTHOR("Hans Ulli Kroll "); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821cu driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c -index 690e35c98f6e..3017a9760da8 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c -@@ -26,6 +26,18 @@ static void rtw8822be_efuse_parsing(struct rtw_efuse *efuse, - ether_addr_copy(efuse->addr, map->e.mac_addr); - } - -+static void rtw8822bu_efuse_parsing(struct rtw_efuse *efuse, -+ struct rtw8822b_efuse *map) -+{ -+ ether_addr_copy(efuse->addr, map->u.mac_addr); -+} -+ -+static void rtw8822bs_efuse_parsing(struct rtw_efuse *efuse, -+ struct rtw8822b_efuse *map) -+{ -+ ether_addr_copy(efuse->addr, map->s.mac_addr); -+} -+ - static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) - { - struct rtw_efuse *efuse = &rtwdev->efuse; -@@ -56,6 +68,12 @@ static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) - case RTW_HCI_TYPE_PCIE: - rtw8822be_efuse_parsing(efuse, map); - break; -+ case RTW_HCI_TYPE_USB: -+ rtw8822bu_efuse_parsing(efuse, map); -+ break; -+ case RTW_HCI_TYPE_SDIO: -+ rtw8822bs_efuse_parsing(efuse, map); -+ break; - default: - /* unsupported now */ - return -ENOTSUPP; -@@ -1588,6 +1606,15 @@ static void rtw8822b_adaptivity(struct rtw_dev *rtwdev) - rtw_phy_set_edcca_th(rtwdev, l2h, h2l); - } - -+static void rtw8822b_fill_txdesc_checksum(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ u8 *txdesc) -+{ -+ size_t words = 32 / 2; /* calculate the first 32 bytes (16 words) */ -+ -+ fill_txdesc_checksum_common(txdesc, words); -+} -+ - static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822b[] = { - {0x0086, - RTW_PWR_CUT_ALL_MSK, -@@ -2163,6 +2190,7 @@ static struct rtw_chip_ops rtw8822b_ops = { - .cfg_csi_rate = rtw_bf_cfg_csi_rate, - .adaptivity_init = rtw8822b_adaptivity_init, - .adaptivity = rtw8822b_adaptivity, -+ .fill_txdesc_checksum = rtw8822b_fill_txdesc_checksum, - - .coex_set_init = rtw8822b_coex_cfg_init, - .coex_set_ant_switch = rtw8822b_coex_cfg_ant_switch, -@@ -2512,6 +2540,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { - .txff_size = 262144, - .rxff_size = 24576, - .fw_rxff_size = 12288, -+ .rsvd_drv_pg_num = 8, - .txgi_factor = 1, - .is_pwr_by_rate_dec = true, - .max_power_index = 0x3f, -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.h b/drivers/net/wireless/realtek/rtw88/rtw8822b.h -index 01d3644e0c94..2dc3a6660f06 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h -@@ -65,6 +65,11 @@ struct rtw8822be_efuse { - u8 res7; - }; - -+struct rtw8822bs_efuse { -+ u8 res4[0x4a]; /* 0xd0 */ -+ u8 mac_addr[ETH_ALEN]; /* 0x11a */ -+} __packed; -+ - struct rtw8822b_efuse { - __le16 rtl_id; - u8 res0[0x0e]; -@@ -92,8 +97,9 @@ struct rtw8822b_efuse { - u8 country_code[2]; - u8 res[3]; - union { -- struct rtw8822bu_efuse u; - struct rtw8822be_efuse e; -+ struct rtw8822bu_efuse u; -+ struct rtw8822bs_efuse s; - }; - }; - -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c -new file mode 100644 -index 000000000000..31d8645f83bd ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c -@@ -0,0 +1,36 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) Jernej Skrabec -+ */ -+ -+#include -+#include -+#include -+#include "main.h" -+#include "rtw8822b.h" -+#include "sdio.h" -+ -+static const struct sdio_device_id rtw_8822bs_id_table[] = { -+ { -+ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, -+ SDIO_DEVICE_ID_REALTEK_RTW8822BS), -+ .driver_data = (kernel_ulong_t)&rtw8822b_hw_spec, -+ }, -+ {} -+}; -+MODULE_DEVICE_TABLE(sdio, rtw_8822bs_id_table); -+ -+static struct sdio_driver rtw_8822bs_driver = { -+ .name = "rtw_8822bs", -+ .probe = rtw_sdio_probe, -+ .remove = rtw_sdio_remove, -+ .id_table = rtw_8822bs_id_table, -+ .drv = { -+ .pm = &rtw_sdio_pm_ops, -+ .shutdown = rtw_sdio_shutdown, -+ } -+}; -+module_sdio_driver(rtw_8822bs_driver); -+ -+MODULE_AUTHOR("Jernej Skrabec "); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822bs driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bu.c b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c -new file mode 100644 -index 000000000000..ab620a0b1dfc ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c -@@ -0,0 +1,90 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#include -+#include -+#include "main.h" -+#include "rtw8822b.h" -+#include "usb.h" -+ -+static const struct usb_device_id rtw_8822bu_id_table[] = { -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb812, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82c, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2102, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* CCNC */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xb822, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822ULC */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc822, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822UTC */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd822, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xe822, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xf822, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822UAD */ -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb81a, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Default ID */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x1841, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS AC1300 USB-AC55 B1 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x184c, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS U2 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x19aa, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS - USB-AC58 rev A1 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1870, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1874, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331e, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Dlink - DWA-181 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331c, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Dlink - DWA-182 - D1 */ -+ {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331f, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec)}, /* Dlink - DWA-183 D Ver */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0043, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Linksys WUSB6400M */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0045, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Linksys WUSB3600 v2 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012d, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T3U v1 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0138, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T3U Plus v1 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0115, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T4U V3 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012e, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0116, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0117, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9055, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Netgear A6150 */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x0e66, 0x0025, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Hawking HW12ACU */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x04ca, 0x8602, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* LiteOn */ -+ { USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x808a, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TRENDnet TEW-808UBM */ -+ {}, -+}; -+MODULE_DEVICE_TABLE(usb, rtw_8822bu_id_table); -+ -+static int rtw8822bu_probe(struct usb_interface *intf, -+ const struct usb_device_id *id) -+{ -+ return rtw_usb_probe(intf, id); -+} -+ -+static struct usb_driver rtw_8822bu_driver = { -+ .name = "rtw_8822bu", -+ .id_table = rtw_8822bu_id_table, -+ .probe = rtw8822bu_probe, -+ .disconnect = rtw_usb_disconnect, -+}; -+module_usb_driver(rtw_8822bu_driver); -+ -+MODULE_AUTHOR("Realtek Corporation"); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822bu driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c -index fccb15dfb959..cd965edc29ce 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c -@@ -29,6 +29,18 @@ static void rtw8822ce_efuse_parsing(struct rtw_efuse *efuse, - ether_addr_copy(efuse->addr, map->e.mac_addr); - } - -+static void rtw8822cu_efuse_parsing(struct rtw_efuse *efuse, -+ struct rtw8822c_efuse *map) -+{ -+ ether_addr_copy(efuse->addr, map->u.mac_addr); -+} -+ -+static void rtw8822cs_efuse_parsing(struct rtw_efuse *efuse, -+ struct rtw8822c_efuse *map) -+{ -+ ether_addr_copy(efuse->addr, map->s.mac_addr); -+} -+ - static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) - { - struct rtw_efuse *efuse = &rtwdev->efuse; -@@ -58,6 +70,12 @@ static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) - case RTW_HCI_TYPE_PCIE: - rtw8822ce_efuse_parsing(efuse, map); - break; -+ case RTW_HCI_TYPE_USB: -+ rtw8822cu_efuse_parsing(efuse, map); -+ break; -+ case RTW_HCI_TYPE_SDIO: -+ rtw8822cs_efuse_parsing(efuse, map); -+ break; - default: - /* unsupported now */ - return -ENOTSUPP; -@@ -4557,6 +4575,18 @@ static void rtw8822c_adaptivity(struct rtw_dev *rtwdev) - rtw_phy_set_edcca_th(rtwdev, l2h, h2l); - } - -+static void rtw8822c_fill_txdesc_checksum(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ u8 *txdesc) -+{ -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ size_t words; -+ -+ words = (pkt_info->pkt_offset * 8 + chip->tx_pkt_desc_sz) / 2; -+ -+ fill_txdesc_checksum_common(txdesc, words); -+} -+ - static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822c[] = { - {0x0086, - RTW_PWR_CUT_ALL_MSK, -@@ -4895,6 +4925,8 @@ static const struct rtw_rfe_def rtw8822c_rfe_defs[] = { - [0] = RTW_DEF_RFE(8822c, 0, 0), - [1] = RTW_DEF_RFE(8822c, 0, 0), - [2] = RTW_DEF_RFE(8822c, 0, 0), -+ [3] = RTW_DEF_RFE(8822c, 0, 0), -+ [4] = RTW_DEF_RFE(8822c, 0, 0), - [5] = RTW_DEF_RFE(8822c, 0, 5), - [6] = RTW_DEF_RFE(8822c, 0, 0), - }; -@@ -4978,6 +5010,7 @@ static struct rtw_chip_ops rtw8822c_ops = { - .cfo_track = rtw8822c_cfo_track, - .config_tx_path = rtw8822c_config_tx_path, - .config_txrx_mode = rtw8822c_config_trx_mode, -+ .fill_txdesc_checksum = rtw8822c_fill_txdesc_checksum, - - .coex_set_init = rtw8822c_coex_cfg_init, - .coex_set_ant_switch = NULL, -@@ -5325,6 +5358,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { - .txff_size = 262144, - .rxff_size = 24576, - .fw_rxff_size = 12288, -+ .rsvd_drv_pg_num = 16, - .txgi_factor = 2, - .is_pwr_by_rate_dec = false, - .max_power_index = 0x7f, -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h -index 479d5d769c52..1bc0e7f5d6bb 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h -@@ -16,6 +16,11 @@ struct rtw8822cu_efuse { - u8 res2[0x3d]; - }; - -+struct rtw8822cs_efuse { -+ u8 res0[0x4a]; /* 0x120 */ -+ u8 mac_addr[ETH_ALEN]; /* 0x16a */ -+} __packed; -+ - struct rtw8822ce_efuse { - u8 mac_addr[ETH_ALEN]; /* 0x120 */ - u8 vender_id[2]; -@@ -91,8 +96,9 @@ struct rtw8822c_efuse { - u8 res9; - u8 res10[0x42]; - union { -- struct rtw8822cu_efuse u; - struct rtw8822ce_efuse e; -+ struct rtw8822cu_efuse u; -+ struct rtw8822cs_efuse s; - }; - }; - -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c -new file mode 100644 -index 000000000000..975e81c824f2 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c -@@ -0,0 +1,36 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) Martin Blumenstingl -+ */ -+ -+#include -+#include -+#include -+#include "main.h" -+#include "rtw8822c.h" -+#include "sdio.h" -+ -+static const struct sdio_device_id rtw_8822cs_id_table[] = { -+ { -+ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, -+ SDIO_DEVICE_ID_REALTEK_RTW8822CS), -+ .driver_data = (kernel_ulong_t)&rtw8822c_hw_spec, -+ }, -+ {} -+}; -+MODULE_DEVICE_TABLE(sdio, rtw_8822cs_id_table); -+ -+static struct sdio_driver rtw_8822cs_driver = { -+ .name = "rtw_8822cs", -+ .probe = rtw_sdio_probe, -+ .remove = rtw_sdio_remove, -+ .id_table = rtw_8822cs_id_table, -+ .drv = { -+ .pm = &rtw_sdio_pm_ops, -+ .shutdown = rtw_sdio_shutdown, -+ } -+}; -+module_sdio_driver(rtw_8822cs_driver); -+ -+MODULE_AUTHOR("Martin Blumenstingl "); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822cs driver"); -+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..157d5102a4b1 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c -@@ -0,0 +1,44 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#include -+#include -+#include "main.h" -+#include "rtw8822c.h" -+#include "usb.h" -+ -+static const struct usb_device_id rtw_8822cu_id_table[] = { -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc812, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82e, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xd820, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xd82b, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0043, 0xff, 0xff, 0xff), -+ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, /* Alpha - Alpha */ -+ {}, -+}; -+MODULE_DEVICE_TABLE(usb, rtw_8822cu_id_table); -+ -+static int rtw8822cu_probe(struct usb_interface *intf, -+ const struct usb_device_id *id) -+{ -+ return rtw_usb_probe(intf, id); -+} -+ -+static struct usb_driver rtw_8822cu_driver = { -+ .name = "rtw_8822cu", -+ .id_table = rtw_8822cu_id_table, -+ .probe = rtw8822cu_probe, -+ .disconnect = rtw_usb_disconnect, -+}; -+module_usb_driver(rtw_8822cu_driver); -+ -+MODULE_AUTHOR("Realtek Corporation"); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822cu driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c -new file mode 100644 -index 000000000000..2c1fb2dabd40 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/sdio.c -@@ -0,0 +1,1404 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright (C) 2021 Martin Blumenstingl -+ * Copyright (C) 2021 Jernej Skrabec -+ * -+ * Based on rtw88/pci.c: -+ * Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#include -+#include -+#include -+#include "main.h" -+#include "debug.h" -+#include "fw.h" -+#include "ps.h" -+#include "reg.h" -+#include "rx.h" -+#include "sdio.h" -+#include "tx.h" -+ -+#define RTW_SDIO_INDIRECT_RW_RETRIES 50 -+ -+static bool rtw_sdio_is_bus_addr(u32 addr) -+{ -+ return !!(addr & RTW_SDIO_BUS_MSK); -+} -+ -+static bool rtw_sdio_bus_claim_needed(struct rtw_sdio *rtwsdio) -+{ -+ return !rtwsdio->irq_thread || -+ rtwsdio->irq_thread != current; -+} -+ -+static u32 rtw_sdio_to_bus_offset(struct rtw_dev *rtwdev, u32 addr) -+{ -+ switch (addr & RTW_SDIO_BUS_MSK) { -+ case WLAN_IOREG_OFFSET: -+ addr &= WLAN_IOREG_REG_MSK; -+ addr |= FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_MAC_REG); -+ break; -+ case SDIO_LOCAL_OFFSET: -+ addr &= SDIO_LOCAL_REG_MSK; -+ addr |= FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_SDIO_REG); -+ break; -+ default: -+ rtw_warn(rtwdev, "Cannot convert addr 0x%08x to bus offset", -+ addr); -+ } -+ -+ return addr; -+} -+ -+static bool rtw_sdio_use_memcpy_io(struct rtw_dev *rtwdev, u32 addr, -+ u8 alignment) -+{ -+ return IS_ALIGNED(addr, alignment) && -+ test_bit(RTW_FLAG_POWERON, rtwdev->flags); -+} -+ -+static void rtw_sdio_writel(struct rtw_dev *rtwdev, u32 val, u32 addr, -+ int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u8 buf[4]; -+ int i; -+ -+ if (rtw_sdio_use_memcpy_io(rtwdev, addr, 4)) { -+ sdio_writel(rtwsdio->sdio_func, val, addr, err_ret); -+ return; -+ } -+ -+ *(__le32 *)buf = cpu_to_le32(val); -+ -+ for (i = 0; i < 4; i++) { -+ sdio_writeb(rtwsdio->sdio_func, buf[i], addr + i, err_ret); -+ if (*err_ret) -+ return; -+ } -+} -+ -+static void rtw_sdio_writew(struct rtw_dev *rtwdev, u16 val, u32 addr, -+ int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u8 buf[2]; -+ int i; -+ -+ *(__le16 *)buf = cpu_to_le16(val); -+ -+ for (i = 0; i < 2; i++) { -+ sdio_writeb(rtwsdio->sdio_func, buf[i], addr + i, err_ret); -+ if (*err_ret) -+ return; -+ } -+} -+ -+static u32 rtw_sdio_readl(struct rtw_dev *rtwdev, u32 addr, int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u8 buf[4]; -+ int i; -+ -+ if (rtw_sdio_use_memcpy_io(rtwdev, addr, 4)) -+ return sdio_readl(rtwsdio->sdio_func, addr, err_ret); -+ -+ for (i = 0; i < 4; i++) { -+ buf[i] = sdio_readb(rtwsdio->sdio_func, addr + i, err_ret); -+ if (*err_ret) -+ return 0; -+ } -+ -+ return le32_to_cpu(*(__le32 *)buf); -+} -+ -+static u16 rtw_sdio_readw(struct rtw_dev *rtwdev, u32 addr, int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u8 buf[2]; -+ int i; -+ -+ for (i = 0; i < 2; i++) { -+ buf[i] = sdio_readb(rtwsdio->sdio_func, addr + i, err_ret); -+ if (*err_ret) -+ return 0; -+ } -+ -+ return le16_to_cpu(*(__le16 *)buf); -+} -+ -+static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr, -+ bool direct) -+{ -+ if (!direct) -+ return addr; -+ -+ if (!rtw_sdio_is_bus_addr(addr)) -+ addr |= WLAN_IOREG_OFFSET; -+ -+ return rtw_sdio_to_bus_offset(rtwdev, addr); -+} -+ -+static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr) -+{ -+ return !rtw_sdio_is_sdio30_supported(rtwdev) || -+ rtw_sdio_is_bus_addr(addr); -+} -+ -+static int rtw_sdio_indirect_reg_cfg(struct rtw_dev *rtwdev, u32 addr, u32 cfg) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ unsigned int retry; -+ u32 reg_cfg; -+ int ret; -+ u8 tmp; -+ -+ reg_cfg = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_CFG); -+ -+ rtw_sdio_writel(rtwdev, addr | cfg | BIT_SDIO_INDIRECT_REG_CFG_UNK20, -+ reg_cfg, &ret); -+ if (ret) -+ return ret; -+ -+ for (retry = 0; retry < RTW_SDIO_INDIRECT_RW_RETRIES; retry++) { -+ tmp = sdio_readb(rtwsdio->sdio_func, reg_cfg + 2, &ret); -+ if (!ret && (tmp & BIT(4))) -+ return 0; -+ } -+ -+ return -ETIMEDOUT; -+} -+ -+static u8 rtw_sdio_indirect_read8(struct rtw_dev *rtwdev, u32 addr, -+ int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u32 reg_data; -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_READ); -+ if (*err_ret) -+ return 0; -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ return sdio_readb(rtwsdio->sdio_func, reg_data, err_ret); -+} -+ -+static int rtw_sdio_indirect_read_bytes(struct rtw_dev *rtwdev, u32 addr, -+ u8 *buf, int count) -+{ -+ int i, ret = 0; -+ -+ for (i = 0; i < count; i++) { -+ buf[i] = rtw_sdio_indirect_read8(rtwdev, addr + i, &ret); -+ if (ret) -+ break; -+ } -+ -+ return ret; -+} -+ -+static u16 rtw_sdio_indirect_read16(struct rtw_dev *rtwdev, u32 addr, -+ int *err_ret) -+{ -+ u32 reg_data; -+ u8 buf[2]; -+ -+ if (!IS_ALIGNED(addr, 2)) { -+ *err_ret = rtw_sdio_indirect_read_bytes(rtwdev, addr, buf, 2); -+ if (*err_ret) -+ return 0; -+ -+ return le16_to_cpu(*(__le16 *)buf); -+ } -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_READ); -+ if (*err_ret) -+ return 0; -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ return rtw_sdio_readw(rtwdev, reg_data, err_ret); -+} -+ -+static u32 rtw_sdio_indirect_read32(struct rtw_dev *rtwdev, u32 addr, -+ int *err_ret) -+{ -+ u32 reg_data; -+ u8 buf[4]; -+ -+ if (!IS_ALIGNED(addr, 4)) { -+ *err_ret = rtw_sdio_indirect_read_bytes(rtwdev, addr, buf, 4); -+ if (*err_ret) -+ return 0; -+ -+ return le32_to_cpu(*(__le32 *)buf); -+ } -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_READ); -+ if (*err_ret) -+ return 0; -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ return rtw_sdio_readl(rtwdev, reg_data, err_ret); -+} -+ -+static u8 rtw_sdio_read8(struct rtw_dev *rtwdev, u32 addr) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ int ret; -+ u8 val; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ val = sdio_readb(rtwsdio->sdio_func, addr, &ret); -+ else -+ val = rtw_sdio_indirect_read8(rtwdev, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio read8 failed (0x%x): %d", addr, ret); -+ -+ return val; -+} -+ -+static u16 rtw_sdio_read16(struct rtw_dev *rtwdev, u32 addr) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ int ret; -+ u16 val; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ val = rtw_sdio_readw(rtwdev, addr, &ret); -+ else -+ val = rtw_sdio_indirect_read16(rtwdev, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio read16 failed (0x%x): %d", addr, ret); -+ -+ return val; -+} -+ -+static u32 rtw_sdio_read32(struct rtw_dev *rtwdev, u32 addr) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ u32 val; -+ int ret; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ val = rtw_sdio_readl(rtwdev, addr, &ret); -+ else -+ val = rtw_sdio_indirect_read32(rtwdev, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio read32 failed (0x%x): %d", addr, ret); -+ -+ return val; -+} -+ -+static void rtw_sdio_indirect_write8(struct rtw_dev *rtwdev, u8 val, u32 addr, -+ int *err_ret) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ u32 reg_data; -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ sdio_writeb(rtwsdio->sdio_func, val, reg_data, err_ret); -+ if (*err_ret) -+ return; -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_WRITE); -+} -+ -+static void rtw_sdio_indirect_write16(struct rtw_dev *rtwdev, u16 val, u32 addr, -+ int *err_ret) -+{ -+ u32 reg_data; -+ -+ if (!IS_ALIGNED(addr, 2)) { -+ addr = rtw_sdio_to_io_address(rtwdev, addr, true); -+ rtw_sdio_writew(rtwdev, val, addr, err_ret); -+ return; -+ } -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ rtw_sdio_writew(rtwdev, val, reg_data, err_ret); -+ if (*err_ret) -+ return; -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_WRITE | -+ BIT_SDIO_INDIRECT_REG_CFG_WORD); -+} -+ -+static void rtw_sdio_indirect_write32(struct rtw_dev *rtwdev, u32 val, -+ u32 addr, int *err_ret) -+{ -+ u32 reg_data; -+ -+ if (!IS_ALIGNED(addr, 4)) { -+ addr = rtw_sdio_to_io_address(rtwdev, addr, true); -+ rtw_sdio_writel(rtwdev, val, addr, err_ret); -+ return; -+ } -+ -+ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); -+ rtw_sdio_writel(rtwdev, val, reg_data, err_ret); -+ -+ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, -+ BIT_SDIO_INDIRECT_REG_CFG_WRITE | -+ BIT_SDIO_INDIRECT_REG_CFG_DWORD); -+} -+ -+static void rtw_sdio_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ int ret; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ sdio_writeb(rtwsdio->sdio_func, val, addr, &ret); -+ else -+ rtw_sdio_indirect_write8(rtwdev, val, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio write8 failed (0x%x): %d", addr, ret); -+} -+ -+static void rtw_sdio_write16(struct rtw_dev *rtwdev, u32 addr, u16 val) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ int ret; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ rtw_sdio_writew(rtwdev, val, addr, &ret); -+ else -+ rtw_sdio_indirect_write16(rtwdev, val, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio write16 failed (0x%x): %d", addr, ret); -+} -+ -+static void rtw_sdio_write32(struct rtw_dev *rtwdev, u32 addr, u32 val) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool direct, bus_claim; -+ int ret; -+ -+ direct = rtw_sdio_use_direct_io(rtwdev, addr); -+ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ if (direct) -+ rtw_sdio_writel(rtwdev, val, addr, &ret); -+ else -+ rtw_sdio_indirect_write32(rtwdev, val, addr, &ret); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, "sdio write32 failed (0x%x): %d", addr, ret); -+} -+ -+static u32 rtw_sdio_get_tx_addr(struct rtw_dev *rtwdev, size_t size, -+ enum rtw_tx_queue_type queue) -+{ -+ u32 txaddr; -+ -+ switch (queue) { -+ case RTW_TX_QUEUE_BCN: -+ case RTW_TX_QUEUE_H2C: -+ case RTW_TX_QUEUE_HI0: -+ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_TXFF_HIGH); -+ break; -+ case RTW_TX_QUEUE_VI: -+ case RTW_TX_QUEUE_VO: -+ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_TXFF_NORMAL); -+ break; -+ case RTW_TX_QUEUE_BE: -+ case RTW_TX_QUEUE_BK: -+ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_TXFF_LOW); -+ break; -+ case RTW_TX_QUEUE_MGMT: -+ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, -+ REG_SDIO_CMD_ADDR_TXFF_EXTRA); -+ break; -+ default: -+ rtw_warn(rtwdev, "Unsupported queue for TX addr: 0x%02x\n", -+ queue); -+ return 0; -+ } -+ -+ txaddr += DIV_ROUND_UP(size, 4); -+ -+ return txaddr; -+}; -+ -+static int rtw_sdio_read_port(struct rtw_dev *rtwdev, u8 *buf, size_t count) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ u32 rxaddr = rtwsdio->rx_addr++; -+ int ret; -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ ret = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -+ RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), count); -+ if (ret) -+ rtw_warn(rtwdev, -+ "Failed to read %zu byte(s) from SDIO port 0x%08x", -+ count, rxaddr); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ return ret; -+} -+ -+static int rtw_sdio_check_free_txpg(struct rtw_dev *rtwdev, u8 queue, -+ size_t count) -+{ -+ unsigned int pages_free, pages_needed; -+ -+ if (rtw_chip_wcpu_11n(rtwdev)) { -+ u32 free_txpg; -+ -+ free_txpg = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG); -+ -+ switch (queue) { -+ case RTW_TX_QUEUE_BCN: -+ case RTW_TX_QUEUE_H2C: -+ case RTW_TX_QUEUE_HI0: -+ case RTW_TX_QUEUE_MGMT: -+ /* high */ -+ pages_free = free_txpg & 0xff; -+ break; -+ case RTW_TX_QUEUE_VI: -+ case RTW_TX_QUEUE_VO: -+ /* normal */ -+ pages_free = (free_txpg >> 8) & 0xff; -+ break; -+ case RTW_TX_QUEUE_BE: -+ case RTW_TX_QUEUE_BK: -+ /* low */ -+ pages_free = (free_txpg >> 16) & 0xff; -+ break; -+ default: -+ rtw_warn(rtwdev, "Unknown mapping for queue %u\n", queue); -+ return -EINVAL; -+ } -+ -+ /* add the pages from the public queue */ -+ pages_free += (free_txpg >> 24) & 0xff; -+ } else { -+ u32 free_txpg[3]; -+ -+ free_txpg[0] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG); -+ free_txpg[1] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 4); -+ free_txpg[2] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 8); -+ -+ switch (queue) { -+ case RTW_TX_QUEUE_BCN: -+ case RTW_TX_QUEUE_H2C: -+ case RTW_TX_QUEUE_HI0: -+ /* high */ -+ pages_free = free_txpg[0] & 0xfff; -+ break; -+ case RTW_TX_QUEUE_VI: -+ case RTW_TX_QUEUE_VO: -+ /* normal */ -+ pages_free = (free_txpg[0] >> 16) & 0xfff; -+ break; -+ case RTW_TX_QUEUE_BE: -+ case RTW_TX_QUEUE_BK: -+ /* low */ -+ pages_free = free_txpg[1] & 0xfff; -+ break; -+ case RTW_TX_QUEUE_MGMT: -+ /* extra */ -+ pages_free = free_txpg[2] & 0xfff; -+ break; -+ default: -+ rtw_warn(rtwdev, "Unknown mapping for queue %u\n", queue); -+ return -EINVAL; -+ } -+ -+ /* add the pages from the public queue */ -+ pages_free += (free_txpg[1] >> 16) & 0xfff; -+ } -+ -+ pages_needed = DIV_ROUND_UP(count, rtwdev->chip->page_size); -+ -+ if (pages_needed > pages_free) { -+ rtw_dbg(rtwdev, RTW_DBG_SDIO, -+ "Not enough free pages (%u needed, %u free) in queue %u for %zu bytes\n", -+ pages_needed, pages_free, queue, count); -+ return -EBUSY; -+ } -+ -+ return 0; -+} -+ -+static int rtw_sdio_write_port(struct rtw_dev *rtwdev, struct sk_buff *skb, -+ enum rtw_tx_queue_type queue) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool bus_claim; -+ size_t txsize; -+ u32 txaddr; -+ int ret; -+ -+ txaddr = rtw_sdio_get_tx_addr(rtwdev, skb->len, queue); -+ if (!txaddr) -+ return -EINVAL; -+ -+ txsize = sdio_align_size(rtwsdio->sdio_func, skb->len); -+ -+ ret = rtw_sdio_check_free_txpg(rtwdev, queue, txsize); -+ if (ret) -+ return ret; -+ -+ if (!IS_ALIGNED((unsigned long)skb->data, RTW_SDIO_DATA_PTR_ALIGN)) -+ rtw_warn(rtwdev, "Got unaligned SKB in %s() for queue %u\n", -+ __func__, queue); -+ -+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); -+ -+ if (bus_claim) -+ sdio_claim_host(rtwsdio->sdio_func); -+ -+ ret = sdio_memcpy_toio(rtwsdio->sdio_func, txaddr, skb->data, txsize); -+ -+ if (bus_claim) -+ sdio_release_host(rtwsdio->sdio_func); -+ -+ if (ret) -+ rtw_warn(rtwdev, -+ "Failed to write %zu byte(s) to SDIO port 0x%08x", -+ txsize, txaddr); -+ -+ return ret; -+} -+ -+static void rtw_sdio_init(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ rtwsdio->irq_mask = REG_SDIO_HIMR_RX_REQUEST | REG_SDIO_HIMR_CPWM1; -+} -+ -+static void rtw_sdio_enable_rx_aggregation(struct rtw_dev *rtwdev) -+{ -+ u8 size, timeout; -+ -+ if (rtw_chip_wcpu_11n(rtwdev)) { -+ size = 0x6; -+ timeout = 0x6; -+ } else { -+ size = 0xff; -+ timeout = 0x1; -+ } -+ -+ /* Make the firmware honor the size limit configured below */ -+ rtw_write32_set(rtwdev, REG_RXDMA_AGG_PG_TH, BIT_EN_PRE_CALC); -+ -+ rtw_write8_set(rtwdev, REG_TXDMA_PQ_MAP, BIT_RXDMA_AGG_EN); -+ -+ rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, -+ FIELD_PREP(BIT_RXDMA_AGG_PG_TH, size) | -+ FIELD_PREP(BIT_DMA_AGG_TO_V1, timeout)); -+ -+ rtw_write8_set(rtwdev, REG_RXDMA_MODE, BIT_DMA_MODE); -+} -+ -+static void rtw_sdio_enable_interrupt(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ rtw_write32(rtwdev, REG_SDIO_HIMR, rtwsdio->irq_mask); -+} -+ -+static void rtw_sdio_disable_interrupt(struct rtw_dev *rtwdev) -+{ -+ rtw_write32(rtwdev, REG_SDIO_HIMR, 0x0); -+} -+ -+static u8 rtw_sdio_get_tx_qsel(struct rtw_dev *rtwdev, struct sk_buff *skb, -+ u8 queue) -+{ -+ switch (queue) { -+ case RTW_TX_QUEUE_BCN: -+ return TX_DESC_QSEL_BEACON; -+ case RTW_TX_QUEUE_H2C: -+ return TX_DESC_QSEL_H2C; -+ case RTW_TX_QUEUE_MGMT: -+ if (rtw_chip_wcpu_11n(rtwdev)) -+ return TX_DESC_QSEL_HIGH; -+ else -+ return TX_DESC_QSEL_MGMT; -+ case RTW_TX_QUEUE_HI0: -+ return TX_DESC_QSEL_HIGH; -+ default: -+ return skb->priority; -+ } -+} -+ -+static int rtw_sdio_setup(struct rtw_dev *rtwdev) -+{ -+ /* nothing to do */ -+ return 0; -+} -+ -+static int rtw_sdio_start(struct rtw_dev *rtwdev) -+{ -+ rtw_sdio_enable_rx_aggregation(rtwdev); -+ rtw_sdio_enable_interrupt(rtwdev); -+ -+ return 0; -+} -+ -+static void rtw_sdio_stop(struct rtw_dev *rtwdev) -+{ -+ rtw_sdio_disable_interrupt(rtwdev); -+} -+ -+static void rtw_sdio_deep_ps_enter(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ bool tx_empty = true; -+ u8 queue; -+ -+ if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_TX_WAKE)) { -+ /* Deep PS state is not allowed to TX-DMA */ -+ for (queue = 0; queue < RTK_MAX_TX_QUEUE_NUM; queue++) { -+ /* BCN queue is rsvd page, does not have DMA interrupt -+ * H2C queue is managed by firmware -+ */ -+ if (queue == RTW_TX_QUEUE_BCN || -+ queue == RTW_TX_QUEUE_H2C) -+ continue; -+ -+ /* check if there is any skb DMAing */ -+ if (skb_queue_len(&rtwsdio->tx_queue[queue])) { -+ tx_empty = false; -+ break; -+ } -+ } -+ } -+ -+ if (!tx_empty) { -+ rtw_dbg(rtwdev, RTW_DBG_PS, -+ "TX path not empty, cannot enter deep power save state\n"); -+ return; -+ } -+ -+ set_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags); -+ rtw_power_mode_change(rtwdev, true); -+} -+ -+static void rtw_sdio_deep_ps_leave(struct rtw_dev *rtwdev) -+{ -+ if (test_and_clear_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) -+ rtw_power_mode_change(rtwdev, false); -+} -+ -+static void rtw_sdio_deep_ps(struct rtw_dev *rtwdev, bool enter) -+{ -+ if (enter && !test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) -+ rtw_sdio_deep_ps_enter(rtwdev); -+ -+ if (!enter && test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) -+ rtw_sdio_deep_ps_leave(rtwdev); -+} -+ -+static void rtw_sdio_tx_kick_off(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ queue_work(rtwsdio->txwq, &rtwsdio->tx_handler_data->work); -+} -+ -+static void rtw_sdio_link_ps(struct rtw_dev *rtwdev, bool enter) -+{ -+ /* nothing to do */ -+} -+ -+static void rtw_sdio_interface_cfg(struct rtw_dev *rtwdev) -+{ -+ u32 val; -+ -+ rtw_read32(rtwdev, REG_SDIO_FREE_TXPG); -+ -+ val = rtw_read32(rtwdev, REG_SDIO_TX_CTRL); -+ val &= 0xfff8; -+ rtw_write32(rtwdev, REG_SDIO_TX_CTRL, val); -+} -+ -+static struct rtw_sdio_tx_data *rtw_sdio_get_tx_data(struct sk_buff *skb) -+{ -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); -+ -+ BUILD_BUG_ON(sizeof(struct rtw_sdio_tx_data) > -+ sizeof(info->status.status_driver_data)); -+ -+ return (struct rtw_sdio_tx_data *)info->status.status_driver_data; -+} -+ -+static void rtw_sdio_tx_skb_prepare(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ struct sk_buff *skb, -+ enum rtw_tx_queue_type queue) -+{ -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ unsigned long data_addr, aligned_addr; -+ size_t offset; -+ u8 *pkt_desc; -+ -+ pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz); -+ -+ data_addr = (unsigned long)pkt_desc; -+ aligned_addr = ALIGN(data_addr, RTW_SDIO_DATA_PTR_ALIGN); -+ -+ if (data_addr != aligned_addr) { -+ /* Ensure that the start of the pkt_desc is always aligned at -+ * RTW_SDIO_DATA_PTR_ALIGN. -+ */ -+ offset = RTW_SDIO_DATA_PTR_ALIGN - (aligned_addr - data_addr); -+ -+ pkt_desc = skb_push(skb, offset); -+ -+ /* By inserting padding to align the start of the pkt_desc we -+ * need to inform the firmware that the actual data starts at -+ * a different offset than normal. -+ */ -+ pkt_info->offset += offset; -+ } -+ -+ memset(pkt_desc, 0, chip->tx_pkt_desc_sz); -+ -+ pkt_info->qsel = rtw_sdio_get_tx_qsel(rtwdev, skb, queue); -+ -+ rtw_tx_fill_tx_desc(pkt_info, skb); -+ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, pkt_desc); -+} -+ -+static int rtw_sdio_write_data(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ struct sk_buff *skb, -+ enum rtw_tx_queue_type queue) -+{ -+ int ret; -+ -+ rtw_sdio_tx_skb_prepare(rtwdev, pkt_info, skb, queue); -+ -+ ret = rtw_sdio_write_port(rtwdev, skb, queue); -+ dev_kfree_skb_any(skb); -+ -+ return ret; -+} -+ -+static int rtw_sdio_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, -+ u32 size) -+{ -+ struct rtw_tx_pkt_info pkt_info = {}; -+ struct sk_buff *skb; -+ -+ skb = rtw_tx_write_data_rsvd_page_get(rtwdev, &pkt_info, buf, size); -+ if (!skb) -+ return -ENOMEM; -+ -+ return rtw_sdio_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_BCN); -+} -+ -+static int rtw_sdio_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size) -+{ -+ struct rtw_tx_pkt_info pkt_info = {}; -+ struct sk_buff *skb; -+ -+ skb = rtw_tx_write_data_h2c_get(rtwdev, &pkt_info, buf, size); -+ if (!skb) -+ return -ENOMEM; -+ -+ return rtw_sdio_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_H2C); -+} -+ -+static int rtw_sdio_tx_write(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ struct sk_buff *skb) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ enum rtw_tx_queue_type queue = rtw_tx_queue_mapping(skb); -+ struct rtw_sdio_tx_data *tx_data; -+ -+ rtw_sdio_tx_skb_prepare(rtwdev, pkt_info, skb, queue); -+ -+ tx_data = rtw_sdio_get_tx_data(skb); -+ tx_data->sn = pkt_info->sn; -+ -+ skb_queue_tail(&rtwsdio->tx_queue[queue], skb); -+ -+ return 0; -+} -+ -+static void rtw_sdio_tx_err_isr(struct rtw_dev *rtwdev) -+{ -+ u32 val = rtw_read32(rtwdev, REG_TXDMA_STATUS); -+ -+ rtw_write32(rtwdev, REG_TXDMA_STATUS, val); -+} -+ -+static void rtw_sdio_rx_skb(struct rtw_dev *rtwdev, struct sk_buff *skb, -+ u32 pkt_offset, struct rtw_rx_pkt_stat *pkt_stat, -+ struct ieee80211_rx_status *rx_status) -+{ -+ *IEEE80211_SKB_RXCB(skb) = *rx_status; -+ -+ if (pkt_stat->is_c2h) { -+ skb_put(skb, pkt_stat->pkt_len + pkt_offset); -+ rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb); -+ return; -+ } -+ -+ skb_put(skb, pkt_stat->pkt_len); -+ skb_reserve(skb, pkt_offset); -+ -+ rtw_rx_stats(rtwdev, pkt_stat->vif, skb); -+ -+ ieee80211_rx_irqsafe(rtwdev->hw, skb); -+} -+ -+static void rtw_sdio_rxfifo_recv(struct rtw_dev *rtwdev, u32 rx_len) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ u32 pkt_desc_sz = chip->rx_pkt_desc_sz; -+ struct ieee80211_rx_status rx_status; -+ struct rtw_rx_pkt_stat pkt_stat; -+ struct sk_buff *skb, *split_skb; -+ u32 pkt_offset, curr_pkt_len; -+ size_t bufsz; -+ u8 *rx_desc; -+ int ret; -+ -+ bufsz = sdio_align_size(rtwsdio->sdio_func, rx_len); -+ -+ skb = dev_alloc_skb(bufsz); -+ if (!skb) -+ return; -+ -+ ret = rtw_sdio_read_port(rtwdev, skb->data, bufsz); -+ if (ret) { -+ dev_kfree_skb_any(skb); -+ return; -+ } -+ -+ while (true) { -+ rx_desc = skb->data; -+ chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat, -+ &rx_status); -+ pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz + -+ pkt_stat.shift; -+ -+ curr_pkt_len = ALIGN(pkt_offset + pkt_stat.pkt_len, -+ RTW_SDIO_DATA_PTR_ALIGN); -+ -+ if ((curr_pkt_len + pkt_desc_sz) >= rx_len) { -+ /* Use the original skb (with it's adjusted offset) -+ * when processing the last (or even the only) entry to -+ * have it's memory freed automatically. -+ */ -+ rtw_sdio_rx_skb(rtwdev, skb, pkt_offset, &pkt_stat, -+ &rx_status); -+ break; -+ } -+ -+ split_skb = dev_alloc_skb(curr_pkt_len); -+ if (!split_skb) { -+ rtw_sdio_rx_skb(rtwdev, skb, pkt_offset, &pkt_stat, -+ &rx_status); -+ break; -+ } -+ -+ skb_copy_header(split_skb, skb); -+ memcpy(split_skb->data, skb->data, curr_pkt_len); -+ -+ rtw_sdio_rx_skb(rtwdev, split_skb, pkt_offset, &pkt_stat, -+ &rx_status); -+ -+ /* Move to the start of the next RX descriptor */ -+ skb_reserve(skb, curr_pkt_len); -+ rx_len -= curr_pkt_len; -+ } -+} -+ -+static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev) -+{ -+ u32 rx_len, hisr, total_rx_bytes = 0; -+ -+ do { -+ if (rtw_chip_wcpu_11n(rtwdev)) -+ rx_len = rtw_read16(rtwdev, REG_SDIO_RX0_REQ_LEN); -+ else -+ rx_len = rtw_read32(rtwdev, REG_SDIO_RX0_REQ_LEN); -+ -+ if (!rx_len) -+ break; -+ -+ rtw_sdio_rxfifo_recv(rtwdev, rx_len); -+ -+ total_rx_bytes += rx_len; -+ -+ if (rtw_chip_wcpu_11n(rtwdev)) { -+ /* Stop if no more RX requests are pending, even if -+ * rx_len could be greater than zero in the next -+ * iteration. This is needed because the RX buffer may -+ * already contain data while either HW or FW are not -+ * done filling that buffer yet. Still reading the -+ * buffer can result in packets where -+ * rtw_rx_pkt_stat.pkt_len is zero or points beyond the -+ * end of the buffer. -+ */ -+ hisr = rtw_read32(rtwdev, REG_SDIO_HISR); -+ } else { -+ /* RTW_WCPU_11AC chips have improved hardware or -+ * firmware and can use rx_len unconditionally. -+ */ -+ hisr = REG_SDIO_HISR_RX_REQUEST; -+ } -+ } while (total_rx_bytes < SZ_64K && hisr & REG_SDIO_HISR_RX_REQUEST); -+} -+ -+static void rtw_sdio_handle_interrupt(struct sdio_func *sdio_func) -+{ -+ struct ieee80211_hw *hw = sdio_get_drvdata(sdio_func); -+ struct rtw_sdio *rtwsdio; -+ struct rtw_dev *rtwdev; -+ u32 hisr; -+ -+ rtwdev = hw->priv; -+ rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ rtwsdio->irq_thread = current; -+ -+ hisr = rtw_read32(rtwdev, REG_SDIO_HISR); -+ -+ if (hisr & REG_SDIO_HISR_TXERR) -+ rtw_sdio_tx_err_isr(rtwdev); -+ if (hisr & REG_SDIO_HISR_RX_REQUEST) { -+ hisr &= ~REG_SDIO_HISR_RX_REQUEST; -+ rtw_sdio_rx_isr(rtwdev); -+ } -+ -+ rtw_write32(rtwdev, REG_SDIO_HISR, hisr); -+ -+ rtwsdio->irq_thread = NULL; -+} -+ -+static int __maybe_unused rtw_sdio_suspend(struct device *dev) -+{ -+ struct sdio_func *func = dev_to_sdio_func(dev); -+ struct ieee80211_hw *hw = dev_get_drvdata(dev); -+ struct rtw_dev *rtwdev = hw->priv; -+ int ret; -+ -+ ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER); -+ if (ret) -+ rtw_err(rtwdev, "Failed to host PM flag MMC_PM_KEEP_POWER"); -+ -+ return ret; -+} -+ -+static int __maybe_unused rtw_sdio_resume(struct device *dev) -+{ -+ return 0; -+} -+ -+SIMPLE_DEV_PM_OPS(rtw_sdio_pm_ops, rtw_sdio_suspend, rtw_sdio_resume); -+EXPORT_SYMBOL(rtw_sdio_pm_ops); -+ -+static int rtw_sdio_claim(struct rtw_dev *rtwdev, struct sdio_func *sdio_func) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ int ret; -+ -+ sdio_claim_host(sdio_func); -+ -+ ret = sdio_enable_func(sdio_func); -+ if (ret) { -+ rtw_err(rtwdev, "Failed to enable SDIO func"); -+ goto err_release_host; -+ } -+ -+ ret = sdio_set_block_size(sdio_func, RTW_SDIO_BLOCK_SIZE); -+ if (ret) { -+ rtw_err(rtwdev, "Failed to set SDIO block size to 512"); -+ goto err_disable_func; -+ } -+ -+ rtwsdio->sdio_func = sdio_func; -+ -+ rtwsdio->sdio3_bus_mode = mmc_card_uhs(sdio_func->card); -+ -+ sdio_set_drvdata(sdio_func, rtwdev->hw); -+ SET_IEEE80211_DEV(rtwdev->hw, &sdio_func->dev); -+ -+ sdio_release_host(sdio_func); -+ -+ return 0; -+ -+err_disable_func: -+ sdio_disable_func(sdio_func); -+err_release_host: -+ sdio_release_host(sdio_func); -+ return ret; -+} -+ -+static void rtw_sdio_declaim(struct rtw_dev *rtwdev, -+ struct sdio_func *sdio_func) -+{ -+ sdio_claim_host(sdio_func); -+ sdio_disable_func(sdio_func); -+ sdio_release_host(sdio_func); -+} -+ -+static struct rtw_hci_ops rtw_sdio_ops = { -+ .tx_write = rtw_sdio_tx_write, -+ .tx_kick_off = rtw_sdio_tx_kick_off, -+ .setup = rtw_sdio_setup, -+ .start = rtw_sdio_start, -+ .stop = rtw_sdio_stop, -+ .deep_ps = rtw_sdio_deep_ps, -+ .link_ps = rtw_sdio_link_ps, -+ .interface_cfg = rtw_sdio_interface_cfg, -+ -+ .read8 = rtw_sdio_read8, -+ .read16 = rtw_sdio_read16, -+ .read32 = rtw_sdio_read32, -+ .write8 = rtw_sdio_write8, -+ .write16 = rtw_sdio_write16, -+ .write32 = rtw_sdio_write32, -+ .write_data_rsvd_page = rtw_sdio_write_data_rsvd_page, -+ .write_data_h2c = rtw_sdio_write_data_h2c, -+}; -+ -+static int rtw_sdio_request_irq(struct rtw_dev *rtwdev, -+ struct sdio_func *sdio_func) -+{ -+ int ret; -+ -+ sdio_claim_host(sdio_func); -+ ret = sdio_claim_irq(sdio_func, &rtw_sdio_handle_interrupt); -+ sdio_release_host(sdio_func); -+ -+ if (ret) { -+ rtw_err(rtwdev, "failed to claim SDIO IRQ"); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+static void rtw_sdio_indicate_tx_status(struct rtw_dev *rtwdev, -+ struct sk_buff *skb) -+{ -+ struct rtw_sdio_tx_data *tx_data = rtw_sdio_get_tx_data(skb); -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); -+ struct ieee80211_hw *hw = rtwdev->hw; -+ -+ /* enqueue to wait for tx report */ -+ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { -+ rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn); -+ return; -+ } -+ -+ /* always ACK for others, then they won't be marked as drop */ -+ ieee80211_tx_info_clear_status(info); -+ if (info->flags & IEEE80211_TX_CTL_NO_ACK) -+ info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; -+ else -+ info->flags |= IEEE80211_TX_STAT_ACK; -+ -+ ieee80211_tx_status_irqsafe(hw, skb); -+} -+ -+static void rtw_sdio_process_tx_queue(struct rtw_dev *rtwdev, -+ enum rtw_tx_queue_type queue) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ struct sk_buff *skb; -+ int ret; -+ -+ skb = skb_dequeue(&rtwsdio->tx_queue[queue]); -+ if (!skb) -+ return; -+ -+ ret = rtw_sdio_write_port(rtwdev, skb, queue); -+ if (ret) { -+ skb_queue_head(&rtwsdio->tx_queue[queue], skb); -+ return; -+ } -+ -+ if (queue <= RTW_TX_QUEUE_VO) -+ rtw_sdio_indicate_tx_status(rtwdev, skb); -+ else -+ dev_kfree_skb_any(skb); -+} -+ -+static void rtw_sdio_tx_handler(struct work_struct *work) -+{ -+ struct rtw_sdio_work_data *work_data = -+ container_of(work, struct rtw_sdio_work_data, work); -+ struct rtw_sdio *rtwsdio; -+ struct rtw_dev *rtwdev; -+ int limit, queue; -+ -+ rtwdev = work_data->rtwdev; -+ rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_TX_WAKE)) -+ rtw_sdio_deep_ps_leave(rtwdev); -+ -+ for (queue = RTK_MAX_TX_QUEUE_NUM - 1; queue >= 0; queue--) { -+ for (limit = 0; limit < 1000; limit++) { -+ rtw_sdio_process_tx_queue(rtwdev, queue); -+ -+ if (skb_queue_empty(&rtwsdio->tx_queue[queue])) -+ break; -+ } -+ } -+} -+ -+static void rtw_sdio_free_irq(struct rtw_dev *rtwdev, -+ struct sdio_func *sdio_func) -+{ -+ sdio_claim_host(sdio_func); -+ sdio_release_irq(sdio_func); -+ sdio_release_host(sdio_func); -+} -+ -+static int rtw_sdio_init_tx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ int i; -+ -+ rtwsdio->txwq = create_singlethread_workqueue("rtw88_sdio: tx wq"); -+ if (!rtwsdio->txwq) { -+ rtw_err(rtwdev, "failed to create TX work queue\n"); -+ return -ENOMEM; -+ } -+ -+ for (i = 0; i < RTK_MAX_TX_QUEUE_NUM; i++) -+ skb_queue_head_init(&rtwsdio->tx_queue[i]); -+ rtwsdio->tx_handler_data = kmalloc(sizeof(*rtwsdio->tx_handler_data), -+ GFP_KERNEL); -+ if (!rtwsdio->tx_handler_data) -+ goto err_destroy_wq; -+ -+ rtwsdio->tx_handler_data->rtwdev = rtwdev; -+ INIT_WORK(&rtwsdio->tx_handler_data->work, rtw_sdio_tx_handler); -+ -+ return 0; -+ -+err_destroy_wq: -+ destroy_workqueue(rtwsdio->txwq); -+ return -ENOMEM; -+} -+ -+static void rtw_sdio_deinit_tx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ int i; -+ -+ for (i = 0; i < RTK_MAX_TX_QUEUE_NUM; i++) -+ skb_queue_purge(&rtwsdio->tx_queue[i]); -+ -+ flush_workqueue(rtwsdio->txwq); -+ destroy_workqueue(rtwsdio->txwq); -+ kfree(rtwsdio->tx_handler_data); -+} -+ -+int rtw_sdio_probe(struct sdio_func *sdio_func, -+ const struct sdio_device_id *id) -+{ -+ struct ieee80211_hw *hw; -+ struct rtw_dev *rtwdev; -+ int drv_data_size; -+ int ret; -+ -+ drv_data_size = sizeof(struct rtw_dev) + sizeof(struct rtw_sdio); -+ hw = ieee80211_alloc_hw(drv_data_size, &rtw_ops); -+ if (!hw) { -+ dev_err(&sdio_func->dev, "failed to allocate hw"); -+ return -ENOMEM; -+ } -+ -+ rtwdev = hw->priv; -+ rtwdev->hw = hw; -+ rtwdev->dev = &sdio_func->dev; -+ rtwdev->chip = (struct rtw_chip_info *)id->driver_data; -+ rtwdev->hci.ops = &rtw_sdio_ops; -+ rtwdev->hci.type = RTW_HCI_TYPE_SDIO; -+ -+ ret = rtw_core_init(rtwdev); -+ if (ret) -+ goto err_release_hw; -+ -+ rtw_dbg(rtwdev, RTW_DBG_SDIO, -+ "rtw88 SDIO probe: vendor=0x%04x device=%04x class=%02x", -+ id->vendor, id->device, id->class); -+ -+ ret = rtw_sdio_claim(rtwdev, sdio_func); -+ if (ret) { -+ rtw_err(rtwdev, "failed to claim SDIO device"); -+ goto err_deinit_core; -+ } -+ -+ rtw_sdio_init(rtwdev); -+ -+ ret = rtw_sdio_init_tx(rtwdev); -+ if (ret) { -+ rtw_err(rtwdev, "failed to init SDIO TX queue\n"); -+ goto err_sdio_declaim; -+ } -+ -+ ret = rtw_chip_info_setup(rtwdev); -+ if (ret) { -+ rtw_err(rtwdev, "failed to setup chip information"); -+ goto err_destroy_txwq; -+ } -+ -+ ret = rtw_sdio_request_irq(rtwdev, sdio_func); -+ if (ret) -+ goto err_destroy_txwq; -+ -+ ret = rtw_register_hw(rtwdev, hw); -+ if (ret) { -+ rtw_err(rtwdev, "failed to register hw"); -+ goto err_free_irq; -+ } -+ -+ return 0; -+ -+err_free_irq: -+ rtw_sdio_free_irq(rtwdev, sdio_func); -+err_destroy_txwq: -+ rtw_sdio_deinit_tx(rtwdev); -+err_sdio_declaim: -+ rtw_sdio_declaim(rtwdev, sdio_func); -+err_deinit_core: -+ rtw_core_deinit(rtwdev); -+err_release_hw: -+ ieee80211_free_hw(hw); -+ -+ return ret; -+} -+EXPORT_SYMBOL(rtw_sdio_probe); -+ -+void rtw_sdio_remove(struct sdio_func *sdio_func) -+{ -+ struct ieee80211_hw *hw = sdio_get_drvdata(sdio_func); -+ struct rtw_dev *rtwdev; -+ -+ if (!hw) -+ return; -+ -+ rtwdev = hw->priv; -+ -+ rtw_unregister_hw(rtwdev, hw); -+ rtw_sdio_disable_interrupt(rtwdev); -+ rtw_sdio_free_irq(rtwdev, sdio_func); -+ rtw_sdio_declaim(rtwdev, sdio_func); -+ rtw_sdio_deinit_tx(rtwdev); -+ rtw_core_deinit(rtwdev); -+ ieee80211_free_hw(hw); -+} -+EXPORT_SYMBOL(rtw_sdio_remove); -+ -+void rtw_sdio_shutdown(struct device *dev) -+{ -+ struct sdio_func *sdio_func = dev_to_sdio_func(dev); -+ const struct rtw_chip_info *chip; -+ struct ieee80211_hw *hw; -+ struct rtw_dev *rtwdev; -+ -+ hw = sdio_get_drvdata(sdio_func); -+ if (!hw) -+ return; -+ -+ rtwdev = hw->priv; -+ chip = rtwdev->chip; -+ -+ if (chip->ops->shutdown) -+ chip->ops->shutdown(rtwdev); -+} -+EXPORT_SYMBOL(rtw_sdio_shutdown); -+ -+MODULE_AUTHOR("Martin Blumenstingl"); -+MODULE_AUTHOR("Jernej Skrabec"); -+MODULE_DESCRIPTION("Realtek 802.11ac wireless SDIO driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/sdio.h b/drivers/net/wireless/realtek/rtw88/sdio.h -new file mode 100644 -index 000000000000..3c659ed180f0 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/sdio.h -@@ -0,0 +1,178 @@ -+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -+/* Copyright (C) 2021 Martin Blumenstingl -+ * Copyright (C) 2021 Jernej Skrabec -+ */ -+ -+#ifndef __REG_SDIO_H_ -+#define __REG_SDIO_H_ -+ -+/* I/O bus domain address mapping */ -+#define SDIO_LOCAL_OFFSET 0x10250000 -+#define WLAN_IOREG_OFFSET 0x10260000 -+#define FIRMWARE_FIFO_OFFSET 0x10270000 -+#define TX_HIQ_OFFSET 0x10310000 -+#define TX_MIQ_OFFSET 0x10320000 -+#define TX_LOQ_OFFSET 0x10330000 -+#define TX_EPQ_OFFSET 0x10350000 -+#define RX_RX0FF_OFFSET 0x10340000 -+ -+#define RTW_SDIO_BUS_MSK 0xffff0000 -+#define SDIO_LOCAL_REG_MSK 0x00000fff -+#define WLAN_IOREG_REG_MSK 0x0000ffff -+ -+/* SDIO Tx Control */ -+#define REG_SDIO_TX_CTRL (SDIO_LOCAL_OFFSET + 0x0000) -+ -+/*SDIO status timeout*/ -+#define REG_SDIO_TIMEOUT (SDIO_LOCAL_OFFSET + 0x0002) -+ -+/* SDIO Host Interrupt Mask */ -+#define REG_SDIO_HIMR (SDIO_LOCAL_OFFSET + 0x0014) -+#define REG_SDIO_HIMR_RX_REQUEST BIT(0) -+#define REG_SDIO_HIMR_AVAL BIT(1) -+#define REG_SDIO_HIMR_TXERR BIT(2) -+#define REG_SDIO_HIMR_RXERR BIT(3) -+#define REG_SDIO_HIMR_TXFOVW BIT(4) -+#define REG_SDIO_HIMR_RXFOVW BIT(5) -+#define REG_SDIO_HIMR_TXBCNOK BIT(6) -+#define REG_SDIO_HIMR_TXBCNERR BIT(7) -+#define REG_SDIO_HIMR_BCNERLY_INT BIT(16) -+#define REG_SDIO_HIMR_C2HCMD BIT(17) -+#define REG_SDIO_HIMR_CPWM1 BIT(18) -+#define REG_SDIO_HIMR_CPWM2 BIT(19) -+#define REG_SDIO_HIMR_HSISR_IND BIT(20) -+#define REG_SDIO_HIMR_GTINT3_IND BIT(21) -+#define REG_SDIO_HIMR_GTINT4_IND BIT(22) -+#define REG_SDIO_HIMR_PSTIMEOUT BIT(23) -+#define REG_SDIO_HIMR_OCPINT BIT(24) -+#define REG_SDIO_HIMR_ATIMEND BIT(25) -+#define REG_SDIO_HIMR_ATIMEND_E BIT(26) -+#define REG_SDIO_HIMR_CTWEND BIT(27) -+/* the following two are RTL8188 SDIO Specific */ -+#define REG_SDIO_HIMR_MCU_ERR BIT(28) -+#define REG_SDIO_HIMR_TSF_BIT32_TOGGLE BIT(29) -+ -+/* SDIO Host Interrupt Service Routine */ -+#define REG_SDIO_HISR (SDIO_LOCAL_OFFSET + 0x0018) -+#define REG_SDIO_HISR_RX_REQUEST BIT(0) -+#define REG_SDIO_HISR_AVAL BIT(1) -+#define REG_SDIO_HISR_TXERR BIT(2) -+#define REG_SDIO_HISR_RXERR BIT(3) -+#define REG_SDIO_HISR_TXFOVW BIT(4) -+#define REG_SDIO_HISR_RXFOVW BIT(5) -+#define REG_SDIO_HISR_TXBCNOK BIT(6) -+#define REG_SDIO_HISR_TXBCNERR BIT(7) -+#define REG_SDIO_HISR_BCNERLY_INT BIT(16) -+#define REG_SDIO_HISR_C2HCMD BIT(17) -+#define REG_SDIO_HISR_CPWM1 BIT(18) -+#define REG_SDIO_HISR_CPWM2 BIT(19) -+#define REG_SDIO_HISR_HSISR_IND BIT(20) -+#define REG_SDIO_HISR_GTINT3_IND BIT(21) -+#define REG_SDIO_HISR_GTINT4_IND BIT(22) -+#define REG_SDIO_HISR_PSTIMEOUT BIT(23) -+#define REG_SDIO_HISR_OCPINT BIT(24) -+#define REG_SDIO_HISR_ATIMEND BIT(25) -+#define REG_SDIO_HISR_ATIMEND_E BIT(26) -+#define REG_SDIO_HISR_CTWEND BIT(27) -+/* the following two are RTL8188 SDIO Specific */ -+#define REG_SDIO_HISR_MCU_ERR BIT(28) -+#define REG_SDIO_HISR_TSF_BIT32_TOGGLE BIT(29) -+ -+/* HCI Current Power Mode */ -+#define REG_SDIO_HCPWM (SDIO_LOCAL_OFFSET + 0x0019) -+/* RXDMA Request Length */ -+#define REG_SDIO_RX0_REQ_LEN (SDIO_LOCAL_OFFSET + 0x001C) -+/* OQT Free Page */ -+#define REG_SDIO_OQT_FREE_PG (SDIO_LOCAL_OFFSET + 0x001E) -+/* Free Tx Buffer Page */ -+#define REG_SDIO_FREE_TXPG (SDIO_LOCAL_OFFSET + 0x0020) -+/* HCI Current Power Mode 1 */ -+#define REG_SDIO_HCPWM1 (SDIO_LOCAL_OFFSET + 0x0024) -+/* HCI Current Power Mode 2 */ -+#define REG_SDIO_HCPWM2 (SDIO_LOCAL_OFFSET + 0x0026) -+/* Free Tx Page Sequence */ -+#define REG_SDIO_FREE_TXPG_SEQ (SDIO_LOCAL_OFFSET + 0x0028) -+/* HTSF Information */ -+#define REG_SDIO_HTSFR_INFO (SDIO_LOCAL_OFFSET + 0x0030) -+#define REG_SDIO_HCPWM1_V2 (SDIO_LOCAL_OFFSET + 0x0038) -+/* H2C */ -+#define REG_SDIO_H2C (SDIO_LOCAL_OFFSET + 0x0060) -+/* HCI Request Power Mode 1 */ -+#define REG_SDIO_HRPWM1 (SDIO_LOCAL_OFFSET + 0x0080) -+/* HCI Request Power Mode 2 */ -+#define REG_SDIO_HRPWM2 (SDIO_LOCAL_OFFSET + 0x0082) -+/* HCI Power Save Clock */ -+#define REG_SDIO_HPS_CLKR (SDIO_LOCAL_OFFSET + 0x0084) -+/* SDIO HCI Suspend Control */ -+#define REG_SDIO_HSUS_CTRL (SDIO_LOCAL_OFFSET + 0x0086) -+#define BIT_HCI_SUS_REQ BIT(0) -+#define BIT_HCI_RESUME_RDY BIT(1) -+/* SDIO Host Extension Interrupt Mask Always */ -+#define REG_SDIO_HIMR_ON (SDIO_LOCAL_OFFSET + 0x0090) -+/* SDIO Host Extension Interrupt Status Always */ -+#define REG_SDIO_HISR_ON (SDIO_LOCAL_OFFSET + 0x0091) -+ -+#define REG_SDIO_INDIRECT_REG_CFG (SDIO_LOCAL_OFFSET + 0x0040) -+#define BIT_SDIO_INDIRECT_REG_CFG_WORD BIT(16) -+#define BIT_SDIO_INDIRECT_REG_CFG_DWORD BIT(17) -+#define BIT_SDIO_INDIRECT_REG_CFG_WRITE BIT(18) -+#define BIT_SDIO_INDIRECT_REG_CFG_READ BIT(19) -+#define BIT_SDIO_INDIRECT_REG_CFG_UNK20 BIT(20) -+#define REG_SDIO_INDIRECT_REG_DATA (SDIO_LOCAL_OFFSET + 0x0044) -+ -+/* Sdio Address for SDIO Local Reg, TRX FIFO, MAC Reg */ -+#define REG_SDIO_CMD_ADDR_MSK GENMASK(16, 13) -+#define REG_SDIO_CMD_ADDR_SDIO_REG 0 -+#define REG_SDIO_CMD_ADDR_MAC_REG 8 -+#define REG_SDIO_CMD_ADDR_TXFF_HIGH 4 -+#define REG_SDIO_CMD_ADDR_TXFF_LOW 6 -+#define REG_SDIO_CMD_ADDR_TXFF_NORMAL 5 -+#define REG_SDIO_CMD_ADDR_TXFF_EXTRA 7 -+#define REG_SDIO_CMD_ADDR_RXFF 7 -+ -+#define RTW_SDIO_BLOCK_SIZE 512 -+#define RTW_SDIO_ADDR_RX_RX0FF_GEN(_id) (0x0e000 | ((_id) & 0x3)) -+ -+#define RTW_SDIO_DATA_PTR_ALIGN 8 -+ -+struct sdio_func; -+struct sdio_device_id; -+ -+struct rtw_sdio_tx_data { -+ u8 sn; -+}; -+ -+struct rtw_sdio_work_data { -+ struct work_struct work; -+ struct rtw_dev *rtwdev; -+}; -+ -+struct rtw_sdio { -+ struct sdio_func *sdio_func; -+ -+ u32 irq_mask; -+ u8 rx_addr; -+ bool sdio3_bus_mode; -+ -+ void *irq_thread; -+ -+ struct workqueue_struct *txwq; -+ struct rtw_sdio_work_data *tx_handler_data; -+ struct sk_buff_head tx_queue[RTK_MAX_TX_QUEUE_NUM]; -+}; -+ -+extern const struct dev_pm_ops rtw_sdio_pm_ops; -+ -+int rtw_sdio_probe(struct sdio_func *sdio_func, -+ const struct sdio_device_id *id); -+void rtw_sdio_remove(struct sdio_func *sdio_func); -+void rtw_sdio_shutdown(struct device *dev); -+ -+static inline bool rtw_sdio_is_sdio30_supported(struct rtw_dev *rtwdev) -+{ -+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ -+ return rtwsdio->sdio3_bus_mode; -+} -+ -+#endif -diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c -index ab39245e9c2f..f63900b6621d 100644 ---- a/drivers/net/wireless/realtek/rtw88/tx.c -+++ b/drivers/net/wireless/realtek/rtw88/tx.c -@@ -34,43 +34,57 @@ void rtw_tx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, - - void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb) - { -- __le32 *txdesc = (__le32 *)skb->data; -- -- SET_TX_DESC_TXPKTSIZE(txdesc, pkt_info->tx_pkt_size); -- SET_TX_DESC_OFFSET(txdesc, pkt_info->offset); -- SET_TX_DESC_PKT_OFFSET(txdesc, pkt_info->pkt_offset); -- SET_TX_DESC_QSEL(txdesc, pkt_info->qsel); -- SET_TX_DESC_BMC(txdesc, pkt_info->bmc); -- SET_TX_DESC_RATE_ID(txdesc, pkt_info->rate_id); -- SET_TX_DESC_DATARATE(txdesc, pkt_info->rate); -- SET_TX_DESC_DISDATAFB(txdesc, pkt_info->dis_rate_fallback); -- SET_TX_DESC_USE_RATE(txdesc, pkt_info->use_rate); -- SET_TX_DESC_SEC_TYPE(txdesc, pkt_info->sec_type); -- SET_TX_DESC_DATA_BW(txdesc, pkt_info->bw); -- SET_TX_DESC_SW_SEQ(txdesc, pkt_info->seq); -- SET_TX_DESC_MAX_AGG_NUM(txdesc, pkt_info->ampdu_factor); -- SET_TX_DESC_AMPDU_DENSITY(txdesc, pkt_info->ampdu_density); -- SET_TX_DESC_DATA_STBC(txdesc, pkt_info->stbc); -- SET_TX_DESC_DATA_LDPC(txdesc, pkt_info->ldpc); -- SET_TX_DESC_AGG_EN(txdesc, pkt_info->ampdu_en); -- SET_TX_DESC_LS(txdesc, pkt_info->ls); -- SET_TX_DESC_DATA_SHORT(txdesc, pkt_info->short_gi); -- SET_TX_DESC_SPE_RPT(txdesc, pkt_info->report); -- SET_TX_DESC_SW_DEFINE(txdesc, pkt_info->sn); -- SET_TX_DESC_USE_RTS(txdesc, pkt_info->rts); -+ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data; -+ bool more_data = false; -+ -+ if (pkt_info->qsel == TX_DESC_QSEL_HIGH) -+ more_data = true; -+ -+ tx_desc->w0 = le32_encode_bits(pkt_info->tx_pkt_size, RTW_TX_DESC_W0_TXPKTSIZE) | -+ le32_encode_bits(pkt_info->offset, RTW_TX_DESC_W0_OFFSET) | -+ le32_encode_bits(pkt_info->bmc, RTW_TX_DESC_W0_BMC) | -+ le32_encode_bits(pkt_info->ls, RTW_TX_DESC_W0_LS) | -+ le32_encode_bits(pkt_info->dis_qselseq, RTW_TX_DESC_W0_DISQSELSEQ); -+ -+ tx_desc->w1 = le32_encode_bits(pkt_info->qsel, RTW_TX_DESC_W1_QSEL) | -+ le32_encode_bits(pkt_info->rate_id, RTW_TX_DESC_W1_RATE_ID) | -+ le32_encode_bits(pkt_info->sec_type, RTW_TX_DESC_W1_SEC_TYPE) | -+ le32_encode_bits(pkt_info->pkt_offset, RTW_TX_DESC_W1_PKT_OFFSET) | -+ le32_encode_bits(more_data, RTW_TX_DESC_W1_MORE_DATA); -+ -+ tx_desc->w2 = le32_encode_bits(pkt_info->ampdu_en, RTW_TX_DESC_W2_AGG_EN) | -+ le32_encode_bits(pkt_info->report, RTW_TX_DESC_W2_SPE_RPT) | -+ le32_encode_bits(pkt_info->ampdu_density, RTW_TX_DESC_W2_AMPDU_DEN) | -+ le32_encode_bits(pkt_info->bt_null, RTW_TX_DESC_W2_BT_NULL); -+ -+ tx_desc->w3 = le32_encode_bits(pkt_info->hw_ssn_sel, RTW_TX_DESC_W3_HW_SSN_SEL) | -+ le32_encode_bits(pkt_info->use_rate, RTW_TX_DESC_W3_USE_RATE) | -+ le32_encode_bits(pkt_info->dis_rate_fallback, RTW_TX_DESC_W3_DISDATAFB) | -+ le32_encode_bits(pkt_info->rts, RTW_TX_DESC_W3_USE_RTS) | -+ le32_encode_bits(pkt_info->nav_use_hdr, RTW_TX_DESC_W3_NAVUSEHDR) | -+ le32_encode_bits(pkt_info->ampdu_factor, RTW_TX_DESC_W3_MAX_AGG_NUM); -+ -+ tx_desc->w4 = le32_encode_bits(pkt_info->rate, RTW_TX_DESC_W4_DATARATE); -+ -+ tx_desc->w5 = le32_encode_bits(pkt_info->short_gi, RTW_TX_DESC_W5_DATA_SHORT) | -+ le32_encode_bits(pkt_info->bw, RTW_TX_DESC_W5_DATA_BW) | -+ le32_encode_bits(pkt_info->ldpc, RTW_TX_DESC_W5_DATA_LDPC) | -+ le32_encode_bits(pkt_info->stbc, RTW_TX_DESC_W5_DATA_STBC); -+ -+ tx_desc->w6 = le32_encode_bits(pkt_info->sn, RTW_TX_DESC_W6_SW_DEFINE); -+ -+ tx_desc->w8 = le32_encode_bits(pkt_info->en_hwseq, RTW_TX_DESC_W8_EN_HWSEQ); -+ -+ tx_desc->w9 = le32_encode_bits(pkt_info->seq, RTW_TX_DESC_W9_SW_SEQ); -+ - if (pkt_info->rts) { -- SET_TX_DESC_RTSRATE(txdesc, DESC_RATE24M); -- SET_TX_DESC_DATA_RTS_SHORT(txdesc, 1); -- } -- SET_TX_DESC_DISQSELSEQ(txdesc, pkt_info->dis_qselseq); -- SET_TX_DESC_EN_HWSEQ(txdesc, pkt_info->en_hwseq); -- SET_TX_DESC_HW_SSN_SEL(txdesc, pkt_info->hw_ssn_sel); -- SET_TX_DESC_NAVUSEHDR(txdesc, pkt_info->nav_use_hdr); -- SET_TX_DESC_BT_NULL(txdesc, pkt_info->bt_null); -- if (pkt_info->tim_offset) { -- SET_TX_DESC_TIM_EN(txdesc, 1); -- SET_TX_DESC_TIM_OFFSET(txdesc, pkt_info->tim_offset); -+ tx_desc->w4 |= le32_encode_bits(DESC_RATE24M, RTW_TX_DESC_W4_RTSRATE); -+ tx_desc->w5 |= le32_encode_bits(1, RTW_TX_DESC_W5_DATA_RTS_SHORT); - } -+ -+ if (pkt_info->tim_offset) -+ tx_desc->w9 |= le32_encode_bits(1, RTW_TX_DESC_W9_TIM_EN) | -+ le32_encode_bits(pkt_info->tim_offset, RTW_TX_DESC_W9_TIM_OFFSET); - } - EXPORT_SYMBOL(rtw_tx_fill_tx_desc); - -@@ -592,8 +606,6 @@ static int rtw_txq_push_skb(struct rtw_dev *rtwdev, - rtw_err(rtwdev, "failed to write TX skb to HCI\n"); - return ret; - } -- rtwtxq->last_push = jiffies; -- - return 0; - } - -@@ -635,9 +647,8 @@ static void rtw_txq_push(struct rtw_dev *rtwdev, - rcu_read_unlock(); - } - --void rtw_tx_work(struct work_struct *w) -+void __rtw_tx_work(struct rtw_dev *rtwdev) - { -- struct rtw_dev *rtwdev = container_of(w, struct rtw_dev, tx_work); - struct rtw_txq *rtwtxq, *tmp; - - spin_lock_bh(&rtwdev->txq_lock); -@@ -658,6 +669,13 @@ void rtw_tx_work(struct work_struct *w) - spin_unlock_bh(&rtwdev->txq_lock); - } - -+void rtw_tx_work(struct work_struct *w) -+{ -+ struct rtw_dev *rtwdev = container_of(w, struct rtw_dev, tx_work); -+ -+ __rtw_tx_work(rtwdev); -+} -+ - void rtw_txq_init(struct rtw_dev *rtwdev, struct ieee80211_txq *txq) - { - struct rtw_txq *rtwtxq; -@@ -682,3 +700,44 @@ void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq) - list_del_init(&rtwtxq->list); - spin_unlock_bh(&rtwdev->txq_lock); - } -+ -+static const enum rtw_tx_queue_type ac_to_hwq[] = { -+ [IEEE80211_AC_VO] = RTW_TX_QUEUE_VO, -+ [IEEE80211_AC_VI] = RTW_TX_QUEUE_VI, -+ [IEEE80211_AC_BE] = RTW_TX_QUEUE_BE, -+ [IEEE80211_AC_BK] = RTW_TX_QUEUE_BK, -+}; -+ -+static_assert(ARRAY_SIZE(ac_to_hwq) == IEEE80211_NUM_ACS); -+ -+enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac) -+{ -+ if (WARN_ON(unlikely(ac >= IEEE80211_NUM_ACS))) -+ return RTW_TX_QUEUE_BE; -+ -+ return ac_to_hwq[ac]; -+} -+EXPORT_SYMBOL(rtw_tx_ac_to_hwq); -+ -+enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb) -+{ -+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -+ __le16 fc = hdr->frame_control; -+ u8 q_mapping = skb_get_queue_mapping(skb); -+ enum rtw_tx_queue_type queue; -+ -+ if (unlikely(ieee80211_is_beacon(fc))) -+ queue = RTW_TX_QUEUE_BCN; -+ else if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))) -+ queue = RTW_TX_QUEUE_MGMT; -+ else if (is_broadcast_ether_addr(hdr->addr1) || -+ is_multicast_ether_addr(hdr->addr1)) -+ queue = RTW_TX_QUEUE_HI0; -+ else if (WARN_ON_ONCE(q_mapping >= ARRAY_SIZE(ac_to_hwq))) -+ queue = ac_to_hwq[IEEE80211_AC_BE]; -+ else -+ queue = ac_to_hwq[q_mapping]; -+ -+ return queue; -+} -+EXPORT_SYMBOL(rtw_tx_queue_mapping); -diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h -index 8419603adce4..324189606257 100644 ---- a/drivers/net/wireless/realtek/rtw88/tx.h -+++ b/drivers/net/wireless/realtek/rtw88/tx.h -@@ -9,68 +9,53 @@ - - #define RTW_TX_PROBE_TIMEOUT msecs_to_jiffies(500) - --#define SET_TX_DESC_TXPKTSIZE(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(15, 0)) --#define SET_TX_DESC_OFFSET(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(23, 16)) --#define SET_TX_DESC_PKT_OFFSET(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(28, 24)) --#define SET_TX_DESC_QSEL(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(12, 8)) --#define SET_TX_DESC_BMC(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(24)) --#define SET_TX_DESC_RATE_ID(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(20, 16)) --#define SET_TX_DESC_DATARATE(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(6, 0)) --#define SET_TX_DESC_DISDATAFB(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(10)) --#define SET_TX_DESC_USE_RATE(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(8)) --#define SET_TX_DESC_SEC_TYPE(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(23, 22)) --#define SET_TX_DESC_DATA_BW(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(6, 5)) --#define SET_TX_DESC_SW_SEQ(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, GENMASK(23, 12)) --#define SET_TX_DESC_TIM_EN(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, BIT(7)) --#define SET_TX_DESC_TIM_OFFSET(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, GENMASK(6, 0)) --#define SET_TX_DESC_MAX_AGG_NUM(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(21, 17)) --#define SET_TX_DESC_USE_RTS(tx_desc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(12)) --#define SET_TX_DESC_RTSRATE(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(28, 24)) --#define SET_TX_DESC_DATA_RTS_SHORT(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(12)) --#define SET_TX_DESC_AMPDU_DENSITY(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, GENMASK(22, 20)) --#define SET_TX_DESC_DATA_STBC(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(9, 8)) --#define SET_TX_DESC_DATA_LDPC(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(7)) --#define SET_TX_DESC_AGG_EN(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(12)) --#define SET_TX_DESC_LS(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(26)) --#define SET_TX_DESC_DATA_SHORT(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(4)) --#define SET_TX_DESC_SPE_RPT(tx_desc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(19)) --#define SET_TX_DESC_SW_DEFINE(tx_desc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x06, value, GENMASK(11, 0)) --#define SET_TX_DESC_DISQSELSEQ(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(31)) --#define SET_TX_DESC_EN_HWSEQ(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x08, value, BIT(15)) --#define SET_TX_DESC_HW_SSN_SEL(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(7, 6)) --#define SET_TX_DESC_NAVUSEHDR(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(15)) --#define SET_TX_DESC_BT_NULL(txdesc, value) \ -- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(23)) -+struct rtw_tx_desc { -+ __le32 w0; -+ __le32 w1; -+ __le32 w2; -+ __le32 w3; -+ __le32 w4; -+ __le32 w5; -+ __le32 w6; -+ __le32 w7; -+ __le32 w8; -+ __le32 w9; -+} __packed; -+ -+#define RTW_TX_DESC_W0_TXPKTSIZE GENMASK(15, 0) -+#define RTW_TX_DESC_W0_OFFSET GENMASK(23, 16) -+#define RTW_TX_DESC_W0_BMC BIT(24) -+#define RTW_TX_DESC_W0_LS BIT(26) -+#define RTW_TX_DESC_W0_DISQSELSEQ BIT(31) -+#define RTW_TX_DESC_W1_QSEL GENMASK(12, 8) -+#define RTW_TX_DESC_W1_RATE_ID GENMASK(20, 16) -+#define RTW_TX_DESC_W1_SEC_TYPE GENMASK(23, 22) -+#define RTW_TX_DESC_W1_PKT_OFFSET GENMASK(28, 24) -+#define RTW_TX_DESC_W1_MORE_DATA BIT(29) -+#define RTW_TX_DESC_W2_AGG_EN BIT(12) -+#define RTW_TX_DESC_W2_SPE_RPT BIT(19) -+#define RTW_TX_DESC_W2_AMPDU_DEN GENMASK(22, 20) -+#define RTW_TX_DESC_W2_BT_NULL BIT(23) -+#define RTW_TX_DESC_W3_HW_SSN_SEL GENMASK(7, 6) -+#define RTW_TX_DESC_W3_USE_RATE BIT(8) -+#define RTW_TX_DESC_W3_DISDATAFB BIT(10) -+#define RTW_TX_DESC_W3_USE_RTS BIT(12) -+#define RTW_TX_DESC_W3_NAVUSEHDR BIT(15) -+#define RTW_TX_DESC_W3_MAX_AGG_NUM GENMASK(21, 17) -+#define RTW_TX_DESC_W4_DATARATE GENMASK(6, 0) -+#define RTW_TX_DESC_W4_RTSRATE GENMASK(28, 24) -+#define RTW_TX_DESC_W5_DATA_SHORT BIT(4) -+#define RTW_TX_DESC_W5_DATA_BW GENMASK(6, 5) -+#define RTW_TX_DESC_W5_DATA_LDPC BIT(7) -+#define RTW_TX_DESC_W5_DATA_STBC GENMASK(9, 8) -+#define RTW_TX_DESC_W5_DATA_RTS_SHORT BIT(12) -+#define RTW_TX_DESC_W6_SW_DEFINE GENMASK(11, 0) -+#define RTW_TX_DESC_W7_TXDESC_CHECKSUM GENMASK(15, 0) -+#define RTW_TX_DESC_W7_DMA_TXAGG_NUM GENMASK(31, 24) -+#define RTW_TX_DESC_W8_EN_HWSEQ BIT(15) -+#define RTW_TX_DESC_W9_SW_SEQ GENMASK(23, 12) -+#define RTW_TX_DESC_W9_TIM_EN BIT(7) -+#define RTW_TX_DESC_W9_TIM_OFFSET GENMASK(6, 0) - - enum rtw_tx_desc_queue_select { - TX_DESC_QSEL_TID0 = 0, -@@ -103,6 +88,7 @@ void rtw_tx(struct rtw_dev *rtwdev, - void rtw_txq_init(struct rtw_dev *rtwdev, struct ieee80211_txq *txq); - void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq); - void rtw_tx_work(struct work_struct *w); -+void __rtw_tx_work(struct rtw_dev *rtwdev); - void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev, - struct rtw_tx_pkt_info *pkt_info, - struct ieee80211_sta *sta, -@@ -123,4 +109,32 @@ rtw_tx_write_data_h2c_get(struct rtw_dev *rtwdev, - struct rtw_tx_pkt_info *pkt_info, - u8 *buf, u32 size); - -+enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac); -+enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb); -+ -+static inline -+void fill_txdesc_checksum_common(u8 *txdesc, size_t words) -+{ -+ __le16 chksum = 0; -+ __le16 *data = (__le16 *)(txdesc); -+ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)txdesc; -+ -+ le32p_replace_bits(&tx_desc->w7, 0, RTW_TX_DESC_W7_TXDESC_CHECKSUM); -+ -+ while (words--) -+ chksum ^= *data++; -+ -+ le32p_replace_bits(&tx_desc->w7, __le16_to_cpu(chksum), -+ RTW_TX_DESC_W7_TXDESC_CHECKSUM); -+} -+ -+static inline void rtw_tx_fill_txdesc_checksum(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ u8 *txdesc) -+{ -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ -+ chip->ops->fill_txdesc_checksum(rtwdev, pkt_info, txdesc); -+} -+ - #endif -diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c -new file mode 100644 -index 000000000000..d879d7e3dc81 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/usb.c -@@ -0,0 +1,916 @@ -+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause -+/* Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#include -+#include -+#include -+#include "main.h" -+#include "debug.h" -+#include "reg.h" -+#include "tx.h" -+#include "rx.h" -+#include "fw.h" -+#include "ps.h" -+#include "usb.h" -+ -+#define RTW_USB_MAX_RXQ_LEN 512 -+ -+struct rtw_usb_txcb { -+ struct rtw_dev *rtwdev; -+ struct sk_buff_head tx_ack_queue; -+}; -+ -+static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, -+ struct sk_buff *skb, int agg_num) -+{ -+ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data; -+ struct rtw_dev *rtwdev = rtwusb->rtwdev; -+ struct rtw_tx_pkt_info pkt_info; -+ -+ le32p_replace_bits(&tx_desc->w7, agg_num, RTW_TX_DESC_W7_DMA_TXAGG_NUM); -+ pkt_info.pkt_offset = le32_get_bits(tx_desc->w1, RTW_TX_DESC_W1_PKT_OFFSET); -+ rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); -+} -+ -+static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ struct usb_device *udev = rtwusb->udev; -+ __le32 *data; -+ unsigned long flags; -+ int idx, ret; -+ static int count; -+ -+ spin_lock_irqsave(&rtwusb->usb_lock, flags); -+ -+ idx = rtwusb->usb_data_index; -+ rtwusb->usb_data_index = (idx + 1) & (RTW_USB_MAX_RXTX_COUNT - 1); -+ -+ spin_unlock_irqrestore(&rtwusb->usb_lock, flags); -+ -+ data = &rtwusb->usb_data[idx]; -+ -+ ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), -+ RTW_USB_CMD_REQ, RTW_USB_CMD_READ, addr, -+ RTW_USB_VENQT_CMD_IDX, data, len, 1000); -+ if (ret < 0 && ret != -ENODEV && count++ < 4) -+ rtw_err(rtwdev, "read register 0x%x failed with %d\n", -+ addr, ret); -+ -+ return le32_to_cpu(*data); -+} -+ -+static u8 rtw_usb_read8(struct rtw_dev *rtwdev, u32 addr) -+{ -+ return (u8)rtw_usb_read(rtwdev, addr, 1); -+} -+ -+static u16 rtw_usb_read16(struct rtw_dev *rtwdev, u32 addr) -+{ -+ return (u16)rtw_usb_read(rtwdev, addr, 2); -+} -+ -+static u32 rtw_usb_read32(struct rtw_dev *rtwdev, u32 addr) -+{ -+ return (u32)rtw_usb_read(rtwdev, addr, 4); -+} -+ -+static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) -+{ -+ struct rtw_usb *rtwusb = (struct rtw_usb *)rtwdev->priv; -+ struct usb_device *udev = rtwusb->udev; -+ unsigned long flags; -+ __le32 *data; -+ int idx, ret; -+ static int count; -+ -+ spin_lock_irqsave(&rtwusb->usb_lock, flags); -+ -+ idx = rtwusb->usb_data_index; -+ rtwusb->usb_data_index = (idx + 1) & (RTW_USB_MAX_RXTX_COUNT - 1); -+ -+ spin_unlock_irqrestore(&rtwusb->usb_lock, flags); -+ -+ data = &rtwusb->usb_data[idx]; -+ -+ *data = cpu_to_le32(val); -+ -+ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), -+ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, -+ addr, 0, data, len, 30000); -+ if (ret < 0 && ret != -ENODEV && count++ < 4) -+ rtw_err(rtwdev, "write register 0x%x failed with %d\n", -+ addr, ret); -+} -+ -+static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) -+{ -+ rtw_usb_write(rtwdev, addr, val, 1); -+} -+ -+static void rtw_usb_write16(struct rtw_dev *rtwdev, u32 addr, u16 val) -+{ -+ rtw_usb_write(rtwdev, addr, val, 2); -+} -+ -+static void rtw_usb_write32(struct rtw_dev *rtwdev, u32 addr, u32 val) -+{ -+ rtw_usb_write(rtwdev, addr, val, 4); -+} -+ -+static int dma_mapping_to_ep(enum rtw_dma_mapping dma_mapping) -+{ -+ switch (dma_mapping) { -+ case RTW_DMA_MAPPING_HIGH: -+ return 0; -+ case RTW_DMA_MAPPING_NORMAL: -+ return 1; -+ case RTW_DMA_MAPPING_LOW: -+ return 2; -+ case RTW_DMA_MAPPING_EXTRA: -+ return 3; -+ default: -+ return -EINVAL; -+ } -+} -+ -+static int rtw_usb_parse(struct rtw_dev *rtwdev, -+ struct usb_interface *interface) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ struct usb_host_interface *host_interface = &interface->altsetting[0]; -+ struct usb_interface_descriptor *interface_desc = &host_interface->desc; -+ struct usb_endpoint_descriptor *endpoint; -+ int num_out_pipes = 0; -+ int i; -+ u8 num; -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ const struct rtw_rqpn *rqpn; -+ -+ for (i = 0; i < interface_desc->bNumEndpoints; i++) { -+ endpoint = &host_interface->endpoint[i].desc; -+ num = usb_endpoint_num(endpoint); -+ -+ if (usb_endpoint_dir_in(endpoint) && -+ usb_endpoint_xfer_bulk(endpoint)) { -+ if (rtwusb->pipe_in) { -+ rtw_err(rtwdev, "IN pipes overflow\n"); -+ return -EINVAL; -+ } -+ -+ rtwusb->pipe_in = num; -+ } -+ -+ if (usb_endpoint_dir_in(endpoint) && -+ usb_endpoint_xfer_int(endpoint)) { -+ if (rtwusb->pipe_interrupt) { -+ rtw_err(rtwdev, "INT pipes overflow\n"); -+ return -EINVAL; -+ } -+ -+ rtwusb->pipe_interrupt = num; -+ } -+ -+ if (usb_endpoint_dir_out(endpoint) && -+ usb_endpoint_xfer_bulk(endpoint)) { -+ if (num_out_pipes >= ARRAY_SIZE(rtwusb->out_ep)) { -+ rtw_err(rtwdev, "OUT pipes overflow\n"); -+ return -EINVAL; -+ } -+ -+ rtwusb->out_ep[num_out_pipes++] = num; -+ } -+ } -+ -+ rtwdev->hci.bulkout_num = num_out_pipes; -+ -+ if (num_out_pipes < 1 || num_out_pipes > 4) { -+ rtw_err(rtwdev, "invalid number of endpoints %d\n", num_out_pipes); -+ return -EINVAL; -+ } -+ -+ rqpn = &chip->rqpn_table[num_out_pipes]; -+ -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = dma_mapping_to_ep(rqpn->dma_map_be); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = dma_mapping_to_ep(rqpn->dma_map_bk); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = dma_mapping_to_ep(rqpn->dma_map_bk); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = dma_mapping_to_ep(rqpn->dma_map_be); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = dma_mapping_to_ep(rqpn->dma_map_vi); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = dma_mapping_to_ep(rqpn->dma_map_vi); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = dma_mapping_to_ep(rqpn->dma_map_vo); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = dma_mapping_to_ep(rqpn->dma_map_vo); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID8] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID9] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID10] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID11] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID12] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID13] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID14] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID15] = -EINVAL; -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_BEACON] = dma_mapping_to_ep(rqpn->dma_map_hi); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_HIGH] = dma_mapping_to_ep(rqpn->dma_map_hi); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_MGMT] = dma_mapping_to_ep(rqpn->dma_map_mg); -+ rtwusb->qsel_to_ep[TX_DESC_QSEL_H2C] = dma_mapping_to_ep(rqpn->dma_map_hi); -+ -+ return 0; -+} -+ -+static void rtw_usb_write_port_tx_complete(struct urb *urb) -+{ -+ struct rtw_usb_txcb *txcb = urb->context; -+ struct rtw_dev *rtwdev = txcb->rtwdev; -+ struct ieee80211_hw *hw = rtwdev->hw; -+ -+ while (true) { -+ struct sk_buff *skb = skb_dequeue(&txcb->tx_ack_queue); -+ struct ieee80211_tx_info *info; -+ struct rtw_usb_tx_data *tx_data; -+ -+ if (!skb) -+ break; -+ -+ info = IEEE80211_SKB_CB(skb); -+ tx_data = rtw_usb_get_tx_data(skb); -+ -+ /* enqueue to wait for tx report */ -+ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { -+ rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn); -+ continue; -+ } -+ -+ /* always ACK for others, then they won't be marked as drop */ -+ ieee80211_tx_info_clear_status(info); -+ if (info->flags & IEEE80211_TX_CTL_NO_ACK) -+ info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; -+ else -+ info->flags |= IEEE80211_TX_STAT_ACK; -+ -+ ieee80211_tx_status_irqsafe(hw, skb); -+ } -+ -+ kfree(txcb); -+} -+ -+static int qsel_to_ep(struct rtw_usb *rtwusb, unsigned int qsel) -+{ -+ if (qsel >= ARRAY_SIZE(rtwusb->qsel_to_ep)) -+ return -EINVAL; -+ -+ return rtwusb->qsel_to_ep[qsel]; -+} -+ -+static int rtw_usb_write_port(struct rtw_dev *rtwdev, u8 qsel, struct sk_buff *skb, -+ usb_complete_t cb, void *context) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ struct usb_device *usbd = rtwusb->udev; -+ struct urb *urb; -+ unsigned int pipe; -+ int ret; -+ int ep = qsel_to_ep(rtwusb, qsel); -+ -+ if (ep < 0) -+ return ep; -+ -+ pipe = usb_sndbulkpipe(usbd, rtwusb->out_ep[ep]); -+ urb = usb_alloc_urb(0, GFP_ATOMIC); -+ if (!urb) -+ return -ENOMEM; -+ -+ usb_fill_bulk_urb(urb, usbd, pipe, skb->data, skb->len, cb, context); -+ urb->transfer_flags |= URB_ZERO_PACKET; -+ ret = usb_submit_urb(urb, GFP_ATOMIC); -+ -+ usb_free_urb(urb); -+ -+ return ret; -+} -+ -+static bool rtw_usb_tx_agg_skb(struct rtw_usb *rtwusb, struct sk_buff_head *list) -+{ -+ struct rtw_dev *rtwdev = rtwusb->rtwdev; -+ struct rtw_tx_desc *tx_desc; -+ struct rtw_usb_txcb *txcb; -+ struct sk_buff *skb_head; -+ struct sk_buff *skb_iter; -+ int agg_num = 0; -+ unsigned int align_next = 0; -+ u8 qsel; -+ -+ if (skb_queue_empty(list)) -+ return false; -+ -+ txcb = kmalloc(sizeof(*txcb), GFP_ATOMIC); -+ if (!txcb) -+ return false; -+ -+ txcb->rtwdev = rtwdev; -+ skb_queue_head_init(&txcb->tx_ack_queue); -+ -+ skb_iter = skb_dequeue(list); -+ -+ if (skb_queue_empty(list)) { -+ skb_head = skb_iter; -+ goto queue; -+ } -+ -+ skb_head = dev_alloc_skb(RTW_USB_MAX_XMITBUF_SZ); -+ if (!skb_head) { -+ skb_head = skb_iter; -+ goto queue; -+ } -+ -+ while (skb_iter) { -+ unsigned long flags; -+ -+ skb_put(skb_head, align_next); -+ skb_put_data(skb_head, skb_iter->data, skb_iter->len); -+ -+ align_next = ALIGN(skb_iter->len, 8) - skb_iter->len; -+ -+ agg_num++; -+ -+ skb_queue_tail(&txcb->tx_ack_queue, skb_iter); -+ -+ spin_lock_irqsave(&list->lock, flags); -+ -+ skb_iter = skb_peek(list); -+ -+ if (skb_iter && skb_iter->len + skb_head->len <= RTW_USB_MAX_XMITBUF_SZ) -+ __skb_unlink(skb_iter, list); -+ else -+ skb_iter = NULL; -+ spin_unlock_irqrestore(&list->lock, flags); -+ } -+ -+ if (agg_num > 1) -+ rtw_usb_fill_tx_checksum(rtwusb, skb_head, agg_num); -+ -+queue: -+ skb_queue_tail(&txcb->tx_ack_queue, skb_head); -+ tx_desc = (struct rtw_tx_desc *)skb_head->data; -+ qsel = le32_get_bits(tx_desc->w1, RTW_TX_DESC_W1_QSEL); -+ -+ rtw_usb_write_port(rtwdev, qsel, skb_head, rtw_usb_write_port_tx_complete, txcb); -+ -+ return true; -+} -+ -+static void rtw_usb_tx_handler(struct work_struct *work) -+{ -+ struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, tx_work); -+ int i, limit; -+ -+ for (i = ARRAY_SIZE(rtwusb->tx_queue) - 1; i >= 0; i--) { -+ for (limit = 0; limit < 200; limit++) { -+ struct sk_buff_head *list = &rtwusb->tx_queue[i]; -+ -+ if (!rtw_usb_tx_agg_skb(rtwusb, list)) -+ break; -+ } -+ } -+} -+ -+static void rtw_usb_tx_queue_purge(struct rtw_usb *rtwusb) -+{ -+ int i; -+ -+ for (i = 0; i < ARRAY_SIZE(rtwusb->tx_queue); i++) -+ skb_queue_purge(&rtwusb->tx_queue[i]); -+} -+ -+static void rtw_usb_write_port_complete(struct urb *urb) -+{ -+ struct sk_buff *skb = urb->context; -+ -+ dev_kfree_skb_any(skb); -+} -+ -+static int rtw_usb_write_data(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ u8 *buf) -+{ -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ struct sk_buff *skb; -+ unsigned int desclen, headsize, size; -+ u8 qsel; -+ int ret = 0; -+ -+ size = pkt_info->tx_pkt_size; -+ qsel = pkt_info->qsel; -+ desclen = chip->tx_pkt_desc_sz; -+ headsize = pkt_info->offset ? pkt_info->offset : desclen; -+ -+ skb = dev_alloc_skb(headsize + size); -+ if (unlikely(!skb)) -+ return -ENOMEM; -+ -+ skb_reserve(skb, headsize); -+ skb_put_data(skb, buf, size); -+ skb_push(skb, headsize); -+ memset(skb->data, 0, headsize); -+ rtw_tx_fill_tx_desc(pkt_info, skb); -+ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data); -+ -+ ret = rtw_usb_write_port(rtwdev, qsel, skb, -+ rtw_usb_write_port_complete, skb); -+ if (unlikely(ret)) -+ rtw_err(rtwdev, "failed to do USB write, ret=%d\n", ret); -+ -+ return ret; -+} -+ -+static int rtw_usb_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, -+ u32 size) -+{ -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ struct rtw_tx_pkt_info pkt_info = {0}; -+ -+ pkt_info.tx_pkt_size = size; -+ pkt_info.qsel = TX_DESC_QSEL_BEACON; -+ pkt_info.offset = chip->tx_pkt_desc_sz; -+ -+ return rtw_usb_write_data(rtwdev, &pkt_info, buf); -+} -+ -+static int rtw_usb_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size) -+{ -+ struct rtw_tx_pkt_info pkt_info = {0}; -+ -+ pkt_info.tx_pkt_size = size; -+ pkt_info.qsel = TX_DESC_QSEL_H2C; -+ -+ return rtw_usb_write_data(rtwdev, &pkt_info, buf); -+} -+ -+static u8 rtw_usb_tx_queue_mapping_to_qsel(struct sk_buff *skb) -+{ -+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -+ __le16 fc = hdr->frame_control; -+ u8 qsel; -+ -+ if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))) -+ qsel = TX_DESC_QSEL_MGMT; -+ else if (is_broadcast_ether_addr(hdr->addr1) || -+ is_multicast_ether_addr(hdr->addr1)) -+ qsel = TX_DESC_QSEL_HIGH; -+ else if (skb_get_queue_mapping(skb) <= IEEE80211_AC_BK) -+ qsel = skb->priority; -+ else -+ qsel = TX_DESC_QSEL_BEACON; -+ -+ return qsel; -+} -+ -+static int rtw_usb_tx_write(struct rtw_dev *rtwdev, -+ struct rtw_tx_pkt_info *pkt_info, -+ struct sk_buff *skb) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ struct rtw_usb_tx_data *tx_data; -+ u8 *pkt_desc; -+ int ep; -+ -+ pkt_info->qsel = rtw_usb_tx_queue_mapping_to_qsel(skb); -+ pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz); -+ memset(pkt_desc, 0, chip->tx_pkt_desc_sz); -+ ep = qsel_to_ep(rtwusb, pkt_info->qsel); -+ rtw_tx_fill_tx_desc(pkt_info, skb); -+ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data); -+ tx_data = rtw_usb_get_tx_data(skb); -+ tx_data->sn = pkt_info->sn; -+ -+ skb_queue_tail(&rtwusb->tx_queue[ep], skb); -+ -+ return 0; -+} -+ -+static void rtw_usb_tx_kick_off(struct rtw_dev *rtwdev) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ -+ queue_work(rtwusb->txwq, &rtwusb->tx_work); -+} -+ -+static void rtw_usb_rx_handler(struct work_struct *work) -+{ -+ struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, rx_work); -+ struct rtw_dev *rtwdev = rtwusb->rtwdev; -+ const struct rtw_chip_info *chip = rtwdev->chip; -+ struct rtw_rx_pkt_stat pkt_stat; -+ struct ieee80211_rx_status rx_status; -+ struct sk_buff *skb; -+ u32 pkt_desc_sz = chip->rx_pkt_desc_sz; -+ u32 pkt_offset; -+ u8 *rx_desc; -+ int limit; -+ -+ for (limit = 0; limit < 200; limit++) { -+ skb = skb_dequeue(&rtwusb->rx_queue); -+ if (!skb) -+ break; -+ -+ rx_desc = skb->data; -+ chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat, -+ &rx_status); -+ pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz + -+ pkt_stat.shift; -+ -+ if (pkt_stat.is_c2h) { -+ skb_put(skb, pkt_stat.pkt_len + pkt_offset); -+ rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb); -+ continue; -+ } -+ -+ if (skb_queue_len(&rtwusb->rx_queue) >= RTW_USB_MAX_RXQ_LEN) { -+ dev_dbg_ratelimited(rtwdev->dev, "failed to get rx_queue, overflow\n"); -+ dev_kfree_skb_any(skb); -+ continue; -+ } -+ -+ skb_put(skb, pkt_stat.pkt_len); -+ skb_reserve(skb, pkt_offset); -+ memcpy(skb->cb, &rx_status, sizeof(rx_status)); -+ ieee80211_rx_irqsafe(rtwdev->hw, skb); -+ } -+} -+ -+static void rtw_usb_read_port_complete(struct urb *urb); -+ -+static void rtw_usb_rx_resubmit(struct rtw_usb *rtwusb, struct rx_usb_ctrl_block *rxcb) -+{ -+ struct rtw_dev *rtwdev = rtwusb->rtwdev; -+ int error; -+ -+ rxcb->rx_skb = alloc_skb(RTW_USB_MAX_RECVBUF_SZ, GFP_ATOMIC); -+ if (!rxcb->rx_skb) -+ return; -+ -+ usb_fill_bulk_urb(rxcb->rx_urb, rtwusb->udev, -+ usb_rcvbulkpipe(rtwusb->udev, rtwusb->pipe_in), -+ rxcb->rx_skb->data, RTW_USB_MAX_RECVBUF_SZ, -+ rtw_usb_read_port_complete, rxcb); -+ -+ error = usb_submit_urb(rxcb->rx_urb, GFP_ATOMIC); -+ if (error) { -+ kfree_skb(rxcb->rx_skb); -+ if (error != -ENODEV) -+ rtw_err(rtwdev, "Err sending rx data urb %d\n", -+ error); -+ } -+} -+ -+static void rtw_usb_read_port_complete(struct urb *urb) -+{ -+ struct rx_usb_ctrl_block *rxcb = urb->context; -+ struct rtw_dev *rtwdev = rxcb->rtwdev; -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ struct sk_buff *skb = rxcb->rx_skb; -+ -+ if (urb->status == 0) { -+ if (urb->actual_length >= RTW_USB_MAX_RECVBUF_SZ || -+ urb->actual_length < 24) { -+ rtw_err(rtwdev, "failed to get urb length:%d\n", -+ urb->actual_length); -+ if (skb) -+ dev_kfree_skb_any(skb); -+ } else { -+ skb_queue_tail(&rtwusb->rx_queue, skb); -+ queue_work(rtwusb->rxwq, &rtwusb->rx_work); -+ } -+ rtw_usb_rx_resubmit(rtwusb, rxcb); -+ } else { -+ switch (urb->status) { -+ case -EINVAL: -+ case -EPIPE: -+ case -ENODEV: -+ case -ESHUTDOWN: -+ case -ENOENT: -+ case -EPROTO: -+ case -EILSEQ: -+ case -ETIME: -+ case -ECOMM: -+ case -EOVERFLOW: -+ case -EINPROGRESS: -+ break; -+ default: -+ rtw_err(rtwdev, "status %d\n", urb->status); -+ break; -+ } -+ if (skb) -+ dev_kfree_skb_any(skb); -+ } -+} -+ -+static void rtw_usb_cancel_rx_bufs(struct rtw_usb *rtwusb) -+{ -+ struct rx_usb_ctrl_block *rxcb; -+ int i; -+ -+ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { -+ rxcb = &rtwusb->rx_cb[i]; -+ if (rxcb->rx_urb) -+ usb_kill_urb(rxcb->rx_urb); -+ } -+} -+ -+static void rtw_usb_free_rx_bufs(struct rtw_usb *rtwusb) -+{ -+ struct rx_usb_ctrl_block *rxcb; -+ int i; -+ -+ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { -+ rxcb = &rtwusb->rx_cb[i]; -+ if (rxcb->rx_urb) { -+ usb_kill_urb(rxcb->rx_urb); -+ usb_free_urb(rxcb->rx_urb); -+ } -+ } -+} -+ -+static int rtw_usb_alloc_rx_bufs(struct rtw_usb *rtwusb) -+{ -+ int i; -+ -+ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { -+ struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i]; -+ -+ rxcb->rtwdev = rtwusb->rtwdev; -+ rxcb->rx_urb = usb_alloc_urb(0, GFP_KERNEL); -+ if (!rxcb->rx_urb) -+ goto err; -+ } -+ -+ return 0; -+err: -+ rtw_usb_free_rx_bufs(rtwusb); -+ return -ENOMEM; -+} -+ -+static int rtw_usb_setup(struct rtw_dev *rtwdev) -+{ -+ /* empty function for rtw_hci_ops */ -+ return 0; -+} -+ -+static int rtw_usb_start(struct rtw_dev *rtwdev) -+{ -+ return 0; -+} -+ -+static void rtw_usb_stop(struct rtw_dev *rtwdev) -+{ -+} -+ -+static void rtw_usb_deep_ps(struct rtw_dev *rtwdev, bool enter) -+{ -+ /* empty function for rtw_hci_ops */ -+} -+ -+static void rtw_usb_link_ps(struct rtw_dev *rtwdev, bool enter) -+{ -+ /* empty function for rtw_hci_ops */ -+} -+ -+static void rtw_usb_interface_cfg(struct rtw_dev *rtwdev) -+{ -+ /* empty function for rtw_hci_ops */ -+} -+ -+static struct rtw_hci_ops rtw_usb_ops = { -+ .tx_write = rtw_usb_tx_write, -+ .tx_kick_off = rtw_usb_tx_kick_off, -+ .setup = rtw_usb_setup, -+ .start = rtw_usb_start, -+ .stop = rtw_usb_stop, -+ .deep_ps = rtw_usb_deep_ps, -+ .link_ps = rtw_usb_link_ps, -+ .interface_cfg = rtw_usb_interface_cfg, -+ -+ .write8 = rtw_usb_write8, -+ .write16 = rtw_usb_write16, -+ .write32 = rtw_usb_write32, -+ .read8 = rtw_usb_read8, -+ .read16 = rtw_usb_read16, -+ .read32 = rtw_usb_read32, -+ -+ .write_data_rsvd_page = rtw_usb_write_data_rsvd_page, -+ .write_data_h2c = rtw_usb_write_data_h2c, -+}; -+ -+static int rtw_usb_init_rx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ int i; -+ -+ rtwusb->rxwq = create_singlethread_workqueue("rtw88_usb: rx wq"); -+ if (!rtwusb->rxwq) { -+ rtw_err(rtwdev, "failed to create RX work queue\n"); -+ return -ENOMEM; -+ } -+ -+ skb_queue_head_init(&rtwusb->rx_queue); -+ -+ INIT_WORK(&rtwusb->rx_work, rtw_usb_rx_handler); -+ -+ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { -+ struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i]; -+ -+ rtw_usb_rx_resubmit(rtwusb, rxcb); -+ } -+ -+ return 0; -+} -+ -+static void rtw_usb_deinit_rx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ -+ skb_queue_purge(&rtwusb->rx_queue); -+ -+ flush_workqueue(rtwusb->rxwq); -+ destroy_workqueue(rtwusb->rxwq); -+} -+ -+static int rtw_usb_init_tx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ int i; -+ -+ rtwusb->txwq = create_singlethread_workqueue("rtw88_usb: tx wq"); -+ if (!rtwusb->txwq) { -+ rtw_err(rtwdev, "failed to create TX work queue\n"); -+ return -ENOMEM; -+ } -+ -+ for (i = 0; i < ARRAY_SIZE(rtwusb->tx_queue); i++) -+ skb_queue_head_init(&rtwusb->tx_queue[i]); -+ -+ INIT_WORK(&rtwusb->tx_work, rtw_usb_tx_handler); -+ -+ return 0; -+} -+ -+static void rtw_usb_deinit_tx(struct rtw_dev *rtwdev) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ -+ rtw_usb_tx_queue_purge(rtwusb); -+ flush_workqueue(rtwusb->txwq); -+ destroy_workqueue(rtwusb->txwq); -+} -+ -+static int rtw_usb_intf_init(struct rtw_dev *rtwdev, -+ struct usb_interface *intf) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ struct usb_device *udev = usb_get_dev(interface_to_usbdev(intf)); -+ int ret; -+ -+ rtwusb->udev = udev; -+ ret = rtw_usb_parse(rtwdev, intf); -+ if (ret) -+ return ret; -+ -+ rtwusb->usb_data = kcalloc(RTW_USB_MAX_RXTX_COUNT, sizeof(u32), -+ GFP_KERNEL); -+ if (!rtwusb->usb_data) -+ return -ENOMEM; -+ -+ usb_set_intfdata(intf, rtwdev->hw); -+ -+ SET_IEEE80211_DEV(rtwdev->hw, &intf->dev); -+ spin_lock_init(&rtwusb->usb_lock); -+ -+ return 0; -+} -+ -+static void rtw_usb_intf_deinit(struct rtw_dev *rtwdev, -+ struct usb_interface *intf) -+{ -+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); -+ -+ usb_put_dev(rtwusb->udev); -+ kfree(rtwusb->usb_data); -+ usb_set_intfdata(intf, NULL); -+} -+ -+int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) -+{ -+ struct rtw_dev *rtwdev; -+ struct ieee80211_hw *hw; -+ struct rtw_usb *rtwusb; -+ int drv_data_size; -+ int ret; -+ -+ drv_data_size = sizeof(struct rtw_dev) + sizeof(struct rtw_usb); -+ hw = ieee80211_alloc_hw(drv_data_size, &rtw_ops); -+ if (!hw) -+ return -ENOMEM; -+ -+ rtwdev = hw->priv; -+ rtwdev->hw = hw; -+ rtwdev->dev = &intf->dev; -+ rtwdev->chip = (struct rtw_chip_info *)id->driver_info; -+ rtwdev->hci.ops = &rtw_usb_ops; -+ rtwdev->hci.type = RTW_HCI_TYPE_USB; -+ -+ rtwusb = rtw_get_usb_priv(rtwdev); -+ rtwusb->rtwdev = rtwdev; -+ -+ ret = rtw_usb_alloc_rx_bufs(rtwusb); -+ if (ret) -+ goto err_release_hw; -+ -+ ret = rtw_core_init(rtwdev); -+ if (ret) -+ goto err_free_rx_bufs; -+ -+ ret = rtw_usb_intf_init(rtwdev, intf); -+ if (ret) { -+ rtw_err(rtwdev, "failed to init USB interface\n"); -+ goto err_deinit_core; -+ } -+ -+ ret = rtw_usb_init_tx(rtwdev); -+ if (ret) { -+ rtw_err(rtwdev, "failed to init USB TX\n"); -+ goto err_destroy_usb; -+ } -+ -+ ret = rtw_usb_init_rx(rtwdev); -+ if (ret) { -+ rtw_err(rtwdev, "failed to init USB RX\n"); -+ goto err_destroy_txwq; -+ } -+ -+ ret = rtw_chip_info_setup(rtwdev); -+ if (ret) { -+ rtw_err(rtwdev, "failed to setup chip information\n"); -+ goto err_destroy_rxwq; -+ } -+ -+ ret = rtw_register_hw(rtwdev, rtwdev->hw); -+ if (ret) { -+ rtw_err(rtwdev, "failed to register hw\n"); -+ goto err_destroy_rxwq; -+ } -+ -+ return 0; -+ -+err_destroy_rxwq: -+ rtw_usb_deinit_rx(rtwdev); -+ -+err_destroy_txwq: -+ rtw_usb_deinit_tx(rtwdev); -+ -+err_destroy_usb: -+ rtw_usb_intf_deinit(rtwdev, intf); -+ -+err_deinit_core: -+ rtw_core_deinit(rtwdev); -+ -+err_free_rx_bufs: -+ rtw_usb_free_rx_bufs(rtwusb); -+ -+err_release_hw: -+ ieee80211_free_hw(hw); -+ -+ return ret; -+} -+EXPORT_SYMBOL(rtw_usb_probe); -+ -+void rtw_usb_disconnect(struct usb_interface *intf) -+{ -+ struct ieee80211_hw *hw = usb_get_intfdata(intf); -+ struct rtw_dev *rtwdev; -+ struct rtw_usb *rtwusb; -+ -+ if (!hw) -+ return; -+ -+ rtwdev = hw->priv; -+ rtwusb = rtw_get_usb_priv(rtwdev); -+ -+ rtw_usb_cancel_rx_bufs(rtwusb); -+ -+ rtw_unregister_hw(rtwdev, hw); -+ rtw_usb_deinit_tx(rtwdev); -+ rtw_usb_deinit_rx(rtwdev); -+ -+ if (rtwusb->udev->state != USB_STATE_NOTATTACHED) -+ usb_reset_device(rtwusb->udev); -+ -+ rtw_usb_free_rx_bufs(rtwusb); -+ -+ rtw_usb_intf_deinit(rtwdev, intf); -+ rtw_core_deinit(rtwdev); -+ ieee80211_free_hw(hw); -+} -+EXPORT_SYMBOL(rtw_usb_disconnect); -+ -+MODULE_AUTHOR("Realtek Corporation"); -+MODULE_DESCRIPTION("Realtek USB 802.11ac wireless driver"); -+MODULE_LICENSE("Dual BSD/GPL"); -diff --git a/drivers/net/wireless/realtek/rtw88/usb.h b/drivers/net/wireless/realtek/rtw88/usb.h -new file mode 100644 -index 000000000000..86697a5c0103 ---- /dev/null -+++ b/drivers/net/wireless/realtek/rtw88/usb.h -@@ -0,0 +1,100 @@ -+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -+/* Copyright(c) 2018-2019 Realtek Corporation -+ */ -+ -+#ifndef __RTW_USB_H_ -+#define __RTW_USB_H_ -+ -+#define FW_8192C_START_ADDRESS 0x1000 -+#define FW_8192C_END_ADDRESS 0x5fff -+ -+#define RTW_USB_MAX_RXTX_COUNT 128 -+#define RTW_USB_VENQT_MAX_BUF_SIZE 254 -+#define MAX_USBCTRL_VENDORREQ_TIMES 10 -+ -+#define RTW_USB_CMD_READ 0xc0 -+#define RTW_USB_CMD_WRITE 0x40 -+#define RTW_USB_CMD_REQ 0x05 -+ -+#define RTW_USB_VENQT_CMD_IDX 0x00 -+ -+#define RTW_USB_TX_SEL_HQ BIT(0) -+#define RTW_USB_TX_SEL_LQ BIT(1) -+#define RTW_USB_TX_SEL_NQ BIT(2) -+#define RTW_USB_TX_SEL_EQ BIT(3) -+ -+#define RTW_USB_BULK_IN_ADDR 0x80 -+#define RTW_USB_INT_IN_ADDR 0x81 -+ -+#define RTW_USB_HW_QUEUE_ENTRY 8 -+ -+#define RTW_USB_PACKET_OFFSET_SZ 8 -+#define RTW_USB_MAX_XMITBUF_SZ (1024 * 20) -+#define RTW_USB_MAX_RECVBUF_SZ 32768 -+ -+#define RTW_USB_RECVBUFF_ALIGN_SZ 8 -+ -+#define RTW_USB_RXAGG_SIZE 6 -+#define RTW_USB_RXAGG_TIMEOUT 10 -+ -+#define RTW_USB_RXCB_NUM 4 -+ -+#define RTW_USB_EP_MAX 4 -+ -+#define TX_DESC_QSEL_MAX 20 -+ -+#define RTW_USB_VENDOR_ID_REALTEK 0x0bda -+ -+static inline struct rtw_usb *rtw_get_usb_priv(struct rtw_dev *rtwdev) -+{ -+ return (struct rtw_usb *)rtwdev->priv; -+} -+ -+struct rx_usb_ctrl_block { -+ struct rtw_dev *rtwdev; -+ struct urb *rx_urb; -+ struct sk_buff *rx_skb; -+}; -+ -+struct rtw_usb_tx_data { -+ u8 sn; -+}; -+ -+struct rtw_usb { -+ struct rtw_dev *rtwdev; -+ struct usb_device *udev; -+ -+ /* protects usb_data_index */ -+ spinlock_t usb_lock; -+ __le32 *usb_data; -+ unsigned int usb_data_index; -+ -+ u8 pipe_interrupt; -+ u8 pipe_in; -+ u8 out_ep[RTW_USB_EP_MAX]; -+ int qsel_to_ep[TX_DESC_QSEL_MAX]; -+ -+ struct workqueue_struct *txwq, *rxwq; -+ -+ struct sk_buff_head tx_queue[RTW_USB_EP_MAX]; -+ struct work_struct tx_work; -+ -+ struct rx_usb_ctrl_block rx_cb[RTW_USB_RXCB_NUM]; -+ struct sk_buff_head rx_queue; -+ struct work_struct rx_work; -+}; -+ -+static inline struct rtw_usb_tx_data *rtw_usb_get_tx_data(struct sk_buff *skb) -+{ -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); -+ -+ BUILD_BUG_ON(sizeof(struct rtw_usb_tx_data) > -+ sizeof(info->status.status_driver_data)); -+ -+ return (struct rtw_usb_tx_data *)info->status.status_driver_data; -+} -+ -+int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id); -+void rtw_usb_disconnect(struct usb_interface *intf); -+ -+#endif -diff --git a/drivers/net/wireless/realtek/rtw88/util.c b/drivers/net/wireless/realtek/rtw88/util.c -index cdfd66a85075..e222d3c01a77 100644 ---- a/drivers/net/wireless/realtek/rtw88/util.c -+++ b/drivers/net/wireless/realtek/rtw88/util.c -@@ -105,3 +105,103 @@ void rtw_desc_to_mcsrate(u16 rate, u8 *mcs, u8 *nss) - *mcs = rate - DESC_RATEMCS0; - } - } -+ -+struct rtw_stas_entry { -+ struct list_head list; -+ struct ieee80211_sta *sta; -+}; -+ -+struct rtw_iter_stas_data { -+ struct rtw_dev *rtwdev; -+ struct list_head list; -+}; -+ -+static void rtw_collect_sta_iter(void *data, struct ieee80211_sta *sta) -+{ -+ struct rtw_iter_stas_data *iter_stas = data; -+ struct rtw_stas_entry *stas_entry; -+ -+ stas_entry = kmalloc(sizeof(*stas_entry), GFP_ATOMIC); -+ if (!stas_entry) -+ return; -+ -+ stas_entry->sta = sta; -+ list_add_tail(&stas_entry->list, &iter_stas->list); -+} -+ -+void rtw_iterate_stas(struct rtw_dev *rtwdev, -+ void (*iterator)(void *data, -+ struct ieee80211_sta *sta), -+ void *data) -+{ -+ struct rtw_iter_stas_data iter_data; -+ struct rtw_stas_entry *sta_entry, *tmp; -+ -+ /* &rtwdev->mutex makes sure no stations can be removed between -+ * collecting the stations and iterating over them. -+ */ -+ lockdep_assert_held(&rtwdev->mutex); -+ -+ iter_data.rtwdev = rtwdev; -+ INIT_LIST_HEAD(&iter_data.list); -+ -+ ieee80211_iterate_stations_atomic(rtwdev->hw, rtw_collect_sta_iter, -+ &iter_data); -+ -+ list_for_each_entry_safe(sta_entry, tmp, &iter_data.list, -+ list) { -+ list_del_init(&sta_entry->list); -+ iterator(data, sta_entry->sta); -+ kfree(sta_entry); -+ } -+} -+ -+struct rtw_vifs_entry { -+ struct list_head list; -+ struct ieee80211_vif *vif; -+}; -+ -+struct rtw_iter_vifs_data { -+ struct rtw_dev *rtwdev; -+ struct list_head list; -+}; -+ -+static void rtw_collect_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) -+{ -+ struct rtw_iter_vifs_data *iter_stas = data; -+ struct rtw_vifs_entry *vifs_entry; -+ -+ vifs_entry = kmalloc(sizeof(*vifs_entry), GFP_ATOMIC); -+ if (!vifs_entry) -+ return; -+ -+ vifs_entry->vif = vif; -+ list_add_tail(&vifs_entry->list, &iter_stas->list); -+} -+ -+void rtw_iterate_vifs(struct rtw_dev *rtwdev, -+ void (*iterator)(void *data, struct ieee80211_vif *vif), -+ void *data) -+{ -+ struct rtw_iter_vifs_data iter_data; -+ struct rtw_vifs_entry *vif_entry, *tmp; -+ -+ /* &rtwdev->mutex makes sure no interfaces can be removed between -+ * collecting the interfaces and iterating over them. -+ */ -+ lockdep_assert_held(&rtwdev->mutex); -+ -+ iter_data.rtwdev = rtwdev; -+ INIT_LIST_HEAD(&iter_data.list); -+ -+ ieee80211_iterate_active_interfaces_atomic(rtwdev->hw, -+ IEEE80211_IFACE_ITER_NORMAL, -+ rtw_collect_vif_iter, &iter_data); -+ -+ list_for_each_entry_safe(vif_entry, tmp, &iter_data.list, -+ list) { -+ list_del_init(&vif_entry->list); -+ iterator(data, vif_entry->vif); -+ kfree(vif_entry); -+ } -+} -diff --git a/drivers/net/wireless/realtek/rtw88/util.h b/drivers/net/wireless/realtek/rtw88/util.h -index 0c23b5069be0..f8399128a9a3 100644 ---- a/drivers/net/wireless/realtek/rtw88/util.h -+++ b/drivers/net/wireless/realtek/rtw88/util.h -@@ -7,9 +7,6 @@ - - struct rtw_dev; - --#define rtw_iterate_vifs(rtwdev, iterator, data) \ -- ieee80211_iterate_active_interfaces(rtwdev->hw, \ -- IEEE80211_IFACE_ITER_NORMAL, iterator, data) - #define rtw_iterate_vifs_atomic(rtwdev, iterator, data) \ - ieee80211_iterate_active_interfaces_atomic(rtwdev->hw, \ - IEEE80211_IFACE_ITER_NORMAL, iterator, data) -@@ -20,6 +17,14 @@ struct rtw_dev; - #define rtw_iterate_keys_rcu(rtwdev, vif, iterator, data) \ - ieee80211_iter_keys_rcu((rtwdev)->hw, vif, iterator, data) - -+void rtw_iterate_vifs(struct rtw_dev *rtwdev, -+ void (*iterator)(void *data, struct ieee80211_vif *vif), -+ void *data); -+void rtw_iterate_stas(struct rtw_dev *rtwdev, -+ void (*iterator)(void *data, -+ struct ieee80211_sta *sta), -+ void *data); -+ - static inline u8 *get_hdr_bssid(struct ieee80211_hdr *hdr) - { - __le16 fc = hdr->frame_control; -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 -+++ b/include/linux/mmc/sdio_ids.h -@@ -111,6 +111,16 @@ - #define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296 - #define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347 - -+#define SDIO_VENDOR_ID_REALTEK 0x024c -+#define SDIO_DEVICE_ID_REALTEK_RTW8723BS 0xb723 -+#define SDIO_DEVICE_ID_REALTEK_RTW8821BS 0xb821 -+#define SDIO_DEVICE_ID_REALTEK_RTW8822BS 0xb822 -+#define SDIO_DEVICE_ID_REALTEK_RTW8821CS 0xc821 -+#define SDIO_DEVICE_ID_REALTEK_RTW8822CS 0xc822 -+#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT 0xd723 -+#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT 0xd724 -+#define SDIO_DEVICE_ID_REALTEK_RTW8821DS 0xd821 -+ - #define SDIO_VENDOR_ID_SIANO 0x039a - #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 - #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 --- -2.39.2 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 20 Nov 2023 12:57:26 +0100 -Subject: [PATCH v3] wifi: rtw88: sdio: Honor the host max_req_size in the RX path - -Lukas reports skb_over_panic errors on his Banana Pi BPI-CM4 which comes -with an Amlogic A311D (G12B) SoC and a RTL8822CS SDIO wifi/Bluetooth -combo card. The error he observed is identical to what has been fixed -in commit e967229ead0e ("wifi: rtw88: sdio: Check the HISR RX_REQUEST -bit in rtw_sdio_rx_isr()") but that commit didn't fix Lukas' problem. - -Lukas found that disabling or limiting RX aggregation works around the -problem for some time (but does not fully fix it). In the following -discussion a few key topics have been discussed which have an impact on -this problem: -- The Amlogic A311D (G12B) SoC has a hardware bug in the SDIO controller - which prevents DMA transfers. Instead all transfers need to go through - the controller SRAM which limits transfers to 1536 bytes -- rtw88 chips don't split incoming (RX) packets, so if a big packet is - received this is forwarded to the host in it's original form -- rtw88 chips can do RX aggregation, meaning more multiple incoming - packets can be pulled by the host from the card with one MMC/SDIO - transfer. This Depends on settings in the REG_RXDMA_AGG_PG_TH - register (BIT_RXDMA_AGG_PG_TH limits the number of packets that will - be aggregated, BIT_DMA_AGG_TO_V1 configures a timeout for aggregation - and BIT_EN_PRE_CALC makes the chip honor the limits more effectively) - -Use multiple consecutive reads in rtw_sdio_read_port() and limit the -number of bytes which are copied by the host from the card in one -MMC/SDIO transfer. This allows receiving a buffer that's larger than -the hosts max_req_size (number of bytes which can be transferred in -one MMC/SDIO transfer). As a result of this the skb_over_panic error -is gone as the rtw88 driver is now able to receive more than 1536 bytes -from the card (either because the incoming packet is larger than that -or because multiple packets have been aggregated). - -In case of an receive errors (-EILSEQ has been observed by Lukas) we -need to drain the remaining data from the card's buffer, otherwise the -card will return corrupt data for the next rtw_sdio_read_port() call. - -Fixes: 65371a3f14e7 ("wifi: rtw88: sdio: Add HCI implementation for SDIO based chipsets") -Reported-by: Lukas F. Hartmann -Closes: https://lore.kernel.org/linux-wireless/CAFBinCBaXtebixKbjkWKW_WXc5k=NdGNaGUjVE8NCPNxOhsb2g@mail.gmail.com/ -Suggested-by: Ping-Ke Shih -Signed-off-by: Martin Blumenstingl ---- - -Changes since v2 at [2]: -- Don't initialize err to zero as that intiial value is never used. - Thanks Ping-Ke for spotting this! -- Add a comment explaning why we need to continue reading but still - have to return an error to the caller of rtw_sdio_read_port() - -Changes since v1 at [0]: -- We need to read all bytes if we split the transaction into multiple - smaller reads. This is even the case when one of N reads reports an - error. Otherwise the next read port call will return garbage (partially - containing zeros, ...). A similar-ish approach can be found in the - vendor driver, see [1] (specifically the call to sdio_recv_and_drop()) -- Update the patch description accordingly - -With a preliminary version of this updated patch Lukas reported off- -list: "i've been using this laptop for almost 3 hours with heavy wifi -usage and so far no problems" - - -[0] https://lore.kernel.org/lkml/169089906853.212423.17095176293160428610.kvalo@kernel.org/T/ -[1] https://github.com/chewitt/RTL8822CS/blob/ad1391e219b59314485739a499fb442d5bbc069e/hal/rtl8822c/sdio/rtl8822cs_io.c#L468-L477 -[2] https://lore.kernel.org/linux-wireless/20230806181656.2072792-1-martin.blumenstingl@googlemail.com/ - - - drivers/net/wireless/realtek/rtw88/sdio.c | 35 ++++++++++++++++++----- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c -index 2c1fb2dabd40..0cae5746f540 100644 ---- a/drivers/net/wireless/realtek/rtw88/sdio.c -+++ b/drivers/net/wireless/realtek/rtw88/sdio.c -@@ -500,19 +500,40 @@ static u32 rtw_sdio_get_tx_addr(struct rtw_dev *rtwdev, size_t size, - static int rtw_sdio_read_port(struct rtw_dev *rtwdev, u8 *buf, size_t count) - { - struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ struct mmc_host *host = rtwsdio->sdio_func->card->host; - bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); - u32 rxaddr = rtwsdio->rx_addr++; -- int ret; -+ int ret = 0, err; -+ size_t bytes; - - if (bus_claim) - sdio_claim_host(rtwsdio->sdio_func); - -- ret = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -- RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), count); -- if (ret) -- rtw_warn(rtwdev, -- "Failed to read %zu byte(s) from SDIO port 0x%08x", -- count, rxaddr); -+ while (count > 0) { -+ bytes = min_t(size_t, host->max_req_size, count); -+ -+ err = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -+ RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), -+ bytes); -+ if (err) { -+ rtw_warn(rtwdev, -+ "Failed to read %zu byte(s) from SDIO port 0x%08x: %d", -+ bytes, rxaddr, err); -+ -+ /* Signal to the caller that reading did not work and -+ * that the data in the buffer is short/corrupted. -+ */ -+ ret = err; -+ -+ /* Don't stop here - instead drain the remaining data -+ * from the card's buffer, else the card will return -+ * corrupt data for the next rtw_sdio_read_port() call. -+ */ -+ } -+ -+ count -= bytes; -+ buf += bytes; -+ } - - if (bus_claim) - sdio_release_host(rtwsdio->sdio_func); --- -2.42.1 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ping-Ke Shih -Date: Wed, 4 Oct 2023 16:50:47 +0800 -Subject: [PATCH 1/5] wifi: rtw88: regd: configure QATAR and UK - -In newer Realtek parameter package, Realtek regd can configure -QATAR and UK individually. So, driver extends the regd enum. -Besides, driver configure alternative of them which will be -referenced when parameter package of a chip doesn't consider -QATAR and UK individually. - -Signed-off-by: Zong-Zhe Yang -Signed-off-by: Ping-Ke Shih ---- - drivers/net/wireless/realtek/rtw88/main.h | 4 +++- - drivers/net/wireless/realtek/rtw88/regd.c | 2 ++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h -index c42ef8294d59..86dc1516effa 100644 ---- a/drivers/net/wireless/realtek/rtw88/main.h -+++ b/drivers/net/wireless/realtek/rtw88/main.h -@@ -342,8 +342,10 @@ enum rtw_regulatory_domains { - RTW_REGD_UKRAINE = 7, - RTW_REGD_MEXICO = 8, - RTW_REGD_CN = 9, -- RTW_REGD_WW, -+ RTW_REGD_QATAR = 10, -+ RTW_REGD_UK = 11, - -+ RTW_REGD_WW, - RTW_REGD_MAX - }; - -diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c -index 2f547cbcf6da..680d8f32fce6 100644 ---- a/drivers/net/wireless/realtek/rtw88/regd.c -+++ b/drivers/net/wireless/realtek/rtw88/regd.c -@@ -519,6 +519,8 @@ rtw_regd_alt[RTW_REGD_MAX] = { - DECL_REGD_ALT(RTW_REGD_UKRAINE, RTW_REGD_ETSI), - DECL_REGD_ALT(RTW_REGD_MEXICO, RTW_REGD_FCC), - DECL_REGD_ALT(RTW_REGD_CN, RTW_REGD_ETSI), -+ DECL_REGD_ALT(RTW_REGD_QATAR, RTW_REGD_ETSI), -+ DECL_REGD_ALT(RTW_REGD_UK, RTW_REGD_ETSI), - }; - - bool rtw_regd_has_alt(u8 regd, u8 *regd_alt) --- -2.25.1 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ping-Ke Shih -Date: Wed, 4 Oct 2023 16:50:48 +0800 -Subject: [PATCH 2/5] wifi: rtw88: 8821c: update TX power limit to V67 - -Update TX power limit to parameter package V67 - * configure values for MEXICO, CN, QATAR, UK - -Signed-off-by: Zong-Zhe Yang -Signed-off-by: Ping-Ke Shih ---- - .../wireless/realtek/rtw88/rtw8821c_table.c | 1154 ++++++++++++----- - 1 file changed, 825 insertions(+), 329 deletions(-) - +@@ -211,6 +238,7 @@ extern const struct rtw_chip_info rtw8821c_hw_spec; + #define REG_RXSB 0xa00 + #define REG_ADCINI 0xa04 + #define REG_PWRTH 0xa08 ++#define REG_CCA_FLTR 0xa20 + #define REG_TXSF2 0xa24 + #define REG_TXSF6 0xa28 + #define REG_FA_CCK 0xa5c diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c_table.c b/drivers/net/wireless/realtek/rtw88/rtw8821c_table.c index 6c82c4383497..0393b9a0c1a3 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c_table.c @@ -8180,24 +4747,444 @@ index 6c82c4383497..0393b9a0c1a3 100644 }; RTW_DECL_TABLE_TXPWR_LMT(rtw8821c_txpwr_lmt_type0); --- -2.25.1 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ping-Ke Shih -Date: Wed, 4 Oct 2023 16:50:49 +0800 -Subject: [PATCH 3/5] wifi: rtw88: 8822c: update TX power limit to V70 - -Update TX power limit to parameter package V70 - * tweak values of CN for its new regulation - * configure values for QATAR, UK - -Signed-off-by: Zong-Zhe Yang -Signed-off-by: Ping-Ke Shih ---- - .../wireless/realtek/rtw88/rtw8822c_table.c | 1239 +++++++---------- - 1 file changed, 522 insertions(+), 717 deletions(-) - +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cs.c b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c +new file mode 100644 +index 000000000000..a359413369a4 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cs.c +@@ -0,0 +1,36 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) Martin Blumenstingl ++ */ ++ ++#include ++#include ++#include ++#include "main.h" ++#include "rtw8821c.h" ++#include "sdio.h" ++ ++static const struct sdio_device_id rtw_8821cs_id_table[] = { ++ { ++ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, ++ SDIO_DEVICE_ID_REALTEK_RTW8821CS), ++ .driver_data = (kernel_ulong_t)&rtw8821c_hw_spec, ++ }, ++ {} ++}; ++MODULE_DEVICE_TABLE(sdio, rtw_8821cs_id_table); ++ ++static struct sdio_driver rtw_8821cs_driver = { ++ .name = "rtw_8821cs", ++ .probe = rtw_sdio_probe, ++ .remove = rtw_sdio_remove, ++ .id_table = rtw_8821cs_id_table, ++ .drv = { ++ .pm = &rtw_sdio_pm_ops, ++ .shutdown = rtw_sdio_shutdown, ++ } ++}; ++module_sdio_driver(rtw_8821cs_driver); ++ ++MODULE_AUTHOR("Martin Blumenstingl "); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821cs driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +new file mode 100644 +index 000000000000..7a5cbdc31ef7 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +@@ -0,0 +1,50 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#include ++#include ++#include "main.h" ++#include "rtw8821c.h" ++#include "usb.h" ++ ++static const struct usb_device_id rtw_8821cu_id_table[] = { ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ ++ {}, ++}; ++MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); ++ ++static int rtw_8821cu_probe(struct usb_interface *intf, ++ const struct usb_device_id *id) ++{ ++ return rtw_usb_probe(intf, id); ++} ++ ++static struct usb_driver rtw_8821cu_driver = { ++ .name = "rtw_8821cu", ++ .id_table = rtw_8821cu_id_table, ++ .probe = rtw_8821cu_probe, ++ .disconnect = rtw_usb_disconnect, ++}; ++module_usb_driver(rtw_8821cu_driver); ++ ++MODULE_AUTHOR("Hans Ulli Kroll "); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821cu driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c +index 690e35c98f6e..3017a9760da8 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c +@@ -26,6 +26,18 @@ static void rtw8822be_efuse_parsing(struct rtw_efuse *efuse, + ether_addr_copy(efuse->addr, map->e.mac_addr); + } + ++static void rtw8822bu_efuse_parsing(struct rtw_efuse *efuse, ++ struct rtw8822b_efuse *map) ++{ ++ ether_addr_copy(efuse->addr, map->u.mac_addr); ++} ++ ++static void rtw8822bs_efuse_parsing(struct rtw_efuse *efuse, ++ struct rtw8822b_efuse *map) ++{ ++ ether_addr_copy(efuse->addr, map->s.mac_addr); ++} ++ + static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) + { + struct rtw_efuse *efuse = &rtwdev->efuse; +@@ -56,6 +68,12 @@ static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) + case RTW_HCI_TYPE_PCIE: + rtw8822be_efuse_parsing(efuse, map); + break; ++ case RTW_HCI_TYPE_USB: ++ rtw8822bu_efuse_parsing(efuse, map); ++ break; ++ case RTW_HCI_TYPE_SDIO: ++ rtw8822bs_efuse_parsing(efuse, map); ++ break; + default: + /* unsupported now */ + return -ENOTSUPP; +@@ -1588,6 +1606,15 @@ static void rtw8822b_adaptivity(struct rtw_dev *rtwdev) + rtw_phy_set_edcca_th(rtwdev, l2h, h2l); + } + ++static void rtw8822b_fill_txdesc_checksum(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ u8 *txdesc) ++{ ++ size_t words = 32 / 2; /* calculate the first 32 bytes (16 words) */ ++ ++ fill_txdesc_checksum_common(txdesc, words); ++} ++ + static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822b[] = { + {0x0086, + RTW_PWR_CUT_ALL_MSK, +@@ -2163,6 +2190,7 @@ static struct rtw_chip_ops rtw8822b_ops = { + .cfg_csi_rate = rtw_bf_cfg_csi_rate, + .adaptivity_init = rtw8822b_adaptivity_init, + .adaptivity = rtw8822b_adaptivity, ++ .fill_txdesc_checksum = rtw8822b_fill_txdesc_checksum, + + .coex_set_init = rtw8822b_coex_cfg_init, + .coex_set_ant_switch = rtw8822b_coex_cfg_ant_switch, +@@ -2512,6 +2540,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { + .txff_size = 262144, + .rxff_size = 24576, + .fw_rxff_size = 12288, ++ .rsvd_drv_pg_num = 8, + .txgi_factor = 1, + .is_pwr_by_rate_dec = true, + .max_power_index = 0x3f, +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.h b/drivers/net/wireless/realtek/rtw88/rtw8822b.h +index 01d3644e0c94..2dc3a6660f06 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h +@@ -65,6 +65,11 @@ struct rtw8822be_efuse { + u8 res7; + }; + ++struct rtw8822bs_efuse { ++ u8 res4[0x4a]; /* 0xd0 */ ++ u8 mac_addr[ETH_ALEN]; /* 0x11a */ ++} __packed; ++ + struct rtw8822b_efuse { + __le16 rtl_id; + u8 res0[0x0e]; +@@ -92,8 +97,9 @@ struct rtw8822b_efuse { + u8 country_code[2]; + u8 res[3]; + union { +- struct rtw8822bu_efuse u; + struct rtw8822be_efuse e; ++ struct rtw8822bu_efuse u; ++ struct rtw8822bs_efuse s; + }; + }; + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bs.c b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c +new file mode 100644 +index 000000000000..31d8645f83bd +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822bs.c +@@ -0,0 +1,36 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) Jernej Skrabec ++ */ ++ ++#include ++#include ++#include ++#include "main.h" ++#include "rtw8822b.h" ++#include "sdio.h" ++ ++static const struct sdio_device_id rtw_8822bs_id_table[] = { ++ { ++ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, ++ SDIO_DEVICE_ID_REALTEK_RTW8822BS), ++ .driver_data = (kernel_ulong_t)&rtw8822b_hw_spec, ++ }, ++ {} ++}; ++MODULE_DEVICE_TABLE(sdio, rtw_8822bs_id_table); ++ ++static struct sdio_driver rtw_8822bs_driver = { ++ .name = "rtw_8822bs", ++ .probe = rtw_sdio_probe, ++ .remove = rtw_sdio_remove, ++ .id_table = rtw_8822bs_id_table, ++ .drv = { ++ .pm = &rtw_sdio_pm_ops, ++ .shutdown = rtw_sdio_shutdown, ++ } ++}; ++module_sdio_driver(rtw_8822bs_driver); ++ ++MODULE_AUTHOR("Jernej Skrabec "); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822bs driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822bu.c b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c +new file mode 100644 +index 000000000000..ab620a0b1dfc +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c +@@ -0,0 +1,90 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#include ++#include ++#include "main.h" ++#include "rtw8822b.h" ++#include "usb.h" ++ ++static const struct usb_device_id rtw_8822bu_id_table[] = { ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb812, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2102, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* CCNC */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xb822, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822ULC */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc822, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822UTC */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd822, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xe822, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xf822, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Edimax EW-7822UAD */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb81a, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Default ID */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x1841, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS AC1300 USB-AC55 B1 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x184c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS U2 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x19aa, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS - USB-AC58 rev A1 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1870, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1874, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ASUS */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331e, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Dlink - DWA-181 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Dlink - DWA-182 - D1 */ ++ {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331f, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec)}, /* Dlink - DWA-183 D Ver */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0043, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Linksys WUSB6400M */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0045, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Linksys WUSB3600 v2 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012d, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T3U v1 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0138, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T3U Plus v1 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0115, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-Link Archer T4U V3 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012e, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0116, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0117, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TP-LINK */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9055, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Netgear A6150 */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0e66, 0x0025, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Hawking HW12ACU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x04ca, 0x8602, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* LiteOn */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x808a, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TRENDnet TEW-808UBM */ ++ {}, ++}; ++MODULE_DEVICE_TABLE(usb, rtw_8822bu_id_table); ++ ++static int rtw8822bu_probe(struct usb_interface *intf, ++ const struct usb_device_id *id) ++{ ++ return rtw_usb_probe(intf, id); ++} ++ ++static struct usb_driver rtw_8822bu_driver = { ++ .name = "rtw_8822bu", ++ .id_table = rtw_8822bu_id_table, ++ .probe = rtw8822bu_probe, ++ .disconnect = rtw_usb_disconnect, ++}; ++module_usb_driver(rtw_8822bu_driver); ++ ++MODULE_AUTHOR("Realtek Corporation"); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822bu driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c +index fccb15dfb959..cd965edc29ce 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c +@@ -29,6 +29,18 @@ static void rtw8822ce_efuse_parsing(struct rtw_efuse *efuse, + ether_addr_copy(efuse->addr, map->e.mac_addr); + } + ++static void rtw8822cu_efuse_parsing(struct rtw_efuse *efuse, ++ struct rtw8822c_efuse *map) ++{ ++ ether_addr_copy(efuse->addr, map->u.mac_addr); ++} ++ ++static void rtw8822cs_efuse_parsing(struct rtw_efuse *efuse, ++ struct rtw8822c_efuse *map) ++{ ++ ether_addr_copy(efuse->addr, map->s.mac_addr); ++} ++ + static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) + { + struct rtw_efuse *efuse = &rtwdev->efuse; +@@ -58,6 +70,12 @@ static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) + case RTW_HCI_TYPE_PCIE: + rtw8822ce_efuse_parsing(efuse, map); + break; ++ case RTW_HCI_TYPE_USB: ++ rtw8822cu_efuse_parsing(efuse, map); ++ break; ++ case RTW_HCI_TYPE_SDIO: ++ rtw8822cs_efuse_parsing(efuse, map); ++ break; + default: + /* unsupported now */ + return -ENOTSUPP; +@@ -4557,6 +4575,18 @@ static void rtw8822c_adaptivity(struct rtw_dev *rtwdev) + rtw_phy_set_edcca_th(rtwdev, l2h, h2l); + } + ++static void rtw8822c_fill_txdesc_checksum(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ u8 *txdesc) ++{ ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ size_t words; ++ ++ words = (pkt_info->pkt_offset * 8 + chip->tx_pkt_desc_sz) / 2; ++ ++ fill_txdesc_checksum_common(txdesc, words); ++} ++ + static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8822c[] = { + {0x0086, + RTW_PWR_CUT_ALL_MSK, +@@ -4895,6 +4925,8 @@ static const struct rtw_rfe_def rtw8822c_rfe_defs[] = { + [0] = RTW_DEF_RFE(8822c, 0, 0), + [1] = RTW_DEF_RFE(8822c, 0, 0), + [2] = RTW_DEF_RFE(8822c, 0, 0), ++ [3] = RTW_DEF_RFE(8822c, 0, 0), ++ [4] = RTW_DEF_RFE(8822c, 0, 0), + [5] = RTW_DEF_RFE(8822c, 0, 5), + [6] = RTW_DEF_RFE(8822c, 0, 0), + }; +@@ -4978,6 +5010,7 @@ static struct rtw_chip_ops rtw8822c_ops = { + .cfo_track = rtw8822c_cfo_track, + .config_tx_path = rtw8822c_config_tx_path, + .config_txrx_mode = rtw8822c_config_trx_mode, ++ .fill_txdesc_checksum = rtw8822c_fill_txdesc_checksum, + + .coex_set_init = rtw8822c_coex_cfg_init, + .coex_set_ant_switch = NULL, +@@ -5325,6 +5358,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { + .txff_size = 262144, + .rxff_size = 24576, + .fw_rxff_size = 12288, ++ .rsvd_drv_pg_num = 16, + .txgi_factor = 2, + .is_pwr_by_rate_dec = false, + .max_power_index = 0x7f, +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h +index 479d5d769c52..1bc0e7f5d6bb 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h +@@ -16,6 +16,11 @@ struct rtw8822cu_efuse { + u8 res2[0x3d]; + }; + ++struct rtw8822cs_efuse { ++ u8 res0[0x4a]; /* 0x120 */ ++ u8 mac_addr[ETH_ALEN]; /* 0x16a */ ++} __packed; ++ + struct rtw8822ce_efuse { + u8 mac_addr[ETH_ALEN]; /* 0x120 */ + u8 vender_id[2]; +@@ -91,8 +96,9 @@ struct rtw8822c_efuse { + u8 res9; + u8 res10[0x42]; + union { +- struct rtw8822cu_efuse u; + struct rtw8822ce_efuse e; ++ struct rtw8822cu_efuse u; ++ struct rtw8822cs_efuse s; + }; + }; + diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c index f9e3d0779c59..5699846a399b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c @@ -12122,238 +9109,3614 @@ index f9e3d0779c59..5699846a399b 100644 }; RTW_DECL_TABLE_TXPWR_LMT(rtw8822c_txpwr_lmt_type5); --- -2.25.1 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ping-Ke Shih -Date: Wed, 4 Oct 2023 16:50:50 +0800 -Subject: [PATCH 4/5] wifi: rtw88: regd: update regulatory map to R64-R42 - -Sync Realtek Regulatory R42 and Realtek Channel Plan R64. -Start to configure with Realtek regd CHILE, CN, UK, QATAR, UKRAINE. - -Signed-off-by: Zong-Zhe Yang -Signed-off-by: Ping-Ke Shih ---- - drivers/net/wireless/realtek/rtw88/regd.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c -index 680d8f32fce6..124fc7ae6a14 100644 ---- a/drivers/net/wireless/realtek/rtw88/regd.c -+++ b/drivers/net/wireless/realtek/rtw88/regd.c -@@ -70,16 +70,16 @@ static const struct rtw_regulatory rtw_reg_map[] = { - COUNTRY_REGD_ENT("BY", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("BZ", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("CA", RTW_REGD_IC, RTW_REGD_IC), -- COUNTRY_REGD_ENT("CC", RTW_REGD_ETSI, RTW_REGD_ETSI), -+ COUNTRY_REGD_ENT("CC", RTW_REGD_ACMA, RTW_REGD_ACMA), - COUNTRY_REGD_ENT("CD", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CF", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CG", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CH", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CI", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("CK", RTW_REGD_ETSI, RTW_REGD_ETSI), -- COUNTRY_REGD_ENT("CL", RTW_REGD_FCC, RTW_REGD_FCC), -+ COUNTRY_REGD_ENT("CL", RTW_REGD_CHILE, RTW_REGD_CHILE), - COUNTRY_REGD_ENT("CM", RTW_REGD_ETSI, RTW_REGD_ETSI), -- COUNTRY_REGD_ENT("CN", RTW_REGD_ETSI, RTW_REGD_ETSI), -+ COUNTRY_REGD_ENT("CN", RTW_REGD_CN, RTW_REGD_CN), - COUNTRY_REGD_ENT("CO", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("CR", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("CV", RTW_REGD_ETSI, RTW_REGD_ETSI), -@@ -106,7 +106,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { - COUNTRY_REGD_ENT("FO", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("FR", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("GA", RTW_REGD_ETSI, RTW_REGD_ETSI), -- COUNTRY_REGD_ENT("GB", RTW_REGD_ETSI, RTW_REGD_ETSI), -+ COUNTRY_REGD_ENT("GB", RTW_REGD_UK, RTW_REGD_UK), - COUNTRY_REGD_ENT("GD", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("GE", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("GF", RTW_REGD_ETSI, RTW_REGD_ETSI), -@@ -214,7 +214,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { - COUNTRY_REGD_ENT("PT", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("PW", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("PY", RTW_REGD_FCC, RTW_REGD_FCC), -- COUNTRY_REGD_ENT("QA", RTW_REGD_ETSI, RTW_REGD_ETSI), -+ COUNTRY_REGD_ENT("QA", RTW_REGD_QATAR, RTW_REGD_QATAR), - COUNTRY_REGD_ENT("RE", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("RO", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("RS", RTW_REGD_ETSI, RTW_REGD_ETSI), -@@ -234,7 +234,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { - COUNTRY_REGD_ENT("SN", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("SO", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("SR", RTW_REGD_FCC, RTW_REGD_FCC), -- COUNTRY_REGD_ENT("ST", RTW_REGD_FCC, RTW_REGD_FCC), -+ COUNTRY_REGD_ENT("ST", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("SV", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("SX", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("SZ", RTW_REGD_ETSI, RTW_REGD_ETSI), -@@ -253,7 +253,7 @@ static const struct rtw_regulatory rtw_reg_map[] = { - COUNTRY_REGD_ENT("TV", RTW_REGD_ETSI, RTW_REGD_WW), - COUNTRY_REGD_ENT("TW", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("TZ", RTW_REGD_ETSI, RTW_REGD_ETSI), -- COUNTRY_REGD_ENT("UA", RTW_REGD_ETSI, RTW_REGD_ETSI), -+ COUNTRY_REGD_ENT("UA", RTW_REGD_UKRAINE, RTW_REGD_UKRAINE), - COUNTRY_REGD_ENT("UG", RTW_REGD_ETSI, RTW_REGD_ETSI), - COUNTRY_REGD_ENT("US", RTW_REGD_FCC, RTW_REGD_FCC), - COUNTRY_REGD_ENT("UY", RTW_REGD_FCC, RTW_REGD_FCC), --- -2.25.1 - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ping-Ke Shih -Date: Wed, 4 Oct 2023 16:50:51 +0800 -Subject: [PATCH 5/5] wifi: rtw88: 8821c: tweak CCK TX filter setting for SRRC regulation - -Since new criterion released by SRRC (State Radio Regulatory Commission, -China) is stricter, we have adjusted TX power limit tables for it. But, -due to RTL8821C HW characteristic, we still need to use specific parameter -in CCK TX filter when set channel to avoid violations in some corner cases. - -Signed-off-by: Zong-Zhe Yang -Signed-off-by: Ping-Ke Shih ---- - drivers/net/wireless/realtek/rtw88/regd.c | 8 +++ - drivers/net/wireless/realtek/rtw88/regd.h | 2 + - drivers/net/wireless/realtek/rtw88/rtw8821c.c | 67 +++++++++++++++++++ - drivers/net/wireless/realtek/rtw88/rtw8821c.h | 1 + - 4 files changed, 78 insertions(+) - -diff --git a/drivers/net/wireless/realtek/rtw88/regd.c b/drivers/net/wireless/realtek/rtw88/regd.c -index 124fc7ae6a14..7f3b2ea3f2a5 100644 ---- a/drivers/net/wireless/realtek/rtw88/regd.c -+++ b/drivers/net/wireless/realtek/rtw88/regd.c -@@ -502,6 +502,14 @@ u8 rtw_regd_get(struct rtw_dev *rtwdev) - } - EXPORT_SYMBOL(rtw_regd_get); - -+bool rtw_regd_srrc(struct rtw_dev *rtwdev) -+{ -+ struct rtw_regd *regd = &rtwdev->regd; +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cs.c b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c +new file mode 100644 +index 000000000000..975e81c824f2 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822cs.c +@@ -0,0 +1,36 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) Martin Blumenstingl ++ */ + -+ return rtw_reg_match(regd->regulatory, "CN"); ++#include ++#include ++#include ++#include "main.h" ++#include "rtw8822c.h" ++#include "sdio.h" ++ ++static const struct sdio_device_id rtw_8822cs_id_table[] = { ++ { ++ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, ++ SDIO_DEVICE_ID_REALTEK_RTW8822CS), ++ .driver_data = (kernel_ulong_t)&rtw8822c_hw_spec, ++ }, ++ {} ++}; ++MODULE_DEVICE_TABLE(sdio, rtw_8822cs_id_table); ++ ++static struct sdio_driver rtw_8822cs_driver = { ++ .name = "rtw_8822cs", ++ .probe = rtw_sdio_probe, ++ .remove = rtw_sdio_remove, ++ .id_table = rtw_8822cs_id_table, ++ .drv = { ++ .pm = &rtw_sdio_pm_ops, ++ .shutdown = rtw_sdio_shutdown, ++ } ++}; ++module_sdio_driver(rtw_8822cs_driver); ++ ++MODULE_AUTHOR("Martin Blumenstingl "); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822cs driver"); ++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..157d5102a4b1 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c +@@ -0,0 +1,44 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#include ++#include ++#include "main.h" ++#include "rtw8822c.h" ++#include "usb.h" ++ ++static const struct usb_device_id rtw_8822cu_id_table[] = { ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc812, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82e, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xd820, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xd82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0043, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, /* Alpha - Alpha */ ++ {}, ++}; ++MODULE_DEVICE_TABLE(usb, rtw_8822cu_id_table); ++ ++static int rtw8822cu_probe(struct usb_interface *intf, ++ const struct usb_device_id *id) ++{ ++ return rtw_usb_probe(intf, id); +} -+EXPORT_SYMBOL(rtw_regd_srrc); + - struct rtw_regd_alternative_t { - bool set; - u8 alt; -diff --git a/drivers/net/wireless/realtek/rtw88/regd.h b/drivers/net/wireless/realtek/rtw88/regd.h -index 34cb13d0cd9e..3c5a6fd8e6dd 100644 ---- a/drivers/net/wireless/realtek/rtw88/regd.h -+++ b/drivers/net/wireless/realtek/rtw88/regd.h -@@ -68,4 +68,6 @@ int rtw_regd_init(struct rtw_dev *rtwdev); - int rtw_regd_hint(struct rtw_dev *rtwdev); - u8 rtw_regd_get(struct rtw_dev *rtwdev); - bool rtw_regd_has_alt(u8 regd, u8 *regd_alt); -+bool rtw_regd_srrc(struct rtw_dev *rtwdev); ++static struct usb_driver rtw_8822cu_driver = { ++ .name = "rtw_8822cu", ++ .id_table = rtw_8822cu_id_table, ++ .probe = rtw8822cu_probe, ++ .disconnect = rtw_usb_disconnect, ++}; ++module_usb_driver(rtw_8822cu_driver); + - #endif -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c -index adf224618a2a..429bb420b056 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c -+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c -@@ -381,6 +381,65 @@ static void rtw8821c_set_channel_rxdfir(struct rtw_dev *rtwdev, u8 bw) - } - } - -+static void rtw8821c_cck_tx_filter_srrc(struct rtw_dev *rtwdev, u8 channel, u8 bw) ++MODULE_AUTHOR("Realtek Corporation"); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8822cu driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c +new file mode 100644 +index 000000000000..0cae5746f540 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/sdio.c +@@ -0,0 +1,1425 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright (C) 2021 Martin Blumenstingl ++ * Copyright (C) 2021 Jernej Skrabec ++ * ++ * Based on rtw88/pci.c: ++ * Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#include ++#include ++#include ++#include "main.h" ++#include "debug.h" ++#include "fw.h" ++#include "ps.h" ++#include "reg.h" ++#include "rx.h" ++#include "sdio.h" ++#include "tx.h" ++ ++#define RTW_SDIO_INDIRECT_RW_RETRIES 50 ++ ++static bool rtw_sdio_is_bus_addr(u32 addr) +{ -+ struct rtw_hal *hal = &rtwdev->hal; ++ return !!(addr & RTW_SDIO_BUS_MSK); ++} + -+ if (channel == 14) { -+ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xe82c); -+ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x0000b81c); -+ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x0000); -+ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, 0x00003667); ++static bool rtw_sdio_bus_claim_needed(struct rtw_sdio *rtwsdio) ++{ ++ return !rtwsdio->irq_thread || ++ rtwsdio->irq_thread != current; ++} + -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); -+ } else if (channel == 13 || -+ (channel == 11 && bw == RTW_CHANNEL_WIDTH_40)) { -+ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xf8fe); -+ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x64b80c1c); -+ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x8810); -+ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, 0x01235667); ++static u32 rtw_sdio_to_bus_offset(struct rtw_dev *rtwdev, u32 addr) ++{ ++ switch (addr & RTW_SDIO_BUS_MSK) { ++ case WLAN_IOREG_OFFSET: ++ addr &= WLAN_IOREG_REG_MSK; ++ addr |= FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_MAC_REG); ++ break; ++ case SDIO_LOCAL_OFFSET: ++ addr &= SDIO_LOCAL_REG_MSK; ++ addr |= FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_SDIO_REG); ++ break; ++ default: ++ rtw_warn(rtwdev, "Cannot convert addr 0x%08x to bus offset", ++ addr); ++ } + -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00027); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00027); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00029); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00026); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); -+ } else { -+ rtw_write32_mask(rtwdev, REG_CCA_FLTR, MASKHWORD, 0xe82c); -+ rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, -+ hal->ch_param[0]); -+ rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, -+ hal->ch_param[1] & MASKLWORD); -+ rtw_write32_mask(rtwdev, REG_TXFILTER, MASKDWORD, -+ hal->ch_param[2]); ++ return addr; ++} + -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00002); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0001c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000e); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWA, RFREG_MASK, 0x0000c); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWD0, RFREG_MASK, 0x00000); -+ rtw_write_rf(rtwdev, RF_PATH_A, RF_LUTWE2, RFREG_MASK, 0x00000); ++static bool rtw_sdio_use_memcpy_io(struct rtw_dev *rtwdev, u32 addr, ++ u8 alignment) ++{ ++ return IS_ALIGNED(addr, alignment) && ++ test_bit(RTW_FLAG_POWERON, rtwdev->flags); ++} ++ ++static void rtw_sdio_writel(struct rtw_dev *rtwdev, u32 val, u32 addr, ++ int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u8 buf[4]; ++ int i; ++ ++ if (rtw_sdio_use_memcpy_io(rtwdev, addr, 4)) { ++ sdio_writel(rtwsdio->sdio_func, val, addr, err_ret); ++ return; ++ } ++ ++ *(__le32 *)buf = cpu_to_le32(val); ++ ++ for (i = 0; i < 4; i++) { ++ sdio_writeb(rtwsdio->sdio_func, buf[i], addr + i, err_ret); ++ if (*err_ret) ++ return; + } +} + - static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, - u8 primary_ch_idx) - { -@@ -395,6 +454,13 @@ static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, - - rtw_write32_mask(rtwdev, REG_TXSCALE_A, 0xf00, 0x0); - rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x96a); ++static void rtw_sdio_writew(struct rtw_dev *rtwdev, u16 val, u32 addr, ++ int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u8 buf[2]; ++ int i; + -+ if (rtw_regd_srrc(rtwdev)) { -+ rtw8821c_cck_tx_filter_srrc(rtwdev, channel, bw); -+ goto set_bw; ++ *(__le16 *)buf = cpu_to_le16(val); ++ ++ for (i = 0; i < 2; i++) { ++ sdio_writeb(rtwsdio->sdio_func, buf[i], addr + i, err_ret); ++ if (*err_ret) ++ return; ++ } ++} ++ ++static u32 rtw_sdio_readl(struct rtw_dev *rtwdev, u32 addr, int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u8 buf[4]; ++ int i; ++ ++ if (rtw_sdio_use_memcpy_io(rtwdev, addr, 4)) ++ return sdio_readl(rtwsdio->sdio_func, addr, err_ret); ++ ++ for (i = 0; i < 4; i++) { ++ buf[i] = sdio_readb(rtwsdio->sdio_func, addr + i, err_ret); ++ if (*err_ret) ++ return 0; ++ } ++ ++ return le32_to_cpu(*(__le32 *)buf); ++} ++ ++static u16 rtw_sdio_readw(struct rtw_dev *rtwdev, u32 addr, int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u8 buf[2]; ++ int i; ++ ++ for (i = 0; i < 2; i++) { ++ buf[i] = sdio_readb(rtwsdio->sdio_func, addr + i, err_ret); ++ if (*err_ret) ++ return 0; ++ } ++ ++ return le16_to_cpu(*(__le16 *)buf); ++} ++ ++static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr, ++ bool direct) ++{ ++ if (!direct) ++ return addr; ++ ++ if (!rtw_sdio_is_bus_addr(addr)) ++ addr |= WLAN_IOREG_OFFSET; ++ ++ return rtw_sdio_to_bus_offset(rtwdev, addr); ++} ++ ++static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr) ++{ ++ return !rtw_sdio_is_sdio30_supported(rtwdev) || ++ rtw_sdio_is_bus_addr(addr); ++} ++ ++static int rtw_sdio_indirect_reg_cfg(struct rtw_dev *rtwdev, u32 addr, u32 cfg) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ unsigned int retry; ++ u32 reg_cfg; ++ int ret; ++ u8 tmp; ++ ++ reg_cfg = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_CFG); ++ ++ rtw_sdio_writel(rtwdev, addr | cfg | BIT_SDIO_INDIRECT_REG_CFG_UNK20, ++ reg_cfg, &ret); ++ if (ret) ++ return ret; ++ ++ for (retry = 0; retry < RTW_SDIO_INDIRECT_RW_RETRIES; retry++) { ++ tmp = sdio_readb(rtwsdio->sdio_func, reg_cfg + 2, &ret); ++ if (!ret && (tmp & BIT(4))) ++ return 0; ++ } ++ ++ return -ETIMEDOUT; ++} ++ ++static u8 rtw_sdio_indirect_read8(struct rtw_dev *rtwdev, u32 addr, ++ int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u32 reg_data; ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_READ); ++ if (*err_ret) ++ return 0; ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ return sdio_readb(rtwsdio->sdio_func, reg_data, err_ret); ++} ++ ++static int rtw_sdio_indirect_read_bytes(struct rtw_dev *rtwdev, u32 addr, ++ u8 *buf, int count) ++{ ++ int i, ret = 0; ++ ++ for (i = 0; i < count; i++) { ++ buf[i] = rtw_sdio_indirect_read8(rtwdev, addr + i, &ret); ++ if (ret) ++ break; ++ } ++ ++ return ret; ++} ++ ++static u16 rtw_sdio_indirect_read16(struct rtw_dev *rtwdev, u32 addr, ++ int *err_ret) ++{ ++ u32 reg_data; ++ u8 buf[2]; ++ ++ if (!IS_ALIGNED(addr, 2)) { ++ *err_ret = rtw_sdio_indirect_read_bytes(rtwdev, addr, buf, 2); ++ if (*err_ret) ++ return 0; ++ ++ return le16_to_cpu(*(__le16 *)buf); ++ } ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_READ); ++ if (*err_ret) ++ return 0; ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ return rtw_sdio_readw(rtwdev, reg_data, err_ret); ++} ++ ++static u32 rtw_sdio_indirect_read32(struct rtw_dev *rtwdev, u32 addr, ++ int *err_ret) ++{ ++ u32 reg_data; ++ u8 buf[4]; ++ ++ if (!IS_ALIGNED(addr, 4)) { ++ *err_ret = rtw_sdio_indirect_read_bytes(rtwdev, addr, buf, 4); ++ if (*err_ret) ++ return 0; ++ ++ return le32_to_cpu(*(__le32 *)buf); ++ } ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_READ); ++ if (*err_ret) ++ return 0; ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ return rtw_sdio_readl(rtwdev, reg_data, err_ret); ++} ++ ++static u8 rtw_sdio_read8(struct rtw_dev *rtwdev, u32 addr) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ int ret; ++ u8 val; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ val = sdio_readb(rtwsdio->sdio_func, addr, &ret); ++ else ++ val = rtw_sdio_indirect_read8(rtwdev, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio read8 failed (0x%x): %d", addr, ret); ++ ++ return val; ++} ++ ++static u16 rtw_sdio_read16(struct rtw_dev *rtwdev, u32 addr) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ int ret; ++ u16 val; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ val = rtw_sdio_readw(rtwdev, addr, &ret); ++ else ++ val = rtw_sdio_indirect_read16(rtwdev, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio read16 failed (0x%x): %d", addr, ret); ++ ++ return val; ++} ++ ++static u32 rtw_sdio_read32(struct rtw_dev *rtwdev, u32 addr) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ u32 val; ++ int ret; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ val = rtw_sdio_readl(rtwdev, addr, &ret); ++ else ++ val = rtw_sdio_indirect_read32(rtwdev, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio read32 failed (0x%x): %d", addr, ret); ++ ++ return val; ++} ++ ++static void rtw_sdio_indirect_write8(struct rtw_dev *rtwdev, u8 val, u32 addr, ++ int *err_ret) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ u32 reg_data; ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ sdio_writeb(rtwsdio->sdio_func, val, reg_data, err_ret); ++ if (*err_ret) ++ return; ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_WRITE); ++} ++ ++static void rtw_sdio_indirect_write16(struct rtw_dev *rtwdev, u16 val, u32 addr, ++ int *err_ret) ++{ ++ u32 reg_data; ++ ++ if (!IS_ALIGNED(addr, 2)) { ++ addr = rtw_sdio_to_io_address(rtwdev, addr, true); ++ rtw_sdio_writew(rtwdev, val, addr, err_ret); ++ return; ++ } ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ rtw_sdio_writew(rtwdev, val, reg_data, err_ret); ++ if (*err_ret) ++ return; ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_WRITE | ++ BIT_SDIO_INDIRECT_REG_CFG_WORD); ++} ++ ++static void rtw_sdio_indirect_write32(struct rtw_dev *rtwdev, u32 val, ++ u32 addr, int *err_ret) ++{ ++ u32 reg_data; ++ ++ if (!IS_ALIGNED(addr, 4)) { ++ addr = rtw_sdio_to_io_address(rtwdev, addr, true); ++ rtw_sdio_writel(rtwdev, val, addr, err_ret); ++ return; ++ } ++ ++ reg_data = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_INDIRECT_REG_DATA); ++ rtw_sdio_writel(rtwdev, val, reg_data, err_ret); ++ ++ *err_ret = rtw_sdio_indirect_reg_cfg(rtwdev, addr, ++ BIT_SDIO_INDIRECT_REG_CFG_WRITE | ++ BIT_SDIO_INDIRECT_REG_CFG_DWORD); ++} ++ ++static void rtw_sdio_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ int ret; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ sdio_writeb(rtwsdio->sdio_func, val, addr, &ret); ++ else ++ rtw_sdio_indirect_write8(rtwdev, val, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio write8 failed (0x%x): %d", addr, ret); ++} ++ ++static void rtw_sdio_write16(struct rtw_dev *rtwdev, u32 addr, u16 val) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ int ret; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ rtw_sdio_writew(rtwdev, val, addr, &ret); ++ else ++ rtw_sdio_indirect_write16(rtwdev, val, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio write16 failed (0x%x): %d", addr, ret); ++} ++ ++static void rtw_sdio_write32(struct rtw_dev *rtwdev, u32 addr, u32 val) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool direct, bus_claim; ++ int ret; ++ ++ direct = rtw_sdio_use_direct_io(rtwdev, addr); ++ addr = rtw_sdio_to_io_address(rtwdev, addr, direct); ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ if (direct) ++ rtw_sdio_writel(rtwdev, val, addr, &ret); ++ else ++ rtw_sdio_indirect_write32(rtwdev, val, addr, &ret); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, "sdio write32 failed (0x%x): %d", addr, ret); ++} ++ ++static u32 rtw_sdio_get_tx_addr(struct rtw_dev *rtwdev, size_t size, ++ enum rtw_tx_queue_type queue) ++{ ++ u32 txaddr; ++ ++ switch (queue) { ++ case RTW_TX_QUEUE_BCN: ++ case RTW_TX_QUEUE_H2C: ++ case RTW_TX_QUEUE_HI0: ++ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_TXFF_HIGH); ++ break; ++ case RTW_TX_QUEUE_VI: ++ case RTW_TX_QUEUE_VO: ++ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_TXFF_NORMAL); ++ break; ++ case RTW_TX_QUEUE_BE: ++ case RTW_TX_QUEUE_BK: ++ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_TXFF_LOW); ++ break; ++ case RTW_TX_QUEUE_MGMT: ++ txaddr = FIELD_PREP(REG_SDIO_CMD_ADDR_MSK, ++ REG_SDIO_CMD_ADDR_TXFF_EXTRA); ++ break; ++ default: ++ rtw_warn(rtwdev, "Unsupported queue for TX addr: 0x%02x\n", ++ queue); ++ return 0; ++ } ++ ++ txaddr += DIV_ROUND_UP(size, 4); ++ ++ return txaddr; ++}; ++ ++static int rtw_sdio_read_port(struct rtw_dev *rtwdev, u8 *buf, size_t count) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ struct mmc_host *host = rtwsdio->sdio_func->card->host; ++ bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ u32 rxaddr = rtwsdio->rx_addr++; ++ int ret = 0, err; ++ size_t bytes; ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ while (count > 0) { ++ bytes = min_t(size_t, host->max_req_size, count); ++ ++ err = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, ++ RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), ++ bytes); ++ if (err) { ++ rtw_warn(rtwdev, ++ "Failed to read %zu byte(s) from SDIO port 0x%08x: %d", ++ bytes, rxaddr, err); ++ ++ /* Signal to the caller that reading did not work and ++ * that the data in the buffer is short/corrupted. ++ */ ++ ret = err; ++ ++ /* Don't stop here - instead drain the remaining data ++ * from the card's buffer, else the card will return ++ * corrupt data for the next rtw_sdio_read_port() call. ++ */ + } + -+ /* CCK TX filter parameters for default case */ - if (channel == 14) { - rtw_write32_mask(rtwdev, REG_TXSF2, MASKDWORD, 0x0000b81c); - rtw_write32_mask(rtwdev, REG_TXSF6, MASKLWORD, 0x0000); -@@ -430,6 +496,7 @@ static void rtw8821c_set_channel_bb(struct rtw_dev *rtwdev, u8 channel, u8 bw, - rtw_write32_mask(rtwdev, REG_CLKTRK, 0x1ffe0000, 0x412); - } ++ count -= bytes; ++ buf += bytes; ++ } ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ return ret; ++} ++ ++static int rtw_sdio_check_free_txpg(struct rtw_dev *rtwdev, u8 queue, ++ size_t count) ++{ ++ unsigned int pages_free, pages_needed; ++ ++ if (rtw_chip_wcpu_11n(rtwdev)) { ++ u32 free_txpg; ++ ++ free_txpg = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG); ++ ++ switch (queue) { ++ case RTW_TX_QUEUE_BCN: ++ case RTW_TX_QUEUE_H2C: ++ case RTW_TX_QUEUE_HI0: ++ case RTW_TX_QUEUE_MGMT: ++ /* high */ ++ pages_free = free_txpg & 0xff; ++ break; ++ case RTW_TX_QUEUE_VI: ++ case RTW_TX_QUEUE_VO: ++ /* normal */ ++ pages_free = (free_txpg >> 8) & 0xff; ++ break; ++ case RTW_TX_QUEUE_BE: ++ case RTW_TX_QUEUE_BK: ++ /* low */ ++ pages_free = (free_txpg >> 16) & 0xff; ++ break; ++ default: ++ rtw_warn(rtwdev, "Unknown mapping for queue %u\n", queue); ++ return -EINVAL; ++ } ++ ++ /* add the pages from the public queue */ ++ pages_free += (free_txpg >> 24) & 0xff; ++ } else { ++ u32 free_txpg[3]; ++ ++ free_txpg[0] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG); ++ free_txpg[1] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 4); ++ free_txpg[2] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 8); ++ ++ switch (queue) { ++ case RTW_TX_QUEUE_BCN: ++ case RTW_TX_QUEUE_H2C: ++ case RTW_TX_QUEUE_HI0: ++ /* high */ ++ pages_free = free_txpg[0] & 0xfff; ++ break; ++ case RTW_TX_QUEUE_VI: ++ case RTW_TX_QUEUE_VO: ++ /* normal */ ++ pages_free = (free_txpg[0] >> 16) & 0xfff; ++ break; ++ case RTW_TX_QUEUE_BE: ++ case RTW_TX_QUEUE_BK: ++ /* low */ ++ pages_free = free_txpg[1] & 0xfff; ++ break; ++ case RTW_TX_QUEUE_MGMT: ++ /* extra */ ++ pages_free = free_txpg[2] & 0xfff; ++ break; ++ default: ++ rtw_warn(rtwdev, "Unknown mapping for queue %u\n", queue); ++ return -EINVAL; ++ } ++ ++ /* add the pages from the public queue */ ++ pages_free += (free_txpg[1] >> 16) & 0xfff; ++ } ++ ++ pages_needed = DIV_ROUND_UP(count, rtwdev->chip->page_size); ++ ++ if (pages_needed > pages_free) { ++ rtw_dbg(rtwdev, RTW_DBG_SDIO, ++ "Not enough free pages (%u needed, %u free) in queue %u for %zu bytes\n", ++ pages_needed, pages_free, queue, count); ++ return -EBUSY; ++ } ++ ++ return 0; ++} ++ ++static int rtw_sdio_write_port(struct rtw_dev *rtwdev, struct sk_buff *skb, ++ enum rtw_tx_queue_type queue) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool bus_claim; ++ size_t txsize; ++ u32 txaddr; ++ int ret; ++ ++ txaddr = rtw_sdio_get_tx_addr(rtwdev, skb->len, queue); ++ if (!txaddr) ++ return -EINVAL; ++ ++ txsize = sdio_align_size(rtwsdio->sdio_func, skb->len); ++ ++ ret = rtw_sdio_check_free_txpg(rtwdev, queue, txsize); ++ if (ret) ++ return ret; ++ ++ if (!IS_ALIGNED((unsigned long)skb->data, RTW_SDIO_DATA_PTR_ALIGN)) ++ rtw_warn(rtwdev, "Got unaligned SKB in %s() for queue %u\n", ++ __func__, queue); ++ ++ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); ++ ++ if (bus_claim) ++ sdio_claim_host(rtwsdio->sdio_func); ++ ++ ret = sdio_memcpy_toio(rtwsdio->sdio_func, txaddr, skb->data, txsize); ++ ++ if (bus_claim) ++ sdio_release_host(rtwsdio->sdio_func); ++ ++ if (ret) ++ rtw_warn(rtwdev, ++ "Failed to write %zu byte(s) to SDIO port 0x%08x", ++ txsize, txaddr); ++ ++ return ret; ++} ++ ++static void rtw_sdio_init(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ rtwsdio->irq_mask = REG_SDIO_HIMR_RX_REQUEST | REG_SDIO_HIMR_CPWM1; ++} ++ ++static void rtw_sdio_enable_rx_aggregation(struct rtw_dev *rtwdev) ++{ ++ u8 size, timeout; ++ ++ if (rtw_chip_wcpu_11n(rtwdev)) { ++ size = 0x6; ++ timeout = 0x6; ++ } else { ++ size = 0xff; ++ timeout = 0x1; ++ } ++ ++ /* Make the firmware honor the size limit configured below */ ++ rtw_write32_set(rtwdev, REG_RXDMA_AGG_PG_TH, BIT_EN_PRE_CALC); ++ ++ rtw_write8_set(rtwdev, REG_TXDMA_PQ_MAP, BIT_RXDMA_AGG_EN); ++ ++ rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, ++ FIELD_PREP(BIT_RXDMA_AGG_PG_TH, size) | ++ FIELD_PREP(BIT_DMA_AGG_TO_V1, timeout)); ++ ++ rtw_write8_set(rtwdev, REG_RXDMA_MODE, BIT_DMA_MODE); ++} ++ ++static void rtw_sdio_enable_interrupt(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ rtw_write32(rtwdev, REG_SDIO_HIMR, rtwsdio->irq_mask); ++} ++ ++static void rtw_sdio_disable_interrupt(struct rtw_dev *rtwdev) ++{ ++ rtw_write32(rtwdev, REG_SDIO_HIMR, 0x0); ++} ++ ++static u8 rtw_sdio_get_tx_qsel(struct rtw_dev *rtwdev, struct sk_buff *skb, ++ u8 queue) ++{ ++ switch (queue) { ++ case RTW_TX_QUEUE_BCN: ++ return TX_DESC_QSEL_BEACON; ++ case RTW_TX_QUEUE_H2C: ++ return TX_DESC_QSEL_H2C; ++ case RTW_TX_QUEUE_MGMT: ++ if (rtw_chip_wcpu_11n(rtwdev)) ++ return TX_DESC_QSEL_HIGH; ++ else ++ return TX_DESC_QSEL_MGMT; ++ case RTW_TX_QUEUE_HI0: ++ return TX_DESC_QSEL_HIGH; ++ default: ++ return skb->priority; ++ } ++} ++ ++static int rtw_sdio_setup(struct rtw_dev *rtwdev) ++{ ++ /* nothing to do */ ++ return 0; ++} ++ ++static int rtw_sdio_start(struct rtw_dev *rtwdev) ++{ ++ rtw_sdio_enable_rx_aggregation(rtwdev); ++ rtw_sdio_enable_interrupt(rtwdev); ++ ++ return 0; ++} ++ ++static void rtw_sdio_stop(struct rtw_dev *rtwdev) ++{ ++ rtw_sdio_disable_interrupt(rtwdev); ++} ++ ++static void rtw_sdio_deep_ps_enter(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ bool tx_empty = true; ++ u8 queue; ++ ++ if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_TX_WAKE)) { ++ /* Deep PS state is not allowed to TX-DMA */ ++ for (queue = 0; queue < RTK_MAX_TX_QUEUE_NUM; queue++) { ++ /* BCN queue is rsvd page, does not have DMA interrupt ++ * H2C queue is managed by firmware ++ */ ++ if (queue == RTW_TX_QUEUE_BCN || ++ queue == RTW_TX_QUEUE_H2C) ++ continue; ++ ++ /* check if there is any skb DMAing */ ++ if (skb_queue_len(&rtwsdio->tx_queue[queue])) { ++ tx_empty = false; ++ break; ++ } ++ } ++ } ++ ++ if (!tx_empty) { ++ rtw_dbg(rtwdev, RTW_DBG_PS, ++ "TX path not empty, cannot enter deep power save state\n"); ++ return; ++ } ++ ++ set_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags); ++ rtw_power_mode_change(rtwdev, true); ++} ++ ++static void rtw_sdio_deep_ps_leave(struct rtw_dev *rtwdev) ++{ ++ if (test_and_clear_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) ++ rtw_power_mode_change(rtwdev, false); ++} ++ ++static void rtw_sdio_deep_ps(struct rtw_dev *rtwdev, bool enter) ++{ ++ if (enter && !test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) ++ rtw_sdio_deep_ps_enter(rtwdev); ++ ++ if (!enter && test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags)) ++ rtw_sdio_deep_ps_leave(rtwdev); ++} ++ ++static void rtw_sdio_tx_kick_off(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ queue_work(rtwsdio->txwq, &rtwsdio->tx_handler_data->work); ++} ++ ++static void rtw_sdio_link_ps(struct rtw_dev *rtwdev, bool enter) ++{ ++ /* nothing to do */ ++} ++ ++static void rtw_sdio_interface_cfg(struct rtw_dev *rtwdev) ++{ ++ u32 val; ++ ++ rtw_read32(rtwdev, REG_SDIO_FREE_TXPG); ++ ++ val = rtw_read32(rtwdev, REG_SDIO_TX_CTRL); ++ val &= 0xfff8; ++ rtw_write32(rtwdev, REG_SDIO_TX_CTRL, val); ++} ++ ++static struct rtw_sdio_tx_data *rtw_sdio_get_tx_data(struct sk_buff *skb) ++{ ++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ ++ BUILD_BUG_ON(sizeof(struct rtw_sdio_tx_data) > ++ sizeof(info->status.status_driver_data)); ++ ++ return (struct rtw_sdio_tx_data *)info->status.status_driver_data; ++} ++ ++static void rtw_sdio_tx_skb_prepare(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ struct sk_buff *skb, ++ enum rtw_tx_queue_type queue) ++{ ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ unsigned long data_addr, aligned_addr; ++ size_t offset; ++ u8 *pkt_desc; ++ ++ pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz); ++ ++ data_addr = (unsigned long)pkt_desc; ++ aligned_addr = ALIGN(data_addr, RTW_SDIO_DATA_PTR_ALIGN); ++ ++ if (data_addr != aligned_addr) { ++ /* Ensure that the start of the pkt_desc is always aligned at ++ * RTW_SDIO_DATA_PTR_ALIGN. ++ */ ++ offset = RTW_SDIO_DATA_PTR_ALIGN - (aligned_addr - data_addr); ++ ++ pkt_desc = skb_push(skb, offset); ++ ++ /* By inserting padding to align the start of the pkt_desc we ++ * need to inform the firmware that the actual data starts at ++ * a different offset than normal. ++ */ ++ pkt_info->offset += offset; ++ } ++ ++ memset(pkt_desc, 0, chip->tx_pkt_desc_sz); ++ ++ pkt_info->qsel = rtw_sdio_get_tx_qsel(rtwdev, skb, queue); ++ ++ rtw_tx_fill_tx_desc(pkt_info, skb); ++ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, pkt_desc); ++} ++ ++static int rtw_sdio_write_data(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ struct sk_buff *skb, ++ enum rtw_tx_queue_type queue) ++{ ++ int ret; ++ ++ rtw_sdio_tx_skb_prepare(rtwdev, pkt_info, skb, queue); ++ ++ ret = rtw_sdio_write_port(rtwdev, skb, queue); ++ dev_kfree_skb_any(skb); ++ ++ return ret; ++} ++ ++static int rtw_sdio_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, ++ u32 size) ++{ ++ struct rtw_tx_pkt_info pkt_info = {}; ++ struct sk_buff *skb; ++ ++ skb = rtw_tx_write_data_rsvd_page_get(rtwdev, &pkt_info, buf, size); ++ if (!skb) ++ return -ENOMEM; ++ ++ return rtw_sdio_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_BCN); ++} ++ ++static int rtw_sdio_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size) ++{ ++ struct rtw_tx_pkt_info pkt_info = {}; ++ struct sk_buff *skb; ++ ++ skb = rtw_tx_write_data_h2c_get(rtwdev, &pkt_info, buf, size); ++ if (!skb) ++ return -ENOMEM; ++ ++ return rtw_sdio_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_H2C); ++} ++ ++static int rtw_sdio_tx_write(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ struct sk_buff *skb) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ enum rtw_tx_queue_type queue = rtw_tx_queue_mapping(skb); ++ struct rtw_sdio_tx_data *tx_data; ++ ++ rtw_sdio_tx_skb_prepare(rtwdev, pkt_info, skb, queue); ++ ++ tx_data = rtw_sdio_get_tx_data(skb); ++ tx_data->sn = pkt_info->sn; ++ ++ skb_queue_tail(&rtwsdio->tx_queue[queue], skb); ++ ++ return 0; ++} ++ ++static void rtw_sdio_tx_err_isr(struct rtw_dev *rtwdev) ++{ ++ u32 val = rtw_read32(rtwdev, REG_TXDMA_STATUS); ++ ++ rtw_write32(rtwdev, REG_TXDMA_STATUS, val); ++} ++ ++static void rtw_sdio_rx_skb(struct rtw_dev *rtwdev, struct sk_buff *skb, ++ u32 pkt_offset, struct rtw_rx_pkt_stat *pkt_stat, ++ struct ieee80211_rx_status *rx_status) ++{ ++ *IEEE80211_SKB_RXCB(skb) = *rx_status; ++ ++ if (pkt_stat->is_c2h) { ++ skb_put(skb, pkt_stat->pkt_len + pkt_offset); ++ rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb); ++ return; ++ } ++ ++ skb_put(skb, pkt_stat->pkt_len); ++ skb_reserve(skb, pkt_offset); ++ ++ rtw_rx_stats(rtwdev, pkt_stat->vif, skb); ++ ++ ieee80211_rx_irqsafe(rtwdev->hw, skb); ++} ++ ++static void rtw_sdio_rxfifo_recv(struct rtw_dev *rtwdev, u32 rx_len) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ u32 pkt_desc_sz = chip->rx_pkt_desc_sz; ++ struct ieee80211_rx_status rx_status; ++ struct rtw_rx_pkt_stat pkt_stat; ++ struct sk_buff *skb, *split_skb; ++ u32 pkt_offset, curr_pkt_len; ++ size_t bufsz; ++ u8 *rx_desc; ++ int ret; ++ ++ bufsz = sdio_align_size(rtwsdio->sdio_func, rx_len); ++ ++ skb = dev_alloc_skb(bufsz); ++ if (!skb) ++ return; ++ ++ ret = rtw_sdio_read_port(rtwdev, skb->data, bufsz); ++ if (ret) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ while (true) { ++ rx_desc = skb->data; ++ chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat, ++ &rx_status); ++ pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz + ++ pkt_stat.shift; ++ ++ curr_pkt_len = ALIGN(pkt_offset + pkt_stat.pkt_len, ++ RTW_SDIO_DATA_PTR_ALIGN); ++ ++ if ((curr_pkt_len + pkt_desc_sz) >= rx_len) { ++ /* Use the original skb (with it's adjusted offset) ++ * when processing the last (or even the only) entry to ++ * have it's memory freed automatically. ++ */ ++ rtw_sdio_rx_skb(rtwdev, skb, pkt_offset, &pkt_stat, ++ &rx_status); ++ break; ++ } ++ ++ split_skb = dev_alloc_skb(curr_pkt_len); ++ if (!split_skb) { ++ rtw_sdio_rx_skb(rtwdev, skb, pkt_offset, &pkt_stat, ++ &rx_status); ++ break; ++ } ++ ++ skb_copy_header(split_skb, skb); ++ memcpy(split_skb->data, skb->data, curr_pkt_len); ++ ++ rtw_sdio_rx_skb(rtwdev, split_skb, pkt_offset, &pkt_stat, ++ &rx_status); ++ ++ /* Move to the start of the next RX descriptor */ ++ skb_reserve(skb, curr_pkt_len); ++ rx_len -= curr_pkt_len; ++ } ++} ++ ++static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev) ++{ ++ u32 rx_len, hisr, total_rx_bytes = 0; ++ ++ do { ++ if (rtw_chip_wcpu_11n(rtwdev)) ++ rx_len = rtw_read16(rtwdev, REG_SDIO_RX0_REQ_LEN); ++ else ++ rx_len = rtw_read32(rtwdev, REG_SDIO_RX0_REQ_LEN); ++ ++ if (!rx_len) ++ break; ++ ++ rtw_sdio_rxfifo_recv(rtwdev, rx_len); ++ ++ total_rx_bytes += rx_len; ++ ++ if (rtw_chip_wcpu_11n(rtwdev)) { ++ /* Stop if no more RX requests are pending, even if ++ * rx_len could be greater than zero in the next ++ * iteration. This is needed because the RX buffer may ++ * already contain data while either HW or FW are not ++ * done filling that buffer yet. Still reading the ++ * buffer can result in packets where ++ * rtw_rx_pkt_stat.pkt_len is zero or points beyond the ++ * end of the buffer. ++ */ ++ hisr = rtw_read32(rtwdev, REG_SDIO_HISR); ++ } else { ++ /* RTW_WCPU_11AC chips have improved hardware or ++ * firmware and can use rx_len unconditionally. ++ */ ++ hisr = REG_SDIO_HISR_RX_REQUEST; ++ } ++ } while (total_rx_bytes < SZ_64K && hisr & REG_SDIO_HISR_RX_REQUEST); ++} ++ ++static void rtw_sdio_handle_interrupt(struct sdio_func *sdio_func) ++{ ++ struct ieee80211_hw *hw = sdio_get_drvdata(sdio_func); ++ struct rtw_sdio *rtwsdio; ++ struct rtw_dev *rtwdev; ++ u32 hisr; ++ ++ rtwdev = hw->priv; ++ rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ rtwsdio->irq_thread = current; ++ ++ hisr = rtw_read32(rtwdev, REG_SDIO_HISR); ++ ++ if (hisr & REG_SDIO_HISR_TXERR) ++ rtw_sdio_tx_err_isr(rtwdev); ++ if (hisr & REG_SDIO_HISR_RX_REQUEST) { ++ hisr &= ~REG_SDIO_HISR_RX_REQUEST; ++ rtw_sdio_rx_isr(rtwdev); ++ } ++ ++ rtw_write32(rtwdev, REG_SDIO_HISR, hisr); ++ ++ rtwsdio->irq_thread = NULL; ++} ++ ++static int __maybe_unused rtw_sdio_suspend(struct device *dev) ++{ ++ struct sdio_func *func = dev_to_sdio_func(dev); ++ struct ieee80211_hw *hw = dev_get_drvdata(dev); ++ struct rtw_dev *rtwdev = hw->priv; ++ int ret; ++ ++ ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER); ++ if (ret) ++ rtw_err(rtwdev, "Failed to host PM flag MMC_PM_KEEP_POWER"); ++ ++ return ret; ++} ++ ++static int __maybe_unused rtw_sdio_resume(struct device *dev) ++{ ++ return 0; ++} ++ ++SIMPLE_DEV_PM_OPS(rtw_sdio_pm_ops, rtw_sdio_suspend, rtw_sdio_resume); ++EXPORT_SYMBOL(rtw_sdio_pm_ops); ++ ++static int rtw_sdio_claim(struct rtw_dev *rtwdev, struct sdio_func *sdio_func) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ int ret; ++ ++ sdio_claim_host(sdio_func); ++ ++ ret = sdio_enable_func(sdio_func); ++ if (ret) { ++ rtw_err(rtwdev, "Failed to enable SDIO func"); ++ goto err_release_host; ++ } ++ ++ ret = sdio_set_block_size(sdio_func, RTW_SDIO_BLOCK_SIZE); ++ if (ret) { ++ rtw_err(rtwdev, "Failed to set SDIO block size to 512"); ++ goto err_disable_func; ++ } ++ ++ rtwsdio->sdio_func = sdio_func; ++ ++ rtwsdio->sdio3_bus_mode = mmc_card_uhs(sdio_func->card); ++ ++ sdio_set_drvdata(sdio_func, rtwdev->hw); ++ SET_IEEE80211_DEV(rtwdev->hw, &sdio_func->dev); ++ ++ sdio_release_host(sdio_func); ++ ++ return 0; ++ ++err_disable_func: ++ sdio_disable_func(sdio_func); ++err_release_host: ++ sdio_release_host(sdio_func); ++ return ret; ++} ++ ++static void rtw_sdio_declaim(struct rtw_dev *rtwdev, ++ struct sdio_func *sdio_func) ++{ ++ sdio_claim_host(sdio_func); ++ sdio_disable_func(sdio_func); ++ sdio_release_host(sdio_func); ++} ++ ++static struct rtw_hci_ops rtw_sdio_ops = { ++ .tx_write = rtw_sdio_tx_write, ++ .tx_kick_off = rtw_sdio_tx_kick_off, ++ .setup = rtw_sdio_setup, ++ .start = rtw_sdio_start, ++ .stop = rtw_sdio_stop, ++ .deep_ps = rtw_sdio_deep_ps, ++ .link_ps = rtw_sdio_link_ps, ++ .interface_cfg = rtw_sdio_interface_cfg, ++ ++ .read8 = rtw_sdio_read8, ++ .read16 = rtw_sdio_read16, ++ .read32 = rtw_sdio_read32, ++ .write8 = rtw_sdio_write8, ++ .write16 = rtw_sdio_write16, ++ .write32 = rtw_sdio_write32, ++ .write_data_rsvd_page = rtw_sdio_write_data_rsvd_page, ++ .write_data_h2c = rtw_sdio_write_data_h2c, ++}; ++ ++static int rtw_sdio_request_irq(struct rtw_dev *rtwdev, ++ struct sdio_func *sdio_func) ++{ ++ int ret; ++ ++ sdio_claim_host(sdio_func); ++ ret = sdio_claim_irq(sdio_func, &rtw_sdio_handle_interrupt); ++ sdio_release_host(sdio_func); ++ ++ if (ret) { ++ rtw_err(rtwdev, "failed to claim SDIO IRQ"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static void rtw_sdio_indicate_tx_status(struct rtw_dev *rtwdev, ++ struct sk_buff *skb) ++{ ++ struct rtw_sdio_tx_data *tx_data = rtw_sdio_get_tx_data(skb); ++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ struct ieee80211_hw *hw = rtwdev->hw; ++ ++ /* enqueue to wait for tx report */ ++ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { ++ rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn); ++ return; ++ } ++ ++ /* always ACK for others, then they won't be marked as drop */ ++ ieee80211_tx_info_clear_status(info); ++ if (info->flags & IEEE80211_TX_CTL_NO_ACK) ++ info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; ++ else ++ info->flags |= IEEE80211_TX_STAT_ACK; ++ ++ ieee80211_tx_status_irqsafe(hw, skb); ++} ++ ++static void rtw_sdio_process_tx_queue(struct rtw_dev *rtwdev, ++ enum rtw_tx_queue_type queue) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ struct sk_buff *skb; ++ int ret; ++ ++ skb = skb_dequeue(&rtwsdio->tx_queue[queue]); ++ if (!skb) ++ return; ++ ++ ret = rtw_sdio_write_port(rtwdev, skb, queue); ++ if (ret) { ++ skb_queue_head(&rtwsdio->tx_queue[queue], skb); ++ return; ++ } ++ ++ if (queue <= RTW_TX_QUEUE_VO) ++ rtw_sdio_indicate_tx_status(rtwdev, skb); ++ else ++ dev_kfree_skb_any(skb); ++} ++ ++static void rtw_sdio_tx_handler(struct work_struct *work) ++{ ++ struct rtw_sdio_work_data *work_data = ++ container_of(work, struct rtw_sdio_work_data, work); ++ struct rtw_sdio *rtwsdio; ++ struct rtw_dev *rtwdev; ++ int limit, queue; ++ ++ rtwdev = work_data->rtwdev; ++ rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_TX_WAKE)) ++ rtw_sdio_deep_ps_leave(rtwdev); ++ ++ for (queue = RTK_MAX_TX_QUEUE_NUM - 1; queue >= 0; queue--) { ++ for (limit = 0; limit < 1000; limit++) { ++ rtw_sdio_process_tx_queue(rtwdev, queue); ++ ++ if (skb_queue_empty(&rtwsdio->tx_queue[queue])) ++ break; ++ } ++ } ++} ++ ++static void rtw_sdio_free_irq(struct rtw_dev *rtwdev, ++ struct sdio_func *sdio_func) ++{ ++ sdio_claim_host(sdio_func); ++ sdio_release_irq(sdio_func); ++ sdio_release_host(sdio_func); ++} ++ ++static int rtw_sdio_init_tx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ int i; ++ ++ rtwsdio->txwq = create_singlethread_workqueue("rtw88_sdio: tx wq"); ++ if (!rtwsdio->txwq) { ++ rtw_err(rtwdev, "failed to create TX work queue\n"); ++ return -ENOMEM; ++ } ++ ++ for (i = 0; i < RTK_MAX_TX_QUEUE_NUM; i++) ++ skb_queue_head_init(&rtwsdio->tx_queue[i]); ++ rtwsdio->tx_handler_data = kmalloc(sizeof(*rtwsdio->tx_handler_data), ++ GFP_KERNEL); ++ if (!rtwsdio->tx_handler_data) ++ goto err_destroy_wq; ++ ++ rtwsdio->tx_handler_data->rtwdev = rtwdev; ++ INIT_WORK(&rtwsdio->tx_handler_data->work, rtw_sdio_tx_handler); ++ ++ return 0; ++ ++err_destroy_wq: ++ destroy_workqueue(rtwsdio->txwq); ++ return -ENOMEM; ++} ++ ++static void rtw_sdio_deinit_tx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ int i; ++ ++ for (i = 0; i < RTK_MAX_TX_QUEUE_NUM; i++) ++ skb_queue_purge(&rtwsdio->tx_queue[i]); ++ ++ flush_workqueue(rtwsdio->txwq); ++ destroy_workqueue(rtwsdio->txwq); ++ kfree(rtwsdio->tx_handler_data); ++} ++ ++int rtw_sdio_probe(struct sdio_func *sdio_func, ++ const struct sdio_device_id *id) ++{ ++ struct ieee80211_hw *hw; ++ struct rtw_dev *rtwdev; ++ int drv_data_size; ++ int ret; ++ ++ drv_data_size = sizeof(struct rtw_dev) + sizeof(struct rtw_sdio); ++ hw = ieee80211_alloc_hw(drv_data_size, &rtw_ops); ++ if (!hw) { ++ dev_err(&sdio_func->dev, "failed to allocate hw"); ++ return -ENOMEM; ++ } ++ ++ rtwdev = hw->priv; ++ rtwdev->hw = hw; ++ rtwdev->dev = &sdio_func->dev; ++ rtwdev->chip = (struct rtw_chip_info *)id->driver_data; ++ rtwdev->hci.ops = &rtw_sdio_ops; ++ rtwdev->hci.type = RTW_HCI_TYPE_SDIO; ++ ++ ret = rtw_core_init(rtwdev); ++ if (ret) ++ goto err_release_hw; ++ ++ rtw_dbg(rtwdev, RTW_DBG_SDIO, ++ "rtw88 SDIO probe: vendor=0x%04x device=%04x class=%02x", ++ id->vendor, id->device, id->class); ++ ++ ret = rtw_sdio_claim(rtwdev, sdio_func); ++ if (ret) { ++ rtw_err(rtwdev, "failed to claim SDIO device"); ++ goto err_deinit_core; ++ } ++ ++ rtw_sdio_init(rtwdev); ++ ++ ret = rtw_sdio_init_tx(rtwdev); ++ if (ret) { ++ rtw_err(rtwdev, "failed to init SDIO TX queue\n"); ++ goto err_sdio_declaim; ++ } ++ ++ ret = rtw_chip_info_setup(rtwdev); ++ if (ret) { ++ rtw_err(rtwdev, "failed to setup chip information"); ++ goto err_destroy_txwq; ++ } ++ ++ ret = rtw_sdio_request_irq(rtwdev, sdio_func); ++ if (ret) ++ goto err_destroy_txwq; ++ ++ ret = rtw_register_hw(rtwdev, hw); ++ if (ret) { ++ rtw_err(rtwdev, "failed to register hw"); ++ goto err_free_irq; ++ } ++ ++ return 0; ++ ++err_free_irq: ++ rtw_sdio_free_irq(rtwdev, sdio_func); ++err_destroy_txwq: ++ rtw_sdio_deinit_tx(rtwdev); ++err_sdio_declaim: ++ rtw_sdio_declaim(rtwdev, sdio_func); ++err_deinit_core: ++ rtw_core_deinit(rtwdev); ++err_release_hw: ++ ieee80211_free_hw(hw); ++ ++ return ret; ++} ++EXPORT_SYMBOL(rtw_sdio_probe); ++ ++void rtw_sdio_remove(struct sdio_func *sdio_func) ++{ ++ struct ieee80211_hw *hw = sdio_get_drvdata(sdio_func); ++ struct rtw_dev *rtwdev; ++ ++ if (!hw) ++ return; ++ ++ rtwdev = hw->priv; ++ ++ rtw_unregister_hw(rtwdev, hw); ++ rtw_sdio_disable_interrupt(rtwdev); ++ rtw_sdio_free_irq(rtwdev, sdio_func); ++ rtw_sdio_declaim(rtwdev, sdio_func); ++ rtw_sdio_deinit_tx(rtwdev); ++ rtw_core_deinit(rtwdev); ++ ieee80211_free_hw(hw); ++} ++EXPORT_SYMBOL(rtw_sdio_remove); ++ ++void rtw_sdio_shutdown(struct device *dev) ++{ ++ struct sdio_func *sdio_func = dev_to_sdio_func(dev); ++ const struct rtw_chip_info *chip; ++ struct ieee80211_hw *hw; ++ struct rtw_dev *rtwdev; ++ ++ hw = sdio_get_drvdata(sdio_func); ++ if (!hw) ++ return; ++ ++ rtwdev = hw->priv; ++ chip = rtwdev->chip; ++ ++ if (chip->ops->shutdown) ++ chip->ops->shutdown(rtwdev); ++} ++EXPORT_SYMBOL(rtw_sdio_shutdown); ++ ++MODULE_AUTHOR("Martin Blumenstingl"); ++MODULE_AUTHOR("Jernej Skrabec"); ++MODULE_DESCRIPTION("Realtek 802.11ac wireless SDIO driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/sdio.h b/drivers/net/wireless/realtek/rtw88/sdio.h +new file mode 100644 +index 000000000000..3c659ed180f0 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/sdio.h +@@ -0,0 +1,178 @@ ++/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ ++/* Copyright (C) 2021 Martin Blumenstingl ++ * Copyright (C) 2021 Jernej Skrabec ++ */ ++ ++#ifndef __REG_SDIO_H_ ++#define __REG_SDIO_H_ ++ ++/* I/O bus domain address mapping */ ++#define SDIO_LOCAL_OFFSET 0x10250000 ++#define WLAN_IOREG_OFFSET 0x10260000 ++#define FIRMWARE_FIFO_OFFSET 0x10270000 ++#define TX_HIQ_OFFSET 0x10310000 ++#define TX_MIQ_OFFSET 0x10320000 ++#define TX_LOQ_OFFSET 0x10330000 ++#define TX_EPQ_OFFSET 0x10350000 ++#define RX_RX0FF_OFFSET 0x10340000 ++ ++#define RTW_SDIO_BUS_MSK 0xffff0000 ++#define SDIO_LOCAL_REG_MSK 0x00000fff ++#define WLAN_IOREG_REG_MSK 0x0000ffff ++ ++/* SDIO Tx Control */ ++#define REG_SDIO_TX_CTRL (SDIO_LOCAL_OFFSET + 0x0000) ++ ++/*SDIO status timeout*/ ++#define REG_SDIO_TIMEOUT (SDIO_LOCAL_OFFSET + 0x0002) ++ ++/* SDIO Host Interrupt Mask */ ++#define REG_SDIO_HIMR (SDIO_LOCAL_OFFSET + 0x0014) ++#define REG_SDIO_HIMR_RX_REQUEST BIT(0) ++#define REG_SDIO_HIMR_AVAL BIT(1) ++#define REG_SDIO_HIMR_TXERR BIT(2) ++#define REG_SDIO_HIMR_RXERR BIT(3) ++#define REG_SDIO_HIMR_TXFOVW BIT(4) ++#define REG_SDIO_HIMR_RXFOVW BIT(5) ++#define REG_SDIO_HIMR_TXBCNOK BIT(6) ++#define REG_SDIO_HIMR_TXBCNERR BIT(7) ++#define REG_SDIO_HIMR_BCNERLY_INT BIT(16) ++#define REG_SDIO_HIMR_C2HCMD BIT(17) ++#define REG_SDIO_HIMR_CPWM1 BIT(18) ++#define REG_SDIO_HIMR_CPWM2 BIT(19) ++#define REG_SDIO_HIMR_HSISR_IND BIT(20) ++#define REG_SDIO_HIMR_GTINT3_IND BIT(21) ++#define REG_SDIO_HIMR_GTINT4_IND BIT(22) ++#define REG_SDIO_HIMR_PSTIMEOUT BIT(23) ++#define REG_SDIO_HIMR_OCPINT BIT(24) ++#define REG_SDIO_HIMR_ATIMEND BIT(25) ++#define REG_SDIO_HIMR_ATIMEND_E BIT(26) ++#define REG_SDIO_HIMR_CTWEND BIT(27) ++/* the following two are RTL8188 SDIO Specific */ ++#define REG_SDIO_HIMR_MCU_ERR BIT(28) ++#define REG_SDIO_HIMR_TSF_BIT32_TOGGLE BIT(29) ++ ++/* SDIO Host Interrupt Service Routine */ ++#define REG_SDIO_HISR (SDIO_LOCAL_OFFSET + 0x0018) ++#define REG_SDIO_HISR_RX_REQUEST BIT(0) ++#define REG_SDIO_HISR_AVAL BIT(1) ++#define REG_SDIO_HISR_TXERR BIT(2) ++#define REG_SDIO_HISR_RXERR BIT(3) ++#define REG_SDIO_HISR_TXFOVW BIT(4) ++#define REG_SDIO_HISR_RXFOVW BIT(5) ++#define REG_SDIO_HISR_TXBCNOK BIT(6) ++#define REG_SDIO_HISR_TXBCNERR BIT(7) ++#define REG_SDIO_HISR_BCNERLY_INT BIT(16) ++#define REG_SDIO_HISR_C2HCMD BIT(17) ++#define REG_SDIO_HISR_CPWM1 BIT(18) ++#define REG_SDIO_HISR_CPWM2 BIT(19) ++#define REG_SDIO_HISR_HSISR_IND BIT(20) ++#define REG_SDIO_HISR_GTINT3_IND BIT(21) ++#define REG_SDIO_HISR_GTINT4_IND BIT(22) ++#define REG_SDIO_HISR_PSTIMEOUT BIT(23) ++#define REG_SDIO_HISR_OCPINT BIT(24) ++#define REG_SDIO_HISR_ATIMEND BIT(25) ++#define REG_SDIO_HISR_ATIMEND_E BIT(26) ++#define REG_SDIO_HISR_CTWEND BIT(27) ++/* the following two are RTL8188 SDIO Specific */ ++#define REG_SDIO_HISR_MCU_ERR BIT(28) ++#define REG_SDIO_HISR_TSF_BIT32_TOGGLE BIT(29) ++ ++/* HCI Current Power Mode */ ++#define REG_SDIO_HCPWM (SDIO_LOCAL_OFFSET + 0x0019) ++/* RXDMA Request Length */ ++#define REG_SDIO_RX0_REQ_LEN (SDIO_LOCAL_OFFSET + 0x001C) ++/* OQT Free Page */ ++#define REG_SDIO_OQT_FREE_PG (SDIO_LOCAL_OFFSET + 0x001E) ++/* Free Tx Buffer Page */ ++#define REG_SDIO_FREE_TXPG (SDIO_LOCAL_OFFSET + 0x0020) ++/* HCI Current Power Mode 1 */ ++#define REG_SDIO_HCPWM1 (SDIO_LOCAL_OFFSET + 0x0024) ++/* HCI Current Power Mode 2 */ ++#define REG_SDIO_HCPWM2 (SDIO_LOCAL_OFFSET + 0x0026) ++/* Free Tx Page Sequence */ ++#define REG_SDIO_FREE_TXPG_SEQ (SDIO_LOCAL_OFFSET + 0x0028) ++/* HTSF Information */ ++#define REG_SDIO_HTSFR_INFO (SDIO_LOCAL_OFFSET + 0x0030) ++#define REG_SDIO_HCPWM1_V2 (SDIO_LOCAL_OFFSET + 0x0038) ++/* H2C */ ++#define REG_SDIO_H2C (SDIO_LOCAL_OFFSET + 0x0060) ++/* HCI Request Power Mode 1 */ ++#define REG_SDIO_HRPWM1 (SDIO_LOCAL_OFFSET + 0x0080) ++/* HCI Request Power Mode 2 */ ++#define REG_SDIO_HRPWM2 (SDIO_LOCAL_OFFSET + 0x0082) ++/* HCI Power Save Clock */ ++#define REG_SDIO_HPS_CLKR (SDIO_LOCAL_OFFSET + 0x0084) ++/* SDIO HCI Suspend Control */ ++#define REG_SDIO_HSUS_CTRL (SDIO_LOCAL_OFFSET + 0x0086) ++#define BIT_HCI_SUS_REQ BIT(0) ++#define BIT_HCI_RESUME_RDY BIT(1) ++/* SDIO Host Extension Interrupt Mask Always */ ++#define REG_SDIO_HIMR_ON (SDIO_LOCAL_OFFSET + 0x0090) ++/* SDIO Host Extension Interrupt Status Always */ ++#define REG_SDIO_HISR_ON (SDIO_LOCAL_OFFSET + 0x0091) ++ ++#define REG_SDIO_INDIRECT_REG_CFG (SDIO_LOCAL_OFFSET + 0x0040) ++#define BIT_SDIO_INDIRECT_REG_CFG_WORD BIT(16) ++#define BIT_SDIO_INDIRECT_REG_CFG_DWORD BIT(17) ++#define BIT_SDIO_INDIRECT_REG_CFG_WRITE BIT(18) ++#define BIT_SDIO_INDIRECT_REG_CFG_READ BIT(19) ++#define BIT_SDIO_INDIRECT_REG_CFG_UNK20 BIT(20) ++#define REG_SDIO_INDIRECT_REG_DATA (SDIO_LOCAL_OFFSET + 0x0044) ++ ++/* Sdio Address for SDIO Local Reg, TRX FIFO, MAC Reg */ ++#define REG_SDIO_CMD_ADDR_MSK GENMASK(16, 13) ++#define REG_SDIO_CMD_ADDR_SDIO_REG 0 ++#define REG_SDIO_CMD_ADDR_MAC_REG 8 ++#define REG_SDIO_CMD_ADDR_TXFF_HIGH 4 ++#define REG_SDIO_CMD_ADDR_TXFF_LOW 6 ++#define REG_SDIO_CMD_ADDR_TXFF_NORMAL 5 ++#define REG_SDIO_CMD_ADDR_TXFF_EXTRA 7 ++#define REG_SDIO_CMD_ADDR_RXFF 7 ++ ++#define RTW_SDIO_BLOCK_SIZE 512 ++#define RTW_SDIO_ADDR_RX_RX0FF_GEN(_id) (0x0e000 | ((_id) & 0x3)) ++ ++#define RTW_SDIO_DATA_PTR_ALIGN 8 ++ ++struct sdio_func; ++struct sdio_device_id; ++ ++struct rtw_sdio_tx_data { ++ u8 sn; ++}; ++ ++struct rtw_sdio_work_data { ++ struct work_struct work; ++ struct rtw_dev *rtwdev; ++}; ++ ++struct rtw_sdio { ++ struct sdio_func *sdio_func; ++ ++ u32 irq_mask; ++ u8 rx_addr; ++ bool sdio3_bus_mode; ++ ++ void *irq_thread; ++ ++ struct workqueue_struct *txwq; ++ struct rtw_sdio_work_data *tx_handler_data; ++ struct sk_buff_head tx_queue[RTK_MAX_TX_QUEUE_NUM]; ++}; ++ ++extern const struct dev_pm_ops rtw_sdio_pm_ops; ++ ++int rtw_sdio_probe(struct sdio_func *sdio_func, ++ const struct sdio_device_id *id); ++void rtw_sdio_remove(struct sdio_func *sdio_func); ++void rtw_sdio_shutdown(struct device *dev); ++ ++static inline bool rtw_sdio_is_sdio30_supported(struct rtw_dev *rtwdev) ++{ ++ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; ++ ++ return rtwsdio->sdio3_bus_mode; ++} ++ ++#endif +diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c +index ab39245e9c2f..f63900b6621d 100644 +--- a/drivers/net/wireless/realtek/rtw88/tx.c ++++ b/drivers/net/wireless/realtek/rtw88/tx.c +@@ -34,43 +34,57 @@ void rtw_tx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, -+set_bw: - switch (bw) { - case RTW_CHANNEL_WIDTH_20: - default: -diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h -index fcff31688c45..91ed921407bb 100644 ---- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h -+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h -@@ -238,6 +238,7 @@ extern const struct rtw_chip_info rtw8821c_hw_spec; - #define REG_RXSB 0xa00 - #define REG_ADCINI 0xa04 - #define REG_PWRTH 0xa08 -+#define REG_CCA_FLTR 0xa20 - #define REG_TXSF2 0xa24 - #define REG_TXSF6 0xa28 - #define REG_FA_CCK 0xa5c + void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb) + { +- __le32 *txdesc = (__le32 *)skb->data; +- +- SET_TX_DESC_TXPKTSIZE(txdesc, pkt_info->tx_pkt_size); +- SET_TX_DESC_OFFSET(txdesc, pkt_info->offset); +- SET_TX_DESC_PKT_OFFSET(txdesc, pkt_info->pkt_offset); +- SET_TX_DESC_QSEL(txdesc, pkt_info->qsel); +- SET_TX_DESC_BMC(txdesc, pkt_info->bmc); +- SET_TX_DESC_RATE_ID(txdesc, pkt_info->rate_id); +- SET_TX_DESC_DATARATE(txdesc, pkt_info->rate); +- SET_TX_DESC_DISDATAFB(txdesc, pkt_info->dis_rate_fallback); +- SET_TX_DESC_USE_RATE(txdesc, pkt_info->use_rate); +- SET_TX_DESC_SEC_TYPE(txdesc, pkt_info->sec_type); +- SET_TX_DESC_DATA_BW(txdesc, pkt_info->bw); +- SET_TX_DESC_SW_SEQ(txdesc, pkt_info->seq); +- SET_TX_DESC_MAX_AGG_NUM(txdesc, pkt_info->ampdu_factor); +- SET_TX_DESC_AMPDU_DENSITY(txdesc, pkt_info->ampdu_density); +- SET_TX_DESC_DATA_STBC(txdesc, pkt_info->stbc); +- SET_TX_DESC_DATA_LDPC(txdesc, pkt_info->ldpc); +- SET_TX_DESC_AGG_EN(txdesc, pkt_info->ampdu_en); +- SET_TX_DESC_LS(txdesc, pkt_info->ls); +- SET_TX_DESC_DATA_SHORT(txdesc, pkt_info->short_gi); +- SET_TX_DESC_SPE_RPT(txdesc, pkt_info->report); +- SET_TX_DESC_SW_DEFINE(txdesc, pkt_info->sn); +- SET_TX_DESC_USE_RTS(txdesc, pkt_info->rts); ++ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data; ++ bool more_data = false; ++ ++ if (pkt_info->qsel == TX_DESC_QSEL_HIGH) ++ more_data = true; ++ ++ tx_desc->w0 = le32_encode_bits(pkt_info->tx_pkt_size, RTW_TX_DESC_W0_TXPKTSIZE) | ++ le32_encode_bits(pkt_info->offset, RTW_TX_DESC_W0_OFFSET) | ++ le32_encode_bits(pkt_info->bmc, RTW_TX_DESC_W0_BMC) | ++ le32_encode_bits(pkt_info->ls, RTW_TX_DESC_W0_LS) | ++ le32_encode_bits(pkt_info->dis_qselseq, RTW_TX_DESC_W0_DISQSELSEQ); ++ ++ tx_desc->w1 = le32_encode_bits(pkt_info->qsel, RTW_TX_DESC_W1_QSEL) | ++ le32_encode_bits(pkt_info->rate_id, RTW_TX_DESC_W1_RATE_ID) | ++ le32_encode_bits(pkt_info->sec_type, RTW_TX_DESC_W1_SEC_TYPE) | ++ le32_encode_bits(pkt_info->pkt_offset, RTW_TX_DESC_W1_PKT_OFFSET) | ++ le32_encode_bits(more_data, RTW_TX_DESC_W1_MORE_DATA); ++ ++ tx_desc->w2 = le32_encode_bits(pkt_info->ampdu_en, RTW_TX_DESC_W2_AGG_EN) | ++ le32_encode_bits(pkt_info->report, RTW_TX_DESC_W2_SPE_RPT) | ++ le32_encode_bits(pkt_info->ampdu_density, RTW_TX_DESC_W2_AMPDU_DEN) | ++ le32_encode_bits(pkt_info->bt_null, RTW_TX_DESC_W2_BT_NULL); ++ ++ tx_desc->w3 = le32_encode_bits(pkt_info->hw_ssn_sel, RTW_TX_DESC_W3_HW_SSN_SEL) | ++ le32_encode_bits(pkt_info->use_rate, RTW_TX_DESC_W3_USE_RATE) | ++ le32_encode_bits(pkt_info->dis_rate_fallback, RTW_TX_DESC_W3_DISDATAFB) | ++ le32_encode_bits(pkt_info->rts, RTW_TX_DESC_W3_USE_RTS) | ++ le32_encode_bits(pkt_info->nav_use_hdr, RTW_TX_DESC_W3_NAVUSEHDR) | ++ le32_encode_bits(pkt_info->ampdu_factor, RTW_TX_DESC_W3_MAX_AGG_NUM); ++ ++ tx_desc->w4 = le32_encode_bits(pkt_info->rate, RTW_TX_DESC_W4_DATARATE); ++ ++ tx_desc->w5 = le32_encode_bits(pkt_info->short_gi, RTW_TX_DESC_W5_DATA_SHORT) | ++ le32_encode_bits(pkt_info->bw, RTW_TX_DESC_W5_DATA_BW) | ++ le32_encode_bits(pkt_info->ldpc, RTW_TX_DESC_W5_DATA_LDPC) | ++ le32_encode_bits(pkt_info->stbc, RTW_TX_DESC_W5_DATA_STBC); ++ ++ tx_desc->w6 = le32_encode_bits(pkt_info->sn, RTW_TX_DESC_W6_SW_DEFINE); ++ ++ tx_desc->w8 = le32_encode_bits(pkt_info->en_hwseq, RTW_TX_DESC_W8_EN_HWSEQ); ++ ++ tx_desc->w9 = le32_encode_bits(pkt_info->seq, RTW_TX_DESC_W9_SW_SEQ); ++ + if (pkt_info->rts) { +- SET_TX_DESC_RTSRATE(txdesc, DESC_RATE24M); +- SET_TX_DESC_DATA_RTS_SHORT(txdesc, 1); +- } +- SET_TX_DESC_DISQSELSEQ(txdesc, pkt_info->dis_qselseq); +- SET_TX_DESC_EN_HWSEQ(txdesc, pkt_info->en_hwseq); +- SET_TX_DESC_HW_SSN_SEL(txdesc, pkt_info->hw_ssn_sel); +- SET_TX_DESC_NAVUSEHDR(txdesc, pkt_info->nav_use_hdr); +- SET_TX_DESC_BT_NULL(txdesc, pkt_info->bt_null); +- if (pkt_info->tim_offset) { +- SET_TX_DESC_TIM_EN(txdesc, 1); +- SET_TX_DESC_TIM_OFFSET(txdesc, pkt_info->tim_offset); ++ tx_desc->w4 |= le32_encode_bits(DESC_RATE24M, RTW_TX_DESC_W4_RTSRATE); ++ tx_desc->w5 |= le32_encode_bits(1, RTW_TX_DESC_W5_DATA_RTS_SHORT); + } ++ ++ if (pkt_info->tim_offset) ++ tx_desc->w9 |= le32_encode_bits(1, RTW_TX_DESC_W9_TIM_EN) | ++ le32_encode_bits(pkt_info->tim_offset, RTW_TX_DESC_W9_TIM_OFFSET); + } + EXPORT_SYMBOL(rtw_tx_fill_tx_desc); + +@@ -592,8 +606,6 @@ static int rtw_txq_push_skb(struct rtw_dev *rtwdev, + rtw_err(rtwdev, "failed to write TX skb to HCI\n"); + return ret; + } +- rtwtxq->last_push = jiffies; +- + return 0; + } + +@@ -635,9 +647,8 @@ static void rtw_txq_push(struct rtw_dev *rtwdev, + rcu_read_unlock(); + } + +-void rtw_tx_work(struct work_struct *w) ++void __rtw_tx_work(struct rtw_dev *rtwdev) + { +- struct rtw_dev *rtwdev = container_of(w, struct rtw_dev, tx_work); + struct rtw_txq *rtwtxq, *tmp; + + spin_lock_bh(&rtwdev->txq_lock); +@@ -658,6 +669,13 @@ void rtw_tx_work(struct work_struct *w) + spin_unlock_bh(&rtwdev->txq_lock); + } + ++void rtw_tx_work(struct work_struct *w) ++{ ++ struct rtw_dev *rtwdev = container_of(w, struct rtw_dev, tx_work); ++ ++ __rtw_tx_work(rtwdev); ++} ++ + void rtw_txq_init(struct rtw_dev *rtwdev, struct ieee80211_txq *txq) + { + struct rtw_txq *rtwtxq; +@@ -682,3 +700,44 @@ void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq) + list_del_init(&rtwtxq->list); + spin_unlock_bh(&rtwdev->txq_lock); + } ++ ++static const enum rtw_tx_queue_type ac_to_hwq[] = { ++ [IEEE80211_AC_VO] = RTW_TX_QUEUE_VO, ++ [IEEE80211_AC_VI] = RTW_TX_QUEUE_VI, ++ [IEEE80211_AC_BE] = RTW_TX_QUEUE_BE, ++ [IEEE80211_AC_BK] = RTW_TX_QUEUE_BK, ++}; ++ ++static_assert(ARRAY_SIZE(ac_to_hwq) == IEEE80211_NUM_ACS); ++ ++enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac) ++{ ++ if (WARN_ON(unlikely(ac >= IEEE80211_NUM_ACS))) ++ return RTW_TX_QUEUE_BE; ++ ++ return ac_to_hwq[ac]; ++} ++EXPORT_SYMBOL(rtw_tx_ac_to_hwq); ++ ++enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb) ++{ ++ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; ++ __le16 fc = hdr->frame_control; ++ u8 q_mapping = skb_get_queue_mapping(skb); ++ enum rtw_tx_queue_type queue; ++ ++ if (unlikely(ieee80211_is_beacon(fc))) ++ queue = RTW_TX_QUEUE_BCN; ++ else if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))) ++ queue = RTW_TX_QUEUE_MGMT; ++ else if (is_broadcast_ether_addr(hdr->addr1) || ++ is_multicast_ether_addr(hdr->addr1)) ++ queue = RTW_TX_QUEUE_HI0; ++ else if (WARN_ON_ONCE(q_mapping >= ARRAY_SIZE(ac_to_hwq))) ++ queue = ac_to_hwq[IEEE80211_AC_BE]; ++ else ++ queue = ac_to_hwq[q_mapping]; ++ ++ return queue; ++} ++EXPORT_SYMBOL(rtw_tx_queue_mapping); +diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h +index 8419603adce4..324189606257 100644 +--- a/drivers/net/wireless/realtek/rtw88/tx.h ++++ b/drivers/net/wireless/realtek/rtw88/tx.h +@@ -9,68 +9,53 @@ + + #define RTW_TX_PROBE_TIMEOUT msecs_to_jiffies(500) + +-#define SET_TX_DESC_TXPKTSIZE(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(15, 0)) +-#define SET_TX_DESC_OFFSET(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, GENMASK(23, 16)) +-#define SET_TX_DESC_PKT_OFFSET(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(28, 24)) +-#define SET_TX_DESC_QSEL(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(12, 8)) +-#define SET_TX_DESC_BMC(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(24)) +-#define SET_TX_DESC_RATE_ID(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(20, 16)) +-#define SET_TX_DESC_DATARATE(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(6, 0)) +-#define SET_TX_DESC_DISDATAFB(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(10)) +-#define SET_TX_DESC_USE_RATE(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(8)) +-#define SET_TX_DESC_SEC_TYPE(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x01, value, GENMASK(23, 22)) +-#define SET_TX_DESC_DATA_BW(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(6, 5)) +-#define SET_TX_DESC_SW_SEQ(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, GENMASK(23, 12)) +-#define SET_TX_DESC_TIM_EN(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, BIT(7)) +-#define SET_TX_DESC_TIM_OFFSET(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x09, value, GENMASK(6, 0)) +-#define SET_TX_DESC_MAX_AGG_NUM(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(21, 17)) +-#define SET_TX_DESC_USE_RTS(tx_desc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(12)) +-#define SET_TX_DESC_RTSRATE(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(28, 24)) +-#define SET_TX_DESC_DATA_RTS_SHORT(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(12)) +-#define SET_TX_DESC_AMPDU_DENSITY(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, GENMASK(22, 20)) +-#define SET_TX_DESC_DATA_STBC(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, GENMASK(9, 8)) +-#define SET_TX_DESC_DATA_LDPC(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(7)) +-#define SET_TX_DESC_AGG_EN(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(12)) +-#define SET_TX_DESC_LS(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(26)) +-#define SET_TX_DESC_DATA_SHORT(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x05, value, BIT(4)) +-#define SET_TX_DESC_SPE_RPT(tx_desc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(19)) +-#define SET_TX_DESC_SW_DEFINE(tx_desc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x06, value, GENMASK(11, 0)) +-#define SET_TX_DESC_DISQSELSEQ(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x00, value, BIT(31)) +-#define SET_TX_DESC_EN_HWSEQ(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x08, value, BIT(15)) +-#define SET_TX_DESC_HW_SSN_SEL(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(7, 6)) +-#define SET_TX_DESC_NAVUSEHDR(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, BIT(15)) +-#define SET_TX_DESC_BT_NULL(txdesc, value) \ +- le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(23)) ++struct rtw_tx_desc { ++ __le32 w0; ++ __le32 w1; ++ __le32 w2; ++ __le32 w3; ++ __le32 w4; ++ __le32 w5; ++ __le32 w6; ++ __le32 w7; ++ __le32 w8; ++ __le32 w9; ++} __packed; ++ ++#define RTW_TX_DESC_W0_TXPKTSIZE GENMASK(15, 0) ++#define RTW_TX_DESC_W0_OFFSET GENMASK(23, 16) ++#define RTW_TX_DESC_W0_BMC BIT(24) ++#define RTW_TX_DESC_W0_LS BIT(26) ++#define RTW_TX_DESC_W0_DISQSELSEQ BIT(31) ++#define RTW_TX_DESC_W1_QSEL GENMASK(12, 8) ++#define RTW_TX_DESC_W1_RATE_ID GENMASK(20, 16) ++#define RTW_TX_DESC_W1_SEC_TYPE GENMASK(23, 22) ++#define RTW_TX_DESC_W1_PKT_OFFSET GENMASK(28, 24) ++#define RTW_TX_DESC_W1_MORE_DATA BIT(29) ++#define RTW_TX_DESC_W2_AGG_EN BIT(12) ++#define RTW_TX_DESC_W2_SPE_RPT BIT(19) ++#define RTW_TX_DESC_W2_AMPDU_DEN GENMASK(22, 20) ++#define RTW_TX_DESC_W2_BT_NULL BIT(23) ++#define RTW_TX_DESC_W3_HW_SSN_SEL GENMASK(7, 6) ++#define RTW_TX_DESC_W3_USE_RATE BIT(8) ++#define RTW_TX_DESC_W3_DISDATAFB BIT(10) ++#define RTW_TX_DESC_W3_USE_RTS BIT(12) ++#define RTW_TX_DESC_W3_NAVUSEHDR BIT(15) ++#define RTW_TX_DESC_W3_MAX_AGG_NUM GENMASK(21, 17) ++#define RTW_TX_DESC_W4_DATARATE GENMASK(6, 0) ++#define RTW_TX_DESC_W4_RTSRATE GENMASK(28, 24) ++#define RTW_TX_DESC_W5_DATA_SHORT BIT(4) ++#define RTW_TX_DESC_W5_DATA_BW GENMASK(6, 5) ++#define RTW_TX_DESC_W5_DATA_LDPC BIT(7) ++#define RTW_TX_DESC_W5_DATA_STBC GENMASK(9, 8) ++#define RTW_TX_DESC_W5_DATA_RTS_SHORT BIT(12) ++#define RTW_TX_DESC_W6_SW_DEFINE GENMASK(11, 0) ++#define RTW_TX_DESC_W7_TXDESC_CHECKSUM GENMASK(15, 0) ++#define RTW_TX_DESC_W7_DMA_TXAGG_NUM GENMASK(31, 24) ++#define RTW_TX_DESC_W8_EN_HWSEQ BIT(15) ++#define RTW_TX_DESC_W9_SW_SEQ GENMASK(23, 12) ++#define RTW_TX_DESC_W9_TIM_EN BIT(7) ++#define RTW_TX_DESC_W9_TIM_OFFSET GENMASK(6, 0) + + enum rtw_tx_desc_queue_select { + TX_DESC_QSEL_TID0 = 0, +@@ -103,6 +88,7 @@ void rtw_tx(struct rtw_dev *rtwdev, + void rtw_txq_init(struct rtw_dev *rtwdev, struct ieee80211_txq *txq); + void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq); + void rtw_tx_work(struct work_struct *w); ++void __rtw_tx_work(struct rtw_dev *rtwdev); + void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev, + struct rtw_tx_pkt_info *pkt_info, + struct ieee80211_sta *sta, +@@ -123,4 +109,32 @@ rtw_tx_write_data_h2c_get(struct rtw_dev *rtwdev, + struct rtw_tx_pkt_info *pkt_info, + u8 *buf, u32 size); + ++enum rtw_tx_queue_type rtw_tx_ac_to_hwq(enum ieee80211_ac_numbers ac); ++enum rtw_tx_queue_type rtw_tx_queue_mapping(struct sk_buff *skb); ++ ++static inline ++void fill_txdesc_checksum_common(u8 *txdesc, size_t words) ++{ ++ __le16 chksum = 0; ++ __le16 *data = (__le16 *)(txdesc); ++ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)txdesc; ++ ++ le32p_replace_bits(&tx_desc->w7, 0, RTW_TX_DESC_W7_TXDESC_CHECKSUM); ++ ++ while (words--) ++ chksum ^= *data++; ++ ++ le32p_replace_bits(&tx_desc->w7, __le16_to_cpu(chksum), ++ RTW_TX_DESC_W7_TXDESC_CHECKSUM); ++} ++ ++static inline void rtw_tx_fill_txdesc_checksum(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ u8 *txdesc) ++{ ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ ++ chip->ops->fill_txdesc_checksum(rtwdev, pkt_info, txdesc); ++} ++ + #endif +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +new file mode 100644 +index 000000000000..e6ab1ac6d709 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -0,0 +1,913 @@ ++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause ++/* Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#include ++#include ++#include ++#include "main.h" ++#include "debug.h" ++#include "reg.h" ++#include "tx.h" ++#include "rx.h" ++#include "fw.h" ++#include "ps.h" ++#include "usb.h" ++ ++#define RTW_USB_MAX_RXQ_LEN 512 ++ ++struct rtw_usb_txcb { ++ struct rtw_dev *rtwdev; ++ struct sk_buff_head tx_ack_queue; ++}; ++ ++static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, ++ struct sk_buff *skb, int agg_num) ++{ ++ struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data; ++ struct rtw_dev *rtwdev = rtwusb->rtwdev; ++ struct rtw_tx_pkt_info pkt_info; ++ ++ le32p_replace_bits(&tx_desc->w7, agg_num, RTW_TX_DESC_W7_DMA_TXAGG_NUM); ++ pkt_info.pkt_offset = le32_get_bits(tx_desc->w1, RTW_TX_DESC_W1_PKT_OFFSET); ++ rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); ++} ++ ++static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = rtwusb->udev; ++ __le32 *data; ++ unsigned long flags; ++ int idx, ret; ++ static int count; ++ ++ spin_lock_irqsave(&rtwusb->usb_lock, flags); ++ ++ idx = rtwusb->usb_data_index; ++ rtwusb->usb_data_index = (idx + 1) & (RTW_USB_MAX_RXTX_COUNT - 1); ++ ++ spin_unlock_irqrestore(&rtwusb->usb_lock, flags); ++ ++ data = &rtwusb->usb_data[idx]; ++ ++ ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_READ, addr, ++ RTW_USB_VENQT_CMD_IDX, data, len, 1000); ++ if (ret < 0 && ret != -ENODEV && count++ < 4) ++ rtw_err(rtwdev, "read register 0x%x failed with %d\n", ++ addr, ret); ++ ++ return le32_to_cpu(*data); ++} ++ ++static u8 rtw_usb_read8(struct rtw_dev *rtwdev, u32 addr) ++{ ++ return (u8)rtw_usb_read(rtwdev, addr, 1); ++} ++ ++static u16 rtw_usb_read16(struct rtw_dev *rtwdev, u32 addr) ++{ ++ return (u16)rtw_usb_read(rtwdev, addr, 2); ++} ++ ++static u32 rtw_usb_read32(struct rtw_dev *rtwdev, u32 addr) ++{ ++ return (u32)rtw_usb_read(rtwdev, addr, 4); ++} ++ ++static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) ++{ ++ struct rtw_usb *rtwusb = (struct rtw_usb *)rtwdev->priv; ++ struct usb_device *udev = rtwusb->udev; ++ unsigned long flags; ++ __le32 *data; ++ int idx, ret; ++ static int count; ++ ++ spin_lock_irqsave(&rtwusb->usb_lock, flags); ++ ++ idx = rtwusb->usb_data_index; ++ rtwusb->usb_data_index = (idx + 1) & (RTW_USB_MAX_RXTX_COUNT - 1); ++ ++ spin_unlock_irqrestore(&rtwusb->usb_lock, flags); ++ ++ data = &rtwusb->usb_data[idx]; ++ ++ *data = cpu_to_le32(val); ++ ++ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, ++ addr, 0, data, len, 30000); ++ if (ret < 0 && ret != -ENODEV && count++ < 4) ++ rtw_err(rtwdev, "write register 0x%x failed with %d\n", ++ addr, ret); ++} ++ ++static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) ++{ ++ rtw_usb_write(rtwdev, addr, val, 1); ++} ++ ++static void rtw_usb_write16(struct rtw_dev *rtwdev, u32 addr, u16 val) ++{ ++ rtw_usb_write(rtwdev, addr, val, 2); ++} ++ ++static void rtw_usb_write32(struct rtw_dev *rtwdev, u32 addr, u32 val) ++{ ++ rtw_usb_write(rtwdev, addr, val, 4); ++} ++ ++static int dma_mapping_to_ep(enum rtw_dma_mapping dma_mapping) ++{ ++ switch (dma_mapping) { ++ case RTW_DMA_MAPPING_HIGH: ++ return 0; ++ case RTW_DMA_MAPPING_NORMAL: ++ return 1; ++ case RTW_DMA_MAPPING_LOW: ++ return 2; ++ case RTW_DMA_MAPPING_EXTRA: ++ return 3; ++ default: ++ return -EINVAL; ++ } ++} ++ ++static int rtw_usb_parse(struct rtw_dev *rtwdev, ++ struct usb_interface *interface) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_host_interface *host_interface = &interface->altsetting[0]; ++ struct usb_interface_descriptor *interface_desc = &host_interface->desc; ++ struct usb_endpoint_descriptor *endpoint; ++ int num_out_pipes = 0; ++ int i; ++ u8 num; ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ const struct rtw_rqpn *rqpn; ++ ++ for (i = 0; i < interface_desc->bNumEndpoints; i++) { ++ endpoint = &host_interface->endpoint[i].desc; ++ num = usb_endpoint_num(endpoint); ++ ++ if (usb_endpoint_dir_in(endpoint) && ++ usb_endpoint_xfer_bulk(endpoint)) { ++ if (rtwusb->pipe_in) { ++ rtw_err(rtwdev, "IN pipes overflow\n"); ++ return -EINVAL; ++ } ++ ++ rtwusb->pipe_in = num; ++ } ++ ++ if (usb_endpoint_dir_in(endpoint) && ++ usb_endpoint_xfer_int(endpoint)) { ++ if (rtwusb->pipe_interrupt) { ++ rtw_err(rtwdev, "INT pipes overflow\n"); ++ return -EINVAL; ++ } ++ ++ rtwusb->pipe_interrupt = num; ++ } ++ ++ if (usb_endpoint_dir_out(endpoint) && ++ usb_endpoint_xfer_bulk(endpoint)) { ++ if (num_out_pipes >= ARRAY_SIZE(rtwusb->out_ep)) { ++ rtw_err(rtwdev, "OUT pipes overflow\n"); ++ return -EINVAL; ++ } ++ ++ rtwusb->out_ep[num_out_pipes++] = num; ++ } ++ } ++ ++ rtwdev->hci.bulkout_num = num_out_pipes; ++ ++ if (num_out_pipes < 1 || num_out_pipes > 4) { ++ rtw_err(rtwdev, "invalid number of endpoints %d\n", num_out_pipes); ++ return -EINVAL; ++ } ++ ++ rqpn = &chip->rqpn_table[num_out_pipes]; ++ ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = dma_mapping_to_ep(rqpn->dma_map_be); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = dma_mapping_to_ep(rqpn->dma_map_bk); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = dma_mapping_to_ep(rqpn->dma_map_bk); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = dma_mapping_to_ep(rqpn->dma_map_be); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = dma_mapping_to_ep(rqpn->dma_map_vi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = dma_mapping_to_ep(rqpn->dma_map_vi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = dma_mapping_to_ep(rqpn->dma_map_vo); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = dma_mapping_to_ep(rqpn->dma_map_vo); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID8] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID9] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID10] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID11] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID12] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID13] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID14] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID15] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_BEACON] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_HIGH] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_MGMT] = dma_mapping_to_ep(rqpn->dma_map_mg); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_H2C] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ ++ return 0; ++} ++ ++static void rtw_usb_write_port_tx_complete(struct urb *urb) ++{ ++ struct rtw_usb_txcb *txcb = urb->context; ++ struct rtw_dev *rtwdev = txcb->rtwdev; ++ struct ieee80211_hw *hw = rtwdev->hw; ++ ++ while (true) { ++ struct sk_buff *skb = skb_dequeue(&txcb->tx_ack_queue); ++ struct ieee80211_tx_info *info; ++ struct rtw_usb_tx_data *tx_data; ++ ++ if (!skb) ++ break; ++ ++ info = IEEE80211_SKB_CB(skb); ++ tx_data = rtw_usb_get_tx_data(skb); ++ ++ /* enqueue to wait for tx report */ ++ if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS) { ++ rtw_tx_report_enqueue(rtwdev, skb, tx_data->sn); ++ continue; ++ } ++ ++ /* always ACK for others, then they won't be marked as drop */ ++ ieee80211_tx_info_clear_status(info); ++ if (info->flags & IEEE80211_TX_CTL_NO_ACK) ++ info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; ++ else ++ info->flags |= IEEE80211_TX_STAT_ACK; ++ ++ ieee80211_tx_status_irqsafe(hw, skb); ++ } ++ ++ kfree(txcb); ++} ++ ++static int qsel_to_ep(struct rtw_usb *rtwusb, unsigned int qsel) ++{ ++ if (qsel >= ARRAY_SIZE(rtwusb->qsel_to_ep)) ++ return -EINVAL; ++ ++ return rtwusb->qsel_to_ep[qsel]; ++} ++ ++static int rtw_usb_write_port(struct rtw_dev *rtwdev, u8 qsel, struct sk_buff *skb, ++ usb_complete_t cb, void *context) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *usbd = rtwusb->udev; ++ struct urb *urb; ++ unsigned int pipe; ++ int ret; ++ int ep = qsel_to_ep(rtwusb, qsel); ++ ++ if (ep < 0) ++ return ep; ++ ++ pipe = usb_sndbulkpipe(usbd, rtwusb->out_ep[ep]); ++ urb = usb_alloc_urb(0, GFP_ATOMIC); ++ if (!urb) ++ return -ENOMEM; ++ ++ usb_fill_bulk_urb(urb, usbd, pipe, skb->data, skb->len, cb, context); ++ urb->transfer_flags |= URB_ZERO_PACKET; ++ ret = usb_submit_urb(urb, GFP_ATOMIC); ++ ++ usb_free_urb(urb); ++ ++ return ret; ++} ++ ++static bool rtw_usb_tx_agg_skb(struct rtw_usb *rtwusb, struct sk_buff_head *list) ++{ ++ struct rtw_dev *rtwdev = rtwusb->rtwdev; ++ struct rtw_tx_desc *tx_desc; ++ struct rtw_usb_txcb *txcb; ++ struct sk_buff *skb_head; ++ struct sk_buff *skb_iter; ++ int agg_num = 0; ++ unsigned int align_next = 0; ++ u8 qsel; ++ ++ if (skb_queue_empty(list)) ++ return false; ++ ++ txcb = kmalloc(sizeof(*txcb), GFP_ATOMIC); ++ if (!txcb) ++ return false; ++ ++ txcb->rtwdev = rtwdev; ++ skb_queue_head_init(&txcb->tx_ack_queue); ++ ++ skb_iter = skb_dequeue(list); ++ ++ if (skb_queue_empty(list)) { ++ skb_head = skb_iter; ++ goto queue; ++ } ++ ++ skb_head = dev_alloc_skb(RTW_USB_MAX_XMITBUF_SZ); ++ if (!skb_head) { ++ skb_head = skb_iter; ++ goto queue; ++ } ++ ++ while (skb_iter) { ++ unsigned long flags; ++ ++ skb_put(skb_head, align_next); ++ skb_put_data(skb_head, skb_iter->data, skb_iter->len); ++ ++ align_next = ALIGN(skb_iter->len, 8) - skb_iter->len; ++ ++ agg_num++; ++ ++ skb_queue_tail(&txcb->tx_ack_queue, skb_iter); ++ ++ spin_lock_irqsave(&list->lock, flags); ++ ++ skb_iter = skb_peek(list); ++ ++ if (skb_iter && skb_iter->len + skb_head->len <= RTW_USB_MAX_XMITBUF_SZ) ++ __skb_unlink(skb_iter, list); ++ else ++ skb_iter = NULL; ++ spin_unlock_irqrestore(&list->lock, flags); ++ } ++ ++ if (agg_num > 1) ++ rtw_usb_fill_tx_checksum(rtwusb, skb_head, agg_num); ++ ++queue: ++ skb_queue_tail(&txcb->tx_ack_queue, skb_head); ++ tx_desc = (struct rtw_tx_desc *)skb_head->data; ++ qsel = le32_get_bits(tx_desc->w1, RTW_TX_DESC_W1_QSEL); ++ ++ rtw_usb_write_port(rtwdev, qsel, skb_head, rtw_usb_write_port_tx_complete, txcb); ++ ++ return true; ++} ++ ++static void rtw_usb_tx_handler(struct work_struct *work) ++{ ++ struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, tx_work); ++ int i, limit; ++ ++ for (i = ARRAY_SIZE(rtwusb->tx_queue) - 1; i >= 0; i--) { ++ for (limit = 0; limit < 200; limit++) { ++ struct sk_buff_head *list = &rtwusb->tx_queue[i]; ++ ++ if (!rtw_usb_tx_agg_skb(rtwusb, list)) ++ break; ++ } ++ } ++} ++ ++static void rtw_usb_tx_queue_purge(struct rtw_usb *rtwusb) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(rtwusb->tx_queue); i++) ++ skb_queue_purge(&rtwusb->tx_queue[i]); ++} ++ ++static void rtw_usb_write_port_complete(struct urb *urb) ++{ ++ struct sk_buff *skb = urb->context; ++ ++ dev_kfree_skb_any(skb); ++} ++ ++static int rtw_usb_write_data(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ u8 *buf) ++{ ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ struct sk_buff *skb; ++ unsigned int desclen, headsize, size; ++ u8 qsel; ++ int ret = 0; ++ ++ size = pkt_info->tx_pkt_size; ++ qsel = pkt_info->qsel; ++ desclen = chip->tx_pkt_desc_sz; ++ headsize = pkt_info->offset ? pkt_info->offset : desclen; ++ ++ skb = dev_alloc_skb(headsize + size); ++ if (unlikely(!skb)) ++ return -ENOMEM; ++ ++ skb_reserve(skb, headsize); ++ skb_put_data(skb, buf, size); ++ skb_push(skb, headsize); ++ memset(skb->data, 0, headsize); ++ rtw_tx_fill_tx_desc(pkt_info, skb); ++ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data); ++ ++ ret = rtw_usb_write_port(rtwdev, qsel, skb, ++ rtw_usb_write_port_complete, skb); ++ if (unlikely(ret)) ++ rtw_err(rtwdev, "failed to do USB write, ret=%d\n", ret); ++ ++ return ret; ++} ++ ++static int rtw_usb_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, ++ u32 size) ++{ ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ struct rtw_tx_pkt_info pkt_info = {0}; ++ ++ pkt_info.tx_pkt_size = size; ++ pkt_info.qsel = TX_DESC_QSEL_BEACON; ++ pkt_info.offset = chip->tx_pkt_desc_sz; ++ ++ return rtw_usb_write_data(rtwdev, &pkt_info, buf); ++} ++ ++static int rtw_usb_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size) ++{ ++ struct rtw_tx_pkt_info pkt_info = {0}; ++ ++ pkt_info.tx_pkt_size = size; ++ pkt_info.qsel = TX_DESC_QSEL_H2C; ++ ++ return rtw_usb_write_data(rtwdev, &pkt_info, buf); ++} ++ ++static u8 rtw_usb_tx_queue_mapping_to_qsel(struct sk_buff *skb) ++{ ++ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; ++ __le16 fc = hdr->frame_control; ++ u8 qsel; ++ ++ if (unlikely(ieee80211_is_mgmt(fc) || ieee80211_is_ctl(fc))) ++ qsel = TX_DESC_QSEL_MGMT; ++ else if (is_broadcast_ether_addr(hdr->addr1) || ++ is_multicast_ether_addr(hdr->addr1)) ++ qsel = TX_DESC_QSEL_HIGH; ++ else if (skb_get_queue_mapping(skb) <= IEEE80211_AC_BK) ++ qsel = skb->priority; ++ else ++ qsel = TX_DESC_QSEL_BEACON; ++ ++ return qsel; ++} ++ ++static int rtw_usb_tx_write(struct rtw_dev *rtwdev, ++ struct rtw_tx_pkt_info *pkt_info, ++ struct sk_buff *skb) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ struct rtw_usb_tx_data *tx_data; ++ u8 *pkt_desc; ++ int ep; ++ ++ pkt_info->qsel = rtw_usb_tx_queue_mapping_to_qsel(skb); ++ pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz); ++ memset(pkt_desc, 0, chip->tx_pkt_desc_sz); ++ ep = qsel_to_ep(rtwusb, pkt_info->qsel); ++ rtw_tx_fill_tx_desc(pkt_info, skb); ++ rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data); ++ tx_data = rtw_usb_get_tx_data(skb); ++ tx_data->sn = pkt_info->sn; ++ ++ skb_queue_tail(&rtwusb->tx_queue[ep], skb); ++ ++ return 0; ++} ++ ++static void rtw_usb_tx_kick_off(struct rtw_dev *rtwdev) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ ++ queue_work(rtwusb->txwq, &rtwusb->tx_work); ++} ++ ++static void rtw_usb_rx_handler(struct work_struct *work) ++{ ++ struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, rx_work); ++ struct rtw_dev *rtwdev = rtwusb->rtwdev; ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ struct rtw_rx_pkt_stat pkt_stat; ++ struct ieee80211_rx_status rx_status; ++ struct sk_buff *skb; ++ u32 pkt_desc_sz = chip->rx_pkt_desc_sz; ++ u32 pkt_offset; ++ u8 *rx_desc; ++ int limit; ++ ++ for (limit = 0; limit < 200; limit++) { ++ skb = skb_dequeue(&rtwusb->rx_queue); ++ if (!skb) ++ break; ++ ++ rx_desc = skb->data; ++ chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat, ++ &rx_status); ++ pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz + ++ pkt_stat.shift; ++ ++ if (pkt_stat.is_c2h) { ++ skb_put(skb, pkt_stat.pkt_len + pkt_offset); ++ rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb); ++ continue; ++ } ++ ++ if (skb_queue_len(&rtwusb->rx_queue) >= RTW_USB_MAX_RXQ_LEN) { ++ dev_dbg_ratelimited(rtwdev->dev, "failed to get rx_queue, overflow\n"); ++ dev_kfree_skb_any(skb); ++ continue; ++ } ++ ++ skb_put(skb, pkt_stat.pkt_len); ++ skb_reserve(skb, pkt_offset); ++ memcpy(skb->cb, &rx_status, sizeof(rx_status)); ++ ieee80211_rx_irqsafe(rtwdev->hw, skb); ++ } ++} ++ ++static void rtw_usb_read_port_complete(struct urb *urb); ++ ++static void rtw_usb_rx_resubmit(struct rtw_usb *rtwusb, struct rx_usb_ctrl_block *rxcb) ++{ ++ struct rtw_dev *rtwdev = rtwusb->rtwdev; ++ int error; ++ ++ rxcb->rx_skb = alloc_skb(RTW_USB_MAX_RECVBUF_SZ, GFP_ATOMIC); ++ if (!rxcb->rx_skb) ++ return; ++ ++ usb_fill_bulk_urb(rxcb->rx_urb, rtwusb->udev, ++ usb_rcvbulkpipe(rtwusb->udev, rtwusb->pipe_in), ++ rxcb->rx_skb->data, RTW_USB_MAX_RECVBUF_SZ, ++ rtw_usb_read_port_complete, rxcb); ++ ++ error = usb_submit_urb(rxcb->rx_urb, GFP_ATOMIC); ++ if (error) { ++ kfree_skb(rxcb->rx_skb); ++ if (error != -ENODEV) ++ rtw_err(rtwdev, "Err sending rx data urb %d\n", ++ error); ++ } ++} ++ ++static void rtw_usb_read_port_complete(struct urb *urb) ++{ ++ struct rx_usb_ctrl_block *rxcb = urb->context; ++ struct rtw_dev *rtwdev = rxcb->rtwdev; ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct sk_buff *skb = rxcb->rx_skb; ++ ++ if (urb->status == 0) { ++ if (urb->actual_length >= RTW_USB_MAX_RECVBUF_SZ || ++ urb->actual_length < 24) { ++ rtw_err(rtwdev, "failed to get urb length:%d\n", ++ urb->actual_length); ++ if (skb) ++ dev_kfree_skb_any(skb); ++ } else { ++ skb_queue_tail(&rtwusb->rx_queue, skb); ++ queue_work(rtwusb->rxwq, &rtwusb->rx_work); ++ } ++ rtw_usb_rx_resubmit(rtwusb, rxcb); ++ } else { ++ switch (urb->status) { ++ case -EINVAL: ++ case -EPIPE: ++ case -ENODEV: ++ case -ESHUTDOWN: ++ case -ENOENT: ++ case -EPROTO: ++ case -EILSEQ: ++ case -ETIME: ++ case -ECOMM: ++ case -EOVERFLOW: ++ case -EINPROGRESS: ++ break; ++ default: ++ rtw_err(rtwdev, "status %d\n", urb->status); ++ break; ++ } ++ if (skb) ++ dev_kfree_skb_any(skb); ++ } ++} ++ ++static void rtw_usb_cancel_rx_bufs(struct rtw_usb *rtwusb) ++{ ++ struct rx_usb_ctrl_block *rxcb; ++ int i; ++ ++ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { ++ rxcb = &rtwusb->rx_cb[i]; ++ usb_kill_urb(rxcb->rx_urb); ++ } ++} ++ ++static void rtw_usb_free_rx_bufs(struct rtw_usb *rtwusb) ++{ ++ struct rx_usb_ctrl_block *rxcb; ++ int i; ++ ++ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { ++ rxcb = &rtwusb->rx_cb[i]; ++ usb_kill_urb(rxcb->rx_urb); ++ usb_free_urb(rxcb->rx_urb); ++ } ++} ++ ++static int rtw_usb_alloc_rx_bufs(struct rtw_usb *rtwusb) ++{ ++ int i; ++ ++ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { ++ struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i]; ++ ++ rxcb->rtwdev = rtwusb->rtwdev; ++ rxcb->rx_urb = usb_alloc_urb(0, GFP_KERNEL); ++ if (!rxcb->rx_urb) ++ goto err; ++ } ++ ++ return 0; ++err: ++ rtw_usb_free_rx_bufs(rtwusb); ++ return -ENOMEM; ++} ++ ++static int rtw_usb_setup(struct rtw_dev *rtwdev) ++{ ++ /* empty function for rtw_hci_ops */ ++ return 0; ++} ++ ++static int rtw_usb_start(struct rtw_dev *rtwdev) ++{ ++ return 0; ++} ++ ++static void rtw_usb_stop(struct rtw_dev *rtwdev) ++{ ++} ++ ++static void rtw_usb_deep_ps(struct rtw_dev *rtwdev, bool enter) ++{ ++ /* empty function for rtw_hci_ops */ ++} ++ ++static void rtw_usb_link_ps(struct rtw_dev *rtwdev, bool enter) ++{ ++ /* empty function for rtw_hci_ops */ ++} ++ ++static void rtw_usb_interface_cfg(struct rtw_dev *rtwdev) ++{ ++ /* empty function for rtw_hci_ops */ ++} ++ ++static struct rtw_hci_ops rtw_usb_ops = { ++ .tx_write = rtw_usb_tx_write, ++ .tx_kick_off = rtw_usb_tx_kick_off, ++ .setup = rtw_usb_setup, ++ .start = rtw_usb_start, ++ .stop = rtw_usb_stop, ++ .deep_ps = rtw_usb_deep_ps, ++ .link_ps = rtw_usb_link_ps, ++ .interface_cfg = rtw_usb_interface_cfg, ++ ++ .write8 = rtw_usb_write8, ++ .write16 = rtw_usb_write16, ++ .write32 = rtw_usb_write32, ++ .read8 = rtw_usb_read8, ++ .read16 = rtw_usb_read16, ++ .read32 = rtw_usb_read32, ++ ++ .write_data_rsvd_page = rtw_usb_write_data_rsvd_page, ++ .write_data_h2c = rtw_usb_write_data_h2c, ++}; ++ ++static int rtw_usb_init_rx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ int i; ++ ++ rtwusb->rxwq = create_singlethread_workqueue("rtw88_usb: rx wq"); ++ if (!rtwusb->rxwq) { ++ rtw_err(rtwdev, "failed to create RX work queue\n"); ++ return -ENOMEM; ++ } ++ ++ skb_queue_head_init(&rtwusb->rx_queue); ++ ++ INIT_WORK(&rtwusb->rx_work, rtw_usb_rx_handler); ++ ++ for (i = 0; i < RTW_USB_RXCB_NUM; i++) { ++ struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i]; ++ ++ rtw_usb_rx_resubmit(rtwusb, rxcb); ++ } ++ ++ return 0; ++} ++ ++static void rtw_usb_deinit_rx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ ++ skb_queue_purge(&rtwusb->rx_queue); ++ ++ flush_workqueue(rtwusb->rxwq); ++ destroy_workqueue(rtwusb->rxwq); ++} ++ ++static int rtw_usb_init_tx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ int i; ++ ++ rtwusb->txwq = create_singlethread_workqueue("rtw88_usb: tx wq"); ++ if (!rtwusb->txwq) { ++ rtw_err(rtwdev, "failed to create TX work queue\n"); ++ return -ENOMEM; ++ } ++ ++ for (i = 0; i < ARRAY_SIZE(rtwusb->tx_queue); i++) ++ skb_queue_head_init(&rtwusb->tx_queue[i]); ++ ++ INIT_WORK(&rtwusb->tx_work, rtw_usb_tx_handler); ++ ++ return 0; ++} ++ ++static void rtw_usb_deinit_tx(struct rtw_dev *rtwdev) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ ++ rtw_usb_tx_queue_purge(rtwusb); ++ flush_workqueue(rtwusb->txwq); ++ destroy_workqueue(rtwusb->txwq); ++} ++ ++static int rtw_usb_intf_init(struct rtw_dev *rtwdev, ++ struct usb_interface *intf) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = usb_get_dev(interface_to_usbdev(intf)); ++ int ret; ++ ++ rtwusb->udev = udev; ++ ret = rtw_usb_parse(rtwdev, intf); ++ if (ret) ++ return ret; ++ ++ rtwusb->usb_data = kcalloc(RTW_USB_MAX_RXTX_COUNT, sizeof(u32), ++ GFP_KERNEL); ++ if (!rtwusb->usb_data) ++ return -ENOMEM; ++ ++ usb_set_intfdata(intf, rtwdev->hw); ++ ++ SET_IEEE80211_DEV(rtwdev->hw, &intf->dev); ++ spin_lock_init(&rtwusb->usb_lock); ++ ++ return 0; ++} ++ ++static void rtw_usb_intf_deinit(struct rtw_dev *rtwdev, ++ struct usb_interface *intf) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ ++ usb_put_dev(rtwusb->udev); ++ kfree(rtwusb->usb_data); ++ usb_set_intfdata(intf, NULL); ++} ++ ++int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) ++{ ++ struct rtw_dev *rtwdev; ++ struct ieee80211_hw *hw; ++ struct rtw_usb *rtwusb; ++ int drv_data_size; ++ int ret; ++ ++ drv_data_size = sizeof(struct rtw_dev) + sizeof(struct rtw_usb); ++ hw = ieee80211_alloc_hw(drv_data_size, &rtw_ops); ++ if (!hw) ++ return -ENOMEM; ++ ++ rtwdev = hw->priv; ++ rtwdev->hw = hw; ++ rtwdev->dev = &intf->dev; ++ rtwdev->chip = (struct rtw_chip_info *)id->driver_info; ++ rtwdev->hci.ops = &rtw_usb_ops; ++ rtwdev->hci.type = RTW_HCI_TYPE_USB; ++ ++ rtwusb = rtw_get_usb_priv(rtwdev); ++ rtwusb->rtwdev = rtwdev; ++ ++ ret = rtw_usb_alloc_rx_bufs(rtwusb); ++ if (ret) ++ goto err_release_hw; ++ ++ ret = rtw_core_init(rtwdev); ++ if (ret) ++ goto err_free_rx_bufs; ++ ++ ret = rtw_usb_intf_init(rtwdev, intf); ++ if (ret) { ++ rtw_err(rtwdev, "failed to init USB interface\n"); ++ goto err_deinit_core; ++ } ++ ++ ret = rtw_usb_init_tx(rtwdev); ++ if (ret) { ++ rtw_err(rtwdev, "failed to init USB TX\n"); ++ goto err_destroy_usb; ++ } ++ ++ ret = rtw_usb_init_rx(rtwdev); ++ if (ret) { ++ rtw_err(rtwdev, "failed to init USB RX\n"); ++ goto err_destroy_txwq; ++ } ++ ++ ret = rtw_chip_info_setup(rtwdev); ++ if (ret) { ++ rtw_err(rtwdev, "failed to setup chip information\n"); ++ goto err_destroy_rxwq; ++ } ++ ++ ret = rtw_register_hw(rtwdev, rtwdev->hw); ++ if (ret) { ++ rtw_err(rtwdev, "failed to register hw\n"); ++ goto err_destroy_rxwq; ++ } ++ ++ return 0; ++ ++err_destroy_rxwq: ++ rtw_usb_deinit_rx(rtwdev); ++ ++err_destroy_txwq: ++ rtw_usb_deinit_tx(rtwdev); ++ ++err_destroy_usb: ++ rtw_usb_intf_deinit(rtwdev, intf); ++ ++err_deinit_core: ++ rtw_core_deinit(rtwdev); ++ ++err_free_rx_bufs: ++ rtw_usb_free_rx_bufs(rtwusb); ++ ++err_release_hw: ++ ieee80211_free_hw(hw); ++ ++ return ret; ++} ++EXPORT_SYMBOL(rtw_usb_probe); ++ ++void rtw_usb_disconnect(struct usb_interface *intf) ++{ ++ struct ieee80211_hw *hw = usb_get_intfdata(intf); ++ struct rtw_dev *rtwdev; ++ struct rtw_usb *rtwusb; ++ ++ if (!hw) ++ return; ++ ++ rtwdev = hw->priv; ++ rtwusb = rtw_get_usb_priv(rtwdev); ++ ++ rtw_usb_cancel_rx_bufs(rtwusb); ++ ++ rtw_unregister_hw(rtwdev, hw); ++ rtw_usb_deinit_tx(rtwdev); ++ rtw_usb_deinit_rx(rtwdev); ++ ++ if (rtwusb->udev->state != USB_STATE_NOTATTACHED) ++ usb_reset_device(rtwusb->udev); ++ ++ rtw_usb_free_rx_bufs(rtwusb); ++ ++ rtw_usb_intf_deinit(rtwdev, intf); ++ rtw_core_deinit(rtwdev); ++ ieee80211_free_hw(hw); ++} ++EXPORT_SYMBOL(rtw_usb_disconnect); ++ ++MODULE_AUTHOR("Realtek Corporation"); ++MODULE_DESCRIPTION("Realtek USB 802.11ac wireless driver"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff --git a/drivers/net/wireless/realtek/rtw88/usb.h b/drivers/net/wireless/realtek/rtw88/usb.h +new file mode 100644 +index 000000000000..86697a5c0103 +--- /dev/null ++++ b/drivers/net/wireless/realtek/rtw88/usb.h +@@ -0,0 +1,100 @@ ++/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ ++/* Copyright(c) 2018-2019 Realtek Corporation ++ */ ++ ++#ifndef __RTW_USB_H_ ++#define __RTW_USB_H_ ++ ++#define FW_8192C_START_ADDRESS 0x1000 ++#define FW_8192C_END_ADDRESS 0x5fff ++ ++#define RTW_USB_MAX_RXTX_COUNT 128 ++#define RTW_USB_VENQT_MAX_BUF_SIZE 254 ++#define MAX_USBCTRL_VENDORREQ_TIMES 10 ++ ++#define RTW_USB_CMD_READ 0xc0 ++#define RTW_USB_CMD_WRITE 0x40 ++#define RTW_USB_CMD_REQ 0x05 ++ ++#define RTW_USB_VENQT_CMD_IDX 0x00 ++ ++#define RTW_USB_TX_SEL_HQ BIT(0) ++#define RTW_USB_TX_SEL_LQ BIT(1) ++#define RTW_USB_TX_SEL_NQ BIT(2) ++#define RTW_USB_TX_SEL_EQ BIT(3) ++ ++#define RTW_USB_BULK_IN_ADDR 0x80 ++#define RTW_USB_INT_IN_ADDR 0x81 ++ ++#define RTW_USB_HW_QUEUE_ENTRY 8 ++ ++#define RTW_USB_PACKET_OFFSET_SZ 8 ++#define RTW_USB_MAX_XMITBUF_SZ (1024 * 20) ++#define RTW_USB_MAX_RECVBUF_SZ 32768 ++ ++#define RTW_USB_RECVBUFF_ALIGN_SZ 8 ++ ++#define RTW_USB_RXAGG_SIZE 6 ++#define RTW_USB_RXAGG_TIMEOUT 10 ++ ++#define RTW_USB_RXCB_NUM 4 ++ ++#define RTW_USB_EP_MAX 4 ++ ++#define TX_DESC_QSEL_MAX 20 ++ ++#define RTW_USB_VENDOR_ID_REALTEK 0x0bda ++ ++static inline struct rtw_usb *rtw_get_usb_priv(struct rtw_dev *rtwdev) ++{ ++ return (struct rtw_usb *)rtwdev->priv; ++} ++ ++struct rx_usb_ctrl_block { ++ struct rtw_dev *rtwdev; ++ struct urb *rx_urb; ++ struct sk_buff *rx_skb; ++}; ++ ++struct rtw_usb_tx_data { ++ u8 sn; ++}; ++ ++struct rtw_usb { ++ struct rtw_dev *rtwdev; ++ struct usb_device *udev; ++ ++ /* protects usb_data_index */ ++ spinlock_t usb_lock; ++ __le32 *usb_data; ++ unsigned int usb_data_index; ++ ++ u8 pipe_interrupt; ++ u8 pipe_in; ++ u8 out_ep[RTW_USB_EP_MAX]; ++ int qsel_to_ep[TX_DESC_QSEL_MAX]; ++ ++ struct workqueue_struct *txwq, *rxwq; ++ ++ struct sk_buff_head tx_queue[RTW_USB_EP_MAX]; ++ struct work_struct tx_work; ++ ++ struct rx_usb_ctrl_block rx_cb[RTW_USB_RXCB_NUM]; ++ struct sk_buff_head rx_queue; ++ struct work_struct rx_work; ++}; ++ ++static inline struct rtw_usb_tx_data *rtw_usb_get_tx_data(struct sk_buff *skb) ++{ ++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ ++ BUILD_BUG_ON(sizeof(struct rtw_usb_tx_data) > ++ sizeof(info->status.status_driver_data)); ++ ++ return (struct rtw_usb_tx_data *)info->status.status_driver_data; ++} ++ ++int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id); ++void rtw_usb_disconnect(struct usb_interface *intf); ++ ++#endif +diff --git a/drivers/net/wireless/realtek/rtw88/util.c b/drivers/net/wireless/realtek/rtw88/util.c +index cdfd66a85075..e222d3c01a77 100644 +--- a/drivers/net/wireless/realtek/rtw88/util.c ++++ b/drivers/net/wireless/realtek/rtw88/util.c +@@ -105,3 +105,103 @@ void rtw_desc_to_mcsrate(u16 rate, u8 *mcs, u8 *nss) + *mcs = rate - DESC_RATEMCS0; + } + } ++ ++struct rtw_stas_entry { ++ struct list_head list; ++ struct ieee80211_sta *sta; ++}; ++ ++struct rtw_iter_stas_data { ++ struct rtw_dev *rtwdev; ++ struct list_head list; ++}; ++ ++static void rtw_collect_sta_iter(void *data, struct ieee80211_sta *sta) ++{ ++ struct rtw_iter_stas_data *iter_stas = data; ++ struct rtw_stas_entry *stas_entry; ++ ++ stas_entry = kmalloc(sizeof(*stas_entry), GFP_ATOMIC); ++ if (!stas_entry) ++ return; ++ ++ stas_entry->sta = sta; ++ list_add_tail(&stas_entry->list, &iter_stas->list); ++} ++ ++void rtw_iterate_stas(struct rtw_dev *rtwdev, ++ void (*iterator)(void *data, ++ struct ieee80211_sta *sta), ++ void *data) ++{ ++ struct rtw_iter_stas_data iter_data; ++ struct rtw_stas_entry *sta_entry, *tmp; ++ ++ /* &rtwdev->mutex makes sure no stations can be removed between ++ * collecting the stations and iterating over them. ++ */ ++ lockdep_assert_held(&rtwdev->mutex); ++ ++ iter_data.rtwdev = rtwdev; ++ INIT_LIST_HEAD(&iter_data.list); ++ ++ ieee80211_iterate_stations_atomic(rtwdev->hw, rtw_collect_sta_iter, ++ &iter_data); ++ ++ list_for_each_entry_safe(sta_entry, tmp, &iter_data.list, ++ list) { ++ list_del_init(&sta_entry->list); ++ iterator(data, sta_entry->sta); ++ kfree(sta_entry); ++ } ++} ++ ++struct rtw_vifs_entry { ++ struct list_head list; ++ struct ieee80211_vif *vif; ++}; ++ ++struct rtw_iter_vifs_data { ++ struct rtw_dev *rtwdev; ++ struct list_head list; ++}; ++ ++static void rtw_collect_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) ++{ ++ struct rtw_iter_vifs_data *iter_stas = data; ++ struct rtw_vifs_entry *vifs_entry; ++ ++ vifs_entry = kmalloc(sizeof(*vifs_entry), GFP_ATOMIC); ++ if (!vifs_entry) ++ return; ++ ++ vifs_entry->vif = vif; ++ list_add_tail(&vifs_entry->list, &iter_stas->list); ++} ++ ++void rtw_iterate_vifs(struct rtw_dev *rtwdev, ++ void (*iterator)(void *data, struct ieee80211_vif *vif), ++ void *data) ++{ ++ struct rtw_iter_vifs_data iter_data; ++ struct rtw_vifs_entry *vif_entry, *tmp; ++ ++ /* &rtwdev->mutex makes sure no interfaces can be removed between ++ * collecting the interfaces and iterating over them. ++ */ ++ lockdep_assert_held(&rtwdev->mutex); ++ ++ iter_data.rtwdev = rtwdev; ++ INIT_LIST_HEAD(&iter_data.list); ++ ++ ieee80211_iterate_active_interfaces_atomic(rtwdev->hw, ++ IEEE80211_IFACE_ITER_NORMAL, ++ rtw_collect_vif_iter, &iter_data); ++ ++ list_for_each_entry_safe(vif_entry, tmp, &iter_data.list, ++ list) { ++ list_del_init(&vif_entry->list); ++ iterator(data, vif_entry->vif); ++ kfree(vif_entry); ++ } ++} +diff --git a/drivers/net/wireless/realtek/rtw88/util.h b/drivers/net/wireless/realtek/rtw88/util.h +index 0c23b5069be0..f8399128a9a3 100644 +--- a/drivers/net/wireless/realtek/rtw88/util.h ++++ b/drivers/net/wireless/realtek/rtw88/util.h +@@ -7,9 +7,6 @@ + + struct rtw_dev; + +-#define rtw_iterate_vifs(rtwdev, iterator, data) \ +- ieee80211_iterate_active_interfaces(rtwdev->hw, \ +- IEEE80211_IFACE_ITER_NORMAL, iterator, data) + #define rtw_iterate_vifs_atomic(rtwdev, iterator, data) \ + ieee80211_iterate_active_interfaces_atomic(rtwdev->hw, \ + IEEE80211_IFACE_ITER_NORMAL, iterator, data) +@@ -20,6 +17,14 @@ struct rtw_dev; + #define rtw_iterate_keys_rcu(rtwdev, vif, iterator, data) \ + ieee80211_iter_keys_rcu((rtwdev)->hw, vif, iterator, data) + ++void rtw_iterate_vifs(struct rtw_dev *rtwdev, ++ void (*iterator)(void *data, struct ieee80211_vif *vif), ++ void *data); ++void rtw_iterate_stas(struct rtw_dev *rtwdev, ++ void (*iterator)(void *data, ++ struct ieee80211_sta *sta), ++ void *data); ++ + static inline u8 *get_hdr_bssid(struct ieee80211_hdr *hdr) + { + __le16 fc = hdr->frame_control; -- -2.25.1 +2.39.2 + +From 8d221f7e77cf255a917dc33e2aa8b17b97ace27f Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Mon, 5 Feb 2024 17:41:25 -0500 +Subject: [PATCH] include: linux: mmc: sdio_ids.h: realtek sdio vendor id + +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 74f9d9a6d3..f30a4e5647 100644 +--- a/include/linux/mmc/sdio_ids.h ++++ b/include/linux/mmc/sdio_ids.h +@@ -111,6 +111,16 @@ + #define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296 + #define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347 + ++#define SDIO_VENDOR_ID_REALTEK 0x024c ++#define SDIO_DEVICE_ID_REALTEK_RTW8723BS 0xb723 ++#define SDIO_DEVICE_ID_REALTEK_RTW8821BS 0xb821 ++#define SDIO_DEVICE_ID_REALTEK_RTW8822BS 0xb822 ++#define SDIO_DEVICE_ID_REALTEK_RTW8821CS 0xc821 ++#define SDIO_DEVICE_ID_REALTEK_RTW8822CS 0xc822 ++#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT 0xd723 ++#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT 0xd724 ++#define SDIO_DEVICE_ID_REALTEK_RTW8821DS 0xd821 ++ + #define SDIO_VENDOR_ID_SIANO 0x039a + #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 + #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 +-- +2.39.2 + +From 4263afa80a9e2bbb2127b0162a8d01b0c823ad5c Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Mon, 5 Feb 2024 17:57:36 -0500 +Subject: [PATCH] drivers: net: wireless: realtek: rtw88: main.c: 6.1.y fixup + +Signed-off-by: Patrick Yavitz +--- + drivers/net/wireless/realtek/rtw88/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c +index 4a33d2e47f..06469babab 100644 +--- a/drivers/net/wireless/realtek/rtw88/main.c ++++ b/drivers/net/wireless/realtek/rtw88/main.c +@@ -2181,7 +2181,7 @@ void rtw_core_deinit(struct rtw_dev *rtwdev) + release_firmware(wow_fw->firmware); + + destroy_workqueue(rtwdev->tx_wq); +- timer_delete_sync(&rtwdev->tx_report.purge_timer); ++ del_timer_sync(&rtwdev->tx_report.purge_timer); + spin_lock_irqsave(&rtwdev->tx_report.q_lock, flags); + skb_queue_purge(&rtwdev->tx_report.queue); + spin_unlock_irqrestore(&rtwdev->tx_report.q_lock, flags); +-- +2.39.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:32:45 +0200 +Subject: [PATCH v2 1/4] wifi: rtw88: 8821cu: Fix firmware upload fail + +RTL8822CU, RTL8822BU, and RTL8821CU need an extra register write after +reading and writing certain addresses. + +Without this, the firmware upload fails approximately more than 50% of +the time. + +Tested with RTL8811CU (Tenda U9 V2.0) which is the same as RTL8821CU +but without Bluetooth. + +Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") +Signed-off-by: Bitterblue Smith +--- +v2: + - Simplify the code and add comments, as suggested. +--- + drivers/net/wireless/realtek/rtw88/usb.c | 40 ++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 3c4f28c306a9..3be6cbbf9ad8 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -33,6 +33,36 @@ static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, + rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); + } + ++static void rtw_usb_reg_sec(struct rtw_dev *rtwdev, u32 addr, __le32 *data) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = rtwusb->udev; ++ bool reg_on_section = false; ++ u16 t_reg = 0x4e0; ++ u8 t_len = 1; ++ int status; ++ ++ /* There are three sections: ++ * 1. on (0x00~0xFF; 0x1000~0x10FF): this section is always powered on ++ * 2. off (< 0xFE00, excluding "on" section): this section could be ++ * powered off ++ * 3. local (>= 0xFE00): usb specific registers section ++ */ ++ if (addr <= 0xff || (addr >= 0x1000 && addr <= 0x10ff)) ++ reg_on_section = true; ++ ++ if (!reg_on_section) ++ return; ++ ++ status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, ++ t_reg, 0, data, t_len, 500); ++ ++ if (status != t_len && status != -ENODEV) ++ rtw_err(rtwdev, "%s: reg 0x%x, usb write %u fail, status: %d\n", ++ __func__, t_reg, t_len, status); ++} ++ + static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + { + struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); +@@ -58,6 +88,11 @@ static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + rtw_err(rtwdev, "read register 0x%x failed with %d\n", + addr, ret); + ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); ++ + return le32_to_cpu(*data); + } + +@@ -111,6 +146,11 @@ static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) + if (ret < 0 && ret != -ENODEV && count++ < 4) + rtw_err(rtwdev, "write register 0x%x failed with %d\n", + addr, ret); ++ ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); + } + + static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:34:13 +0200 +Subject: [PATCH v2 2/4] wifi: rtw88: 8821cu: Fix connection failure + +Clear bit 8 of REG_SYS_STATUS1 after MAC power on. + +Without this, some RTL8821CU and RTL8811CU cannot connect to any +network: + +Feb 19 13:33:11 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 1/3) +Feb 19 13:33:13 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 2/3) +Feb 19 13:33:14 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 3/3) +Feb 19 13:33:15 ideapad2 kernel: wlp3s0f3u2: authentication with + 90:55:de:__:__:__ timed out + +The RTL8822CU and RTL8822BU out-of-tree drivers do this as well, so do +it for all three types of chips. + +Tested with RTL8811CU (Tenda U9 V2.0). + +Signed-off-by: Bitterblue Smith +--- +v2: + - Check for pwr_on instead of pwr_seq == chip->pwr_on_seq. +--- + drivers/net/wireless/realtek/rtw88/mac.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c +index 298663b03580..0c1c1ff31085 100644 +--- a/drivers/net/wireless/realtek/rtw88/mac.c ++++ b/drivers/net/wireless/realtek/rtw88/mac.c +@@ -309,6 +309,13 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) + pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; + ret = rtw_pwr_seq_parser(rtwdev, pwr_seq); + ++ if (pwr_on && rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB) { ++ if (chip->id == RTW_CHIP_TYPE_8822C || ++ chip->id == RTW_CHIP_TYPE_8822B || ++ chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_write8_clr(rtwdev, REG_SYS_STATUS1 + 1, BIT(0)); ++ } ++ + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) + rtw_write32(rtwdev, REG_SDIO_HIMR, imr); + +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +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 +--- +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 + +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 +--- +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 +Date: Tue, 27 Feb 2024 02:34:40 +0000 +Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU + +From: Nick Morrow + +Purpose: Add VID/PIDs that are known to be missing for this driver. +- removed /* 8811CU */ and /* 8821CU */ as they are redundant +since the file is specific to those chips. +- removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK +VID so it may not be specific to this adapter. + +Source is https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh43p_e8oz7OouS6gRBEng0 +Verified and tested. + +Signed-off-by: Nick Morrow +Signed-off-by: Larry Finger +Acked-by: Ping-Ke Shih + +--- + .../net/wireless/realtek/rtw88/rtw8821cu.c | 40 ++++++++++++------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +index 7a5cbdc31ef7..e2c7d9f87683 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +@@ -9,24 +9,36 @@ + #include "usb.h" + + static const struct usb_device_id rtw_8821cu_id_table[] = { +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8731, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc80c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331d, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* D-Link */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ + {}, + }; + MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); +-- +2.43.2 + diff --git a/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch b/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch index 8d8edd9018..382255cd90 100644 --- a/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch +++ b/patch/misc/rtw88/6.6/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch @@ -1,131 +1,71 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 20 Nov 2023 12:57:26 +0100 -Subject: [PATCH v3] wifi: rtw88: sdio: Honor the host max_req_size in the RX path +From: Dmitry Antipov +To: Ping-Ke Shih +Date: Tue, 15 Aug 2023 17:28:28 +0300 +Subject: [PATCH] wifi: rtw88: add missing call to cancel_work_sync() -Lukas reports skb_over_panic errors on his Banana Pi BPI-CM4 which comes -with an Amlogic A311D (G12B) SoC and a RTL8822CS SDIO wifi/Bluetooth -combo card. The error he observed is identical to what has been fixed -in commit e967229ead0e ("wifi: rtw88: sdio: Check the HISR RX_REQUEST -bit in rtw_sdio_rx_isr()") but that commit didn't fix Lukas' problem. +Add missing call to 'cancel_work_sync()' in 'rtw_core_stop()'. -Lukas found that disabling or limiting RX aggregation works around the -problem for some time (but does not fully fix it). In the following -discussion a few key topics have been discussed which have an impact on -this problem: -- The Amlogic A311D (G12B) SoC has a hardware bug in the SDIO controller - which prevents DMA transfers. Instead all transfers need to go through - the controller SRAM which limits transfers to 1536 bytes -- rtw88 chips don't split incoming (RX) packets, so if a big packet is - received this is forwarded to the host in it's original form -- rtw88 chips can do RX aggregation, meaning more multiple incoming - packets can be pulled by the host from the card with one MMC/SDIO - transfer. This Depends on settings in the REG_RXDMA_AGG_PG_TH - register (BIT_RXDMA_AGG_PG_TH limits the number of packets that will - be aggregated, BIT_DMA_AGG_TO_V1 configures a timeout for aggregation - and BIT_EN_PRE_CALC makes the chip honor the limits more effectively) - -Use multiple consecutive reads in rtw_sdio_read_port() and limit the -number of bytes which are copied by the host from the card in one -MMC/SDIO transfer. This allows receiving a buffer that's larger than -the hosts max_req_size (number of bytes which can be transferred in -one MMC/SDIO transfer). As a result of this the skb_over_panic error -is gone as the rtw88 driver is now able to receive more than 1536 bytes -from the card (either because the incoming packet is larger than that -or because multiple packets have been aggregated). - -In case of an receive errors (-EILSEQ has been observed by Lukas) we -need to drain the remaining data from the card's buffer, otherwise the -card will return corrupt data for the next rtw_sdio_read_port() call. - -Fixes: 65371a3f14e7 ("wifi: rtw88: sdio: Add HCI implementation for SDIO based chipsets") -Reported-by: Lukas F. Hartmann -Closes: https://lore.kernel.org/linux-wireless/CAFBinCBaXtebixKbjkWKW_WXc5k=NdGNaGUjVE8NCPNxOhsb2g@mail.gmail.com/ -Suggested-by: Ping-Ke Shih -Signed-off-by: Martin Blumenstingl +Fixes: 5c831644e1f4 ("rtw88: handle and recover when firmware crash") +Signed-off-by: Dmitry Antipov --- + drivers/net/wireless/realtek/rtw88/main.c | 1 + + 1 file changed, 1 insertion(+) -Changes since v2 at [2]: -- Don't initialize err to zero as that intiial value is never used. - Thanks Ping-Ke for spotting this! -- Add a comment explaning why we need to continue reading but still - have to return an error to the caller of rtw_sdio_read_port() - -Changes since v1 at [0]: -- We need to read all bytes if we split the transaction into multiple - smaller reads. This is even the case when one of N reads reports an - error. Otherwise the next read port call will return garbage (partially - containing zeros, ...). A similar-ish approach can be found in the - vendor driver, see [1] (specifically the call to sdio_recv_and_drop()) -- Update the patch description accordingly - -With a preliminary version of this updated patch Lukas reported off- -list: "i've been using this laptop for almost 3 hours with heavy wifi -usage and so far no problems" - - -[0] https://lore.kernel.org/lkml/169089906853.212423.17095176293160428610.kvalo@kernel.org/T/ -[1] https://github.com/chewitt/RTL8822CS/blob/ad1391e219b59314485739a499fb442d5bbc069e/hal/rtl8822c/sdio/rtl8822cs_io.c#L468-L477 -[2] https://lore.kernel.org/linux-wireless/20230806181656.2072792-1-martin.blumenstingl@googlemail.com/ - - - drivers/net/wireless/realtek/rtw88/sdio.c | 35 ++++++++++++++++++----- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c -index 2c1fb2dabd40..0cae5746f540 100644 ---- a/drivers/net/wireless/realtek/rtw88/sdio.c -+++ b/drivers/net/wireless/realtek/rtw88/sdio.c -@@ -500,19 +500,40 @@ static u32 rtw_sdio_get_tx_addr(struct rtw_dev *rtwdev, size_t size, - static int rtw_sdio_read_port(struct rtw_dev *rtwdev, u8 *buf, size_t count) - { - struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ struct mmc_host *host = rtwsdio->sdio_func->card->host; - bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); - u32 rxaddr = rtwsdio->rx_addr++; -- int ret; -+ int ret = 0, err; -+ size_t bytes; +diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c +index 4a33d2e47f33..3a63dfc81d06 100644 +--- a/drivers/net/wireless/realtek/rtw88/main.c ++++ b/drivers/net/wireless/realtek/rtw88/main.c +@@ -1522,6 +1522,7 @@ void rtw_core_stop(struct rtw_dev *rtwdev) + mutex_unlock(&rtwdev->mutex); - if (bus_claim) - sdio_claim_host(rtwsdio->sdio_func); - -- ret = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -- RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), count); -- if (ret) -- rtw_warn(rtwdev, -- "Failed to read %zu byte(s) from SDIO port 0x%08x", -- count, rxaddr); -+ while (count > 0) { -+ bytes = min_t(size_t, host->max_req_size, count); -+ -+ err = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -+ RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), -+ bytes); -+ if (err) { -+ rtw_warn(rtwdev, -+ "Failed to read %zu byte(s) from SDIO port 0x%08x: %d", -+ bytes, rxaddr, err); -+ -+ /* Signal to the caller that reading did not work and -+ * that the data in the buffer is short/corrupted. -+ */ -+ ret = err; -+ -+ /* Don't stop here - instead drain the remaining data -+ * from the card's buffer, else the card will return -+ * corrupt data for the next rtw_sdio_read_port() call. -+ */ -+ } -+ -+ count -= bytes; -+ buf += bytes; -+ } - - if (bus_claim) - sdio_release_host(rtwsdio->sdio_func); + cancel_work_sync(&rtwdev->c2h_work); ++ cancel_work_sync(&rtwdev->fw_recovery_work); + cancel_work_sync(&rtwdev->update_beacon_work); + cancel_delayed_work_sync(&rtwdev->watch_dog_work); + cancel_delayed_work_sync(&coex->bt_relink_work); -- -2.42.1 +2.41.0 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ping-Ke Shih +To: +Date: Fri, 25 Aug 2023 14:24:04 +0800 +Subject: [PATCH] wifi: rtw88: fix typo rtw8822cu_probe + +The probe function of 8822cu is misplaced to 8822bu, so we fix it. + +Fixes: 07cef03b8d44 ("wifi: rtw88: Add rtw8822cu chipset support") +Signed-off-by: Po-Hao Huang +Signed-off-by: Ping-Ke Shih +--- + drivers/net/wireless/realtek/rtw88/rtw8822cu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822cu.c b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c +index af28ca09d41f..157d5102a4b1 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8822cu.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8822cu.c +@@ -25,7 +25,7 @@ static const struct usb_device_id rtw_8822cu_id_table[] = { + }; + 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); +@@ -34,7 +34,7 @@ static int rtw8822bu_probe(struct usb_interface *intf, + 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); +-- +2.25.1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ping-Ke Shih @@ -6194,3 +6134,346 @@ index fcff31688c45..91ed921407bb 100644 #define REG_FA_CCK 0xa5c -- 2.25.1 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:32:45 +0200 +Subject: [PATCH v2 1/4] wifi: rtw88: 8821cu: Fix firmware upload fail + +RTL8822CU, RTL8822BU, and RTL8821CU need an extra register write after +reading and writing certain addresses. + +Without this, the firmware upload fails approximately more than 50% of +the time. + +Tested with RTL8811CU (Tenda U9 V2.0) which is the same as RTL8821CU +but without Bluetooth. + +Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") +Signed-off-by: Bitterblue Smith +--- +v2: + - Simplify the code and add comments, as suggested. +--- + drivers/net/wireless/realtek/rtw88/usb.c | 40 ++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 3c4f28c306a9..3be6cbbf9ad8 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -33,6 +33,36 @@ static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, + rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); + } + ++static void rtw_usb_reg_sec(struct rtw_dev *rtwdev, u32 addr, __le32 *data) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = rtwusb->udev; ++ bool reg_on_section = false; ++ u16 t_reg = 0x4e0; ++ u8 t_len = 1; ++ int status; ++ ++ /* There are three sections: ++ * 1. on (0x00~0xFF; 0x1000~0x10FF): this section is always powered on ++ * 2. off (< 0xFE00, excluding "on" section): this section could be ++ * powered off ++ * 3. local (>= 0xFE00): usb specific registers section ++ */ ++ if (addr <= 0xff || (addr >= 0x1000 && addr <= 0x10ff)) ++ reg_on_section = true; ++ ++ if (!reg_on_section) ++ return; ++ ++ status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, ++ t_reg, 0, data, t_len, 500); ++ ++ if (status != t_len && status != -ENODEV) ++ rtw_err(rtwdev, "%s: reg 0x%x, usb write %u fail, status: %d\n", ++ __func__, t_reg, t_len, status); ++} ++ + static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + { + struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); +@@ -58,6 +88,11 @@ static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + rtw_err(rtwdev, "read register 0x%x failed with %d\n", + addr, ret); + ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); ++ + return le32_to_cpu(*data); + } + +@@ -111,6 +146,11 @@ static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) + if (ret < 0 && ret != -ENODEV && count++ < 4) + rtw_err(rtwdev, "write register 0x%x failed with %d\n", + addr, ret); ++ ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); + } + + static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:34:13 +0200 +Subject: [PATCH v2 2/4] wifi: rtw88: 8821cu: Fix connection failure + +Clear bit 8 of REG_SYS_STATUS1 after MAC power on. + +Without this, some RTL8821CU and RTL8811CU cannot connect to any +network: + +Feb 19 13:33:11 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 1/3) +Feb 19 13:33:13 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 2/3) +Feb 19 13:33:14 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 3/3) +Feb 19 13:33:15 ideapad2 kernel: wlp3s0f3u2: authentication with + 90:55:de:__:__:__ timed out + +The RTL8822CU and RTL8822BU out-of-tree drivers do this as well, so do +it for all three types of chips. + +Tested with RTL8811CU (Tenda U9 V2.0). + +Signed-off-by: Bitterblue Smith +--- +v2: + - Check for pwr_on instead of pwr_seq == chip->pwr_on_seq. +--- + drivers/net/wireless/realtek/rtw88/mac.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c +index 298663b03580..0c1c1ff31085 100644 +--- a/drivers/net/wireless/realtek/rtw88/mac.c ++++ b/drivers/net/wireless/realtek/rtw88/mac.c +@@ -309,6 +309,13 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) + pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; + ret = rtw_pwr_seq_parser(rtwdev, pwr_seq); + ++ if (pwr_on && rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB) { ++ if (chip->id == RTW_CHIP_TYPE_8822C || ++ chip->id == RTW_CHIP_TYPE_8822B || ++ chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_write8_clr(rtwdev, REG_SYS_STATUS1 + 1, BIT(0)); ++ } ++ + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) + rtw_write32(rtwdev, REG_SDIO_HIMR, imr); + +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +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 +--- +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 + +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 +--- +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 +Date: Tue, 27 Feb 2024 02:34:40 +0000 +Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU + +From: Nick Morrow + +Purpose: Add VID/PIDs that are known to be missing for this driver. +- removed /* 8811CU */ and /* 8821CU */ as they are redundant +since the file is specific to those chips. +- removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK +VID so it may not be specific to this adapter. + +Source is https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh43p_e8oz7OouS6gRBEng0 +Verified and tested. + +Signed-off-by: Nick Morrow +Signed-off-by: Larry Finger +Acked-by: Ping-Ke Shih + +--- + .../net/wireless/realtek/rtw88/rtw8821cu.c | 40 ++++++++++++------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +index 7a5cbdc31ef7..e2c7d9f87683 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +@@ -9,24 +9,36 @@ + #include "usb.h" + + static const struct usb_device_id rtw_8821cu_id_table[] = { +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8731, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc80c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331d, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* D-Link */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ + {}, + }; + MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); +-- +2.43.2 + diff --git a/patch/misc/rtw88/6.7/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch b/patch/misc/rtw88/6.7/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch index 761cd4d373..22a15550a2 100644 --- a/patch/misc/rtw88/6.7/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch +++ b/patch/misc/rtw88/6.7/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch @@ -1,129 +1,342 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 20 Nov 2023 12:57:26 +0100 -Subject: [PATCH v3] wifi: rtw88: sdio: Honor the host max_req_size in the RX path +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:32:45 +0200 +Subject: [PATCH v2 1/4] wifi: rtw88: 8821cu: Fix firmware upload fail -Lukas reports skb_over_panic errors on his Banana Pi BPI-CM4 which comes -with an Amlogic A311D (G12B) SoC and a RTL8822CS SDIO wifi/Bluetooth -combo card. The error he observed is identical to what has been fixed -in commit e967229ead0e ("wifi: rtw88: sdio: Check the HISR RX_REQUEST -bit in rtw_sdio_rx_isr()") but that commit didn't fix Lukas' problem. +RTL8822CU, RTL8822BU, and RTL8821CU need an extra register write after +reading and writing certain addresses. -Lukas found that disabling or limiting RX aggregation works around the -problem for some time (but does not fully fix it). In the following -discussion a few key topics have been discussed which have an impact on -this problem: -- The Amlogic A311D (G12B) SoC has a hardware bug in the SDIO controller - which prevents DMA transfers. Instead all transfers need to go through - the controller SRAM which limits transfers to 1536 bytes -- rtw88 chips don't split incoming (RX) packets, so if a big packet is - received this is forwarded to the host in it's original form -- rtw88 chips can do RX aggregation, meaning more multiple incoming - packets can be pulled by the host from the card with one MMC/SDIO - transfer. This Depends on settings in the REG_RXDMA_AGG_PG_TH - register (BIT_RXDMA_AGG_PG_TH limits the number of packets that will - be aggregated, BIT_DMA_AGG_TO_V1 configures a timeout for aggregation - and BIT_EN_PRE_CALC makes the chip honor the limits more effectively) +Without this, the firmware upload fails approximately more than 50% of +the time. -Use multiple consecutive reads in rtw_sdio_read_port() and limit the -number of bytes which are copied by the host from the card in one -MMC/SDIO transfer. This allows receiving a buffer that's larger than -the hosts max_req_size (number of bytes which can be transferred in -one MMC/SDIO transfer). As a result of this the skb_over_panic error -is gone as the rtw88 driver is now able to receive more than 1536 bytes -from the card (either because the incoming packet is larger than that -or because multiple packets have been aggregated). +Tested with RTL8811CU (Tenda U9 V2.0) which is the same as RTL8821CU +but without Bluetooth. -In case of an receive errors (-EILSEQ has been observed by Lukas) we -need to drain the remaining data from the card's buffer, otherwise the -card will return corrupt data for the next rtw_sdio_read_port() call. - -Fixes: 65371a3f14e7 ("wifi: rtw88: sdio: Add HCI implementation for SDIO based chipsets") -Reported-by: Lukas F. Hartmann -Closes: https://lore.kernel.org/linux-wireless/CAFBinCBaXtebixKbjkWKW_WXc5k=NdGNaGUjVE8NCPNxOhsb2g@mail.gmail.com/ -Suggested-by: Ping-Ke Shih -Signed-off-by: Martin Blumenstingl +Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") +Signed-off-by: Bitterblue Smith --- +v2: + - Simplify the code and add comments, as suggested. +--- + drivers/net/wireless/realtek/rtw88/usb.c | 40 ++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) -Changes since v2 at [2]: -- Don't initialize err to zero as that intiial value is never used. - Thanks Ping-Ke for spotting this! -- Add a comment explaning why we need to continue reading but still - have to return an error to the caller of rtw_sdio_read_port() - -Changes since v1 at [0]: -- We need to read all bytes if we split the transaction into multiple - smaller reads. This is even the case when one of N reads reports an - error. Otherwise the next read port call will return garbage (partially - containing zeros, ...). A similar-ish approach can be found in the - vendor driver, see [1] (specifically the call to sdio_recv_and_drop()) -- Update the patch description accordingly - -With a preliminary version of this updated patch Lukas reported off- -list: "i've been using this laptop for almost 3 hours with heavy wifi -usage and so far no problems" - - -[0] https://lore.kernel.org/lkml/169089906853.212423.17095176293160428610.kvalo@kernel.org/T/ -[1] https://github.com/chewitt/RTL8822CS/blob/ad1391e219b59314485739a499fb442d5bbc069e/hal/rtl8822c/sdio/rtl8822cs_io.c#L468-L477 -[2] https://lore.kernel.org/linux-wireless/20230806181656.2072792-1-martin.blumenstingl@googlemail.com/ - - - drivers/net/wireless/realtek/rtw88/sdio.c | 35 ++++++++++++++++++----- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c -index 2c1fb2dabd40..0cae5746f540 100644 ---- a/drivers/net/wireless/realtek/rtw88/sdio.c -+++ b/drivers/net/wireless/realtek/rtw88/sdio.c -@@ -500,19 +500,40 @@ static u32 rtw_sdio_get_tx_addr(struct rtw_dev *rtwdev, size_t size, - static int rtw_sdio_read_port(struct rtw_dev *rtwdev, u8 *buf, size_t count) +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 3c4f28c306a9..3be6cbbf9ad8 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -33,6 +33,36 @@ static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, + rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); + } + ++static void rtw_usb_reg_sec(struct rtw_dev *rtwdev, u32 addr, __le32 *data) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = rtwusb->udev; ++ bool reg_on_section = false; ++ u16 t_reg = 0x4e0; ++ u8 t_len = 1; ++ int status; ++ ++ /* There are three sections: ++ * 1. on (0x00~0xFF; 0x1000~0x10FF): this section is always powered on ++ * 2. off (< 0xFE00, excluding "on" section): this section could be ++ * powered off ++ * 3. local (>= 0xFE00): usb specific registers section ++ */ ++ if (addr <= 0xff || (addr >= 0x1000 && addr <= 0x10ff)) ++ reg_on_section = true; ++ ++ if (!reg_on_section) ++ return; ++ ++ status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, ++ t_reg, 0, data, t_len, 500); ++ ++ if (status != t_len && status != -ENODEV) ++ rtw_err(rtwdev, "%s: reg 0x%x, usb write %u fail, status: %d\n", ++ __func__, t_reg, t_len, status); ++} ++ + static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) { - struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv; -+ struct mmc_host *host = rtwsdio->sdio_func->card->host; - bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio); - u32 rxaddr = rtwsdio->rx_addr++; -- int ret; -+ int ret = 0, err; -+ size_t bytes; + struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); +@@ -58,6 +88,11 @@ static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + rtw_err(rtwdev, "read register 0x%x failed with %d\n", + addr, ret); - if (bus_claim) - sdio_claim_host(rtwsdio->sdio_func); ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); ++ + return le32_to_cpu(*data); + } -- ret = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -- RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), count); -- if (ret) -- rtw_warn(rtwdev, -- "Failed to read %zu byte(s) from SDIO port 0x%08x", -- count, rxaddr); -+ while (count > 0) { -+ bytes = min_t(size_t, host->max_req_size, count); +@@ -111,6 +146,11 @@ static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) + if (ret < 0 && ret != -ENODEV && count++ < 4) + rtw_err(rtwdev, "write register 0x%x failed with %d\n", + addr, ret); + -+ err = sdio_memcpy_fromio(rtwsdio->sdio_func, buf, -+ RTW_SDIO_ADDR_RX_RX0FF_GEN(rxaddr), -+ bytes); -+ if (err) { -+ rtw_warn(rtwdev, -+ "Failed to read %zu byte(s) from SDIO port 0x%08x: %d", -+ bytes, rxaddr, err); -+ -+ /* Signal to the caller that reading did not work and -+ * that the data in the buffer is short/corrupted. -+ */ -+ ret = err; -+ -+ /* Don't stop here - instead drain the remaining data -+ * from the card's buffer, else the card will return -+ * corrupt data for the next rtw_sdio_read_port() call. -+ */ -+ } -+ -+ count -= bytes; -+ buf += bytes; -+ } ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); + } - if (bus_claim) - sdio_release_host(rtwsdio->sdio_func); + static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) -- -2.42.1 +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:34:13 +0200 +Subject: [PATCH v2 2/4] wifi: rtw88: 8821cu: Fix connection failure + +Clear bit 8 of REG_SYS_STATUS1 after MAC power on. + +Without this, some RTL8821CU and RTL8811CU cannot connect to any +network: + +Feb 19 13:33:11 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 1/3) +Feb 19 13:33:13 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 2/3) +Feb 19 13:33:14 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 3/3) +Feb 19 13:33:15 ideapad2 kernel: wlp3s0f3u2: authentication with + 90:55:de:__:__:__ timed out + +The RTL8822CU and RTL8822BU out-of-tree drivers do this as well, so do +it for all three types of chips. + +Tested with RTL8811CU (Tenda U9 V2.0). + +Signed-off-by: Bitterblue Smith +--- +v2: + - Check for pwr_on instead of pwr_seq == chip->pwr_on_seq. +--- + drivers/net/wireless/realtek/rtw88/mac.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c +index 298663b03580..0c1c1ff31085 100644 +--- a/drivers/net/wireless/realtek/rtw88/mac.c ++++ b/drivers/net/wireless/realtek/rtw88/mac.c +@@ -309,6 +309,13 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) + pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; + ret = rtw_pwr_seq_parser(rtwdev, pwr_seq); + ++ if (pwr_on && rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB) { ++ if (chip->id == RTW_CHIP_TYPE_8822C || ++ chip->id == RTW_CHIP_TYPE_8822B || ++ chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_write8_clr(rtwdev, REG_SYS_STATUS1 + 1, BIT(0)); ++ } ++ + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) + rtw_write32(rtwdev, REG_SDIO_HIMR, imr); + +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +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 +--- +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 + +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 +--- +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 +Date: Tue, 27 Feb 2024 02:34:40 +0000 +Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU + +From: Nick Morrow + +Purpose: Add VID/PIDs that are known to be missing for this driver. +- removed /* 8811CU */ and /* 8821CU */ as they are redundant +since the file is specific to those chips. +- removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK +VID so it may not be specific to this adapter. + +Source is https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh43p_e8oz7OouS6gRBEng0 +Verified and tested. + +Signed-off-by: Nick Morrow +Signed-off-by: Larry Finger +Acked-by: Ping-Ke Shih + +--- + .../net/wireless/realtek/rtw88/rtw8821cu.c | 40 ++++++++++++------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +index 7a5cbdc31ef7..e2c7d9f87683 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +@@ -9,24 +9,36 @@ + #include "usb.h" + + static const struct usb_device_id rtw_8821cu_id_table[] = { +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8731, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc80c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331d, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* D-Link */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ + {}, + }; + MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); +-- +2.43.2 diff --git a/patch/misc/rtw88/6.8/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch b/patch/misc/rtw88/6.8/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch new file mode 100644 index 0000000000..22a15550a2 --- /dev/null +++ b/patch/misc/rtw88/6.8/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch @@ -0,0 +1,342 @@ +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:32:45 +0200 +Subject: [PATCH v2 1/4] wifi: rtw88: 8821cu: Fix firmware upload fail + +RTL8822CU, RTL8822BU, and RTL8821CU need an extra register write after +reading and writing certain addresses. + +Without this, the firmware upload fails approximately more than 50% of +the time. + +Tested with RTL8811CU (Tenda U9 V2.0) which is the same as RTL8821CU +but without Bluetooth. + +Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") +Signed-off-by: Bitterblue Smith +--- +v2: + - Simplify the code and add comments, as suggested. +--- + drivers/net/wireless/realtek/rtw88/usb.c | 40 ++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 3c4f28c306a9..3be6cbbf9ad8 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -33,6 +33,36 @@ static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb, + rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data); + } + ++static void rtw_usb_reg_sec(struct rtw_dev *rtwdev, u32 addr, __le32 *data) ++{ ++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); ++ struct usb_device *udev = rtwusb->udev; ++ bool reg_on_section = false; ++ u16 t_reg = 0x4e0; ++ u8 t_len = 1; ++ int status; ++ ++ /* There are three sections: ++ * 1. on (0x00~0xFF; 0x1000~0x10FF): this section is always powered on ++ * 2. off (< 0xFE00, excluding "on" section): this section could be ++ * powered off ++ * 3. local (>= 0xFE00): usb specific registers section ++ */ ++ if (addr <= 0xff || (addr >= 0x1000 && addr <= 0x10ff)) ++ reg_on_section = true; ++ ++ if (!reg_on_section) ++ return; ++ ++ status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, ++ t_reg, 0, data, t_len, 500); ++ ++ if (status != t_len && status != -ENODEV) ++ rtw_err(rtwdev, "%s: reg 0x%x, usb write %u fail, status: %d\n", ++ __func__, t_reg, t_len, status); ++} ++ + static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + { + struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev); +@@ -58,6 +88,11 @@ static u32 rtw_usb_read(struct rtw_dev *rtwdev, u32 addr, u16 len) + rtw_err(rtwdev, "read register 0x%x failed with %d\n", + addr, ret); + ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); ++ + return le32_to_cpu(*data); + } + +@@ -111,6 +146,11 @@ static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) + if (ret < 0 && ret != -ENODEV && count++ < 4) + rtw_err(rtwdev, "write register 0x%x failed with %d\n", + addr, ret); ++ ++ if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8822B || ++ rtwdev->chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_usb_reg_sec(rtwdev, addr, data); + } + + static void rtw_usb_write8(struct rtw_dev *rtwdev, u32 addr, u8 val) +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Fri, 1 Mar 2024 00:34:13 +0200 +Subject: [PATCH v2 2/4] wifi: rtw88: 8821cu: Fix connection failure + +Clear bit 8 of REG_SYS_STATUS1 after MAC power on. + +Without this, some RTL8821CU and RTL8811CU cannot connect to any +network: + +Feb 19 13:33:11 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 1/3) +Feb 19 13:33:13 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 2/3) +Feb 19 13:33:14 ideapad2 kernel: wlp3s0f3u2: send auth to + 90:55:de:__:__:__ (try 3/3) +Feb 19 13:33:15 ideapad2 kernel: wlp3s0f3u2: authentication with + 90:55:de:__:__:__ timed out + +The RTL8822CU and RTL8822BU out-of-tree drivers do this as well, so do +it for all three types of chips. + +Tested with RTL8811CU (Tenda U9 V2.0). + +Signed-off-by: Bitterblue Smith +--- +v2: + - Check for pwr_on instead of pwr_seq == chip->pwr_on_seq. +--- + drivers/net/wireless/realtek/rtw88/mac.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c +index 298663b03580..0c1c1ff31085 100644 +--- a/drivers/net/wireless/realtek/rtw88/mac.c ++++ b/drivers/net/wireless/realtek/rtw88/mac.c +@@ -309,6 +309,13 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) + pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; + ret = rtw_pwr_seq_parser(rtwdev, pwr_seq); + ++ if (pwr_on && rtw_hci_type(rtwdev) == RTW_HCI_TYPE_USB) { ++ if (chip->id == RTW_CHIP_TYPE_8822C || ++ chip->id == RTW_CHIP_TYPE_8822B || ++ chip->id == RTW_CHIP_TYPE_8821C) ++ rtw_write8_clr(rtwdev, REG_SYS_STATUS1 + 1, BIT(0)); ++ } ++ + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) + rtw_write32(rtwdev, REG_SDIO_HIMR, imr); + +-- +2.43.2 + +From 3b25c78f92268d44d0c3c8201a302f49a841c0a1 Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +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 +--- +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 + +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 +--- +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 +Date: Tue, 27 Feb 2024 02:34:40 +0000 +Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU + +From: Nick Morrow + +Purpose: Add VID/PIDs that are known to be missing for this driver. +- removed /* 8811CU */ and /* 8821CU */ as they are redundant +since the file is specific to those chips. +- removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK +VID so it may not be specific to this adapter. + +Source is https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh43p_e8oz7OouS6gRBEng0 +Verified and tested. + +Signed-off-by: Nick Morrow +Signed-off-by: Larry Finger +Acked-by: Ping-Ke Shih + +--- + .../net/wireless/realtek/rtw88/rtw8821cu.c | 40 ++++++++++++------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +index 7a5cbdc31ef7..e2c7d9f87683 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c +@@ -9,24 +9,36 @@ + #include "usb.h" + + static const struct usb_device_id rtw_8821cu_id_table[] = { +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8731, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc80c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, + { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */ +- { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff), +- .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */ ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331d, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* D-Link */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd811, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */ + {}, + }; + MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table); +-- +2.43.2 +