Commit f1f74dff authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw89: add EHT radiotap in monitor mode 



Add IEEE80211_RADIOTAP_EHT and IEEE80211_RADIOTAP_EHT_USIG radiotap to
fill basic EHT NSS, MCS, GI and bandwidth.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231011115256.6121-7-pkshih@realtek.com
parent e25ef743

drivers/net/wireless/realtek/rtw89/core.c

+68 −0
Original line number Diff line number Diff line
@@ -1907,6 +1907,72 @@ static void rtw89_core_hw_to_sband_rate(struct ieee80211_rx_status *rx_status) 
	rx_status->rate_idx -= 4;

}



static const u8 rx_status_bw_to_radiotap_eht_usig[] = {

	[RATE_INFO_BW_20] = IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_20MHZ,

	[RATE_INFO_BW_5] = U8_MAX,

	[RATE_INFO_BW_10] = U8_MAX,

	[RATE_INFO_BW_40] = IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_40MHZ,

	[RATE_INFO_BW_80] = IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_80MHZ,

	[RATE_INFO_BW_160] = IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_160MHZ,

	[RATE_INFO_BW_HE_RU] = U8_MAX,

	[RATE_INFO_BW_320] = IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_1,

	[RATE_INFO_BW_EHT_RU] = U8_MAX,

};



static void rtw89_core_update_radiotap_eht(struct rtw89_dev *rtwdev,

					   struct sk_buff *skb,

					   struct ieee80211_rx_status *rx_status)

{

	struct ieee80211_radiotap_eht_usig *usig;

	struct ieee80211_radiotap_eht *eht;

	struct ieee80211_radiotap_tlv *tlv;

	int eht_len = struct_size(eht, user_info, 1);

	int usig_len = sizeof(*usig);

	int len;

	u8 bw;



	len = sizeof(*tlv) + ALIGN(eht_len, 4) +

	      sizeof(*tlv) + ALIGN(usig_len, 4);



	rx_status->flag |= RX_FLAG_RADIOTAP_TLV_AT_END;

	skb_reset_mac_header(skb);



	/* EHT */

	tlv = skb_push(skb, len);

	memset(tlv, 0, len);

	tlv->type = cpu_to_le16(IEEE80211_RADIOTAP_EHT);

	tlv->len = cpu_to_le16(eht_len);



	eht = (struct ieee80211_radiotap_eht *)tlv->data;

	eht->known = cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_GI);

	eht->data[0] =

		le32_encode_bits(rx_status->eht.gi, IEEE80211_RADIOTAP_EHT_DATA0_GI);



	eht->user_info[0] =

		cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |

			    IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O);

	eht->user_info[0] |=

		le32_encode_bits(rx_status->rate_idx, IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) |

		le32_encode_bits(rx_status->nss, IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O);



	/* U-SIG */

	tlv = (void *)tlv + sizeof(*tlv) + ALIGN(eht_len, 4);

	tlv->type = cpu_to_le16(IEEE80211_RADIOTAP_EHT_USIG);

	tlv->len = cpu_to_le16(usig_len);



	if (rx_status->bw >= ARRAY_SIZE(rx_status_bw_to_radiotap_eht_usig))

		return;



	bw = rx_status_bw_to_radiotap_eht_usig[rx_status->bw];

	if (bw == U8_MAX)

		return;



	usig = (struct ieee80211_radiotap_eht_usig *)tlv->data;

	usig->common =

		le32_encode_bits(1, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN) |

		le32_encode_bits(bw, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW);

}



static void rtw89_core_update_radiotap(struct rtw89_dev *rtwdev,

				       struct sk_buff *skb,

				       struct ieee80211_rx_status *rx_status)
@@ -1925,6 +1991,8 @@ static void rtw89_core_update_radiotap(struct rtw89_dev *rtwdev, 
		rx_status->flag |= RX_FLAG_RADIOTAP_HE;

		he = skb_push(skb, sizeof(*he));

		*he = known_he;

	} else if (rx_status->encoding == RX_ENC_EHT) {

		rtw89_core_update_radiotap_eht(rtwdev, skb, rx_status);

	}

}

drivers/net/wireless/realtek/rtw89/core.h

+8 −1
Original line number Diff line number Diff line
@@ -37,7 +37,14 @@ 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_RADIOTAP_ROOM_HE sizeof(struct ieee80211_radiotap_he)

#define RTW89_RADIOTAP_ROOM_EHT \

	(sizeof(struct ieee80211_radiotap_tlv) + \

	 ALIGN(struct_size((struct ieee80211_radiotap_eht *)0, user_info, 1), 4) + \

	 sizeof(struct ieee80211_radiotap_tlv) + \

	 ALIGN(sizeof(struct ieee80211_radiotap_eht_usig), 4))

#define RTW89_RADIOTAP_ROOM \

	ALIGN(max(RTW89_RADIOTAP_ROOM_HE, RTW89_RADIOTAP_ROOM_EHT), 64)



#define RTW89_HTC_MASK_VARIANT GENMASK(1, 0)

#define RTW89_HTC_VARIANT_HE 3