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

wifi: rtw89: separate BSSID CAM operations 



Normally, we allocate a BSSID CAM to a vif. By hardware design, we must
allocate a BSSID CAM to each TDLS peer, so separate BSSID CAM operations
that will be used by later patches.

This patch doesn't change logic at all.

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/20220610072610.27095-3-pkshih@realtek.com
parent 7312100d

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

+16 −8
Original line number Diff line number Diff line
@@ -445,15 +445,22 @@ void rtw89_cam_deinit_addr_cam(struct rtw89_dev *rtwdev, 
	clear_bit(addr_cam->addr_cam_idx, cam_info->addr_cam_map);

}



void rtw89_cam_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)

void rtw89_cam_deinit_bssid_cam(struct rtw89_dev *rtwdev,

				struct rtw89_bssid_cam_entry *bssid_cam)

{

	struct rtw89_cam_info *cam_info = &rtwdev->cam_info;



	bssid_cam->valid = false;

	clear_bit(bssid_cam->bssid_cam_idx, cam_info->bssid_cam_map);

}



void rtw89_cam_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)

{

	struct rtw89_addr_cam_entry *addr_cam = &rtwvif->addr_cam;

	struct rtw89_bssid_cam_entry *bssid_cam = &rtwvif->bssid_cam;



	rtw89_cam_deinit_addr_cam(rtwdev, addr_cam);

	bssid_cam->valid = false;

	clear_bit(bssid_cam->bssid_cam_idx, cam_info->bssid_cam_map);

	rtw89_cam_deinit_bssid_cam(rtwdev, bssid_cam);

}



void rtw89_cam_reset_keys(struct rtw89_dev *rtwdev)
@@ -539,10 +546,11 @@ static int rtw89_cam_get_avail_bssid_cam(struct rtw89_dev *rtwdev, 
	return 0;

}



static int rtw89_cam_init_bssid_cam(struct rtw89_dev *rtwdev,

				    struct rtw89_vif *rtwvif)

int rtw89_cam_init_bssid_cam(struct rtw89_dev *rtwdev,

			     struct rtw89_vif *rtwvif,

			     struct rtw89_bssid_cam_entry *bssid_cam,

			     const u8 *bssid)

{

	struct rtw89_bssid_cam_entry *bssid_cam = &rtwvif->bssid_cam;

	u8 bssid_cam_idx;

	int ret;
@@ -563,7 +571,7 @@ static int rtw89_cam_init_bssid_cam(struct rtw89_dev *rtwdev, 
	bssid_cam->len = BSSID_CAM_ENT_SIZE;

	bssid_cam->offset = 0;

	bssid_cam->valid = true;

	ether_addr_copy(bssid_cam->bssid, rtwvif->bssid);

	ether_addr_copy(bssid_cam->bssid, bssid);



	return 0;

}
@@ -581,7 +589,7 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
	struct rtw89_bssid_cam_entry *bssid_cam = &rtwvif->bssid_cam;

	int ret;



	ret = rtw89_cam_init_bssid_cam(rtwdev, rtwvif);

	ret = rtw89_cam_init_bssid_cam(rtwdev, rtwvif, bssid_cam, rtwvif->bssid);

	if (ret) {

		rtw89_err(rtwdev, "failed to init bssid cam\n");

		return ret;

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

+6 −0
Original line number Diff line number Diff line
@@ -359,6 +359,12 @@ int rtw89_cam_init_addr_cam(struct rtw89_dev *rtwdev, 
			    const struct rtw89_bssid_cam_entry *bssid_cam);

void rtw89_cam_deinit_addr_cam(struct rtw89_dev *rtwdev,

			       struct rtw89_addr_cam_entry *addr_cam);

int rtw89_cam_init_bssid_cam(struct rtw89_dev *rtwdev,

			     struct rtw89_vif *rtwvif,

			     struct rtw89_bssid_cam_entry *bssid_cam,

			     const u8 *bssid);

void rtw89_cam_deinit_bssid_cam(struct rtw89_dev *rtwdev,

				struct rtw89_bssid_cam_entry *bssid_cam);

void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,

				  struct rtw89_vif *vif,

				  struct rtw89_sta *rtwsta,