rtw88: 8821c: support AP mode
Ping-Ke Shih
maintainercover rtw88: 8821c: support AP mode
AP mode is common flow in rtw88, but 8821ce doesn't work well, so we review the AP flow. We also test STA mode, and then correct some mistakes.
First two patches are to correct things for STA mode. Patches 3/6~5/6 are to refine and correct AP mode flow. Final patch is to correct RSSI value in debugfs.
Ping-Ke Shih (1):
rtw88: do PHY calibration while starting AP
Po-Hao Huang (5):
rtw88: add ieee80211:sta_rc_update ops
rtw88: fix incorrect frequency reported
rtw88: Add update beacon flow for AP mode
rtw88: 8821c: Enable TX report for management frames
rtw88: 8821c: fix debugfs rssi value
drivers/net/wireless/realtek/rtw88/fw.c | 11 ++--- drivers/net/wireless/realtek/rtw88/fw.h | 4 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 44 ++++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.c | 13 ++++-- drivers/net/wireless/realtek/rtw88/main.h | 6 ++- drivers/net/wireless/realtek/rtw88/pci.c | 3 ++ drivers/net/wireless/realtek/rtw88/phy.c | 2 +- drivers/net/wireless/realtek/rtw88/reg.h | 2 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 4 ++ .../wireless/realtek/rtw88/rtw8821c_table.c | 2 +- drivers/net/wireless/realtek/rtw88/rx.c | 3 +- drivers/net/wireless/realtek/rtw88/tx.c | 17 +++++++ drivers/net/wireless/realtek/rtw88/tx.h | 4 ++ 13 files changed, 99 insertions(+), 16 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 rtw88: add ieee80211:sta_rc_update ops
From: Po-Hao Huang <[email protected]>
Adding this allows us to get notification when bitrate configuration of the station changes. Update according parameters to firmware so the rate control algorithm can work properly.
--- drivers/net/wireless/realtek/rtw88/fw.c | 7 +++---- drivers/net/wireless/realtek/rtw88/fw.h | 3 ++- drivers/net/wireless/realtek/rtw88/mac80211.c | 14 +++++++++++++- drivers/net/wireless/realtek/rtw88/main.c | 7 ++++--- drivers/net/wireless/realtek/rtw88/main.h | 4 ++-- drivers/net/wireless/realtek/rtw88/phy.c | 2 +- 6 files changed, 25 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +3 -4
@@ -585,10 +585,10 @@ void rtw_fw_send_rssi_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)rtw_fw_send_h2c_command (rtwdev, h2c_pkt); } -void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si) +void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si, +bool reset_ra_mask) {u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; -bool no_update = si->updated;bool disable_pt = true;SET_H2C_CMD_ID_CLASS (h2c_pkt,H2C_CMD_RA_INFO );
@@ -599,7 +599,7 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)SET_RA_INFO_SGI_EN (h2c_pkt, si->sgi_enable);SET_RA_INFO_BW_MODE (h2c_pkt, si->bw_mode);SET_RA_INFO_LDPC (h2c_pkt, !!si->ldpc_en); -SET_RA_INFO_NO_UPDATE (h2c_pkt, no_update); +SET_RA_INFO_NO_UPDATE (h2c_pkt, !reset_ra_mask);SET_RA_INFO_VHT_EN (h2c_pkt, si->vht_enable);SET_RA_INFO_DIS_PT (h2c_pkt, disable_pt);SET_RA_INFO_RA_MASK0 (h2c_pkt, (si->ra_mask &0xff ));
@@ -608,7 +608,6 @@ void rtw_fw_send_ra_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)SET_RA_INFO_RA_MASK3 (h2c_pkt, (si->ra_mask &0xff000000 ) >>24 ); si->init_ra_lv =0 ; - si->updated = true;rtw_fw_send_h2c_command (rtwdev, h2c_pkt); }
drivers/net/wireless/realtek/rtw88/fw.h +2 -1
@@ -791,7 +791,8 @@ void rtw_fw_coex_query_hid_info(struct rtw_dev *rtwdev, u8 sub_id, u8 data);void rtw_fw_bt_wifi_control (struct rtw_dev *rtwdev,u8 op_code,u8 *data);void rtw_fw_send_rssi_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si); -void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si); +void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si, +bool reset_ra_mask);void rtw_fw_media_status_report (struct rtw_dev *rtwdev,u8 mac_id,bool conn);void rtw_fw_update_wl_phy_info (struct rtw_dev *rtwdev); void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect,
drivers/net/wireless/realtek/rtw88/mac80211.c +13 -1
@@ -694,7 +694,7 @@ static void rtw_ra_mask_info_update_iter(void *data, struct ieee80211_sta *sta) } si->use_cfg_mask = true; -rtw_update_sta_info (br_data->rtwdev, si); +rtw_update_sta_info (br_data->rtwdev, si, true); } static void rtw_ra_mask_info_update(struct rtw_dev *rtwdev,
@@ -850,6 +850,17 @@ static int rtw_ops_set_sar_specs(struct ieee80211_hw *hw,return 0 ; } +static void rtw_ops_sta_rc_update (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta,u32 changed) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv; + +if (changed &IEEE80211_RC_BW_CHANGED ) +rtw_update_sta_info (rtwdev, si, true); +} +const struct ieee80211_ops rtw_ops = { .tx = rtw_ops_tx, .wake_tx_queue = rtw_ops_wake_tx_queue,
@@ -879,6 +890,7 @@ const struct ieee80211_ops rtw_ops = { .reconfig_complete = rtw_reconfig_complete, .hw_scan = rtw_ops_hw_scan, .cancel_hw_scan = rtw_ops_cancel_hw_scan, + .sta_rc_update = rtw_ops_sta_rc_update, .set_sar_specs = rtw_ops_set_sar_specs, #ifdef CONFIG_PM .suspend = rtw_ops_suspend,
drivers/net/wireless/realtek/rtw88/main.c +4 -3
@@ -313,7 +313,7 @@ int rtw_sta_add(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,for (i =0 ; i <ARRAY_SIZE (sta->txq); i++)rtw_txq_init (rtwdev, sta->txq[i]); -rtw_update_sta_info (rtwdev, si); +rtw_update_sta_info (rtwdev, si, true);rtw_fw_media_status_report (rtwdev, si->mac_id, true); rtwdev->sta_cnt++;
@@ -1105,7 +1105,8 @@ static u64 rtw_rate_mask_cfg(struct rtw_dev *rtwdev, struct rtw_sta_info *si,return ra_mask; } -void rtw_update_sta_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si) +void rtw_update_sta_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si, +bool reset_ra_mask) {struct rtw_dm_info *dm_info = &rtwdev->dm_info;struct ieee80211_sta *sta = si->sta;
@@ -1223,7 +1224,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) si->ra_mask = ra_mask; si->rate_id = rate_id; -rtw_fw_send_ra_info (rtwdev, si); +rtw_fw_send_ra_info (rtwdev, si, reset_ra_mask); }static int rtw_wait_firmware_completion (struct rtw_dev *rtwdev)
drivers/net/wireless/realtek/rtw88/main.h +2 -2
@@ -753,7 +753,6 @@ struct rtw_sta_info { u8 ldpc_en:2;bool sgi_enable;bool vht_enable; -bool updated;u8 init_ra_lv;u64 ra_mask;
@@ -2145,7 +2144,8 @@ void rtw_chip_prepare_tx(struct rtw_dev *rtwdev);void rtw_vif_port_config (struct rtw_dev *rtwdev,struct rtw_vif *rtwvif,u32 config);void rtw_tx_report_purge_timer (struct timer_list *t); -void rtw_update_sta_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si); +void rtw_update_sta_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si, +bool reset_ra_mask);void rtw_core_scan_start (struct rtw_dev *rtwdev,struct rtw_vif *rtwvif,const u8 *mac_addr,bool hw_scan); void rtw_core_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
drivers/net/wireless/realtek/rtw88/phy.c +1 -1
@@ -536,7 +536,7 @@ static void rtw_phy_ra_info_update_iter(void *data, struct ieee80211_sta *sta)struct rtw_dev *rtwdev = data;struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv; -rtw_update_sta_info (rtwdev, si); +rtw_update_sta_info (rtwdev, si, false); }static void rtw_phy_ra_info_update (struct rtw_dev *rtwdev)
Signature · 1 line
2.25.1
Re: [PATCH 1/6] rtw88: add ieee80211:sta_rc_update ops
Quoted 8 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
Adding this allows us to get notification when bitrate configuration of the station changes. Update according parameters to firmware so the rate control algorithm can work properly.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
6 patches applied to wireless-next.git, thanks.
c1edc86472fc rtw88: add ieee80211:sta_rc_update ops 6723c0cde84f rtw88: fix incorrect frequency reported f2217968ffda rtw88: Add update beacon flow for AP mode f1c4dabfe68d rtw88: 8821c: Enable TX report for management frames f5207c122102 rtw88: do PHY calibration while starting AP ece31c93d4d6 rtw88: 8821c: fix debugfs rssi value
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/6 rtw88: fix incorrect frequency reported
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
We should only fill in frequency reported by firmware during scan. Add this so frames won't be dropped by mac80211 due to frequency mismatch.
--- drivers/net/wireless/realtek/rtw88/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/rx.c +2 -1
@@ -158,7 +158,8 @@ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,memset (rx_status,0 ,sizeof (*rx_status)); rx_status->freq = hw->conf.chandef.chan->center_freq; rx_status->band = hw->conf.chandef.chan->band; -if (rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_SCAN_OFFLOAD )) +if (rtw_fw_feature_check (&rtwdev->fw,FW_FEATURE_SCAN_OFFLOAD ) && +test_bit (RTW_FLAG_SCANNING , rtwdev->flags))rtw_set_rx_freq_by_pktstat (pkt_stat, rx_status);if (pkt_stat->crc_err) rx_status->flag |=RX_FLAG_FAILED_FCS_CRC ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 rtw88: Add update beacon flow for AP mode
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
To support stations in power saving mode, AP should notify stations that there are frames buffered at the AP via TIM during beacons. Driver used to transmit identical beacons that were downloaded to hardware during the initiation phase. This beacon will become obsolete over time.
If the beacon does not contain sufficient information, station would not be able to percept that there is data to receive. Hence it won't wake up and start the PS-poll procedure, this could lead to timeout and/or lost data segments. In order to resolve this issue, driver will now download beacon to hardware whenever the content is updated.
Enable hardware to update dtim_count for more efficiency, this reduces the overhead of downloading beacon at every beacon interval since most of the time only the dtim_count needs to be updated.
Change queue mapping for broadcast/multicast frames to high queue, so these frames can be prioritized and sent when dtim_count is zero.
--- drivers/net/wireless/realtek/rtw88/fw.c | 4 +++- drivers/net/wireless/realtek/rtw88/fw.h | 1 + drivers/net/wireless/realtek/rtw88/mac80211.c | 17 ++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.c | 6 ++++++ drivers/net/wireless/realtek/rtw88/main.h | 2 ++ drivers/net/wireless/realtek/rtw88/pci.c | 3 +++ drivers/net/wireless/realtek/rtw88/reg.h | 2 ++ drivers/net/wireless/realtek/rtw88/tx.c | 17 +++++++++++++++++ drivers/net/wireless/realtek/rtw88/tx.h | 4 ++++ 9 files changed, 54 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +3 -1
@@ -1047,6 +1047,7 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,struct rtw_vif *rtwvif;struct sk_buff *skb_new;struct cfg80211_ssid *ssid; +u16 tim_offset;if (rsvd_pkt->type ==RSVD_DUMMY ) { skb_new =alloc_skb (1 ,GFP_KERNEL );
@@ -1065,7 +1066,8 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,switch (rsvd_pkt->type) {case RSVD_BEACON : - skb_new =ieee80211_beacon_get (hw, vif); + skb_new =ieee80211_beacon_get_tim (hw, vif, &tim_offset,NULL ); + rsvd_pkt->tim_offset = tim_offset;break ;case RSVD_PS_POLL : skb_new =ieee80211_pspoll_get (hw, vif);
drivers/net/wireless/realtek/rtw88/fw.h +1 -0
@@ -172,6 +172,7 @@ struct rtw_rsvd_page {struct sk_buff *skb;enum rtw_rsvd_packet_type type;u8 page; +u16 tim_offset;bool add_txdesc;struct cfg80211_ssid *ssid;u16 probe_req_size;
drivers/net/wireless/realtek/rtw88/mac80211.c +16 -1
@@ -402,8 +402,10 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, coex_stat->wl_beacon_interval = conf->beacon_int; } -if (changed &BSS_CHANGED_BEACON ) +if (changed &BSS_CHANGED_BEACON ) { +rtw_set_dtim_period (rtwdev, conf->dtim_period);rtw_fw_download_rsvd_page (rtwdev); + }if (changed &BSS_CHANGED_BEACON_ENABLED ) {if (conf->enable_beacon)
@@ -474,6 +476,18 @@ static int rtw_ops_sta_remove(struct ieee80211_hw *hw,return 0 ; } +static int rtw_ops_set_tim (struct ieee80211_hw *hw,struct ieee80211_sta *sta, +bool set) +{ +struct rtw_dev *rtwdev = hw->priv; + +mutex_lock (&rtwdev->mutex); +rtw_fw_download_rsvd_page (rtwdev); +mutex_unlock (&rtwdev->mutex); + +return 0 ; +} +static int rtw_ops_set_key (struct ieee80211_hw *hw,enum set_key_cmd cmd,struct ieee80211_vif *vif,struct ieee80211_sta *sta,struct ieee80211_key_conf *key)
@@ -875,6 +889,7 @@ const struct ieee80211_ops rtw_ops = { .conf_tx = rtw_ops_conf_tx, .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove, + .set_tim = rtw_ops_set_tim, .set_key = rtw_ops_set_key, .ampdu_action = rtw_ops_ampdu_action, .can_aggregate_in_amsdu = rtw_ops_can_aggregate_in_amsdu,
drivers/net/wireless/realtek/rtw88/main.c +6 -0
@@ -664,6 +664,12 @@ void rtw_set_rx_freq_band(struct rtw_rx_pkt_stat *pkt_stat, u8 channel) }EXPORT_SYMBOL (rtw_set_rx_freq_band); +void rtw_set_dtim_period (struct rtw_dev *rtwdev,int dtim_period) +{ +rtw_write32_set (rtwdev,REG_TCR ,BIT_TCR_UPDATE_TIMIE ); +rtw_write8 (rtwdev,REG_DTIM_COUNTER_ROOT , dtim_period -1 ); +} +void rtw_get_channel_params (struct cfg80211_chan_def *chandef,struct rtw_channel_params *chan_params) {
drivers/net/wireless/realtek/rtw88/main.h +2 -0
@@ -580,6 +580,7 @@ struct rtw_tx_pkt_info {u32 tx_pkt_size;u8 offset;u8 pkt_offset; +u8 tim_offset;u8 mac_id;u8 rate_id;u8 rate;
@@ -2131,6 +2132,7 @@ static inline int rtw_chip_dump_fw_crash(struct rtw_dev *rtwdev) }void rtw_set_rx_freq_band (struct rtw_rx_pkt_stat *pkt_stat,u8 channel); +void rtw_set_dtim_period (struct rtw_dev *rtwdev,int dtim_period);void rtw_get_channel_params (struct cfg80211_chan_def *chandef,struct rtw_channel_params *ch_param);bool check_hw_ready (struct rtw_dev *rtwdev,u32 addr,u32 mask,u32 target);
drivers/net/wireless/realtek/rtw88/pci.c +3 -0
@@ -689,6 +689,9 @@ static u8 rtw_hw_queue_mapping(struct sk_buff *skb) 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
drivers/net/wireless/realtek/rtw88/reg.h +2 -0
@@ -389,12 +389,14 @@#define BIT_EN_FREE_CNT BIT(3)#define BIT_DIS_SECOND_CCA (BIT(0) | BIT(1))#define REG_HIQ_NO_LMT_EN 0x5A7 +#define REG_DTIM_COUNTER_ROOT 0x5A8#define BIT_HIQ_NO_LMT_EN_ROOT BIT(0)#define REG_TIMER0_SRC_SEL 0x05B4#define BIT_TSFT_SEL_TIMER0 (BIT(4) | BIT(5) | BIT(6))#define REG_TCR 0x0604#define BIT_PWRMGT_HWDATA_EN BIT(7) +#define BIT_TCR_UPDATE_TIMIE BIT(5)#define REG_RCR 0x0608#define BIT_APP_FCS BIT(31)#define BIT_APP_MIC BIT(30)
drivers/net/wireless/realtek/rtw88/tx.c +17 -0
@@ -67,6 +67,10 @@ void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb)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); + } }EXPORT_SYMBOL (rtw_tx_fill_tx_desc);
@@ -448,6 +452,19 @@ void rtw_tx_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev,if (type ==RSVD_QOS_NULL ) pkt_info->bt_null = true; +if (type ==RSVD_BEACON ) { +struct rtw_rsvd_page *rsvd_pkt; +int hdr_len; + + rsvd_pkt =list_first_entry_or_null (&rtwdev->rsvd_page_list, + struct rtw_rsvd_page, + build_list); +if (rsvd_pkt && rsvd_pkt->tim_offset !=0 ) { + hdr_len =sizeof (struct ieee80211_hdr_3addr ); + pkt_info->tim_offset = rsvd_pkt->tim_offset - hdr_len; + } + } +rtw_tx_pkt_info_update_sec (rtwdev, pkt_info, skb);/* TODO: need to change hw port and hw ssn sel for multiple vifs */
drivers/net/wireless/realtek/rtw88/tx.h +4 -0
@@ -33,6 +33,10 @@ 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) \
Signature · 1 line
2.25.1
Re: [PATCH 3/6] rtw88: Add update beacon flow for AP mode
Hello Ping-Ke,
please see bugreport below:
Quoted 45 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
To support stations in power saving mode, AP should notify stations that there are frames buffered at the AP via TIM during beacons. Driver used to transmit identical beacons that were downloaded to hardware during the initiation phase. This beacon will become obsolete over time.
If the beacon does not contain sufficient information, station would not be able to percept that there is data to receive. Hence it won't wake up and start the PS-poll procedure, this could lead to timeout and/or lost data segments. In order to resolve this issue, driver will now download beacon to hardware whenever the content is updated.
Enable hardware to update
dtim_countfor more efficiency, this reduces the overhead of downloading beacon at every beacon interval since most of the time only thedtim_countneeds to be updated.Change queue mapping for broadcast/multicast frames to high queue, so these frames can be prioritized and sent when
dtim_countis zero.Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>---
[...]
drivers/net/wireless/realtek/rtw88/mac80211.c +3
-1@@ -402,8 +402,10 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, coex_stat->wl_beacon_interval = conf->beacon_int; } -if (changed &BSS_CHANGED_BEACON ) +if (changed &BSS_CHANGED_BEACON ) { +rtw_set_dtim_period (rtwdev, conf->dtim_period);rtw_fw_download_rsvd_page (rtwdev); + }if (changed &BSS_CHANGED_BEACON_ENABLED ) {if (conf->enable_beacon)@@ -474,6 +476,18 @@ static int rtw_ops_sta_remove(struct ieee80211_hw *hw,return 0 ;
drivers/net/wireless/realtek/rtw88/mac80211.c static int rtw_ops_sta_remove(struct ieee80211_hw *hw, · line 486
Quoted 10 lines
drivers/net/wireless/realtek/rtw88/mac80211.c +8
-0} +static int rtw_ops_set_tim (struct ieee80211_hw *hw,struct ieee80211_sta *sta, +bool set) +{ +struct rtw_dev *rtwdev = hw->priv; + +mutex_lock (&rtwdev->mutex); +rtw_fw_download_rsvd_page (rtwdev); +mutex_unlock (&rtwdev->mutex);
set_tim is supposed to be atomic. See: https://elixir.bootlin.com/linux/latest/source/include/net/mac80211.h#L3500
This is causing some scheduling in atomic warnings in my kernel:
BUG: scheduling while atomic: swapper/1/0/0x00000700 Modules linked in: CPU: 1 PID: 0 Comm: swapper/1 Tainted: G W 5.18.0-rc7-00703-g33b5ee09a0c1 #4 Hardware name: Pine64 RK3566 Quartz64-A Board (DT) Call trace: dump_backtrace.part.0+0xc4/0xd0 show_stack+0x14/0x60 dump_stack_lvl+0x60/0x78 dump_stack+0x14/0x2c __schedule_bug+0x5c/0x70 __schedule+0x5c4/0x630 schedule+0x44/0xb0 schedule_preempt_disabled+0xc/0x14 __mutex_lock.constprop.0+0x538/0x56c __mutex_lock_slowpath+0x10/0x20 mutex_lock+0x54/0x60 rtw_ops_set_tim+0x20/0x40 __sta_info_recalc_tim+0x150/0x250 sta_info_recalc_tim+0x10/0x20 invoke_tx_handlers_early+0x4e4/0x5c0 ieee80211_tx+0x78/0x110 ieee80211_xmit+0x94/0xc0 __ieee80211_subif_start_xmit+0x818/0xd20 ieee80211_subif_start_xmit+0x44/0x2d0 dev_hard_start_xmit+0xd0/0x150 __dev_queue_xmit+0x250/0xb30 dev_queue_xmit+0x10/0x20 br_dev_queue_push_xmit+0x94/0x174 br_forward_finish+0x90/0xa0 __br_forward+0xc0/0x13c br_forward+0x108/0x134 br_dev_xmit+0x1cc/0x3a4 dev_hard_start_xmit+0xd0/0x150 __dev_queue_xmit+0x250/0xb30 dev_queue_xmit+0x10/0x20 arp_xmit+0x6c/0x7c arp_send_dst+0x8c/0xc0 arp_solicit+0xd4/0x1e0 neigh_probe+0x58/0xa0 neigh_timer_handler+0x27c/0x380 call_timer_fn.constprop.0+0x20/0x80 __run_timers.part.0+0x230/0x280 run_timer_softirq+0x38/0x70 _stext+0x104/0x278 __irq_exit_rcu+0xa4/0xdc irq_exit_rcu+0xc/0x14 el1_interrupt+0x34/0x50 el1h_64_irq_handler+0x14/0x20 el1h_64_irq+0x64/0x68 arch_cpu_idle+0x14/0x20 do_idle+0x208/0x290 cpu_startup_entry+0x20/0x30 secondary_start_kernel+0x130/0x144 __secondary_switched+0x54/0x58
kind regards,
o.
Quoted 14 lines
drivers/net/wireless/realtek/rtw88/mac80211.c +4
-0+return 0 ; +} +static int rtw_ops_set_key (struct ieee80211_hw *hw,enum set_key_cmd cmd,struct ieee80211_vif *vif,struct ieee80211_sta *sta,struct ieee80211_key_conf *key)@@ -875,6 +889,7 @@ const struct ieee80211_ops rtw_ops = { .conf_tx = rtw_ops_conf_tx, .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove, + .set_tim = rtw_ops_set_tim, .set_key = rtw_ops_set_key, .ampdu_action = rtw_ops_ampdu_action, .can_aggregate_in_amsdu = rtw_ops_can_aggregate_in_amsdu,
Ping-Ke Shih
maintainerRE: [PATCH 3/6] rtw88: Add update beacon flow for AP mode
Quoted 14 lines
-----Original Message-----
From: Ondřej Jirman <[email protected]>
Sent: Thursday, May 26, 2022 7:01 AM
To: Ping-Ke Shih <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Bernie Huang <[email protected]>
Subject: Re: [PATCH 3/6] rtw88: Add update beacon flow for AP modeHello Ping-Ke,
please see bugreport below:
Quoted 1 line
Quoted 12 lines
drivers/net/wireless/realtek/rtw88/mac80211.c static int rtw_ops_sta_remove(struct ieee80211_hw *hw, · line 486
Quoted 8 lines
drivers/net/wireless/realtek/rtw88/mac80211.c +8
-0+static int rtw_ops_set_tim (struct ieee80211_hw *hw,struct ieee80211_sta *sta, +bool set) +{ +struct rtw_dev *rtwdev = hw->priv; + +mutex_lock (&rtwdev->mutex); +rtw_fw_download_rsvd_page (rtwdev); +mutex_unlock (&rtwdev->mutex);
set_timis supposed to be atomic. See:
https://elixir.bootlin.com/linux/latest/source/include/net/mac80211.h#L3500
Thanks for pointing out.
We will fix it.
Ping-Ke
Ping-Ke Shih
maintainerPATCH 4/6 rtw88: 8821c: Enable TX report for management frames
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Without this setting, hardware would not report to driver even if management frames are transmitted successfully. So we fix it.
--- drivers/net/wireless/realtek/rtw88/rtw8821c_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/rtw8821c_table.c +1 -1
@@ -13,7 +13,7 @@ static const u32 rtw8821c_mac[] = {0x04F ,0x00000001 ,0x029 ,0x000000F9 ,0x420 ,0x00000080 , -0x421 ,0x0000000F , +0x421 ,0x0000001F ,0x428 ,0x0000000A ,0x429 ,0x00000010 , 0x430, 0x00000000,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 rtw88: do PHY calibration while starting AP
In reply to Ping-Ke ShihCalling calibration to yield expected PHY performance. We do this in STA mode, so do this in AP mode as well.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/wireless/realtek/rtw88/mac80211.c +13 -0
@@ -429,6 +429,18 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,mutex_unlock (&rtwdev->mutex); } +static int rtw_ops_start_ap (struct ieee80211_hw *hw,struct ieee80211_vif *vif) +{ +struct rtw_dev *rtwdev = hw->priv; +struct rtw_chip_info *chip = rtwdev->chip; + +mutex_lock (&rtwdev->mutex); + chip->ops->phy_calibration (rtwdev); +mutex_unlock (&rtwdev->mutex); + +return 0 ; +} +static int rtw_ops_conf_tx (struct ieee80211_hw *hw,struct ieee80211_vif *vif,u16 ac,const struct ieee80211_tx_queue_params *params)
@@ -886,6 +898,7 @@ const struct ieee80211_ops rtw_ops = { .change_interface = rtw_ops_change_interface, .configure_filter = rtw_ops_configure_filter, .bss_info_changed = rtw_ops_bss_info_changed, + .start_ap = rtw_ops_start_ap, .conf_tx = rtw_ops_conf_tx, .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 rtw88: 8821c: fix debugfs rssi value
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
RSSI value per frame is reported to mac80211 but not maintained in our own statistics, add it back to help us debug.
--- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw88/rtw8821c.c +4 -0
@@ -512,6 +512,7 @@ static s8 get_cck_rx_pwr(struct rtw_dev *rtwdev, u8 lna_idx, u8 vga_idx)static void query_phy_status_page0 (struct rtw_dev *rtwdev,u8 *phy_status,struct rtw_rx_pkt_stat *pkt_stat) { +struct rtw_dm_info *dm_info = &rtwdev->dm_info;s8 rx_power;u8 lna_idx =0 ;u8 vga_idx =0 ;
@@ -523,6 +524,7 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status, pkt_stat->rx_power[RF_PATH_A ] = rx_power; pkt_stat->rssi =rtw_phy_rf_power_2_rssi (pkt_stat->rx_power,1 ); + dm_info->rssi[RF_PATH_A ] = pkt_stat->rssi; pkt_stat->bw =RTW_CHANNEL_WIDTH_20 ; pkt_stat->signal_power = rx_power; }
@@ -530,6 +532,7 @@ static void query_phy_status_page0(struct rtw_dev *rtwdev, u8 *phy_status,static void query_phy_status_page1 (struct rtw_dev *rtwdev,u8 *phy_status,struct rtw_rx_pkt_stat *pkt_stat) { +struct rtw_dm_info *dm_info = &rtwdev->dm_info;u8 rxsc, bw;s8 min_rx_power =-120 ;
@@ -549,6 +552,7 @@ static void query_phy_status_page1(struct rtw_dev *rtwdev, u8 *phy_status, pkt_stat->rx_power[RF_PATH_A ] =GET_PHY_STAT_P1_PWDB_A (phy_status) -110 ; pkt_stat->rssi =rtw_phy_rf_power_2_rssi (pkt_stat->rx_power,1 ); + dm_info->rssi[RF_PATH_A ] = pkt_stat->rssi; pkt_stat->bw = bw; pkt_stat->signal_power =max (pkt_stat->rx_power[RF_PATH_A ], min_rx_power);
Signature · 1 line
2.25.1