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

rtw89: support variant of fill_txdesc 



The txdesc is descriptor related to skb->data. The v1 version contains
8 dwords txwd_body and 6 dwords txwd_info, and the format is also different
from original one.

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/20220318023214.32411-10-pkshih@realtek.com
parent 6d5b5d62

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

+68 −0
Original line number Diff line number Diff line
@@ -897,6 +897,26 @@ static __le32 rtw89_build_txwd_body0(struct rtw89_tx_desc_info *desc_info) 
	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_body0_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_BODY0_WP_OFFSET_V1, desc_info->wp_offset) |

		    FIELD_PREP(RTW89_TXWD_BODY0_WD_INFO_EN, desc_info->en_wd_info) |

		    FIELD_PREP(RTW89_TXWD_BODY0_CHANNEL_DMA, desc_info->ch_dma) |

		    FIELD_PREP(RTW89_TXWD_BODY0_HDR_LLC_LEN, desc_info->hdr_llc_len) |

		    FIELD_PREP(RTW89_TXWD_BODY0_WD_PAGE, desc_info->wd_page) |

		    FIELD_PREP(RTW89_TXWD_BODY0_FW_DL, desc_info->fw_dl);



	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_body1_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_BODY1_ADDR_INFO_NUM, desc_info->addr_info_nr) |

		    FIELD_PREP(RTW89_TXWD_BODY1_SEC_TYPE, desc_info->sec_type);



	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_body2(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_BODY2_TID_INDICATE, desc_info->tid_indicate) |
@@ -916,6 +936,14 @@ static __le32 rtw89_build_txwd_body3(struct rtw89_tx_desc_info *desc_info) 
	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_body7_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_BODY7_USE_RATE_V1, desc_info->use_rate) |

		    FIELD_PREP(RTW89_TXWD_BODY7_DATA_RATE, desc_info->data_rate);



	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_info0(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_INFO0_USE_RATE, desc_info->use_rate) |
@@ -926,6 +954,13 @@ static __le32 rtw89_build_txwd_info0(struct rtw89_tx_desc_info *desc_info) 
	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_info0_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_INFO0_DISDATAFB, desc_info->dis_data_fb);



	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_info1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_INFO1_MAX_AGGNUM, desc_info->ampdu_num) |
@@ -946,6 +981,15 @@ static __le32 rtw89_build_txwd_info2(struct rtw89_tx_desc_info *desc_info) 
	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_info2_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_INFO2_AMPDU_DENSITY, desc_info->ampdu_density) |

		    FIELD_PREP(RTW89_TXWD_INFO2_FORCE_KEY_EN, desc_info->sec_en) |

		    FIELD_PREP(RTW89_TXWD_INFO2_SEC_CAM_IDX, desc_info->sec_cam_idx);



	return cpu_to_le32(dword);

}



