Commit b5d70201 authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

wifi: rtw89: update scan C2H messages for wifi 7 IC 



Add definition and parsing for wifi 7 extended fields. These fields
include hardware index which is current reporting, timestamp and self
defined sequences for debug purposes.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240126063356.17857-2-pkshih@realtek.com
parent a6c759c8

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

+5 −0
Original line number Diff line number Diff line
@@ -3309,6 +3309,11 @@ struct rtw89_c2h_scanofld { 
#define RTW89_C2H_SCANOFLD_W5_TX_FAIL GENMASK(3, 0)

#define RTW89_C2H_SCANOFLD_W5_AIR_DENSITY GENMASK(7, 4)

#define RTW89_C2H_SCANOFLD_W5_BAND GENMASK(25, 24)

#define RTW89_C2H_SCANOFLD_W5_MAC_IDX BIT(26)

#define RTW89_C2H_SCANOFLD_W6_SW_DEF GENMASK(7, 0)

#define RTW89_C2H_SCANOFLD_W6_EXPECT_PERIOD GENMASK(15, 8)

#define RTW89_C2H_SCANOFLD_W6_FW_DEF GENMASK(23, 16)

#define RTW89_C2H_SCANOFLD_W7_REPORT_TSF GENMASK(31, 0)



#define RTW89_GET_MAC_C2H_MCC_RCV_ACK_GROUP(c2h) \

	le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(1, 0))

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

+20 −4
Original line number Diff line number Diff line
@@ -4686,8 +4686,9 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, 
	struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;

	struct rtw89_vif *rtwvif = vif_to_rtwvif_safe(vif);

	struct rtw89_chan new;

	u8 reason, status, tx_fail, band, actual_period;

	u32 last_chan = rtwdev->scan_info.last_chan_idx;

	u8 reason, status, tx_fail, band, actual_period, expect_period;

	u32 last_chan = rtwdev->scan_info.last_chan_idx, report_tsf;

	u8 mac_idx, sw_def, fw_def;

	u16 chan;

	int ret;
@@ -4700,15 +4701,29 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, 
	reason = le32_get_bits(c2h->w2, RTW89_C2H_SCANOFLD_W2_RSN);

	band = le32_get_bits(c2h->w5, RTW89_C2H_SCANOFLD_W5_BAND);

	actual_period = le32_get_bits(c2h->w2, RTW89_C2H_SCANOFLD_W2_PERIOD);

	mac_idx = le32_get_bits(c2h->w5, RTW89_C2H_SCANOFLD_W5_MAC_IDX);





	if (!(rtwdev->chip->support_bands & BIT(NL80211_BAND_6GHZ)))

		band = chan > 14 ? RTW89_BAND_5G : RTW89_BAND_2G;



	rtw89_debug(rtwdev, RTW89_DBG_HW_SCAN,

		    "band: %d, chan: %d, reason: %d, status: %d, tx_fail: %d, actual: %d\n",

		    band, chan, reason, status, tx_fail, actual_period);

		    "mac_idx[%d] band: %d, chan: %d, reason: %d, status: %d, tx_fail: %d, actual: %d\n",

		    mac_idx, band, chan, reason, status, tx_fail, actual_period);



	if (rtwdev->chip->chip_gen == RTW89_CHIP_BE) {

		sw_def = le32_get_bits(c2h->w6, RTW89_C2H_SCANOFLD_W6_SW_DEF);

		expect_period = le32_get_bits(c2h->w6, RTW89_C2H_SCANOFLD_W6_EXPECT_PERIOD);

		fw_def = le32_get_bits(c2h->w6, RTW89_C2H_SCANOFLD_W6_FW_DEF);

		report_tsf = le32_get_bits(c2h->w7, RTW89_C2H_SCANOFLD_W7_REPORT_TSF);



		rtw89_debug(rtwdev, RTW89_DBG_HW_SCAN,

			    "sw_def: %d, fw_def: %d, tsf: %x, expect: %d\n",

			    sw_def, fw_def, report_tsf, expect_period);

	}



	switch (reason) {

	case RTW89_SCAN_LEAVE_OP_NOTIFY:

	case RTW89_SCAN_LEAVE_CH_NOTIFY:

		if (rtw89_is_op_chan(rtwdev, band, chan)) {

			rtw89_mac_enable_beacon_for_ap_vifs(rtwdev, false);
@@ -4727,6 +4742,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, 
			rtw89_hw_scan_complete(rtwdev, vif, rtwdev->scan_info.abort);

		}

		break;

	case RTW89_SCAN_ENTER_OP_NOTIFY:

	case RTW89_SCAN_ENTER_CH_NOTIFY:

		if (rtw89_is_op_chan(rtwdev, band, chan)) {

			rtw89_assign_entity_chan(rtwdev, rtwvif->sub_entity_idx,