wifi: rtw89: prepare TX/RX WD and D/C-MAC H2C command for RTL8922D
Ping-Ke Shih
maintainerv2 cover wifi: rtw89: prepare TX/RX WD and D/C-MAC H2C command for RTL8922D
RTL8922D use different TX/RX WD (to assist in TX and RX per packets) and D/C-MAC command format (to assist in TX/RX per association). Add them accordingly.
Patch 9/10 is to consider hardware AID in firmware element. Patch 10/10: The RACK (received ack by firmware) every 4 commands are not
necessary for WiFi 7 chips. Remove the logic.
v2:
- patch 2/10: add missed bb_sel field which can report received link.
Ping-Ke Shih (10):
wifi: rtw89: update TXWD v3 for RTL8922D
wifi: rtw89: update query RXDESC v3 for RTL8922D
wifi: rtw89: fw: add DMAC v3 H2C command for RTL8922D
wifi: rtw89: fw: add CMAC H2C command to initialize default value for
RTL8922D
wifi: rtw89: fw: add CMAC H2C command for association for RTL8922D
wifi: rtw89: fw: add CMAC H2C command for TX AMPDU for RTL8922D
wifi: rtw89: fw: add CMAC H2C command for TX time for RTL8922D
wifi: rtw89: fw: add CMAC H2C command for punctured for RTL8922D
wifi: rtw89: fw: consider hardware AID for firmware elements
wifi: rtw89: fw: set RACK bit every 4 H2C command for WiFi 6 chips
only
drivers/net/wireless/realtek/rtw89/cam.c | 134 ++++++ drivers/net/wireless/realtek/rtw89/cam.h | 129 ++++++ drivers/net/wireless/realtek/rtw89/core.c | 132 ++++++ drivers/net/wireless/realtek/rtw89/core.h | 28 ++ drivers/net/wireless/realtek/rtw89/fw.c | 514 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 171 ++++++- drivers/net/wireless/realtek/rtw89/mac.h | 12 + drivers/net/wireless/realtek/rtw89/txrx.h | 22 + 8 files changed, 1126 insertions(+), 16 deletions(-)
base-commit: 6a0b7392a6f5487fb58704926a24b1e2ee2762e9
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/10 wifi: rtw89: update TXWD v3 for RTL8922D
Add TXWD v3 to assist in transmitting for RTL8922D according to hardware design.
--- drivers/net/wireless/realtek/rtw89/core.c | 59 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 3 ++ drivers/net/wireless/realtek/rtw89/txrx.h | 16 ++++++ 3 files changed, 78 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +59 -0
@@ -1633,6 +1633,17 @@ static __le32 rtw89_build_txwd_body2_v2(struct rtw89_tx_desc_info *desc_info)return cpu_to_le32 (dword); } +static __le32 rtw89_build_txwd_body2_v3 (struct rtw89_tx_desc_info *desc_info) +{ +u32 dword =FIELD_PREP (BE_TXD_BODY2_TID_IND_V1 , desc_info->tid_indicate) | +FIELD_PREP (BE_TXD_BODY2_QSEL_V1 , desc_info->qsel) | +FIELD_PREP (BE_TXD_BODY2_TXPKTSIZE , desc_info->pkt_size) | +FIELD_PREP (BE_TXD_BODY2_AGG_EN , desc_info->agg_en) | +FIELD_PREP (BE_TXD_BODY2_MACID_V1 , desc_info->mac_id); + +return cpu_to_le32 (dword); +} +static __le32 rtw89_build_txwd_body3_v2 (struct rtw89_tx_desc_info *desc_info) { u32 dword = FIELD_PREP(BE_TXD_BODY3_WIFI_SEQ, desc_info->seq) |
@@ -1642,6 +1653,16 @@ static __le32 rtw89_build_txwd_body3_v2(struct rtw89_tx_desc_info *desc_info)return cpu_to_le32 (dword); } +static __le32 rtw89_build_txwd_body3_v3 (struct rtw89_tx_desc_info *desc_info) +{ +u32 dword =FIELD_PREP (BE_TXD_BODY3_WIFI_SEQ , desc_info->seq) | +FIELD_PREP (BE_TXD_BODY3_MLO_FLAG , desc_info->mlo) | +FIELD_PREP (BE_TXD_BODY3_IS_MLD_SW_EN , desc_info->sw_mld) | +FIELD_PREP (BE_TXD_BODY3_BK_V1 , desc_info->bk); + +return cpu_to_le32 (dword); +} +static __le32 rtw89_build_txwd_body4_v2 (struct rtw89_tx_desc_info *desc_info) { u32 dword = FIELD_PREP(BE_TXD_BODY4_SEC_IV_L0, desc_info->sec_seq[0]) |
@@ -1713,6 +1734,15 @@ static __le32 rtw89_build_txwd_info2_v2(struct rtw89_tx_desc_info *desc_info)return cpu_to_le32 (dword); } +static __le32 rtw89_build_txwd_info2_v3 (struct rtw89_tx_desc_info *desc_info) +{ +u32 dword =FIELD_PREP (BE_TXD_INFO2_AMPDU_DENSITY , desc_info->ampdu_density) | +FIELD_PREP (BE_TXD_INFO2_FORCE_KEY_EN_V1 , desc_info->sec_en) | +FIELD_PREP (BE_TXD_INFO2_SEC_CAM_IDX_V1 , desc_info->sec_cam_idx); + +return cpu_to_le32 (dword); +} +static __le32 rtw89_build_txwd_info4_v2 (struct rtw89_tx_desc_info *desc_info) {bool rts_en = !desc_info->is_bmc;
@@ -1751,6 +1781,35 @@ void rtw89_core_fill_txdesc_v2(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_core_fill_txdesc_v2); +void rtw89_core_fill_txdesc_v3 (struct rtw89_dev *rtwdev, +struct rtw89_tx_desc_info *desc_info, +void *txdesc) +{ +struct rtw89_txwd_body_v2 *txwd_body = txdesc; +struct rtw89_txwd_info_v2 *txwd_info; + + txwd_body->dword0 =rtw89_build_txwd_body0_v2 (desc_info); + txwd_body->dword1 =rtw89_build_txwd_body1_v2 (desc_info); + txwd_body->dword2 =rtw89_build_txwd_body2_v3 (desc_info); + txwd_body->dword3 =rtw89_build_txwd_body3_v3 (desc_info); +if (desc_info->sec_en) { + txwd_body->dword4 =rtw89_build_txwd_body4_v2 (desc_info); + txwd_body->dword5 =rtw89_build_txwd_body5_v2 (desc_info); + } + txwd_body->dword6 =rtw89_build_txwd_body6_v2 (desc_info); + txwd_body->dword7 =rtw89_build_txwd_body7_v2 (desc_info); + +if (!desc_info->en_wd_info) +return ; + + txwd_info = (struct rtw89_txwd_info_v2 *)(txwd_body +1 ); + txwd_info->dword0 =rtw89_build_txwd_info0_v2 (desc_info); + txwd_info->dword1 =rtw89_build_txwd_info1_v2 (desc_info); + txwd_info->dword2 =rtw89_build_txwd_info2_v3 (desc_info); + txwd_info->dword4 =rtw89_build_txwd_info4_v2 (desc_info); +} +EXPORT_SYMBOL (rtw89_core_fill_txdesc_v3); +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 +3 -0
@@ -7580,6 +7580,9 @@ void rtw89_core_fill_txdesc_v1(struct rtw89_dev *rtwdev,void rtw89_core_fill_txdesc_v2 (struct rtw89_dev *rtwdev,struct rtw89_tx_desc_info *desc_info,void *txdesc); +void rtw89_core_fill_txdesc_v3 (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/txrx.h +16 -0
@@ -188,12 +188,16 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_BODY2_QSEL GENMASK(22, 17)#define BE_TXD_BODY2_TID_IND BIT(23)#define BE_TXD_BODY2_MACID GENMASK(31, 24) +#define BE_TXD_BODY2_QSEL_V1 GENMASK(20, 15) +#define BE_TXD_BODY2_TID_IND_V1 BIT(21) +#define BE_TXD_BODY2_MACID_V1 GENMASK(31, 22)/* TX WD BODY DWORD 3 */ #define BE_TXD_BODY3_WIFI_SEQ GENMASK(11, 0)#define BE_TXD_BODY3_MLO_FLAG BIT(12)#define BE_TXD_BODY3_IS_MLD_SW_EN BIT(13)#define BE_TXD_BODY3_TRY_RATE BIT(14) +#define BE_TXD_BODY3_BK_V1 BIT(14)#define BE_TXD_BODY3_RELINK_FLAG_V1 BIT(15)#define BE_TXD_BODY3_BAND0_SU_TC_V1 GENMASK(21, 16)#define BE_TXD_BODY3_TOTAL_TC GENMASK(27, 22)
@@ -201,6 +205,7 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_BODY3_MU_PRI_RTY BIT(29)#define BE_TXD_BODY3_MU_2ND_RTY BIT(30)#define BE_TXD_BODY3_BAND1_SU_RTY_V1 BIT(31) +#define BE_TXD_BODY3_DRIVER_QUEUE_TIME GENMASK(31, 16)/* TX WD BODY DWORD 4 */ #define BE_TXD_BODY4_TXDESC_CHECKSUM GENMASK(15, 0)
@@ -224,6 +229,10 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_BODY6_EOSP_BIT BIT(15)#define BE_TXD_BODY6_S_IDX GENMASK(23, 16)#define BE_TXD_BODY6_RU_POS GENMASK(31, 24) +#define BE_TXD_BODY6_MU_TC_V1 GENMASK(3, 0) +#define BE_TXD_BODY6_RU_TC_V1 GENMASK(8, 5) +#define BE_TXD_BODY6_RELINK_EN BIT(9) +#define BE_TXD_BODY6_RELINK_LAST BIT(10)/* TX WD BODY DWORD 7 */ #define BE_TXD_BODY7_RTS_TC GENMASK(5, 0)
@@ -262,6 +271,8 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)/* TX WD INFO DWORD 2 */ #define BE_TXD_INFO2_SEC_CAM_IDX GENMASK(7, 0)#define BE_TXD_INFO2_FORCE_KEY_EN BIT(8) +#define BE_TXD_INFO2_SEC_CAM_IDX_V1 GENMASK(9, 0) +#define BE_TXD_INFO2_FORCE_KEY_EN_V1 BIT(10)#define BE_TXD_INFO2_LIFETIME_SEL GENMASK(15, 13)#define BE_TXD_INFO2_FORCE_TXOP BIT(17)#define BE_TXD_INFO2_AMPDU_DENSITY GENMASK(20, 18)
@@ -277,6 +288,7 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_INFO3_RTT_EN BIT(9)#define BE_TXD_INFO3_HT_DATA_SND_V1 BIT(10)#define BE_TXD_INFO3_BT_NULL BIT(11) +#define BE_TXD_INFO3_DISABLE_TXBF BIT(11)#define BE_TXD_INFO3_TRI_FRAME BIT(12)#define BE_TXD_INFO3_NULL_0 BIT(13)#define BE_TXD_INFO3_NULL_1 BIT(14)
@@ -292,6 +304,8 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_INFO4_PUNC_MODE GENMASK(17, 16)#define BE_TXD_INFO4_SW_TX_OK_0 BIT(18)#define BE_TXD_INFO4_SW_TX_OK_1 BIT(19) +#define BE_TXD_INFO4_SW_EHT_NLTF_SWITCH BIT(20) +#define BE_TXD_INFO4_SW_EHT_NLTF GENMASK(22, 21)#define BE_TXD_INFO4_SW_TX_PWR_DBM GENMASK(26, 23)#define BE_TXD_INFO4_RTS_EN BIT(27)#define BE_TXD_INFO4_CTS2SELF BIT(28)
@@ -308,6 +322,7 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_INFO6_UL_GI_LTF GENMASK(14, 12)#define BE_TXD_INFO6_UL_DOPPLER BIT(15)#define BE_TXD_INFO6_UL_STBC BIT(16) +#define BE_TXD_INFO6_UL_MU_MIMO_EN BIT(17)#define BE_TXD_INFO6_UL_LENGTH_REF GENMASK(21, 18)#define BE_TXD_INFO6_UL_RF_GAIN_IDX GENMASK(31, 22)
@@ -322,6 +337,7 @@ static inline u8 rtw89_get_data_nss(struct rtw89_dev *rtwdev, u16 hw_rate)#define BE_TXD_INFO7_UL_HELTF_SYMBOL_NUM GENMASK(19, 17)#define BE_TXD_INFO7_ULBW GENMASK(21, 20)#define BE_TXD_INFO7_ULBW_EXT GENMASK(23, 22) +#define BE_TXD_INFO7_UL_TRI_PAD_TSF BIT(24)#define BE_TXD_INFO7_USE_WD_UL GENMASK(25, 24)#define BE_TXD_INFO7_EXTEND_MODE_SEL GENMASK(31, 28)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next v2 01/10] wifi: rtw89: update TXWD v3 for RTL8922D
Quoted 4 lines · Ping-Ke Shih
Add TXWD v3 to assist in transmitting for RTL8922D according to hardware design.
Signed-off-by Ping-Ke Shih <[email protected]>
10 patch(es) applied to rtw-next branch of rtw.git, thanks.
2adaa4b36b55 wifi: rtw89: update TXWD v3 for RTL8922D2b4a2fc32a47 wifi: rtw89: update query RXDESC v3 for RTL8922D49218572f331 wifi: rtw89: fw: add DMAC v3 H2C command for RTL8922D c73607b3a8ef wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D 96f5ceb44875 wifi: rtw89: fw: add CMAC H2C command for association for RTL8922D dfe3dea6b9a2 wifi: rtw89: fw: add CMAC H2C command for TX AMPDU for RTL8922D eccf7b10785b wifi: rtw89: fw: add CMAC H2C command for TX time for RTL8922D 1ddebb8f6e04 wifi: rtw89: fw: add CMAC H2C command for punctured for RTL8922D 483539d89110 wifi: rtw89: fw: consider hardware AID for firmware elements 5fbc19b0f62b wifi: rtw89: fw: set RACK bit every 4 H2C command for WiFi 6 chips only
Ping-Ke Shih
maintainerPATCH v2 2/10 wifi: rtw89: update query RXDESC v3 for RTL8922D
In reply to Ping-Ke ShihAdd RXDESC v3 to parse meta data of receiving packets for RTL8922D.
---
v2: add missed bb_sel field which can report received link.
--- drivers/net/wireless/realtek/rtw89/core.c | 73 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 25 ++++++++ drivers/net/wireless/realtek/rtw89/txrx.h | 6 ++ 3 files changed, 104 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +73 -0
@@ -3469,6 +3469,79 @@ void rtw89_core_query_rxdesc_v2(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_core_query_rxdesc_v2); +void rtw89_core_query_rxdesc_v3 (struct rtw89_dev *rtwdev, +struct rtw89_rx_desc_info *desc_info, +u8 *data,u32 data_offset) +{ +struct rtw89_rxdesc_phy_rpt_v2 *rxd_rpt; +struct rtw89_rxdesc_short_v3 *rxd_s; +struct rtw89_rxdesc_long_v3 *rxd_l; +u16 shift_len, drv_info_len, phy_rtp_len, hdr_cnv_len; + + rxd_s = (struct rtw89_rxdesc_short_v3 *)(data + data_offset); + + desc_info->pkt_size =le32_get_bits (rxd_s->dword0,BE_RXD_RPKT_LEN_MASK ); + desc_info->drv_info_size =le32_get_bits (rxd_s->dword0,BE_RXD_DRV_INFO_SZ_MASK ); + desc_info->phy_rpt_size =le32_get_bits (rxd_s->dword0,BE_RXD_PHY_RPT_SZ_MASK ); + desc_info->hdr_cnv_size =le32_get_bits (rxd_s->dword0,BE_RXD_HDR_CNV_SZ_MASK ); + desc_info->shift =le32_get_bits (rxd_s->dword0,BE_RXD_SHIFT_MASK ); + desc_info->long_rxdesc =le32_get_bits (rxd_s->dword0,BE_RXD_LONG_RXD ); + desc_info->pkt_type =le32_get_bits (rxd_s->dword0,BE_RXD_RPKT_TYPE_MASK ); + desc_info->bb_sel =le32_get_bits (rxd_s->dword0,BE_RXD_BB_SEL ); +if (desc_info->pkt_type ==RTW89_CORE_RX_TYPE_PPDU_STAT ) + desc_info->mac_info_valid = true; + + desc_info->frame_type =le32_get_bits (rxd_s->dword2,BE_RXD_TYPE_MASK ); + desc_info->mac_id =le32_get_bits (rxd_s->dword2,BE_RXD_MAC_ID_V1 ); + desc_info->addr_cam_valid =le32_get_bits (rxd_s->dword2,BE_RXD_ADDR_CAM_VLD ); + + desc_info->icv_err =le32_get_bits (rxd_s->dword3,BE_RXD_ICV_ERR ); + desc_info->crc32_err =le32_get_bits (rxd_s->dword3,BE_RXD_CRC32_ERR ); + desc_info->hw_dec =le32_get_bits (rxd_s->dword3,BE_RXD_HW_DEC ); + desc_info->sw_dec =le32_get_bits (rxd_s->dword3,BE_RXD_SW_DEC ); + desc_info->addr1_match =le32_get_bits (rxd_s->dword3,BE_RXD_A1_MATCH ); + + desc_info->bw =le32_get_bits (rxd_s->dword4,BE_RXD_BW_MASK ); + desc_info->data_rate =le32_get_bits (rxd_s->dword4,BE_RXD_RX_DATARATE_MASK ); + desc_info->gi_ltf =le32_get_bits (rxd_s->dword4,BE_RXD_RX_GI_LTF_MASK ); + desc_info->ppdu_cnt =le32_get_bits (rxd_s->dword4,BE_RXD_PPDU_CNT_MASK ); + desc_info->ppdu_type =le32_get_bits (rxd_s->dword4,BE_RXD_PPDU_TYPE_MASK ); + + desc_info->free_run_cnt =le32_to_cpu (rxd_s->dword5); + + shift_len = desc_info->shift <<1 ;/* 2-byte unit */ + drv_info_len = desc_info->drv_info_size <<3 ;/* 8-byte unit */ + phy_rtp_len = desc_info->phy_rpt_size <<3 ;/* 8-byte unit */ + hdr_cnv_len = desc_info->hdr_cnv_size <<4 ;/* 16-byte unit */ + desc_info->offset = data_offset + shift_len + drv_info_len + + phy_rtp_len + hdr_cnv_len; + +if (desc_info->long_rxdesc) + desc_info->rxd_len =sizeof (struct rtw89_rxdesc_long_v3 ); +else + desc_info->rxd_len =sizeof (struct rtw89_rxdesc_short_v3 ); + desc_info->ready = true; + +if (phy_rtp_len ==sizeof (*rxd_rpt)) { + rxd_rpt = (struct rtw89_rxdesc_phy_rpt_v2 *)(data + data_offset + + desc_info->rxd_len); + desc_info->rssi =le32_get_bits (rxd_rpt->dword0,BE_RXD_PHY_RSSI ); + } + +if (!desc_info->long_rxdesc) +return ; + + rxd_l = (struct rtw89_rxdesc_long_v3 *)(data + data_offset); + + desc_info->sr_en =le32_get_bits (rxd_l->dword6,BE_RXD_SR_EN ); + desc_info->user_id =le32_get_bits (rxd_l->dword6,BE_RXD_USER_ID_MASK ); + desc_info->addr_cam_id =le32_get_bits (rxd_l->dword6,BE_RXD_ADDR_CAM_V1 ); + desc_info->sec_cam_id =le32_get_bits (rxd_l->dword6,BE_RXD_SEC_CAM_IDX_V1 ); + + desc_info->rx_pl_id =le32_get_bits (rxd_l->dword7,BE_RXD_RX_PL_ID_MASK ); +} +EXPORT_SYMBOL (rtw89_core_query_rxdesc_v3); +struct rtw89_core_iter_rx_status {struct rtw89_dev *rtwdev;struct ieee80211_rx_status *rx_status;
drivers/net/wireless/realtek/rtw89/core.h +25 -0
@@ -1137,6 +1137,15 @@ struct rtw89_rxdesc_short_v2 {__le32 dword5; } __packed; +struct rtw89_rxdesc_short_v3 { +__le32 dword0; +__le32 dword1; +__le32 dword2; +__le32 dword3; +__le32 dword4; +__le32 dword5; +} __packed; +struct rtw89_rxdesc_long {__le32 dword0;__le32 dword1;
@@ -1161,6 +1170,19 @@ struct rtw89_rxdesc_long_v2 {__le32 dword9; } __packed; +struct rtw89_rxdesc_long_v3 { +__le32 dword0; +__le32 dword1; +__le32 dword2; +__le32 dword3; +__le32 dword4; +__le32 dword5; +__le32 dword6; +__le32 dword7; +__le32 dword8; +__le32 dword9; +} __packed; +struct rtw89_rxdesc_phy_rpt_v2 {__le32 dword0;__le32 dword1;
@@ -7601,6 +7623,9 @@ void rtw89_core_query_rxdesc(struct rtw89_dev *rtwdev,void rtw89_core_query_rxdesc_v2 (struct rtw89_dev *rtwdev,struct rtw89_rx_desc_info *desc_info,u8 *data,u32 data_offset); +void rtw89_core_query_rxdesc_v3 (struct rtw89_dev *rtwdev, +struct rtw89_rx_desc_info *desc_info, +u8 *data,u32 data_offset);void rtw89_core_napi_start (struct rtw89_dev *rtwdev);void rtw89_core_napi_stop (struct rtw89_dev *rtwdev);int rtw89_core_napi_init (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/txrx.h +6 -0
@@ -504,6 +504,7 @@ struct rtw89_phy_sts_iehdr {/* BE RXD dword2 */ #define BE_RXD_MAC_ID_MASK GENMASK(7, 0) +#define BE_RXD_MAC_ID_V1 GENMASK(9, 0)#define BE_RXD_TYPE_MASK GENMASK(11, 10)#define BE_RXD_LAST_MSDU BIT(12)#define BE_RXD_AMSDU_CUT BIT(13)
@@ -535,6 +536,7 @@ struct rtw89_phy_sts_iehdr {#define BE_RXD_QNULL BIT(22)#define BE_RXD_A4_FRAME BIT(23)#define BE_RXD_FRAG_MASK GENMASK(27, 24) +#define BE_RXD_GET_CH_INFO_V2 GENMASK(31, 29)#define BE_RXD_GET_CH_INFO_V1_MASK GENMASK(31, 30)/* BE RXD dword4 */
@@ -550,10 +552,14 @@ struct rtw89_phy_sts_iehdr {/* BE RXD dword6 */ #define BE_RXD_ADDR_CAM_MASK GENMASK(7, 0) +#define BE_RXD_ADDR_CAM_V1 GENMASK(9, 0) +#define BE_RXD_RX_STATISTICS_V1 BIT(11) +#define BE_RXD_SMART_ANT_V1 BIT(12)#define BE_RXD_SR_EN BIT(13)#define BE_RXD_NON_SRG_PPDU BIT(14)#define BE_RXD_INTER_PPDU BIT(15)#define BE_RXD_USER_ID_MASK GENMASK(21, 16) +#define BE_RXD_SEC_CAM_IDX_V1 GENMASK(31, 22)#define BE_RXD_RX_STATISTICS BIT(22)#define BE_RXD_SMART_ANT BIT(23)#define BE_RXD_SEC_CAM_IDX_MASK GENMASK(31, 24)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/10 wifi: rtw89: fw: add DMAC v3 H2C command for RTL8922D
In reply to Ping-Ke ShihWrite association data including address and security key of peer to hardware. Add the command for RTL8922D accordingly.
--- drivers/net/wireless/realtek/rtw89/cam.c | 134 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/cam.h | 129 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.c | 95 ++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 7 ++ 4 files changed, 365 insertions(+)
drivers/net/wireless/realtek/rtw89/cam.c +134 -0
@@ -1140,3 +1140,137 @@ void rtw89_cam_fill_dctl_sec_cam_info_v2(struct rtw89_dev *rtwdev,le32_encode_bits (mld_bssid[5 ],DCTLINFO_V2_W12_MLD_BSSID_5 ); h2c->m12 =cpu_to_le32 (DCTLINFO_V2_W12_ALL ); } + +void rtw89_cam_fill_dctl_sec_cam_info_v3 (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link, +struct rtw89_h2c_dctlinfo_ud_v3 *h2c) +{ +struct ieee80211_sta *sta =rtwsta_link_to_sta_safe (rtwsta_link); +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif_link->rtwvif); +struct rtw89_vif *rtwvif = rtwvif_link->rtwvif; +struct rtw89_addr_cam_entry *addr_cam = +rtw89_get_addr_cam_of (rtwvif_link, rtwsta_link); +bool is_mld = sta ? sta->mlo :ieee80211_vif_is_mld (vif); +struct rtw89_wow_param *rtw_wow = &rtwdev->wow; +u8 *ptk_tx_iv = rtw_wow->key_info.ptk_tx_iv; +u8 *mld_sma, *mld_tma, *mld_bssid; + + h2c->c0 =le32_encode_bits (rtwsta_link ? rtwsta_link->mac_id : + rtwvif_link->mac_id, +DCTLINFO_V3_C0_MACID ) | +le32_encode_bits (1 ,DCTLINFO_V3_C0_OP ); + + h2c->w2 =le32_encode_bits (is_mld,DCTLINFO_V3_W2_IS_MLD ); + h2c->m2 =cpu_to_le32 (DCTLINFO_V3_W2_IS_MLD ); + + h2c->w4 =le32_encode_bits (addr_cam->sec_ent_keyid[0 ], +DCTLINFO_V3_W4_SEC_ENT0_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[1 ], +DCTLINFO_V3_W4_SEC_ENT1_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[2 ], +DCTLINFO_V3_W4_SEC_ENT2_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[3 ], +DCTLINFO_V3_W4_SEC_ENT3_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[4 ], +DCTLINFO_V3_W4_SEC_ENT4_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[5 ], +DCTLINFO_V3_W4_SEC_ENT5_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[6 ], +DCTLINFO_V3_W4_SEC_ENT6_KEYID ); + h2c->m4 =cpu_to_le32 (DCTLINFO_V3_W4_SEC_ENT0_KEYID | +DCTLINFO_V3_W4_SEC_ENT1_KEYID | +DCTLINFO_V3_W4_SEC_ENT2_KEYID | +DCTLINFO_V3_W4_SEC_ENT3_KEYID | +DCTLINFO_V3_W4_SEC_ENT4_KEYID | +DCTLINFO_V3_W4_SEC_ENT5_KEYID | +DCTLINFO_V3_W4_SEC_ENT6_KEYID ); + + h2c->w5 =le32_encode_bits (addr_cam->sec_cam_map[0 ], +DCTLINFO_V3_W5_SEC_ENT_VALID_V1 ); + h2c->m5 =cpu_to_le32 (DCTLINFO_V3_W5_SEC_ENT_VALID_V1 ); + + h2c->w6 =le32_encode_bits (addr_cam->sec_ent[0 ], +DCTLINFO_V3_W6_SEC_ENT0_V2 ) | +le32_encode_bits (addr_cam->sec_ent[1 ], +DCTLINFO_V3_W6_SEC_ENT1_V2 ) | +le32_encode_bits (addr_cam->sec_ent[2 ], +DCTLINFO_V3_W6_SEC_ENT2_V2 ); + h2c->m6 =cpu_to_le32 (DCTLINFO_V3_W6_SEC_ENT0_V2 | +DCTLINFO_V3_W6_SEC_ENT1_V2 | +DCTLINFO_V3_W6_SEC_ENT2_V2 ); + + h2c->w7 =le32_encode_bits (addr_cam->sec_ent[3 ], +DCTLINFO_V3_W7_SEC_ENT3_V2 ) | +le32_encode_bits (addr_cam->sec_ent[4 ], +DCTLINFO_V3_W7_SEC_ENT4_V2 ) | +le32_encode_bits (addr_cam->sec_ent[5 ], +DCTLINFO_V3_W7_SEC_ENT5_V2 ); + h2c->m7 =cpu_to_le32 (DCTLINFO_V3_W7_SEC_ENT3_V2 | +DCTLINFO_V3_W7_SEC_ENT4_V2 | +DCTLINFO_V3_W7_SEC_ENT5_V2 ); + + h2c->w8 =le32_encode_bits (addr_cam->sec_ent[6 ], +DCTLINFO_V3_W8_SEC_ENT6_V2 ); + h2c->m8 =cpu_to_le32 (DCTLINFO_V3_W8_SEC_ENT6_V2 ); + +if (rtw_wow->ptk_alg) { + h2c->w0 =le32_encode_bits (ptk_tx_iv[0 ] | ptk_tx_iv[1 ] <<8 , +DCTLINFO_V3_W0_AES_IV_L ); + h2c->m0 =cpu_to_le32 (DCTLINFO_V3_W0_AES_IV_L ); + + h2c->w1 =le32_encode_bits (ptk_tx_iv[4 ] | + ptk_tx_iv[5 ] <<8 | + ptk_tx_iv[6 ] <<16 | + ptk_tx_iv[7 ] <<24 , +DCTLINFO_V3_W1_AES_IV_H ); + h2c->m1 =cpu_to_le32 (DCTLINFO_V3_W1_AES_IV_H ); + + h2c->w4 |=le32_encode_bits (rtw_wow->ptk_keyidx, +DCTLINFO_V3_W4_SEC_KEY_ID ); + h2c->m4 |=cpu_to_le32 (DCTLINFO_V3_W4_SEC_KEY_ID ); + } + +if (!is_mld) +return ; + +if (rtwvif_link->net_type ==RTW89_NET_TYPE_INFRA ) { + mld_sma = rtwvif->mac_addr; + mld_tma = vif->cfg.ap_addr; + mld_bssid = vif->cfg.ap_addr; + }else if (rtwvif_link->net_type ==RTW89_NET_TYPE_AP_MODE && sta) { + mld_sma = rtwvif->mac_addr; + mld_tma = sta->addr; + mld_bssid = rtwvif->mac_addr; + }else { +return ; + } + + h2c->w9 =le32_encode_bits (mld_sma[0 ],DCTLINFO_V3_W9_MLD_SMA_0_V2 ) | +le32_encode_bits (mld_sma[1 ],DCTLINFO_V3_W9_MLD_SMA_1_V2 ) | +le32_encode_bits (mld_sma[2 ],DCTLINFO_V3_W9_MLD_SMA_2_V2 ) | +le32_encode_bits (mld_sma[3 ],DCTLINFO_V3_W9_MLD_SMA_3_V2 ); + h2c->m9 =cpu_to_le32 (DCTLINFO_V3_W9_ALL ); + + h2c->w10 =le32_encode_bits (mld_sma[4 ],DCTLINFO_V3_W10_MLD_SMA_4_V2 ) | +le32_encode_bits (mld_sma[5 ],DCTLINFO_V3_W10_MLD_SMA_5_V2 ) | +le32_encode_bits (mld_tma[0 ],DCTLINFO_V3_W10_MLD_TMA_0_V2 ) | +le32_encode_bits (mld_tma[1 ],DCTLINFO_V3_W10_MLD_TMA_1_V2 ); + h2c->m10 =cpu_to_le32 (DCTLINFO_V3_W10_ALL ); + + h2c->w11 =le32_encode_bits (mld_tma[2 ],DCTLINFO_V3_W11_MLD_TMA_2_V2 ) | +le32_encode_bits (mld_tma[3 ],DCTLINFO_V3_W11_MLD_TMA_3_V2 ) | +le32_encode_bits (mld_tma[4 ],DCTLINFO_V3_W11_MLD_TMA_4_V2 ) | +le32_encode_bits (mld_tma[5 ],DCTLINFO_V3_W11_MLD_TMA_5_V2 ); + h2c->m11 =cpu_to_le32 (DCTLINFO_V3_W11_ALL ); + + h2c->w12 =le32_encode_bits (mld_bssid[0 ],DCTLINFO_V3_W12_MLD_TA_BSSID_0_V2 ) | +le32_encode_bits (mld_bssid[1 ],DCTLINFO_V3_W12_MLD_TA_BSSID_1_V2 ) | +le32_encode_bits (mld_bssid[2 ],DCTLINFO_V3_W12_MLD_TA_BSSID_2_V2 ) | +le32_encode_bits (mld_bssid[3 ],DCTLINFO_V3_W12_MLD_TA_BSSID_3_V2 ); + h2c->m12 =cpu_to_le32 (DCTLINFO_V3_W12_ALL ); + + h2c->w13 =le32_encode_bits (mld_bssid[4 ],DCTLINFO_V3_W13_MLD_TA_BSSID_4_V2 ) | +le32_encode_bits (mld_bssid[5 ],DCTLINFO_V3_W13_MLD_TA_BSSID_5_V2 ); + h2c->m13 =cpu_to_le32 (DCTLINFO_V3_W13_ALL ); +}
drivers/net/wireless/realtek/rtw89/cam.h +129 -0
141 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +95 -0
107 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +7 -0
@@ -4335,6 +4335,7 @@ enum rtw89_ps_h2c_func {#define H2C_FUNC_MAC_CCTLINFO_UD_V1 0xa#define H2C_FUNC_MAC_DCTLINFO_UD_V2 0xc#define H2C_FUNC_MAC_BCN_UPD_BE 0xd +#define H2C_FUNC_MAC_DCTLINFO_UD_V3 0x10#define H2C_FUNC_MAC_CCTLINFO_UD_G7 0x11/* CLASS 6 - Address CAM */
@@ -4849,6 +4850,9 @@ int rtw89_fw_h2c_default_cmac_tbl_g7(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_default_dmac_tbl_v2 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_default_dmac_tbl_v3 (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_assoc_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link);
@@ -4883,6 +4887,9 @@ int rtw89_fw_h2c_dctl_sec_cam_v1(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_dctl_sec_cam_v2 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_dctl_sec_cam_v3 (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link);void rtw89_fw_c2h_irqsafe (struct rtw89_dev *rtwdev,struct sk_buff *c2h);void rtw89_fw_c2h_work (struct wiphy *wiphy,struct wiphy_work *work);void rtw89_fw_c2h_purge_obsoleted_scan_events (struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/10 wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D
In reply to Ping-Ke ShihCMAC H2C command is to configure CMAC such as TX retry and padding. Add to reset CMAC function block to default value.
--- drivers/net/wireless/realtek/rtw89/fw.c | 86 +++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 150 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 12 ++ 3 files changed, 248 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +86 -0
@@ -3423,6 +3423,92 @@ int rtw89_fw_h2c_default_cmac_tbl_g7(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_default_cmac_tbl_g7); +int rtw89_fw_h2c_default_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link) +{ +u8 mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id; +bool preld =rtw89_mac_chk_preload_allow (rtwdev); +struct rtw89_h2c_cctlinfo_ud_be *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for default cmac be\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_cctlinfo_ud_be *)skb->data; + + h2c->c0 =le32_encode_bits (mac_id,BE_CCTL_INFO_C0_V1_MACID ) | +le32_encode_bits (1 ,BE_CCTL_INFO_C0_V1_OP ); + + h2c->w0 =le32_encode_bits (4 ,BE_CCTL_INFO_W0_DATARATE ); + h2c->m0 =cpu_to_le32 (BE_CCTL_INFO_W0_ALL ); + + h2c->w1 =le32_encode_bits (4 ,BE_CCTL_INFO_W1_DATA_RTY_LOWEST_RATE ) | +le32_encode_bits (0xa ,BE_CCTL_INFO_W1_RTSRATE ) | +le32_encode_bits (4 ,BE_CCTL_INFO_W1_RTS_RTY_LOWEST_RATE ); + h2c->m1 =cpu_to_le32 (BE_CCTL_INFO_W1_ALL ); + + h2c->w1 =le32_encode_bits (preld,BE_CCTL_INFO_W2_PRELOAD_ENABLE ); + h2c->m2 =cpu_to_le32 (BE_CCTL_INFO_W2_ALL ); + + h2c->m3 =cpu_to_le32 (BE_CCTL_INFO_W3_ALL ); + + h2c->w4 =le32_encode_bits (0xFFFF ,BE_CCTL_INFO_W4_ACT_SUBCH_CBW ); + h2c->m4 =cpu_to_le32 (BE_CCTL_INFO_W4_ALL ); + + h2c->w5 =le32_encode_bits (2 ,BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING0_V1 ) | +le32_encode_bits (2 ,BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING1_V1 ) | +le32_encode_bits (2 ,BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING2_V1 ) | +le32_encode_bits (2 ,BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING3_V1 ) | +le32_encode_bits (2 ,BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING4_V1 ); + h2c->m5 =cpu_to_le32 (BE_CCTL_INFO_W5_ALL ); + + h2c->w6 =le32_encode_bits (0xb ,BE_CCTL_INFO_W6_RESP_REF_RATE ); + h2c->m6 =cpu_to_le32 (BE_CCTL_INFO_W6_ALL ); + + h2c->w7 =le32_encode_bits (1 ,BE_CCTL_INFO_W7_NC ) | +le32_encode_bits (1 ,BE_CCTL_INFO_W7_NR ) | +le32_encode_bits (1 ,BE_CCTL_INFO_W7_CB ) | +le32_encode_bits (0x1 ,BE_CCTL_INFO_W7_CSI_PARA_EN ) | +le32_encode_bits (0xb ,BE_CCTL_INFO_W7_CSI_FIX_RATE ); + h2c->m7 =cpu_to_le32 (BE_CCTL_INFO_W7_ALL ); + + h2c->m8 =cpu_to_le32 (BE_CCTL_INFO_W8_ALL ); + + h2c->w14 =le32_encode_bits (0 ,BE_CCTL_INFO_W14_VO_CURR_RATE ) | +le32_encode_bits (0 ,BE_CCTL_INFO_W14_VI_CURR_RATE ) | +le32_encode_bits (0 ,BE_CCTL_INFO_W14_BE_CURR_RATE_L ); + h2c->m14 =cpu_to_le32 (BE_CCTL_INFO_W14_ALL ); + + h2c->w15 =le32_encode_bits (0 ,BE_CCTL_INFO_W15_BE_CURR_RATE_H ) | +le32_encode_bits (0 ,BE_CCTL_INFO_W15_BK_CURR_RATE ) | +le32_encode_bits (0 ,BE_CCTL_INFO_W15_MGNT_CURR_RATE ); + h2c->m15 =cpu_to_le32 (BE_CCTL_INFO_W15_ALL ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_CCTLINFO_UD_G7 ,0 ,1 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +EXPORT_SYMBOL (rtw89_fw_h2c_default_cmac_tbl_be); +static void __get_sta_he_pkt_padding (struct rtw89_dev *rtwdev,struct ieee80211_link_sta *link_sta,u8 *pads)
drivers/net/wireless/realtek/rtw89/fw.h +150 -0
162 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.h +12 -0
@@ -1737,4 +1737,16 @@ void rtw89_tx_rpt_skbs_purge(struct rtw89_dev *rtwdev)rtw89_tx_rpt_tx_status (rtwdev, skbs[i], RTW89_TX_MACID_DROP); } + +static inline bool rtw89_mac_chk_preload_allow (struct rtw89_dev *rtwdev) +{ +if (rtwdev->hci.type !=RTW89_HCI_TYPE_PCIE ) +return false; + +if (rtwdev->chip->chip_id ==RTL8922D && rtwdev->hal.cid ==RTL8922D_CID7090 ) +return true; + +return false; +} +#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/10 wifi: rtw89: fw: add CMAC H2C command for association for RTL8922D
In reply to Ping-Ke ShihCMAC H2C command is to configure CMAC such as TX retry and padding. Add to update CMAC function block according to associated peer.
--- drivers/net/wireless/realtek/rtw89/fw.c | 128 ++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 3 + 2 files changed, 131 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +128 -0
@@ -3839,6 +3839,134 @@ int rtw89_fw_h2c_assoc_cmac_tbl_g7(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_assoc_cmac_tbl_g7); +int rtw89_fw_h2c_assoc_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link) +{ +struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link); +const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif_link->chanctx_idx); +u8 mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id; +struct rtw89_h2c_cctlinfo_ud_be *h2c; +struct ieee80211_bss_conf *bss_conf; +struct ieee80211_link_sta *link_sta; +u8 pads[RTW89_PPE_BW_NUM ]; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +u16 lowest_rate; +int ret; + +memset (pads,0 ,sizeof (pads)); + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for assoc cmac be\n" ); +return -ENOMEM ; + } + +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); + +if (rtwsta_link) { + link_sta =rtw89_sta_rcu_dereference_link (rtwsta_link, true); + +if (link_sta->eht_cap.has_eht) +__get_sta_eht_pkt_padding (rtwdev, link_sta, pads); +else if (link_sta->he_cap.has_he) +__get_sta_he_pkt_padding (rtwdev, link_sta, pads); + } + +if (vif->p2p) + lowest_rate =RTW89_HW_RATE_OFDM6 ; +else if (chan->band_type ==RTW89_BAND_2G ) + lowest_rate =RTW89_HW_RATE_CCK1 ; +else + lowest_rate =RTW89_HW_RATE_OFDM6 ; + +skb_put (skb, len); + h2c = (struct rtw89_h2c_cctlinfo_ud_be *)skb->data; + + h2c->c0 =le32_encode_bits (mac_id,BE_CCTL_INFO_C0_V1_MACID ) | +le32_encode_bits (1 ,BE_CCTL_INFO_C0_V1_OP ); + + h2c->w0 =le32_encode_bits (1 ,BE_CCTL_INFO_W0_DISRTSFB ) | +le32_encode_bits (1 ,BE_CCTL_INFO_W0_DISDATAFB ); + h2c->m0 =cpu_to_le32 (BE_CCTL_INFO_W0_DISRTSFB | +BE_CCTL_INFO_W0_DISDATAFB ); + + h2c->w1 =le32_encode_bits (lowest_rate,BE_CCTL_INFO_W1_RTS_RTY_LOWEST_RATE ); + h2c->m1 =cpu_to_le32 (BE_CCTL_INFO_W1_RTS_RTY_LOWEST_RATE ); + + h2c->w2 =le32_encode_bits (0 ,BE_CCTL_INFO_W2_DATA_TXCNT_LMT_SEL ); + h2c->m2 =cpu_to_le32 (BE_CCTL_INFO_W2_DATA_TXCNT_LMT_SEL ); + + h2c->w3 =le32_encode_bits (0 ,BE_CCTL_INFO_W3_RTS_TXCNT_LMT_SEL ); + h2c->m3 =cpu_to_le32 (BE_CCTL_INFO_W3_RTS_TXCNT_LMT_SEL ); + + h2c->w4 =le32_encode_bits (rtwvif_link->port,BE_CCTL_INFO_W4_MULTI_PORT_ID ); + h2c->m4 =cpu_to_le32 (BE_CCTL_INFO_W4_MULTI_PORT_ID ); + +if (bss_conf->eht_support) { +u16 punct = bss_conf->chanreq.oper.punctured; + + h2c->w4 |=le32_encode_bits (~punct, +BE_CCTL_INFO_W4_ACT_SUBCH_CBW ); + h2c->m4 |=cpu_to_le32 (BE_CCTL_INFO_W4_ACT_SUBCH_CBW ); + } + + h2c->w5 =le32_encode_bits (pads[RTW89_CHANNEL_WIDTH_20 ], +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING0_V1 ) | +le32_encode_bits (pads[RTW89_CHANNEL_WIDTH_40 ], +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING1_V1 ) | +le32_encode_bits (pads[RTW89_CHANNEL_WIDTH_80 ], +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING2_V1 ) | +le32_encode_bits (pads[RTW89_CHANNEL_WIDTH_160 ], +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING3_V1 ) | +le32_encode_bits (pads[RTW89_CHANNEL_WIDTH_320 ], +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING4_V1 ); + h2c->m5 =cpu_to_le32 (BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING0_V1 | +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING1_V1 | +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING2_V1 | +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING3_V1 | +BE_CCTL_INFO_W5_NOMINAL_PKT_PADDING4_V1 ); + +if (rtwvif_link->net_type ==RTW89_NET_TYPE_AP_MODE ) { + h2c->w5 |=le32_encode_bits (0 ,BE_CCTL_INFO_W5_DATA_DCM_V1 ); + h2c->m5 |=cpu_to_le32 (BE_CCTL_INFO_W5_DATA_DCM_V1 ); + } + + h2c->w6 =le32_encode_bits (vif->cfg.aid,BE_CCTL_INFO_W6_AID12_PAID ) | +le32_encode_bits (vif->type ==NL80211_IFTYPE_STATION ?1 :0 , +BE_CCTL_INFO_W6_ULDL ); + h2c->m6 =cpu_to_le32 (BE_CCTL_INFO_W6_AID12_PAID |BE_CCTL_INFO_W6_ULDL ); + +if (rtwsta_link) { + h2c->w8 =le32_encode_bits (link_sta->he_cap.has_he, +BE_CCTL_INFO_W8_BSR_QUEUE_SIZE_FORMAT_V1 ); + h2c->m8 =cpu_to_le32 (BE_CCTL_INFO_W8_BSR_QUEUE_SIZE_FORMAT_V1 ); + } + +rcu_read_unlock (); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_CCTLINFO_UD_G7 ,0 ,1 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +EXPORT_SYMBOL (rtw89_fw_h2c_assoc_cmac_tbl_be); +int rtw89_fw_h2c_ampdu_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link)
drivers/net/wireless/realtek/rtw89/fw.h +3 -0
@@ -5009,6 +5009,9 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_assoc_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_assoc_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_ampdu_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/10 wifi: rtw89: fw: add CMAC H2C command for TX AMPDU for RTL8922D
In reply to Ping-Ke ShihCMAC H2C command is to configure CMAC such as TX retry and padding. Add to update CMAC function block while AMPDU is established.
--- drivers/net/wireless/realtek/rtw89/fw.c | 66 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 3 ++ 2 files changed, 69 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +66 -0
@@ -4033,6 +4033,72 @@ int rtw89_fw_h2c_ampdu_cmac_tbl_g7(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_ampdu_cmac_tbl_g7); +int rtw89_fw_h2c_ampdu_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link) +{ +struct rtw89_sta *rtwsta = rtwsta_link->rtwsta; +struct rtw89_h2c_cctlinfo_ud_be *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +u16 agg_num =0 ; +u8 ba_bmap =0 ; +int ret; +u8 tid; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for ampdu cmac be\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_cctlinfo_ud_be *)skb->data; + +for_each_set_bit (tid, rtwsta->ampdu_map,IEEE80211_NUM_TIDS ) { +if (agg_num ==0 ) + agg_num = rtwsta->ampdu_params[tid].agg_num; +else + agg_num =min (agg_num, rtwsta->ampdu_params[tid].agg_num); + } + +if (agg_num <=0x20 ) + ba_bmap =3 ; +else if (agg_num >0x20 && agg_num <=0x40 ) + ba_bmap =0 ; +else if (agg_num >0x40 && agg_num <=0x80 ) + ba_bmap =1 ; +else if (agg_num >0x80 && agg_num <=0x100 ) + ba_bmap =2 ; +else if (agg_num >0x100 && agg_num <=0x200 ) + ba_bmap =4 ; +else if (agg_num >0x200 && agg_num <=0x400 ) + ba_bmap =5 ; + + h2c->c0 =le32_encode_bits (rtwsta_link->mac_id,BE_CCTL_INFO_C0_V1_MACID ) | +le32_encode_bits (1 ,BE_CCTL_INFO_C0_V1_OP ); + + h2c->w3 =le32_encode_bits (ba_bmap,BE_CCTL_INFO_W3_BA_BMAP ); + h2c->m3 =cpu_to_le32 (BE_CCTL_INFO_W3_BA_BMAP ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_CCTLINFO_UD_G7 ,0 ,0 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +EXPORT_SYMBOL (rtw89_fw_h2c_ampdu_cmac_tbl_be); +int rtw89_fw_h2c_txtime_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link) {
drivers/net/wireless/realtek/rtw89/fw.h +3 -0
@@ -5015,6 +5015,9 @@ int rtw89_fw_h2c_assoc_cmac_tbl_be(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_ampdu_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_ampdu_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_txtime_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); int rtw89_fw_h2c_txtime_cmac_tbl_g7(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 7/10 wifi: rtw89: fw: add CMAC H2C command for TX time for RTL8922D
In reply to Ping-Ke ShihCMAC H2C command is to configure CMAC such as TX retry and padding. Add to update CMAC function block when BT-coex want shorter TX time due to timeslot assignment, or when MCC want higher retry time to improve connection rate.
--- drivers/net/wireless/realtek/rtw89/fw.c | 54 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 2 + 2 files changed, 56 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +54 -0
@@ -4196,6 +4196,60 @@ int rtw89_fw_h2c_txtime_cmac_tbl_g7(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_txtime_cmac_tbl_g7); +int rtw89_fw_h2c_txtime_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_sta_link *rtwsta_link) +{ +struct rtw89_h2c_cctlinfo_ud_be *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for txtime_cmac_be\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_cctlinfo_ud_be *)skb->data; + + h2c->c0 =le32_encode_bits (rtwsta_link->mac_id,BE_CCTL_INFO_C0_V1_MACID ) | +le32_encode_bits (1 ,BE_CCTL_INFO_C0_V1_OP ); + +if (rtwsta_link->cctl_tx_time) { + h2c->w3 |=le32_encode_bits (1 ,BE_CCTL_INFO_W3_AMPDU_TIME_SEL ); + h2c->m3 |=cpu_to_le32 (BE_CCTL_INFO_W3_AMPDU_TIME_SEL ); + + h2c->w2 |=le32_encode_bits (rtwsta_link->ampdu_max_time, +BE_CCTL_INFO_W2_AMPDU_MAX_TIME ); + h2c->m2 |=cpu_to_le32 (BE_CCTL_INFO_W2_AMPDU_MAX_TIME ); + } +if (rtwsta_link->cctl_tx_retry_limit) { + h2c->w2 |=le32_encode_bits (1 ,BE_CCTL_INFO_W2_DATA_TXCNT_LMT_SEL ) | +le32_encode_bits (rtwsta_link->data_tx_cnt_lmt, +BE_CCTL_INFO_W2_DATA_TX_CNT_LMT ); + h2c->m2 |=cpu_to_le32 (BE_CCTL_INFO_W2_DATA_TXCNT_LMT_SEL | +BE_CCTL_INFO_W2_DATA_TX_CNT_LMT ); + } + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_CCTLINFO_UD_G7 ,0 ,1 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +EXPORT_SYMBOL (rtw89_fw_h2c_txtime_cmac_tbl_be); +int rtw89_fw_h2c_punctured_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,u16 punctured)
drivers/net/wireless/realtek/rtw89/fw.h +2 -0
@@ -5022,6 +5022,8 @@ int rtw89_fw_h2c_txtime_cmac_tbl(struct rtw89_dev *rtwdev, struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_txtime_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); +int rtw89_fw_h2c_txtime_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_sta_link *rtwsta_link);int rtw89_fw_h2c_punctured_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,u16 punctured);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 8/10 wifi: rtw89: fw: add CMAC H2C command for punctured for RTL8922D
In reply to Ping-Ke ShihCMAC H2C command is to configure CMAC such as TX retry and padding. Add to update CMAC function block while puncturing is changing.
--- drivers/net/wireless/realtek/rtw89/fw.c | 42 +++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 3 ++ 2 files changed, 45 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +42 -0
@@ -4293,6 +4293,48 @@ int rtw89_fw_h2c_punctured_cmac_tbl_g7(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_fw_h2c_punctured_cmac_tbl_g7); +int rtw89_fw_h2c_punctured_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 punctured) +{ +struct rtw89_h2c_cctlinfo_ud_be *h2c; +u32 len =sizeof (*h2c); +struct sk_buff *skb; +int ret; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len); +if (!skb) { +rtw89_err (rtwdev,"failed to alloc skb for punctured cmac be\n" ); +return -ENOMEM ; + } +skb_put (skb, len); + h2c = (struct rtw89_h2c_cctlinfo_ud_be *)skb->data; + + h2c->c0 =le32_encode_bits (rtwvif_link->mac_id,BE_CCTL_INFO_C0_V1_MACID ) | +le32_encode_bits (1 ,BE_CCTL_INFO_C0_V1_OP ); + + h2c->w4 =le32_encode_bits (~punctured,BE_CCTL_INFO_W4_ACT_SUBCH_CBW ); + h2c->m4 =cpu_to_le32 (BE_CCTL_INFO_W4_ACT_SUBCH_CBW ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_MAC ,H2C_CL_MAC_FR_EXCHG , +H2C_FUNC_MAC_CCTLINFO_UD_G7 ,0 ,1 , + len); + + ret =rtw89_h2c_tx (rtwdev, skb, false); +if (ret) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; +fail: +dev_kfree_skb_any (skb); + +return ret; +} +EXPORT_SYMBOL (rtw89_fw_h2c_punctured_cmac_tbl_be); +int rtw89_fw_h2c_txpath_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link) {
drivers/net/wireless/realtek/rtw89/fw.h +3 -0
@@ -5027,6 +5027,9 @@ int rtw89_fw_h2c_txtime_cmac_tbl_be(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_punctured_cmac_tbl_g7 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,u16 punctured); +int rtw89_fw_h2c_punctured_cmac_tbl_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 punctured);int rtw89_fw_h2c_txpath_cmac_tbl (struct rtw89_dev *rtwdev,struct rtw89_sta_link *rtwsta_link); int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 9/10 wifi: rtw89: fw: consider hardware AID for firmware elements
In reply to Ping-Ke ShihThe coming chip RTL8922D has variant of hardware with different AID. Add AID field to header of firmware elements, and compare AID with the value read from hardware.
Currently, apply this rule to BB and RF parameters.
--- drivers/net/wireless/realtek/rtw89/fw.c | 40 ++++++++++++++++--------- drivers/net/wireless/realtek/rtw89/fw.h | 3 +- 2 files changed, 28 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +26 -14
@@ -1023,42 +1023,47 @@ int rtw89_build_phy_tbl_from_elm(struct rtw89_dev *rtwdev, const union rtw89_fw_element_arg arg) {struct rtw89_fw_elm_info *elm_info = &rtwdev->fw.elm_info; -struct rtw89_phy_table *tbl; +struct rtw89_hal *hal = &rtwdev->hal; +struct rtw89_phy_table *tbl, **pp;struct rtw89_reg2_def *regs; -enum rtw89_rf_path rf_path; +bool radio = false;u32 n_regs, i; +u16 aid;u8 idx; - tbl =kzalloc (sizeof (*tbl),GFP_KERNEL ); -if (!tbl) -return -ENOMEM ; -switch (le32_to_cpu (elm->id)) {case RTW89_FW_ELEMENT_ID_BB_REG : - elm_info->bb_tbl = tbl; + pp = &elm_info->bb_tbl;break ;case RTW89_FW_ELEMENT_ID_BB_GAIN : - elm_info->bb_gain = tbl; + pp = &elm_info->bb_gain;break ;case RTW89_FW_ELEMENT_ID_RADIO_A :case RTW89_FW_ELEMENT_ID_RADIO_B :case RTW89_FW_ELEMENT_ID_RADIO_C :case RTW89_FW_ELEMENT_ID_RADIO_D : - rf_path = arg.rf_path; idx = elm->u.reg2.idx; + pp = &elm_info->rf_radio[idx]; - elm_info->rf_radio[idx] = tbl; - tbl->rf_path = rf_path; - tbl->config = rtw89_phy_config_rf_reg_v1; + radio = true;break ;case RTW89_FW_ELEMENT_ID_RF_NCTL : - elm_info->rf_nctl = tbl; + pp = &elm_info->rf_nctl;break ;default : -kfree (tbl);return -ENOENT ; } + aid =le16_to_cpu (elm->aid); +if (aid && aid != hal->aid) +return 1 ;/* ignore if aid not matched */ +else if (*pp) +return 1 ;/* ignore if an element is existing */ + + tbl =kzalloc (sizeof (*tbl),GFP_KERNEL ); +if (!tbl) +return -ENOMEM ; + n_regs =le32_to_cpu (elm->size) /sizeof (tbl->regs[0 ]); regs =kcalloc (n_regs,sizeof (*regs),GFP_KERNEL );if (!regs)
@@ -1072,6 +1077,13 @@ int rtw89_build_phy_tbl_from_elm(struct rtw89_dev *rtwdev, tbl->n_regs = n_regs; tbl->regs = regs; +if (radio) { + tbl->rf_path = arg.rf_path; + tbl->config = rtw89_phy_config_rf_reg_v1; + } + + *pp = tbl; +return 0 ; out:
drivers/net/wireless/realtek/rtw89/fw.h +2 -1
@@ -4311,7 +4311,8 @@ struct rtw89_fw_element_hdr {__le32 id;/* enum rtw89_fw_element_id */ __le32 size;/* exclude header size */ u8 ver[4 ]; -__le32 rsvd0; +__le16 aid;/* should match rtw89_hal::aid */ +__le16 rsvd0;__le32 rsvd1;__le32 rsvd2;union {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 10/10 wifi: rtw89: fw: set RACK bit every 4 H2C command for WiFi 6 chips only
In reply to Ping-Ke ShihRACK is to ask firmware send received ACK to driver when a H2C command is received. This is necessary for WiFi 6 chips only.
--- drivers/net/wireless/realtek/rtw89/fw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.c +2 -1
@@ -1503,11 +1503,12 @@ void rtw89_h2c_pkt_set_hdr(struct rtw89_dev *rtwdev, struct sk_buff *skb, u8 type, u8 cat, u8 class, u8 func, bool rack, bool dack, u32 len) { + const struct rtw89_chip_info *chip = rtwdev->chip;struct fwcmd_hdr *hdr; hdr = (struct fwcmd_hdr *)skb_push (skb,8 ); -if (!(rtwdev->fw.h2c_seq %4 )) +if (chip->chip_gen ==RTW89_CHIP_AX && !(rtwdev->fw.h2c_seq %4 )) rack = true; hdr->hdr0 = cpu_to_le32(FIELD_PREP(H2C_HDR_DEL_TYPE, type) | FIELD_PREP(H2C_HDR_CAT, cat) |
Signature · 1 line
2.25.1