wifi: rtw89: update debug stuffs and enter PS mode aggressively
Ping-Ke Shih
maintainercover wifi: rtw89: update debug stuffs and enter PS mode aggressively
First three patches are to correct/update registers settings for debug. Patch 4/6 is to avoid crash for a very very rare case, which almost can't reproduce. The cause looks like hardware report abnormal value somehow. The last patch is to enter PS mode aggressively to reduce power consumption for certain use case.
Chin-Yen Lee (1):
wifi: rtw89: enter power save mode aggressively
Eric Huang (2):
wifi: rtw89: update EDCCA report for subband 40M/80M/sub-20M
wifi: rtw89: correct length for IE18/19 PHY report and IE parser
Kuan-Chung Chen (1):
wifi: rtw89: mac: differentiate mem_page_size by chip generation
Zong-Zhe Yang (2):
wifi: rtw89: avoid NULL dereference when RX problematic packet on
unsupported 6 GHz band
wifi: rtw89: report boottime of receiving beacon and probe response
drivers/net/wireless/realtek/rtw89/core.c | 106 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/core.h | 20 +++- drivers/net/wireless/realtek/rtw89/debug.c | 13 ++- drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 5 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 3 + drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 11 +- drivers/net/wireless/realtek/rtw89/ser.c | 14 ++- drivers/net/wireless/realtek/rtw89/wow.c | 2 +- drivers/net/wireless/realtek/rtw89/wow.h | 14 ++- 11 files changed, 145 insertions(+), 45 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 wifi: rtw89: mac: differentiate mem_page_size by chip generation
From: Kuan-Chung Chen <[email protected]>
When debugging or recovering system error recovery (SER), it's necessary to dump internal memory to perform status inspection. Since the memory page size differs between WiFi 6 and 7 chips, define them accordingly.
--- drivers/net/wireless/realtek/rtw89/debug.c | 13 +++++++------ drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 5 ++++- drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + drivers/net/wireless/realtek/rtw89/ser.c | 11 ++++++----- 5 files changed, 19 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +7 -6
@@ -1114,6 +1114,7 @@ static int rtw89_debug_dump_mac_mem(struct rtw89_dev *rtwdev,const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;u32 filter_model_addr = mac->filter_model_addr;u32 indir_access_addr = mac->indir_access_addr; +u32 mem_page_size = mac->mem_page_size;u32 base_addr, start_page, residue;char *p = buf, *end = buf + bufsz;u32 i, j, pp, pages;
@@ -1121,14 +1122,14 @@ static int rtw89_debug_dump_mac_mem(struct rtw89_dev *rtwdev,u32 val; remain = len; - pages = len /MAC_MEM_DUMP_PAGE_SIZE +1 ; - start_page = start_addr /MAC_MEM_DUMP_PAGE_SIZE ; - residue = start_addr %MAC_MEM_DUMP_PAGE_SIZE ; + pages = len / mem_page_size +1 ; + start_page = start_addr / mem_page_size; + residue = start_addr % mem_page_size; base_addr = mac->mem_base_addrs[sel]; - base_addr += start_page *MAC_MEM_DUMP_PAGE_SIZE ; + base_addr += start_page * mem_page_size;for (pp =0 ; pp < pages; pp++) { - dump_len =min_t (u32, remain,MAC_MEM_DUMP_PAGE_SIZE ); + dump_len =min_t (u32, remain, mem_page_size);rtw89_write32 (rtwdev, filter_model_addr, base_addr);for (i = indir_access_addr + residue; i < indir_access_addr + dump_len;) {
@@ -1142,7 +1143,7 @@ static int rtw89_debug_dump_mac_mem(struct rtw89_dev *rtwdev, } p +=scnprintf (p, end - p,"\n" ); } - base_addr +=MAC_MEM_DUMP_PAGE_SIZE ; + base_addr += mem_page_size; }return p - buf;
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -6914,6 +6914,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .filter_model_addr = R_AX_FILTER_MODEL_ADDR, .indir_access_addr = R_AX_INDIR_ACCESS_ENTRY, .mem_base_addrs = rtw89_mac_mem_base_addrs_ax, + .mem_page_size = MAC_MEM_DUMP_PAGE_SIZE_AX, .rx_fltr = R_AX_RX_FLTR_OPT, .port_base = &rtw89_port_base_ax, .agg_len_ht = R_AX_AGG_LEN_HT_0,
drivers/net/wireless/realtek/rtw89/mac.h +4 -1
@@ -8,7 +8,9 @@#include "core.h" #include "reg.h" -#define MAC_MEM_DUMP_PAGE_SIZE 0x40000 +#define MAC_MEM_DUMP_PAGE_SIZE_AX 0x40000 +#define MAC_MEM_DUMP_PAGE_SIZE_BE 0x80000 +#define ADDR_CAM_ENT_SIZE 0x40#define ADDR_CAM_ENT_SHORT_SIZE 0x20#define BSSID_CAM_ENT_SIZE 0x08
@@ -970,6 +972,7 @@ struct rtw89_mac_gen_def {u32 filter_model_addr;u32 indir_access_addr;const u32 *mem_base_addrs; +u32 mem_page_size;u32 rx_fltr;const struct rtw89_port_reg *port_base;u32 agg_len_ht;
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -0
@@ -2567,6 +2567,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .filter_model_addr = R_BE_FILTER_MODEL_ADDR, .indir_access_addr = R_BE_INDIR_ACCESS_ENTRY, .mem_base_addrs = rtw89_mac_mem_base_addrs_be, + .mem_page_size = MAC_MEM_DUMP_PAGE_SIZE_BE, .rx_fltr = R_BE_RX_FLTR_OPT, .port_base = &rtw89_port_base_be, .agg_len_ht = R_BE_AGG_LEN_HT_0,
drivers/net/wireless/realtek/rtw89/ser.c +6 -5
@@ -566,21 +566,22 @@ static void ser_mac_mem_dump(struct rtw89_dev *rtwdev, u8 *buf,const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;u32 filter_model_addr = mac->filter_model_addr;u32 indir_access_addr = mac->indir_access_addr; +u32 mem_page_size = mac->mem_page_size;u32 *ptr = (u32 *)buf;u32 base_addr, start_page, residue;u32 cnt =0 ;u32 i; - start_page = start_addr /MAC_MEM_DUMP_PAGE_SIZE ; - residue = start_addr %MAC_MEM_DUMP_PAGE_SIZE ; + start_page = start_addr / mem_page_size; + residue = start_addr % mem_page_size; base_addr = mac->mem_base_addrs[sel]; - base_addr += start_page *MAC_MEM_DUMP_PAGE_SIZE ; + base_addr += start_page * mem_page_size;while (cnt < len) {rtw89_write32 (rtwdev, filter_model_addr, base_addr);for (i = indir_access_addr + residue; - i < indir_access_addr +MAC_MEM_DUMP_PAGE_SIZE ; + i < indir_access_addr + mem_page_size; i +=4 , ptr++) { *ptr =rtw89_read32 (rtwdev, i); cnt +=4 ;
@@ -589,7 +590,7 @@ static void ser_mac_mem_dump(struct rtw89_dev *rtwdev, u8 *buf, } residue =0 ; - base_addr +=MAC_MEM_DUMP_PAGE_SIZE ; + base_addr += mem_page_size; } }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/6] wifi: rtw89: mac: differentiate mem_page_size by chip generation
Quoted 9 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
When debugging or recovering system error recovery (SER), it's necessary to dump internal memory to perform status inspection. Since the memory page size differs between WiFi 6 and 7 chips, define them accordingly.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patch(es) applied to rtw-next branch of rtw.git, thanks.
9c5c5a920a79 wifi: rtw89: mac: differentiate mem_page_size by chip generation 8408366f61a7 wifi: rtw89: update EDCCA report for subband 40M/80M/sub-20M 640c27b2e0c5 wifi: rtw89: correct length for IE18/19 PHY report and IE parser 7e04f01bb94f wifi: rtw89: avoid NULL dereference when RX problematic packet on unsupported 6 GHz band c2852b5a0575 wifi: rtw89: report boottime of receiving beacon and probe response
Ping-Ke Shih
maintainerPATCH 2/6 wifi: rtw89: update EDCCA report for subband 40M/80M/sub-20M
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
EDCCA report is obtained from the hardware to display OBSS interference and their respective power levels for each subband. Modify the query settings to improve resolution for debugging purposes.
--- drivers/net/wireless/realtek/rtw89/phy.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +5 -6
@@ -7128,7 +7128,7 @@ static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bconst struct rtw89_edcca_p_regs *edcca_p_regs;bool flag_fb, flag_p20, flag_s20, flag_s40, flag_s80;s8 pwdb_fb, pwdb_p20, pwdb_s20, pwdb_s40, pwdb_s80; -u8 path, per20_bitmap; +u8 path, per20_bitmap =0 ;u8 pwdb[8 ];u32 tmp;
@@ -7158,14 +7158,11 @@ static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *b pwdb_fb =u32_get_bits (tmp,MASKBYTE3 );rtw89_phy_write32_mask (rtwdev, edcca_p_regs->rpt_sel, - edcca_p_regs->rpt_sel_mask,4 ); + edcca_p_regs->rpt_sel_mask,5 ); tmp =rtw89_phy_read32 (rtwdev, edcca_p_regs->rpt_b); pwdb_s80 =u32_get_bits (tmp,MASKBYTE1 ); pwdb_s40 =u32_get_bits (tmp,MASKBYTE2 ); - per20_bitmap =rtw89_phy_read32_mask (rtwdev, edcca_p_regs->rpt_a, -MASKBYTE0 ); -if (rtwdev->chip->chip_id ==RTL8922A ) {rtw89_phy_write32_mask (rtwdev, edcca_regs->rpt_sel_be, edcca_regs->rpt_sel_be_mask,4 );
@@ -7174,6 +7171,8 @@ static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *b pwdb[1 ] =u32_get_bits (tmp,MASKBYTE2 ); pwdb[2 ] =u32_get_bits (tmp,MASKBYTE1 ); pwdb[3 ] =u32_get_bits (tmp,MASKBYTE0 ); + per20_bitmap =rtw89_phy_read32_mask (rtwdev, edcca_p_regs->rpt_a, +MASKBYTE0 );rtw89_phy_write32_mask (rtwdev, edcca_regs->rpt_sel_be, edcca_regs->rpt_sel_be_mask,5 );
@@ -7190,7 +7189,7 @@ static void rtw89_phy_edcca_log(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *b pwdb[1 ] =u32_get_bits (tmp,MASKBYTE2 );rtw89_phy_write32_mask (rtwdev, edcca_p_regs->rpt_sel, - edcca_p_regs->rpt_sel_mask,1 ); + edcca_p_regs->rpt_sel_mask,5 ); tmp =rtw89_phy_read32 (rtwdev, edcca_p_regs->rpt_a); pwdb[2 ] =u32_get_bits (tmp,MASKBYTE3 ); pwdb[3 ] =u32_get_bits (tmp,MASKBYTE2 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 wifi: rtw89: correct length for IE18/19 PHY report and IE parser
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
Correct the length when parsing with 2nd IE header and the length of IE18/19 PHY status report. These two IE contain PHY OFDM signal information and can be used for debug.
--- drivers/net/wireless/realtek/rtw89/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +3 -1
@@ -1723,7 +1723,7 @@ static u16 rtw89_core_get_phy_status_ie_len(struct rtw89_dev *rtwdev, }, [RTW89_CHIP_BE ] = {32 ,40 ,24 ,24 ,8 ,8 ,8 ,8 ,VAR_LEN ,8 ,VAR_LEN ,176 ,VAR_LEN , -VAR_LEN ,VAR_LEN ,VAR_LEN ,VAR_LEN ,VAR_LEN ,16 ,24 ,VAR_LEN , +VAR_LEN ,VAR_LEN ,VAR_LEN ,VAR_LEN ,VAR_LEN ,88 ,56 ,VAR_LEN ,VAR_LEN ,VAR_LEN ,0 ,24 ,24 ,24 ,24 ,32 ,32 ,32 ,32 }, };
@@ -1918,6 +1918,8 @@ static int rtw89_core_rx_parse_phy_sts(struct rtw89_dev *rtwdev,return -EINVAL ; pos = phy_ppdu->buf +PHY_STS_HDR_LEN ; +if (phy_ppdu->hdr_2_en) + pos +=PHY_STS_HDR_LEN ; end = phy_ppdu->buf + phy_ppdu->len;while (pos < end) {const struct rtw89_phy_sts_iehdr *iehdr = pos;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 wifi: rtw89: avoid NULL dereference when RX problematic packet on unsupported 6 GHz band
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
With a quite rare chance, RX report might be problematic to make SW think a packet is received on 6 GHz band even if the chip does not support 6 GHz band actually. Since SW won't initialize stuffs for unsupported bands, NULL dereference will happen then in the sequence, rtw89_vif_rx_stats_iter() -> rtw89_core_cancel_6ghz_probe_tx(). So, add a check to avoid it.
The following is a crash log for this case.
BUG: kernel NULL pointer dereference, address: 0000000000000032 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 1 PID: 1907 Comm: irq/131-rtw89_p Tainted: G U 6.6.56-05896-g89f5fb0eb30b #1 (HASH:1400 4) Hardware name: Google Telith/Telith, BIOS Google_Telith.15217.747.0 11/12/2024 RIP: 0010:rtw89_vif_rx_stats_iter+0xd2/0x310 [rtw89_core] Code: 4c 89 7d c8 48 89 55 c0 49 8d 44 24 02 48 89 45 b8 45 31 ff eb 11 41 c6 45 3a 01 41 b7 01 4d 8b 6d 00 4d 39 f5 74 42 8b 43 10 <41> 33 45 32 0f b7 4b 14 66 41 33 4d 36 0f b7 c9 09 c1 74 d8 4d 85 RSP: 0018:ffff9f3080138ca0 EFLAGS: 00010246 RAX: 00000000b8bf5770 RBX: ffff91b5e8c639c0 RCX: 0000000000000011 RDX: ffff91b582de1be8 RSI: 0000000000000000 RDI: ffff91b5e8c639e6 RBP: ffff9f3080138d00 R08: 0000000000000000 R09: 0000000000000000 R10: ffff91b59de70000 R11: ffffffffc069be50 R12: ffff91b5e8c639e4 R13: 0000000000000000 R14: ffff91b5828020b8 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff91b8efa40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000032 CR3: 00000002bf838000 CR4: 0000000000750ee0 PKRU: 55555554 Call Trace: <IRQ> ? __die_body+0x68/0xb0 ? page_fault_oops+0x379/0x3e0 ? exc_page_fault+0x4f/0xa0 ? asm_exc_page_fault+0x22/0x30 ? __pfx_rtw89_vif_rx_stats_iter+0x10/0x10 [rtw89_core (HASH:1400 5)] ? rtw89_vif_rx_stats_iter+0xd2/0x310 [rtw89_core (HASH:1400 5)] __iterate_interfaces+0x59/0x110 [mac80211 (HASH:1400 6)] ? __pfx_rtw89_vif_rx_stats_iter+0x10/0x10 [rtw89_core (HASH:1400 5)] ? __pfx_rtw89_vif_rx_stats_iter+0x10/0x10 [rtw89_core (HASH:1400 5)] ieee80211_iterate_active_interfaces_atomic+0x36/0x50 [mac80211 (HASH:1400 6)] rtw89_core_rx_to_mac80211+0xfd/0x1b0 [rtw89_core (HASH:1400 5)] rtw89_core_rx+0x43a/0x980 [rtw89_core (HASH:1400 5)]
--- drivers/net/wireless/realtek/rtw89/core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +5 -0
@@ -2161,6 +2161,11 @@ static void rtw89_core_cancel_6ghz_probe_tx(struct rtw89_dev *rtwdev,if (rx_status->band !=NL80211_BAND_6GHZ )return ; +if (unlikely (!(rtwdev->chip->support_bands &BIT (NL80211_BAND_6GHZ )))) { +rtw89_debug (rtwdev,RTW89_DBG_UNEXP ,"invalid rx on unsupported 6 GHz\n" ); +return ; + } + ssid_ie =cfg80211_find_ie (WLAN_EID_SSID , ies, skb->len);list_for_each_entry (info, &pkt_list[NL80211_BAND_6GHZ ], list) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 wifi: rtw89: report boottime of receiving beacon and probe response
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Userspace tools will parse NL80211_BSS_LAST_SEEN_BOOTTIME (if any) for a more accurate timing when a BSS was seen. For example, iw, wpa_supplicant. For beacon and probe response, fill RX boottime_ns in ieee80211_rx_status. And for certain, it shouldn't count the waiting time for the PPDU status, i.e. the possible buffering time of a frame in driver.
--- drivers/net/wireless/realtek/rtw89/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +7 -1
@@ -2796,9 +2796,11 @@ static void rtw89_core_stats_sta_rx_status(struct rtw89_dev *rtwdev, }static void rtw89_core_update_rx_status (struct rtw89_dev *rtwdev, +struct sk_buff *skb,struct rtw89_rx_desc_info *desc_info,struct ieee80211_rx_status *rx_status) { +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;const struct cfg80211_chan_def *chandef =rtw89_chandef_get (rtwdev,RTW89_CHANCTX_0 );u16 data_rate;
@@ -2810,6 +2812,10 @@ static void rtw89_core_update_rx_status(struct rtw89_dev *rtwdev, rx_status->freq = chandef->chan->center_freq; rx_status->band = chandef->chan->band; +if (ieee80211_is_beacon (hdr->frame_control) || +ieee80211_is_probe_resp (hdr->frame_control)) + rx_status->boottime_ns =ktime_get_boottime_ns (); +if (rtwdev->scanning &&RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) {const struct rtw89_chan *cur =rtw89_scan_chan_get (rtwdev);
@@ -2966,7 +2972,7 @@ void rtw89_core_rx(struct rtw89_dev *rtwdev, rx_status =IEEE80211_SKB_RXCB (skb);memset (rx_status,0 ,sizeof (*rx_status)); -rtw89_core_update_rx_status (rtwdev, desc_info, rx_status); +rtw89_core_update_rx_status (rtwdev, skb, desc_info, rx_status);rtw89_core_rx_pkt_hdl (rtwdev, skb, desc_info);if (desc_info->long_rxdesc &&BIT (desc_info->frame_type) &PPDU_FILTER_BITMAP )
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 wifi: rtw89: enter power save mode aggressively
In reply to Ping-Ke ShihFrom: Chin-Yen Lee <[email protected]>
Currently the driver allows the WiFi chip enter power save mode by checking the transmitting and receiving traffic is very low per two seconds. But it's hard for some applications to enter power save mode, like video streaming, which sends burst traffic regularly for other side to buffer and only send little traffic at most time. So adjust the criteria to enter power save while lower than 10Mbps and check it per 100ms. Thus WiFi chip could reduce power consumption under these applications.
--- drivers/net/wireless/realtek/rtw89/core.c | 89 ++++++++++++++----- drivers/net/wireless/realtek/rtw89/core.h | 20 ++++- drivers/net/wireless/realtek/rtw89/mac80211.c | 3 + drivers/net/wireless/realtek/rtw89/ser.c | 3 + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- drivers/net/wireless/realtek/rtw89/wow.h | 14 ++- 6 files changed, 106 insertions(+), 25 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +67 -22
@@ -319,15 +319,25 @@ static const struct ieee80211_supported_band rtw89_sband_6ghz = { .n_bitrates = ARRAY_SIZE(rtw89_bitrates) - 4, }; +static void __rtw89_traffic_stats_accu (struct rtw89_traffic_stats *stats, +struct sk_buff *skb,bool tx) +{ +if (tx) { + stats->tx_cnt++; + stats->tx_unicast += skb->len; + }else { + stats->rx_cnt++; + stats->rx_unicast += skb->len; + } +} +static void rtw89_traffic_stats_accu (struct rtw89_dev *rtwdev, -struct rtw89_traffic_stats *stats, -struct sk_buff *skb,bool tx) +struct rtw89_vif *rtwvif, +struct sk_buff *skb, +bool accu_dev,bool tx) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -if (tx &&ieee80211_is_assoc_req (hdr->frame_control)) -rtw89_wow_parse_akm (rtwdev, skb); -if (!ieee80211_is_data (hdr->frame_control))return ;
@@ -335,12 +345,12 @@ static void rtw89_traffic_stats_accu(struct rtw89_dev *rtwdev, is_multicast_ether_addr(hdr->addr1))return ; -if (tx) { - stats->tx_cnt++; - stats->tx_unicast += skb->len; - }else { - stats->rx_cnt++; - stats->rx_unicast += skb->len; +if (accu_dev) +__rtw89_traffic_stats_accu (&rtwdev->stats, skb, tx); + +if (rtwvif) { +__rtw89_traffic_stats_accu (&rtwvif->stats, skb, tx); +__rtw89_traffic_stats_accu (&rtwvif->stats_ps, skb, tx); } }
@@ -1150,8 +1160,8 @@ static int rtw89_core_tx_write_link(struct rtw89_dev *rtwdev, tx_req.rtwsta_link = rtwsta_link; tx_req.desc_info.sw_mld = sw_mld; -rtw89_traffic_stats_accu (rtwdev, &rtwdev->stats, skb, true); -rtw89_traffic_stats_accu (rtwdev, &rtwvif->stats, skb, true); +rtw89_traffic_stats_accu (rtwdev, rtwvif, skb, true, true); +rtw89_wow_parse_akm (rtwdev, skb);rtw89_core_tx_update_desc_info (rtwdev, &tx_req);rtw89_core_tx_wake (rtwdev, &tx_req);
@@ -2267,7 +2277,7 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,if (desc_info->data_rate <RTW89_HW_RATE_NR ) pkt_stat->rx_rate_cnt[desc_info->data_rate]++; -rtw89_traffic_stats_accu (rtwdev, &rtwvif->stats, skb, false); +rtw89_traffic_stats_accu (rtwdev, rtwvif, skb, false, false); out:rcu_read_unlock ();
@@ -2280,7 +2290,7 @@ static void rtw89_core_rx_stats(struct rtw89_dev *rtwdev, {struct rtw89_vif_rx_stats_iter_data iter_data; -rtw89_traffic_stats_accu (rtwdev, &rtwdev->stats, skb, false); +rtw89_traffic_stats_accu (rtwdev,NULL , skb, true, false); iter_data.rtwdev = rtwdev; iter_data.phy_ppdu = phy_ppdu;
@@ -3581,13 +3591,14 @@ static enum rtw89_tfc_lv rtw89_get_traffic_level(struct rtw89_dev *rtwdev, }static bool rtw89_traffic_stats_calc (struct rtw89_dev *rtwdev, -struct rtw89_traffic_stats *stats) +struct rtw89_traffic_stats *stats, +enum rtw89_tfc_interval interval) {enum rtw89_tfc_lv tx_tfc_lv = stats->tx_tfc_lv;enum rtw89_tfc_lv rx_tfc_lv = stats->rx_tfc_lv; - stats->tx_throughput_raw = (u32)(stats->tx_unicast >>RTW89_TP_SHIFT ); - stats->rx_throughput_raw = (u32)(stats->rx_unicast >>RTW89_TP_SHIFT ); + stats->tx_throughput_raw =rtw89_bytes_to_mbps (stats->tx_unicast, interval); + stats->rx_throughput_raw =rtw89_bytes_to_mbps (stats->rx_unicast, interval);ewma_tp_add (&stats->tx_ewma_tp, stats->tx_throughput_raw);ewma_tp_add (&stats->rx_ewma_tp, stats->rx_throughput_raw);
@@ -3623,10 +3634,12 @@ static bool rtw89_traffic_stats_track(struct rtw89_dev *rtwdev)unsigned int link_id;bool tfc_changed; - tfc_changed =rtw89_traffic_stats_calc (rtwdev, &rtwdev->stats); + tfc_changed =rtw89_traffic_stats_calc (rtwdev, &rtwdev->stats, +RTW89_TFC_INTERVAL_2SEC );rtw89_for_each_rtwvif (rtwdev, rtwvif) { -rtw89_traffic_stats_calc (rtwdev, &rtwvif->stats); +rtw89_traffic_stats_calc (rtwdev, &rtwvif->stats, +RTW89_TFC_INTERVAL_2SEC );rtw89_vif_for_each_link (rtwvif, rtwvif_link, link_id)rtw89_fw_h2c_tp_offload (rtwdev, rtwvif_link);
@@ -3646,8 +3659,8 @@ static void rtw89_enter_lps_track(struct rtw89_dev *rtwdev)if (rtwvif->offchan)continue ; -if (rtwvif->stats.tx_tfc_lv !=RTW89_TFC_IDLE || - rtwvif->stats.rx_tfc_lv !=RTW89_TFC_IDLE ) +if (rtwvif->stats_ps.tx_tfc_lv >=RTW89_TFC_MID || + rtwvif->stats_ps.rx_tfc_lv >=RTW89_TFC_MID )continue ; vif =rtwvif_to_vif (rtwvif);
@@ -3786,6 +3799,34 @@ static void rtw89_core_mlo_track(struct rtw89_dev *rtwdev) } } +static void rtw89_track_ps_work (struct wiphy *wiphy,struct wiphy_work *work) +{ + struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev, + track_ps_work.work); +struct rtw89_vif *rtwvif; + +lockdep_assert_wiphy (wiphy); + +if (test_bit (RTW89_FLAG_FORBIDDEN_TRACK_WORK , rtwdev->flags)) +return ; + +if (!test_bit (RTW89_FLAG_RUNNING , rtwdev->flags)) +return ; + +wiphy_delayed_work_queue (wiphy, &rtwdev->track_ps_work, +RTW89_TRACK_PS_WORK_PERIOD ); + +rtw89_for_each_rtwvif (rtwdev, rtwvif) +rtw89_traffic_stats_calc (rtwdev, &rtwvif->stats_ps, +RTW89_TFC_INTERVAL_100MS ); + +if (rtwdev->scanning) +return ; + +if (rtwdev->lps_enabled && !rtwdev->btc.lps) +rtw89_enter_lps_track (rtwdev); +} +static void rtw89_track_work (struct wiphy *wiphy,struct wiphy_work *work) { struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev,
@@ -4872,6 +4913,8 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)wiphy_delayed_work_queue (rtwdev->hw->wiphy, &rtwdev->track_work,RTW89_TRACK_WORK_PERIOD ); +wiphy_delayed_work_queue (rtwdev->hw->wiphy, &rtwdev->track_ps_work, +RTW89_TRACK_PS_WORK_PERIOD );set_bit (RTW89_FLAG_RUNNING , rtwdev->flags);
@@ -4906,6 +4949,7 @@ void rtw89_core_stop(struct rtw89_dev *rtwdev)wiphy_work_cancel (wiphy, &btc->icmp_notify_work);cancel_delayed_work_sync (&rtwdev->txq_reinvoke_work);wiphy_delayed_work_cancel (wiphy, &rtwdev->track_work); +wiphy_delayed_work_cancel (wiphy, &rtwdev->track_ps_work);wiphy_delayed_work_cancel (wiphy, &rtwdev->chanctx_work);wiphy_delayed_work_cancel (wiphy, &rtwdev->coex_act1_work);wiphy_delayed_work_cancel (wiphy, &rtwdev->coex_bt_devinfo_work);
@@ -5133,6 +5177,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)INIT_WORK (&rtwdev->txq_work, rtw89_core_txq_work);INIT_DELAYED_WORK (&rtwdev->txq_reinvoke_work, rtw89_core_txq_reinvoke_work);wiphy_delayed_work_init (&rtwdev->track_work, rtw89_track_work); +wiphy_delayed_work_init (&rtwdev->track_ps_work, rtw89_track_ps_work);wiphy_delayed_work_init (&rtwdev->chanctx_work, rtw89_chanctx_work);wiphy_delayed_work_init (&rtwdev->coex_act1_work, rtw89_coex_act1_work);wiphy_delayed_work_init (&rtwdev->coex_bt_devinfo_work, rtw89_coex_bt_devinfo_work);
drivers/net/wireless/realtek/rtw89/core.h +19 -1
@@ -40,6 +40,7 @@ extern const struct ieee80211_ops rtw89_ops;#define BYPASS_CR_DATA 0xbabecafe#define RTW89_TRACK_WORK_PERIOD round_jiffies_relative(HZ * 2) +#define RTW89_TRACK_PS_WORK_PERIOD msecs_to_jiffies(100)#define RTW89_FORBID_BA_TIMER round_jiffies_relative(HZ * 4)#define CFO_TRACK_MAX_USER 64#define MAX_RSSI 110
@@ -1380,6 +1381,11 @@ struct rtw89_btc_wl_smap { u32 emlsr: 1; }; +enum rtw89_tfc_interval { +RTW89_TFC_INTERVAL_100MS , +RTW89_TFC_INTERVAL_2SEC , +}; +enum rtw89_tfc_lv {RTW89_TFC_IDLE ,RTW89_TFC_ULTRA_LOW ,
@@ -1388,7 +1394,6 @@ enum rtw89_tfc_lv {RTW89_TFC_HIGH , }; -#define RTW89_TP_SHIFT 18/* bytes/2s --> Mbps */ DECLARE_EWMA (tp,10 ,2 ); struct rtw89_traffic_stats {
@@ -5918,6 +5923,7 @@ struct rtw89_dev { } bbs[RTW89_PHY_NUM ];struct wiphy_delayed_work track_work; +struct wiphy_delayed_work track_ps_work;struct wiphy_delayed_work chanctx_work;struct wiphy_delayed_work coex_act1_work;struct wiphy_delayed_work coex_bt_devinfo_work;
@@ -5968,6 +5974,7 @@ struct rtw89_vif {__be32 ip_addr;struct rtw89_traffic_stats stats; +struct rtw89_traffic_stats stats_ps;u32 tdls_peer;struct ieee80211_scan_ies *scan_ies;
@@ -7280,6 +7287,17 @@ static inline bool rtw89_is_rtl885xb(struct rtw89_dev *rtwdev)return false; } +static inline u32 rtw89_bytes_to_mbps (u64 bytes,enum rtw89_tfc_interval interval) +{ +switch (interval) { +default : +case RTW89_TFC_INTERVAL_2SEC : +return bytes >>18 ;/* bytes/2s --> Mbps */ ; +case RTW89_TFC_INTERVAL_100MS : +return (bytes *10 ) >>17 ;/* bytes/100ms --> Mbps */ + } +} +int rtw89_core_tx_write (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,struct sk_buff *skb,int *qsel); int rtw89_h2c_tx(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/mac80211.c +3 -0
@@ -1770,6 +1770,7 @@ static int rtw89_ops_suspend(struct ieee80211_hw *hw,set_bit (RTW89_FLAG_FORBIDDEN_TRACK_WORK , rtwdev->flags);wiphy_delayed_work_cancel (hw->wiphy, &rtwdev->track_work); +wiphy_delayed_work_cancel (hw->wiphy, &rtwdev->track_ps_work); ret =rtw89_wow_suspend (rtwdev, wowlan);if (ret) {
@@ -1795,6 +1796,8 @@ static int rtw89_ops_resume(struct ieee80211_hw *hw)clear_bit (RTW89_FLAG_FORBIDDEN_TRACK_WORK , rtwdev->flags);wiphy_delayed_work_queue (hw->wiphy, &rtwdev->track_work,RTW89_TRACK_WORK_PERIOD ); +wiphy_delayed_work_queue (hw->wiphy, &rtwdev->track_ps_work, +RTW89_TRACK_PS_WORK_PERIOD );return ret ?1 :0 ; }
drivers/net/wireless/realtek/rtw89/ser.c +3 -0
@@ -492,6 +492,7 @@ static void ser_reset_trx_st_hdl(struct rtw89_ser *ser, u8 evt)case SER_EV_STATE_IN :wiphy_lock (wiphy);wiphy_delayed_work_cancel (wiphy, &rtwdev->track_work); +wiphy_delayed_work_cancel (wiphy, &rtwdev->track_ps_work);wiphy_unlock (wiphy);drv_stop_tx (ser);
@@ -525,6 +526,8 @@ static void ser_reset_trx_st_hdl(struct rtw89_ser *ser, u8 evt)drv_resume_tx (ser);wiphy_delayed_work_queue (wiphy, &rtwdev->track_work,RTW89_TRACK_WORK_PERIOD ); +wiphy_delayed_work_queue (wiphy, &rtwdev->track_ps_work, +RTW89_TRACK_PS_WORK_PERIOD );break ;default :
drivers/net/wireless/realtek/rtw89/wow.c +1 -1
@@ -12,7 +12,7 @@#include "util.h" #include "wow.h" -void rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb) +void __rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb) {struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;struct rtw89_wow_param *rtw_wow = &rtwdev->wow;
drivers/net/wireless/realtek/rtw89/wow.h +13 -1
@@ -116,9 +116,21 @@ static inline bool rtw_wow_has_mgd_features(struct rtw89_dev *rtwdev) return !bitmap_empty(rtw_wow->flags, RTW89_WOW_FLAG_NUM); } +void __rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb); + +static inline +void rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb) +{ +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + +if (likely (!ieee80211_is_assoc_req (hdr->frame_control))) +return ; + +__rtw89_wow_parse_akm (rtwdev, skb); +} +int rtw89_wow_suspend (struct rtw89_dev *rtwdev,struct cfg80211_wowlan *wowlan);int rtw89_wow_resume (struct rtw89_dev *rtwdev); -void rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb);#else static inline void rtw89_wow_parse_akm (struct rtw89_dev *rtwdev,struct sk_buff *skb)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 6/6] wifi: rtw89: enter power save mode aggressively
Quoted 11 lines · Ping-Ke Shih
From: Chin-Yen Lee <[email protected]>
Currently the driver allows the WiFi chip enter power save mode by checking the transmitting and receiving traffic is very low per two seconds. But it's hard for some applications to enter power save mode, like video streaming, which sends burst traffic regularly for other side to buffer and only send little traffic at most time. So adjust the criteria to enter power save while lower than 10Mbps and check it per 100ms. Thus WiFi chip could reduce power consumption under these applications.
Quoted 2 lines
Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Internal found that the traffic level should consider sampling interval (i.e. 100ms), so drop this patch for now.
Set patchset state to Changes Requested
[rtw-next,6/6] wifi: rtw89: enter power save mode aggressively