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

wifi: rtw89: change naming of BA CAM from V1 to V0_EXT 



BA CAM of 8852C has more entries and more fields of H2C, and needs
initialization before using. Due to differences from 8852A/8852B, we name
it as V1 before. However, real V1 of BA CAM is introduced now, so change
it to V0_EXT to avoid confusing with firmware design.

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/20230421024551.29994-7-pkshih@realtek.com
parent ce816ab5

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

+8 −1
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ enum rtw89_cv { 
	CHIP_CV_INVALID = CHIP_CV_MAX,

};



enum rtw89_bacam_ver {

	RTW89_BACAM_V0,

	RTW89_BACAM_V1,



	RTW89_BACAM_V0_EXT = 99,

};



enum rtw89_core_tx_type {

	RTW89_CORE_TX_TYPE_DATA,

	RTW89_CORE_TX_TYPE_MGMT,
@@ -3182,7 +3189,7 @@ struct rtw89_chip_info { 
	u8 scam_num;

	u8 bacam_num;

	u8 bacam_dynamic_num;

	bool bacam_v1;

	enum rtw89_bacam_ver bacam_ver;



	u8 sec_ctrl_efuse_size;

	u32 physical_efuse_size;

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

+6 −6
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, 
	}

	skb_put(skb, H2C_BA_CAM_LEN);

	SET_BA_CAM_MACID(skb->data, macid);

	if (chip->bacam_v1)

	if (chip->bacam_ver == RTW89_BACAM_V0_EXT)

		SET_BA_CAM_ENTRY_IDX_V1(skb->data, entry_idx);

	else

		SET_BA_CAM_ENTRY_IDX(skb->data, entry_idx);
@@ -825,7 +825,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, 
	SET_BA_CAM_INIT_REQ(skb->data, 1);

	SET_BA_CAM_SSN(skb->data, params->ssn);



	if (chip->bacam_v1) {

	if (chip->bacam_ver == RTW89_BACAM_V0_EXT) {

		SET_BA_CAM_STD_EN(skb->data, 1);

		SET_BA_CAM_BAND(skb->data, rtwvif->mac_idx);

	}
@@ -850,7 +850,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, 
	return ret;

}



static int rtw89_fw_h2c_init_dynamic_ba_cam_v1(struct rtw89_dev *rtwdev,

static int rtw89_fw_h2c_init_ba_cam_v0_ext(struct rtw89_dev *rtwdev,

					   u8 entry_idx, u8 uid)

{

	struct sk_buff *skb;
@@ -888,7 +888,7 @@ static int rtw89_fw_h2c_init_dynamic_ba_cam_v1(struct rtw89_dev *rtwdev, 
	return ret;

}



void rtw89_fw_h2c_init_ba_cam_v1(struct rtw89_dev *rtwdev)

void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext(struct rtw89_dev *rtwdev)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	u8 entry_idx = chip->bacam_num;
@@ -896,7 +896,7 @@ void rtw89_fw_h2c_init_ba_cam_v1(struct rtw89_dev *rtwdev) 
	int i;



	for (i = 0; i < chip->bacam_dynamic_num; i++) {

		rtw89_fw_h2c_init_dynamic_ba_cam_v1(rtwdev, entry_idx, uid);

		rtw89_fw_h2c_init_ba_cam_v0_ext(rtwdev, entry_idx, uid);

		entry_idx++;

		uid++;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -3676,7 +3676,7 @@ void rtw89_fw_release_general_pkt_list_vif(struct rtw89_dev *rtwdev, 
void rtw89_fw_release_general_pkt_list(struct rtw89_dev *rtwdev, bool notify_fw);

int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,

			bool valid, struct ieee80211_ampdu_params *params);

void rtw89_fw_h2c_init_ba_cam_v1(struct rtw89_dev *rtwdev);

void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext(struct rtw89_dev *rtwdev);



int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev,

			  struct rtw89_lps_parm *lps_param);
@@ -3739,8 +3739,8 @@ static inline void rtw89_fw_h2c_init_ba_cam(struct rtw89_dev *rtwdev) 
{

	const struct rtw89_chip_info *chip = rtwdev->chip;



	if (chip->bacam_v1)

		rtw89_fw_h2c_init_ba_cam_v1(rtwdev);

	if (chip->bacam_ver == RTW89_BACAM_V0_EXT)

		rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext(rtwdev);

}



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { 
	.scam_num		= 128,

	.bacam_num		= 2,

	.bacam_dynamic_num	= 4,

	.bacam_v1		= false,

	.bacam_ver		= RTW89_BACAM_V0,

	.sec_ctrl_efuse_size	= 4,

	.physical_efuse_size	= 1216,

	.logical_efuse_size	= 2048,

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

+1 −1
Original line number Diff line number Diff line
@@ -2115,7 +2115,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { 
	.scam_num		= 128,

	.bacam_num		= 2,

	.bacam_dynamic_num	= 4,

	.bacam_v1		= false,

	.bacam_ver		= RTW89_BACAM_V0,

	.sec_ctrl_efuse_size	= 4,

	.physical_efuse_size	= 1216,

	.logical_efuse_size	= 1536,