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

rtw89: extend H2C of CMAC control info 



In order to support new chip that has capability of 160M, we need new
format to fill new information, so add a new V1 ID for newer use. Since
most fields are the same, fill fields according to the function ID of chip.

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/20220413010804.8941-2-pkshih@realtek.com
parent 79649041

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

+2 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ enum rtw89_ps_mode { 
#define RTW89_2G_BW_NUM (RTW89_CHANNEL_WIDTH_40 + 1)

#define RTW89_5G_BW_NUM (RTW89_CHANNEL_WIDTH_160 + 1)

#define RTW89_6G_BW_NUM (RTW89_CHANNEL_WIDTH_160 + 1)

#define RTW89_PPE_BW_NUM (RTW89_CHANNEL_WIDTH_80 + 1)

#define RTW89_PPE_BW_NUM (RTW89_CHANNEL_WIDTH_160 + 1)



enum rtw89_ru_bandwidth {

	RTW89_RU26 = 0,
@@ -2413,6 +2413,7 @@ struct rtw89_chip_info { 
	const struct rtw89_btc_rf_trx_para *rf_para_dlink;

	u8 ps_mode_supported;



	u32 h2c_cctl_func_id;

	u32 hci_func_en_addr;

	u32 h2c_desc_size;

	u32 txwd_body_size;

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

+31 −16
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ int rtw89_fw_h2c_lps_parm(struct rtw89_dev *rtwdev, 
int rtw89_fw_h2c_default_cmac_tbl(struct rtw89_dev *rtwdev,

				  struct rtw89_vif *rtwvif)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_hal *hal = &rtwdev->hal;

	struct sk_buff *skb;

	u8 ntx_path = hal->antenna_tx ? hal->antenna_tx : RF_B;
@@ -794,6 +795,7 @@ int rtw89_fw_h2c_default_cmac_tbl(struct rtw89_dev *rtwdev, 
	skb_put(skb, H2C_CMC_TBL_LEN);

	SET_CTRL_INFO_MACID(skb->data, macid);

	SET_CTRL_INFO_OPERATION(skb->data, 1);

	if (chip->h2c_cctl_func_id == H2C_FUNC_MAC_CCTLINFO_UD) {

		SET_CMC_TBL_TXPWR_MODE(skb->data, 0);

		SET_CMC_TBL_NTX_PATH_EN(skb->data, ntx_path);

		SET_CMC_TBL_PATH_MAP_A(skb->data, 0);
@@ -804,6 +806,7 @@ int rtw89_fw_h2c_default_cmac_tbl(struct rtw89_dev *rtwdev, 
		SET_CMC_TBL_ANTSEL_B(skb->data, 0);

		SET_CMC_TBL_ANTSEL_C(skb->data, 0);

		SET_CMC_TBL_ANTSEL_D(skb->data, 0);

	}

	SET_CMC_TBL_DOPPLER_CTRL(skb->data, 0);

	SET_CMC_TBL_TXPWR_TOLERENCE(skb->data, 0);

	if (rtwvif->net_type == RTW89_NET_TYPE_AP_MODE)
@@ -811,7 +814,7 @@ int rtw89_fw_h2c_default_cmac_tbl(struct rtw89_dev *rtwdev, 


	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

			      H2C_CAT_MAC, H2C_CL_MAC_FR_EXCHG,

			      H2C_FUNC_MAC_CCTLINFO_UD, 0, 1,

			      chip->h2c_cctl_func_id, 0, 1,

			      H2C_CMC_TBL_LEN);



	if (rtw89_h2c_tx(rtwdev, skb, false)) {
@@ -851,6 +854,8 @@ static void __get_sta_he_pkt_padding(struct rtw89_dev *rtwdev, 


		for (i = 0; i < RTW89_PPE_BW_NUM; i++)

			pads[i] = pad;



		return;

	}



	ru_bitmap = FIELD_GET(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK, ppe_thres_hdr);
@@ -885,6 +890,7 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev, 
				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_hal *hal = &rtwdev->hal;

	struct rtw89_sta *rtwsta = sta_to_rtwsta_safe(sta);

	struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;
@@ -917,9 +923,17 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev, 
	else

		SET_CMC_TBL_ULDL(skb->data, 0);

	SET_CMC_TBL_MULTI_PORT_ID(skb->data, rtwvif->port);

	if (chip->h2c_cctl_func_id == H2C_FUNC_MAC_CCTLINFO_UD_V1) {

		SET_CMC_TBL_NOMINAL_PKT_PADDING_V1(skb->data, pads[RTW89_CHANNEL_WIDTH_20]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING40_V1(skb->data, pads[RTW89_CHANNEL_WIDTH_40]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING80_V1(skb->data, pads[RTW89_CHANNEL_WIDTH_80]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING160_V1(skb->data, pads[RTW89_CHANNEL_WIDTH_160]);

	} else if (chip->h2c_cctl_func_id == H2C_FUNC_MAC_CCTLINFO_UD) {

		SET_CMC_TBL_NOMINAL_PKT_PADDING(skb->data, pads[RTW89_CHANNEL_WIDTH_20]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING40(skb->data, pads[RTW89_CHANNEL_WIDTH_40]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING80(skb->data, pads[RTW89_CHANNEL_WIDTH_80]);

		SET_CMC_TBL_NOMINAL_PKT_PADDING160(skb->data, pads[RTW89_CHANNEL_WIDTH_160]);

	}

	if (sta)

		SET_CMC_TBL_BSR_QUEUE_SIZE_FORMAT(skb->data,

						  sta->deflink.he_cap.has_he);
@@ -928,7 +942,7 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev, 


	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

			      H2C_CAT_MAC, H2C_CL_MAC_FR_EXCHG,

			      H2C_FUNC_MAC_CCTLINFO_UD, 0, 1,

			      chip->h2c_cctl_func_id, 0, 1,

			      H2C_CMC_TBL_LEN);



	if (rtw89_h2c_tx(rtwdev, skb, false)) {
@@ -946,6 +960,7 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev, 
int rtw89_fw_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev,

				 struct rtw89_sta *rtwsta)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct sk_buff *skb;



	skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_CMC_TBL_LEN);
@@ -967,7 +982,7 @@ int rtw89_fw_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev, 


	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

			      H2C_CAT_MAC, H2C_CL_MAC_FR_EXCHG,

			      H2C_FUNC_MAC_CCTLINFO_UD, 0, 1,

			      chip->h2c_cctl_func_id, 0, 1,

			      H2C_CMC_TBL_LEN);



	if (rtw89_h2c_tx(rtwdev, skb, false)) {

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

+37 −6
Original line number Diff line number Diff line
@@ -973,6 +973,36 @@ static inline void SET_CMC_TBL_ANTSEL_D(void *table, u32 val) 
	le32p_replace_bits((__le32 *)(table) + 14, SET_CMC_TBL_MASK_ANTSEL_D,

			   BIT(31));

}



#define SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING GENMASK(1, 0)

static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING_V1(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 7, val, GENMASK(1, 0));

	le32p_replace_bits((__le32 *)(table) + 15, SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING,

			   GENMASK(1, 0));

}



static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING40_V1(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 7, val, GENMASK(3, 2));

	le32p_replace_bits((__le32 *)(table) + 15, SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING,

			   GENMASK(3, 2));

}



static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING80_V1(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 7, val, GENMASK(5, 4));

	le32p_replace_bits((__le32 *)(table) + 15, SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING,

			   GENMASK(5, 4));

}



static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING160_V1(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 7, val, GENMASK(7, 6));

	le32p_replace_bits((__le32 *)(table) + 15, SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING,

			   GENMASK(7, 6));

}



#define SET_CMC_TBL_MASK_ADDR_CAM_INDEX GENMASK(7, 0)

static inline void SET_CMC_TBL_ADDR_CAM_INDEX(void *table, u32 val)

{
@@ -1001,7 +1031,6 @@ static inline void SET_CMC_TBL_DOPPLER_CTRL(void *table, u32 val) 
	le32p_replace_bits((__le32 *)(table) + 15, SET_CMC_TBL_MASK_DOPPLER_CTRL,

			   GENMASK(19, 18));

}

#define SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING GENMASK(1, 0)

static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 7, val, GENMASK(21, 20));
@@ -1106,13 +1135,14 @@ static inline void SET_CMC_TBL_CSI_GI_LTF(void *table, u32 val) 
	le32p_replace_bits((__le32 *)(table) + 16, SET_CMC_TBL_MASK_CSI_GI_LTF,

			   GENMASK(27, 25));

}

#define SET_CMC_TBL_MASK_CSI_GID_SEL BIT(0)

static inline void SET_CMC_TBL_CSI_GID_SEL(void *table, u32 val)



static inline void SET_CMC_TBL_NOMINAL_PKT_PADDING160(void *table, u32 val)

{

	le32p_replace_bits((__le32 *)(table) + 8, val, BIT(29));

	le32p_replace_bits((__le32 *)(table) + 16, SET_CMC_TBL_MASK_CSI_GID_SEL,

			   BIT(29));

	le32p_replace_bits((__le32 *)(table) + 8, val, GENMASK(29, 28));

	le32p_replace_bits((__le32 *)(table) + 16, SET_CMC_TBL_MASK_NOMINAL_PKT_PADDING,

			   GENMASK(29, 28));

}



#define SET_CMC_TBL_MASK_CSI_BW GENMASK(1, 0)

static inline void SET_CMC_TBL_CSI_BW(void *table, u32 val)

{
@@ -2170,6 +2200,7 @@ struct rtw89_fw_h2c_rf_reg_info { 
#define H2C_CL_MAC_FR_EXCHG		0x5

#define H2C_FUNC_MAC_CCTLINFO_UD	0x2

#define H2C_FUNC_MAC_BCN_UPD		0x5

#define H2C_FUNC_MAC_CCTLINFO_UD_V1	0xa



/* CLASS 6 - Address CAM */

#define H2C_CL_MAC_ADDR_CAM_UPDATE	0x6

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

+1 −0
Original line number Diff line number Diff line
@@ -2147,6 +2147,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { 
	.ps_mode_supported	= BIT(RTW89_PS_MODE_RFOFF) |

				  BIT(RTW89_PS_MODE_CLK_GATED) |

				  BIT(RTW89_PS_MODE_PWR_GATED),

	.h2c_cctl_func_id	= H2C_FUNC_MAC_CCTLINFO_UD,

	.hci_func_en_addr	= R_AX_HCI_FUNC_EN,

	.h2c_desc_size		= sizeof(struct rtw89_txwd_body),

	.txwd_body_size		= sizeof(struct rtw89_txwd_body),

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

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { 
	.dav_log_efuse_size	= 16,

	.phycap_addr		= 0x590,

	.phycap_size		= 0x60,

	.h2c_cctl_func_id	= H2C_FUNC_MAC_CCTLINFO_UD_V1,

	.hci_func_en_addr	= R_AX_HCI_FUNC_EN_V1,

	.h2c_desc_size		= sizeof(struct rtw89_rxdesc_short),

	.txwd_body_size		= sizeof(struct rtw89_txwd_body_v1),