wifi: rtw89: fixes of monitor mode
Ping-Ke Shih
maintainercover wifi: rtw89: fixes of monitor mode
With channel context, it needs WANT_MONITOR_VIF to make monitor work properly, so we add first patch. Second patch is to have HE radiotap, but only basic information that has been reported by rx_status. The last patch is to fix 8852BE RX stuck in monitor mode.
With these fixes, 8852A/8852B/8852C can capture packets as expected.
Ping-Ke Shih (2):
wifi: rtw89: add HE radiotap for monitor mode
wifi: rtw89: 8852b: turn off PoP function in monitor mode
Zong-Zhe Yang (1):
wifi: rtw89: enable mac80211 virtual monitor interface
drivers/net/wireless/realtek/rtw89/core.c | 28 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 18 ++++++++++++ drivers/net/wireless/realtek/rtw89/pci.c | 2 +- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 7 +++++ 5 files changed, 56 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/3 wifi: rtw89: enable mac80211 virtual monitor interface
From: Zong-Zhe Yang <[email protected]>
For running with mac80211 channel context ops and using only as monitor, we need to enable WANT_MONITOR_VIF to let mac80211 process virtual monitor interface. Then, we are able to set channel on the monitor from user space.
--- drivers/net/wireless/realtek/rtw89/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +6 -0
@@ -1405,6 +1405,9 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;const u8 *bssid = iter_data->bssid; +if (!vif->bss_conf.bssid) +return ; +if (ieee80211_is_trigger (hdr->frame_control)) {rtw89_stats_trigger_frame (rtwdev, vif, skb);return ;
@@ -2386,6 +2389,8 @@ void rtw89_vif_type_mapping(struct ieee80211_vif *vif, bool assoc) rtwvif->self_role =RTW89_SELF_ROLE_CLIENT ; rtwvif->addr_cam.sec_ent_mode =RTW89_ADDR_CAM_SEC_NORMAL ;break ; +case NL80211_IFTYPE_MONITOR : +break ;default :WARN_ON (1 );break ;
@@ -3266,6 +3271,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)ieee80211_hw_set (hw,SUPPORTS_DYNAMIC_PS );ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS );ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID ); +ieee80211_hw_set (hw,WANT_MONITOR_VIF ); hw->wiphy->interface_modes =BIT (NL80211_IFTYPE_STATION ) | BIT(NL80211_IFTYPE_AP) |
Signature · 1 line
2.25.1
Re: [PATCH 1/3] wifi: rtw89: enable mac80211 virtual monitor interface
Quoted 8 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
For running with mac80211 channel context ops and using only as monitor, we need to enable
WANT_MONITOR_VIFto let mac80211 process virtual monitor interface. Then, we are able to set channel on the monitor from user space.Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
3 patches applied to wireless-next.git, thanks.
cd9b6b3baf52 wifi: rtw89: enable mac80211 virtual monitor interface 51e8ed4e44b5 wifi: rtw89: add HE radiotap for monitor mode a215b2b7055f wifi: rtw89: 8852b: turn off PoP function in monitor mode
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/3 wifi: rtw89: add HE radiotap for monitor mode
In reply to Ping-Ke ShihWith basic HE radiotap, we can check data rate in sniffer data. To store the radiotap data, we reserve headroom of aligned 64 bytes, and then update HE radiotap in monitor mode, so it doesn't affect performance in normal mode.
--- drivers/net/wireless/realtek/rtw89/core.c | 22 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 18 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/pci.c | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +22 -0
@@ -1480,6 +1480,27 @@ static void rtw89_core_hw_to_sband_rate(struct ieee80211_rx_status *rx_status) rx_status->rate_idx -=4 ; } +static void rtw89_core_update_radiotap (struct rtw89_dev *rtwdev, +struct sk_buff *skb, +struct ieee80211_rx_status *rx_status) +{ +static const struct ieee80211_radiotap_he known_he = { + .data1 =cpu_to_le16 (IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN | +IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN ), + .data2 =cpu_to_le16 (IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN ), + }; +struct ieee80211_radiotap_he *he; + +if (!(rtwdev->hw->conf.flags &IEEE80211_CONF_MONITOR )) +return ; + +if (rx_status->encoding ==RX_ENC_HE ) { + rx_status->flag |=RX_FLAG_RADIOTAP_HE ; + he =skb_push (skb,sizeof (*he)); + *he = known_he; + } +} + static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev, struct rtw89_rx_phy_ppdu *phy_ppdu, struct rtw89_rx_desc_info *desc_info,
@@ -1494,6 +1515,7 @@ static void rtw89_core_rx_to_mac80211(struct rtw89_dev *rtwdev,rtw89_core_hw_to_sband_rate (rx_status);rtw89_core_rx_stats (rtwdev, phy_ppdu, desc_info, skb_ppdu); +rtw89_core_update_radiotap (rtwdev, skb_ppdu, rx_status);/* In low power mode, it does RX in thread context. */ local_bh_disable ();ieee80211_rx_napi (rtwdev->hw,NULL , skb_ppdu, napi);
drivers/net/wireless/realtek/rtw89/core.h +18 -0
@@ -35,6 +35,7 @@ extern const struct ieee80211_ops rtw89_ops;#define RSSI_FACTOR 1#define RTW89_RSSI_RAW_TO_DBM (rssi) ((s8)((rssi) >> RSSI_FACTOR) - MAX_RSSI)#define RTW89_TX_DIV_RSSI_RAW_TH (2 << RSSI_FACTOR) +#define RTW89_RADIOTAP_ROOM ALIGN(sizeof(struct ieee80211_radiotap_he), 64)#define RTW89_HTC_MASK_VARIANT GENMASK(1, 0)#define RTW89_HTC_VARIANT_HE 3
@@ -4383,6 +4384,23 @@ static inline struct rtw89_fw_suit *rtw89_fw_suit_get(struct rtw89_dev *rtwdev,return &fw_info->normal; } +static inline struct sk_buff *rtw89_alloc_skb_for_rx (struct rtw89_dev *rtwdev, +unsigned int length) +{ +struct sk_buff *skb; + +if (rtwdev->hw->conf.flags &IEEE80211_CONF_MONITOR ) { + skb =dev_alloc_skb (length +RTW89_RADIOTAP_ROOM ); +if (!skb) +return NULL ; + +skb_reserve (skb,RTW89_RADIOTAP_ROOM ); +return skb; + } + +return dev_alloc_skb (length); +} +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/pci.c +1 -1
@@ -267,7 +267,7 @@ static u32 rtw89_pci_rxbd_deliver_skbs(struct rtw89_dev *rtwdev,rtw89_core_query_rxdesc (rtwdev, desc_info, skb->data, rxinfo_size); - new =dev_alloc_skb (desc_info->pkt_size); + new =rtw89_alloc_skb_for_rx (rtwdev, desc_info->pkt_size);if (!new) goto err_sync_device;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/3 wifi: rtw89: 8852b: turn off PoP function in monitor mode
In reply to Ping-Ke ShihPoP stands for Packet on Packet that can improve performance in noisy environment, but it could get RX stuck suddenly. In normal mode, firmware can help to resolve the stuck, but firmware doesn't work in monitor mode. Therefore, turn off PoP to avoid RX stuck.
--- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 7 +++++++ 2 files changed, 9 insertions(+)
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -4236,6 +4236,8 @@#define R_P1_NBIIDX 0x4770#define B_P1_NBIIDX_VAL GENMASK(11, 0)#define B_P1_NBIIDX_NOTCH_EN BIT(12) +#define R_PKT_CTRL 0x47D4 +#define B_PKT_POP_EN BIT(8)#define R_SEG0R_PD 0x481C#define R_SEG0R_PD_V1 0x4860#define B_SEG0R_PD_SPATIAL_REUSE_EN_MSK_V1 BIT(30)
drivers/net/wireless/realtek/rtw89/rtw8852b.c +7 -0
@@ -1411,6 +1411,12 @@ static void rtw8852b_bb_sethw(struct rtw89_dev *rtwdev)rtw89_phy_read32_mask (rtwdev,R_P1_RPL1 ,B_P0_RPL1_BIAS_MASK ); } +static void rtw8852b_bb_set_pop (struct rtw89_dev *rtwdev) +{ +if (rtwdev->hw->conf.flags &IEEE80211_CONF_MONITOR ) +rtw89_phy_write32_clr (rtwdev,R_PKT_CTRL ,B_PKT_POP_EN ); +} +static void rtw8852b_set_channel_bb (struct rtw89_dev *rtwdev,const struct rtw89_chan *chan,enum rtw89_phy_idx phy_idx) {
@@ -1441,6 +1447,7 @@ static void rtw8852b_set_channel_bb(struct rtw89_dev *rtwdev, const struct rtw89rtw89_phy_write32_mask (rtwdev,R_MAC_PIN_SEL ,B_CH_IDX_SEG0 , chan->primary_channel);rtw8852b_5m_mask (rtwdev, chan, phy_idx); +rtw8852b_bb_set_pop (rtwdev);rtw8852b_bb_reset_all (rtwdev, phy_idx); }
Signature · 1 line
2.25.1