static __le32 rtw89_build_txwd_info4(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(RTW89_TXWD_INFO4_RTS_EN, 1) |
@@ -977,6 +1021,30 @@ void rtw89_core_fill_txdesc(struct rtw89_dev *rtwdev, 
}

EXPORT_SYMBOL(rtw89_core_fill_txdesc);



void rtw89_core_fill_txdesc_v1(struct rtw89_dev *rtwdev,

			       struct rtw89_tx_desc_info *desc_info,

			       void *txdesc)

{

	struct rtw89_txwd_body_v1 *txwd_body = (struct rtw89_txwd_body_v1 *)txdesc;

	struct rtw89_txwd_info *txwd_info;



	txwd_body->dword0 = rtw89_build_txwd_body0_v1(desc_info);

	txwd_body->dword1 = rtw89_build_txwd_body1_v1(desc_info);

	txwd_body->dword2 = rtw89_build_txwd_body2(desc_info);

	txwd_body->dword3 = rtw89_build_txwd_body3(desc_info);

	txwd_body->dword7 = rtw89_build_txwd_body7_v1(desc_info);



	if (!desc_info->en_wd_info)

		return;



	txwd_info = (struct rtw89_txwd_info *)(txwd_body + 1);

	txwd_info->dword0 = rtw89_build_txwd_info0_v1(desc_info);

	txwd_info->dword1 = rtw89_build_txwd_info1(desc_info);

	txwd_info->dword2 = rtw89_build_txwd_info2_v1(desc_info);

	txwd_info->dword4 = rtw89_build_txwd_info4(desc_info);

}

EXPORT_SYMBOL(rtw89_core_fill_txdesc_v1);



static __le32 rtw89_build_txwd_fwcmd0_v1(struct rtw89_tx_desc_info *desc_info)

{

	u32 dword = FIELD_PREP(AX_RXD_RPKT_LEN_MASK, desc_info->pkt_size) |

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

+28 −0
Original line number Diff line number Diff line
@@ -642,6 +642,17 @@ struct rtw89_txwd_body { 
	__le32 dword5;

} __packed;



struct rtw89_txwd_body_v1 {

	__le32 dword0;

	__le32 dword1;

	__le32 dword2;

	__le32 dword3;

	__le32 dword4;

	__le32 dword5;

	__le32 dword6;

	__le32 dword7;

} __packed;



struct rtw89_txwd_info {

	__le32 dword0;

	__le32 dword1;
@@ -2079,6 +2090,9 @@ struct rtw89_chip_ops { 
				       s8 pw_ofst, enum rtw89_mac_idx mac_idx);

	int (*pwr_on_func)(struct rtw89_dev *rtwdev);

	int (*pwr_off_func)(struct rtw89_dev *rtwdev);

	void (*fill_txdesc)(struct rtw89_dev *rtwdev,

			    struct rtw89_tx_desc_info *desc_info,

			    void *txdesc);

	void (*fill_txdesc_fwcmd)(struct rtw89_dev *rtwdev,

				  struct rtw89_tx_desc_info *desc_info,

				  void *txdesc);
@@ -2351,6 +2365,7 @@ struct rtw89_chip_info { 


	u32 hci_func_en_addr;

	u32 h2c_desc_size;

	u32 txwd_body_size;

	u32 h2c_ctrl_reg;

	const u32 *h2c_regs;

	u32 c2h_ctrl_reg;
@@ -3514,6 +3529,16 @@ static inline void rtw89_ctrl_btg(struct rtw89_dev *rtwdev, bool btg) 
		chip->ops->ctrl_btg(rtwdev, btg);

}



static inline

void rtw89_chip_fill_txdesc(struct rtw89_dev *rtwdev,

			    struct rtw89_tx_desc_info *desc_info,

			    void *txdesc)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;



	chip->ops->fill_txdesc(rtwdev, desc_info, txdesc);

}



static inline

void rtw89_chip_fill_txdesc_fwcmd(struct rtw89_dev *rtwdev,

				  struct rtw89_tx_desc_info *desc_info,
@@ -3597,6 +3622,9 @@ void rtw89_core_tx_kick_off(struct rtw89_dev *rtwdev, u8 qsel); 
void rtw89_core_fill_txdesc(struct rtw89_dev *rtwdev,

			    struct rtw89_tx_desc_info *desc_info,

			    void *txdesc);

void rtw89_core_fill_txdesc_v1(struct rtw89_dev *rtwdev,

			       struct rtw89_tx_desc_info *desc_info,

			       void *txdesc);

void rtw89_core_fill_txdesc_fwcmd_v1(struct rtw89_dev *rtwdev,

				     struct rtw89_tx_desc_info *desc_info,

				     void *txdesc);

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

+4 −4
Original line number Diff line number Diff line
@@ -1035,8 +1035,8 @@ static int rtw89_pci_txwd_submit(struct rtw89_dev *rtwdev, 
				 struct rtw89_core_tx_request *tx_req)

{

	struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info;

	struct rtw89_txwd_body *txwd_body;

	struct rtw89_txwd_info *txwd_info;

	struct rtw89_pci_tx_wp_info *txwp_info;

	void *txaddr_info_addr;
@@ -1050,8 +1050,6 @@ static int rtw89_pci_txwd_submit(struct rtw89_dev *rtwdev, 
	dma_addr_t dma;

	int ret;



	rtw89_core_fill_txdesc(rtwdev, desc_info, txwd->vaddr);



	dma = dma_map_single(&pdev->dev, skb->data, skb->len, DMA_TO_DEVICE);

	if (dma_mapping_error(&pdev->dev, dma)) {

		rtw89_err(rtwdev, "failed to map skb dma data\n");
@@ -1062,7 +1060,7 @@ static int rtw89_pci_txwd_submit(struct rtw89_dev *rtwdev, 
	tx_data->dma = dma;



	txwp_len = sizeof(*txwp_info);

	txwd_len = sizeof(*txwd_body);

	txwd_len = chip->txwd_body_size;

	txwd_len += en_wd_info ? sizeof(*txwd_info) : 0;



	txwp_info = txwd->vaddr + txwd_len;
@@ -1079,6 +1077,8 @@ static int rtw89_pci_txwd_submit(struct rtw89_dev *rtwdev, 


	txwd->len = txwd_len + txwp_len + txaddr_info_len;



	rtw89_chip_fill_txdesc(rtwdev, desc_info, txwd->vaddr);



	skb_queue_tail(&txwd->queue, skb);



	return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { 
	.set_txpwr_ul_tb_offset	= rtw8852a_set_txpwr_ul_tb_offset,

	.pwr_on_func		= NULL,

	.pwr_off_func		= NULL,

	.fill_txdesc		= rtw89_core_fill_txdesc,

	.fill_txdesc_fwcmd	= rtw89_core_fill_txdesc,

	.cfg_ctrl_path		= rtw89_mac_cfg_ctrl_path,

	.mac_cfg_gnt		= rtw89_mac_cfg_gnt,
@@ -2099,6 +2100,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { 
				  BIT(RTW89_PS_MODE_PWR_GATED),

	.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),

	.h2c_ctrl_reg		= R_AX_H2CREG_CTRL,

	.h2c_regs		= rtw8852a_h2c_regs,

	.c2h_ctrl_reg		= R_AX_C2HREG_CTRL,

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

+2 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { 
	.set_txpwr_ul_tb_offset	= rtw8852c_set_txpwr_ul_tb_offset,

	.pwr_on_func		= rtw8852c_pwr_on_func,

	.pwr_off_func		= rtw8852c_pwr_off_func,

	.fill_txdesc		= rtw89_core_fill_txdesc_v1,

	.fill_txdesc_fwcmd	= rtw89_core_fill_txdesc_fwcmd_v1,

	.cfg_ctrl_path		= rtw89_mac_cfg_ctrl_path_v1,

	.mac_cfg_gnt		= rtw89_mac_cfg_gnt_v1,
@@ -517,6 +518,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { 
	.phycap_size		= 0x60,

	.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),

	.h2c_ctrl_reg		= R_AX_H2CREG_CTRL_V1,

	.h2c_regs		= rtw8852c_h2c_regs,

	.c2h_ctrl_reg		= R_AX_C2HREG_CTRL_V1,