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

rtw89: update scan_mac_addr during scanning period 



Update scan_mac_addr to address CAM as A1, so hardware can ACK probe
response properly.

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/20211111023706.14154-2-pkshih@realtek.com
parent 00224aa7

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

+12 −10
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, 
	addr_cam->sec_ent[key_idx] = sec_cam->sec_cam_idx;

	addr_cam->sec_entries[key_idx] = sec_cam;

	set_bit(key_idx, addr_cam->sec_cam_map);

	ret = rtw89_fw_h2c_cam(rtwdev, rtwvif);

	ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, NULL);

	if (ret) {

		rtw89_err(rtwdev, "failed to update addr cam sec entry: %d\n",

			  ret);
@@ -394,7 +394,7 @@ int rtw89_cam_sec_key_del(struct rtw89_dev *rtwdev, 
	clear_bit(key_idx, addr_cam->sec_cam_map);

	addr_cam->sec_entries[key_idx] = NULL;

	if (inform_fw) {

		ret = rtw89_fw_h2c_cam(rtwdev, rtwvif);

		ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, NULL);

		if (ret)

			rtw89_err(rtwdev, "failed to update cam del key: %d\n", ret);

	}
@@ -593,7 +593,7 @@ int rtw89_cam_fill_bssid_cam_info(struct rtw89_dev *rtwdev, 
	return 0;

}



static u8 rtw89_cam_addr_hash(u8 start, u8 *addr)

static u8 rtw89_cam_addr_hash(u8 start, const u8 *addr)

{

	u8 hash = 0;

	u8 i;
@@ -606,12 +606,14 @@ static u8 rtw89_cam_addr_hash(u8 start, u8 *addr) 


void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,

				  struct rtw89_vif *rtwvif,

				  const u8 *scan_mac_addr,

				  u8 *cmd)

{

	struct ieee80211_vif *vif = rtwvif_to_vif(rtwvif);

	struct ieee80211_sta *sta;

	struct rtw89_sta *rtwsta;

	struct rtw89_addr_cam_entry *addr_cam = &rtwvif->addr_cam;

	const u8 *sma = scan_mac_addr ? scan_mac_addr : rtwvif->mac_addr;

	u8 sma_hash, tma_hash, addr_msk_start;

	u8 sma_start = 0;

	u8 tma_start = 0;
@@ -623,7 +625,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, 
		else if (addr_cam->mask_sel == RTW89_TMA)

			tma_start = addr_msk_start;

	}

	sma_hash = rtw89_cam_addr_hash(sma_start, rtwvif->mac_addr);

	sma_hash = rtw89_cam_addr_hash(sma_start, sma);

	tma_hash = rtw89_cam_addr_hash(tma_start, addr_cam->tma);



	FWCMD_SET_ADDR_IDX(cmd, addr_cam->addr_cam_idx);
@@ -642,12 +644,12 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, 


	FWCMD_SET_ADDR_BSSID_CAM_IDX(cmd, addr_cam->bssid_cam_idx);



	FWCMD_SET_ADDR_SMA0(cmd, rtwvif->mac_addr[0]);

	FWCMD_SET_ADDR_SMA1(cmd, rtwvif->mac_addr[1]);

	FWCMD_SET_ADDR_SMA2(cmd, rtwvif->mac_addr[2]);

	FWCMD_SET_ADDR_SMA3(cmd, rtwvif->mac_addr[3]);

	FWCMD_SET_ADDR_SMA4(cmd, rtwvif->mac_addr[4]);

	FWCMD_SET_ADDR_SMA5(cmd, rtwvif->mac_addr[5]);

	FWCMD_SET_ADDR_SMA0(cmd, sma[0]);

	FWCMD_SET_ADDR_SMA1(cmd, sma[1]);

	FWCMD_SET_ADDR_SMA2(cmd, sma[2]);

	FWCMD_SET_ADDR_SMA3(cmd, sma[3]);

	FWCMD_SET_ADDR_SMA4(cmd, sma[4]);

	FWCMD_SET_ADDR_SMA5(cmd, sma[5]);



	FWCMD_SET_ADDR_TMA0(cmd, addr_cam->tma[0]);

	FWCMD_SET_ADDR_TMA1(cmd, addr_cam->tma[1]);

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

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ static inline void FWCMD_SET_ADDR_BSSID_BSSID5(void *cmd, u32 value) 
int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif *vif);

void rtw89_cam_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif *vif);

void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,

				  struct rtw89_vif *vif, u8 *cmd);

				  struct rtw89_vif *vif,

				  const u8 *scan_mac_addr, u8 *cmd);

int rtw89_cam_fill_bssid_cam_info(struct rtw89_dev *rtwdev,

				  struct rtw89_vif *vif, u8 *cmd);

int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev,

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

+2 −2
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ int rtw89_core_sta_disconnect(struct rtw89_dev *rtwdev, 
	}



	/* update cam aid mac_id net_type */

	rtw89_fw_h2c_cam(rtwdev, rtwvif);

	rtw89_fw_h2c_cam(rtwdev, rtwvif, NULL);

	if (ret) {

		rtw89_warn(rtwdev, "failed to send h2c cam\n");

		return ret;
@@ -1908,7 +1908,7 @@ int rtw89_core_sta_assoc(struct rtw89_dev *rtwdev, 
	}



	/* update cam aid mac_id net_type */

	rtw89_fw_h2c_cam(rtwdev, rtwvif);

	rtw89_fw_h2c_cam(rtwdev, rtwvif, NULL);

	if (ret) {

		rtw89_warn(rtwdev, "failed to send h2c cam\n");

		return ret;

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

+3 −2
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ void rtw89_unload_firmware(struct rtw89_dev *rtwdev) 
}



#define H2C_CAM_LEN 60

int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)

int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif,

		     const u8 *scan_mac_addr)

{

	struct sk_buff *skb;
@@ -533,7 +534,7 @@ int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
		return -ENOMEM;

	}

	skb_put(skb, H2C_CAM_LEN);

	rtw89_cam_fill_addr_cam_info(rtwdev, rtwvif, skb->data);

	rtw89_cam_fill_addr_cam_info(rtwdev, rtwvif, scan_mac_addr, skb->data);

	rtw89_cam_fill_bssid_cam_info(rtwdev, rtwvif, skb->data);



	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

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

+2 −1
Original line number Diff line number Diff line
@@ -1756,7 +1756,8 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev, 
				struct ieee80211_sta *sta);

int rtw89_fw_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev,

				 struct rtw89_sta *rtwsta);

int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *vif);

int rtw89_fw_h2c_cam(struct rtw89_dev *rtwdev, struct rtw89_vif *vif,

		     const u8 *scan_mac_addr);

void rtw89_fw_c2h_irqsafe(struct rtw89_dev *rtwdev, struct sk_buff *c2h);

void rtw89_fw_c2h_work(struct work_struct *work);

int rtw89_fw_h2c_vif_maintain(struct rtw89_dev *rtwdev,