diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h index a94fd2729c..9848ffac3d 100644 --- a/hal/wifi3.0/hal_internal.h +++ b/hal/wifi3.0/hal_internal.h @@ -439,6 +439,7 @@ struct hal_hw_txrx_ops { struct hal_reo_params *reo_params); uint32_t (*hal_rx_msdu_flow_idx_get)(uint8_t *buf); bool (*hal_rx_msdu_flow_idx_invalid)(uint8_t *buf); + bool (*hal_rx_msdu_flow_idx_timeout)(uint8_t *buf); }; /** diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index ee3070ae78..caf88a1580 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -3219,12 +3219,6 @@ hal_rx_msdu_flow_idx_get(hal_soc_handle_t hal_soc_hdl, return hal_soc->ops->hal_rx_msdu_flow_idx_get(buf); } -#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ - (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ - RX_MSDU_END_5_FLOW_IDX_TIMEOUT_OFFSET)), \ - RX_MSDU_END_5_FLOW_IDX_TIMEOUT_MASK, \ - RX_MSDU_END_5_FLOW_IDX_TIMEOUT_LSB)) - /** * hal_rx_msdu_flow_idx_timeout: API to get flow index timeout * from rx_msdu_end TLV @@ -3232,14 +3226,13 @@ hal_rx_msdu_flow_idx_get(hal_soc_handle_t hal_soc_hdl, * * Return: flow index timeout value from MSDU END TLV */ -static inline bool hal_rx_msdu_flow_idx_timeout(uint8_t *buf) +static inline bool +hal_rx_msdu_flow_idx_timeout(hal_soc_handle_t hal_soc_hdl, + uint8_t *buf) { - struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; - struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; - bool timeout; + struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl; - timeout = HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); - return timeout; + return hal_soc->ops->hal_rx_msdu_flow_idx_timeout(buf); } /** diff --git a/hal/wifi3.0/qca6290/hal_6290.c b/hal/wifi3.0/qca6290/hal_6290.c index 57e4c38900..b95a36f60e 100644 --- a/hal/wifi3.0/qca6290/hal_6290.c +++ b/hal/wifi3.0/qca6290/hal_6290.c @@ -880,6 +880,21 @@ static bool hal_rx_msdu_flow_idx_invalid_6290(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_6290: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_6290(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -959,6 +974,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { hal_reo_config_6290, hal_rx_msdu_flow_idx_get_6290, hal_rx_msdu_flow_idx_invalid_6290, + hal_rx_msdu_flow_idx_timeout_6290, }; struct hal_hw_srng_config hw_srng_table_6290[] = { diff --git a/hal/wifi3.0/qca6290/hal_6290_rx.h b/hal/wifi3.0/qca6290/hal_6290_rx.h index 170acb6c6c..65d7f7d743 100644 --- a/hal/wifi3.0/qca6290/hal_6290_rx.h +++ b/hal/wifi3.0/qca6290/hal_6290_rx.h @@ -306,6 +306,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET)) RX_MSDU_END_5_FLOW_IDX_INVALID_MASK, \ RX_MSDU_END_5_FLOW_IDX_INVALID_LSB)) +#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_OFFSET)), \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_MASK, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_LSB)) + #if defined(QCA_WIFI_QCA6290_11AX) #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ diff --git a/hal/wifi3.0/qca6390/hal_6390.c b/hal/wifi3.0/qca6390/hal_6390.c index 5daef01aeb..12db32b6ad 100644 --- a/hal/wifi3.0/qca6390/hal_6390.c +++ b/hal/wifi3.0/qca6390/hal_6390.c @@ -876,6 +876,21 @@ static bool hal_rx_msdu_flow_idx_invalid_6390(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_6390: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_6390(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -955,6 +970,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { hal_reo_config_6390, hal_rx_msdu_flow_idx_get_6390, hal_rx_msdu_flow_idx_invalid_6390, + hal_rx_msdu_flow_idx_timeout_6390, }; struct hal_hw_srng_config hw_srng_table_6390[] = { diff --git a/hal/wifi3.0/qca6390/hal_6390_rx.h b/hal/wifi3.0/qca6390/hal_6390_rx.h index 4b4395cd0e..2c6d1b6b07 100644 --- a/hal/wifi3.0/qca6390/hal_6390_rx.h +++ b/hal/wifi3.0/qca6390/hal_6390_rx.h @@ -311,6 +311,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET)) RX_MSDU_END_5_FLOW_IDX_INVALID_OFFSET)), \ RX_MSDU_END_5_FLOW_IDX_INVALID_MASK, \ RX_MSDU_END_5_FLOW_IDX_INVALID_LSB)) + +#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_OFFSET)), \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_MASK, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_LSB)) /* * hal_rx_msdu_start_nss_get_6390(): API to get the NSS * Interval from rx_msdu_start diff --git a/hal/wifi3.0/qca6490/hal_6490.c b/hal/wifi3.0/qca6490/hal_6490.c index 5383f0dca1..70d7f96d66 100644 --- a/hal/wifi3.0/qca6490/hal_6490.c +++ b/hal/wifi3.0/qca6490/hal_6490.c @@ -750,6 +750,21 @@ static bool hal_rx_msdu_flow_idx_invalid_6490(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_6490: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_6490(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = { /* tx */ hal_tx_desc_set_mesh_en_6490, @@ -791,4 +806,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = { hal_reo_config_6490, hal_rx_msdu_flow_idx_get_6490, hal_rx_msdu_flow_idx_invalid_6490, + hal_rx_msdu_flow_idx_timeout_6490, }; diff --git a/hal/wifi3.0/qca6490/hal_6490_rx.h b/hal/wifi3.0/qca6490/hal_6490_rx.h index 4877e624b9..3400ec2f92 100644 --- a/hal/wifi3.0/qca6490/hal_6490_rx.h +++ b/hal/wifi3.0/qca6490/hal_6490_rx.h @@ -296,3 +296,9 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET)) RX_MSDU_END_10_FLOW_IDX_INVALID_OFFSET)), \ RX_MSDU_END_10_FLOW_IDX_INVALID_MASK, \ RX_MSDU_END_10_FLOW_IDX_INVALID_LSB)) + +#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_10_FLOW_IDX_TIMEOUT_OFFSET)), \ + RX_MSDU_END_10_FLOW_IDX_TIMEOUT_MASK, \ + RX_MSDU_END_10_FLOW_IDX_TIMEOUT_LSB)) diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1.c b/hal/wifi3.0/qca8074v1/hal_8074v1.c index 7928388c60..f3e031afc9 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1.c +++ b/hal/wifi3.0/qca8074v1/hal_8074v1.c @@ -876,6 +876,21 @@ static bool hal_rx_msdu_flow_idx_invalid_8074v1(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_8074v1: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_8074v1(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { /* init and setup */ @@ -956,6 +971,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { hal_reo_config_8074v1, hal_rx_msdu_flow_idx_get_8074v1, hal_rx_msdu_flow_idx_invalid_8074v1, + hal_rx_msdu_flow_idx_timeout_8074v1, }; struct hal_hw_srng_config hw_srng_table_8074[] = { diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h b/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h index 58112b37b8..3abfbe2b63 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h +++ b/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h @@ -295,6 +295,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET)) RX_MSDU_END_5_FLOW_IDX_INVALID_MASK, \ RX_MSDU_END_5_FLOW_IDX_INVALID_LSB)) +#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_OFFSET)), \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_MASK, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_LSB)) + /* * hal_rx_msdu_start_nss_get_8074(): API to get the NSS * Interval from rx_msdu_start diff --git a/hal/wifi3.0/qca8074v2/hal_8074v2.c b/hal/wifi3.0/qca8074v2/hal_8074v2.c index 51fead1457..47d778b01e 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2.c +++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c @@ -873,6 +873,21 @@ static bool hal_rx_msdu_flow_idx_invalid_8074v2(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_8074v2: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_8074v2(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { /* init and setup */ @@ -954,6 +969,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { hal_reo_config_8074v2, hal_rx_msdu_flow_idx_get_8074v2, hal_rx_msdu_flow_idx_invalid_8074v2, + hal_rx_msdu_flow_idx_timeout_8074v2, }; struct hal_hw_srng_config hw_srng_table_8074v2[] = { diff --git a/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h b/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h index c72dc8c7b3..28ca9151d6 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h +++ b/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h @@ -304,6 +304,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET)) RX_MSDU_END_5_FLOW_IDX_INVALID_MASK, \ RX_MSDU_END_5_FLOW_IDX_INVALID_LSB)) +#define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_OFFSET)), \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_MASK, \ + RX_MSDU_END_5_FLOW_IDX_TIMEOUT_LSB)) + /* * hal_rx_msdu_start_nss_get_8074v2(): API to get the NSS * Interval from rx_msdu_start diff --git a/hal/wifi3.0/qcn9000/hal_9000.c b/hal/wifi3.0/qcn9000/hal_9000.c index a731e3b8c0..e69c9e5a97 100644 --- a/hal/wifi3.0/qcn9000/hal_9000.c +++ b/hal/wifi3.0/qcn9000/hal_9000.c @@ -882,6 +882,21 @@ static bool hal_rx_msdu_flow_idx_invalid_9000(uint8_t *buf) return HAL_RX_MSDU_END_FLOW_IDX_INVALID_GET(msdu_end); } +/** + * hal_rx_msdu_flow_idx_timeout_9000: API to get flow index timeout + * from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: flow index timeout value from MSDU END TLV + */ +static bool hal_rx_msdu_flow_idx_timeout_9000(uint8_t *buf) +{ + struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf; + struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end; + + return HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(msdu_end); +} + struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { /* init and setup */ @@ -963,6 +978,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { hal_reo_config_9000, hal_rx_msdu_flow_idx_get_9000, hal_rx_msdu_flow_idx_invalid_9000, + hal_rx_msdu_flow_idx_timeout_9000, }; struct hal_hw_srng_config hw_srng_table_9000[] = {