diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index 945ba00bce..59360bdd0c 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -2025,7 +2025,9 @@ done: is_mcbc = hal_rx_msdu_end_da_is_mcbc_get(soc->hal_soc, rx_tlv_hdr); - is_sa_vld = hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr); + is_sa_vld = + hal_rx_msdu_end_sa_is_valid_get(soc->hal_soc, + rx_tlv_hdr); is_da_vld = hal_rx_msdu_end_da_is_valid_get(rx_tlv_hdr); qdf_nbuf_set_da_mcbc(nbuf, is_mcbc); diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index 7e2d5351e3..cff6273bec 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -92,7 +92,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, * then drop the pkt as it is looped back */ qdf_spin_lock_bh(&soc->ast_lock); - if (hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr)) { + if (hal_rx_msdu_end_sa_is_valid_get(soc->hal_soc, rx_tlv_hdr)) { sa_idx = hal_rx_msdu_end_sa_idx_get(rx_tlv_hdr); if ((sa_idx < 0) || @@ -705,7 +705,8 @@ dp_rx_null_q_desc_handle(struct dp_soc *soc, qdf_nbuf_t nbuf, qdf_nbuf_set_da_valid(nbuf, hal_rx_msdu_end_da_is_valid_get(rx_tlv_hdr)); qdf_nbuf_set_sa_valid(nbuf, - hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr)); + hal_rx_msdu_end_sa_is_valid_get(soc->hal_soc, + rx_tlv_hdr)); l2_hdr_offset = hal_rx_msdu_end_l3_hdr_padding_get(rx_tlv_hdr); msdu_len = hal_rx_msdu_start_msdu_len_get(rx_tlv_hdr); diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h index 203530d92f..8f1e1ff260 100644 --- a/hal/wifi3.0/hal_internal.h +++ b/hal/wifi3.0/hal_internal.h @@ -382,6 +382,7 @@ struct hal_hw_txrx_ops { void (*hal_tx_set_tidmap_prty)(struct hal_soc *hal_soc, uint8_t prio); uint8_t (*hal_rx_get_rx_fragment_number)(uint8_t *buf); uint8_t (*hal_rx_msdu_end_da_is_mcbc_get)(uint8_t *buf); + uint8_t (*hal_rx_msdu_end_sa_is_valid_get)(uint8_t *buf); }; /** diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index c5cbaa7a99..b117b19a51 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -1082,12 +1082,6 @@ hal_rx_msdu_end_sa_idx_get(uint8_t *buf) return sa_idx; } -#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ - (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ - RX_MSDU_END_5_SA_IS_VALID_OFFSET)), \ - RX_MSDU_END_5_SA_IS_VALID_MASK, \ - RX_MSDU_END_5_SA_IS_VALID_LSB)) - /** * hal_rx_msdu_end_sa_is_valid_get(): API to get the * sa_is_valid bit from rx_msdu_end TLV @@ -1096,15 +1090,12 @@ hal_rx_msdu_end_sa_idx_get(uint8_t *buf) * Return: sa_is_valid bit */ static inline uint8_t -hal_rx_msdu_end_sa_is_valid_get(uint8_t *buf) +hal_rx_msdu_end_sa_is_valid_get(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; - uint8_t sa_is_valid; + struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl; - sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); - - return sa_is_valid; + return hal_soc->ops->hal_rx_msdu_end_sa_is_valid_get(buf); } #define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ diff --git a/hal/wifi3.0/qca6290/hal_6290.c b/hal/wifi3.0/qca6290/hal_6290.c index da7e27f30e..ae73a44fce 100644 --- a/hal/wifi3.0/qca6290/hal_6290.c +++ b/hal/wifi3.0/qca6290/hal_6290.c @@ -143,6 +143,25 @@ hal_rx_msdu_end_da_is_mcbc_get_6290(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_6290(): API to get_6290 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} + struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -186,6 +205,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { hal_tx_update_tidmap_prty_generic, hal_rx_get_rx_fragment_number_6290, hal_rx_msdu_end_da_is_mcbc_get_6290, + hal_rx_msdu_end_sa_is_valid_get_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 97fa54d869..5a6f2a0389 100644 --- a/hal/wifi3.0/qca6290/hal_6290_rx.h +++ b/hal/wifi3.0/qca6290/hal_6290_rx.h @@ -47,6 +47,12 @@ RX_MSDU_END_5_DA_IS_MCBC_MASK, \ RX_MSDU_END_5_DA_IS_MCBC_LSB)) +#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_SA_IS_VALID_OFFSET)), \ + RX_MSDU_END_5_SA_IS_VALID_MASK, \ + RX_MSDU_END_5_SA_IS_VALID_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 ee41639bd7..2421db28fd 100644 --- a/hal/wifi3.0/qca6390/hal_6390.c +++ b/hal/wifi3.0/qca6390/hal_6390.c @@ -143,6 +143,25 @@ hal_rx_msdu_end_da_is_mcbc_get_6390(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_6390(): API to get_6390 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} + struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -186,6 +205,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { hal_tx_update_tidmap_prty_generic, hal_rx_get_rx_fragment_number_6390, hal_rx_msdu_end_da_is_mcbc_get_6390, + hal_rx_msdu_end_sa_is_valid_get_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 a801cb452e..43a36bd778 100644 --- a/hal/wifi3.0/qca6390/hal_6390_rx.h +++ b/hal/wifi3.0/qca6390/hal_6390_rx.h @@ -47,6 +47,12 @@ RX_MSDU_END_5_DA_IS_MCBC_MASK, \ RX_MSDU_END_5_DA_IS_MCBC_LSB)) +#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_SA_IS_VALID_OFFSET)), \ + RX_MSDU_END_5_SA_IS_VALID_MASK, \ + RX_MSDU_END_5_SA_IS_VALID_LSB)) + #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ RX_MSDU_START_5_MIMO_SS_BITMAP_OFFSET)), \ diff --git a/hal/wifi3.0/qca6490/hal_6490.c b/hal/wifi3.0/qca6490/hal_6490.c index 2b1d5a7939..ac7c42d690 100644 --- a/hal/wifi3.0/qca6490/hal_6490.c +++ b/hal/wifi3.0/qca6490/hal_6490.c @@ -49,8 +49,28 @@ hal_rx_msdu_end_da_is_mcbc_get_6490(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_6490(): API to get_6490 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} + struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = { /* rx */ hal_rx_get_rx_fragment_number_6490, hal_rx_msdu_end_da_is_mcbc_get_6490, + hal_rx_msdu_end_sa_is_valid_get_6490, }; diff --git a/hal/wifi3.0/qca6490/hal_6490_rx.h b/hal/wifi3.0/qca6490/hal_6490_rx.h index b50146930d..0b465cf0f0 100644 --- a/hal/wifi3.0/qca6490/hal_6490_rx.h +++ b/hal/wifi3.0/qca6490/hal_6490_rx.h @@ -27,3 +27,9 @@ RX_MSDU_END_10_DA_IS_MCBC_OFFSET)), \ RX_MSDU_END_10_DA_IS_MCBC_MASK, \ RX_MSDU_END_10_DA_IS_MCBC_LSB)) + +#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_10_SA_IS_VALID_OFFSET)), \ + RX_MSDU_END_10_SA_IS_VALID_MASK, \ + RX_MSDU_END_10_SA_IS_VALID_LSB)) diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1.c b/hal/wifi3.0/qca8074v1/hal_8074v1.c index 14756ba354..509260b0d2 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1.c +++ b/hal/wifi3.0/qca8074v1/hal_8074v1.c @@ -139,6 +139,24 @@ hal_rx_msdu_end_da_is_mcbc_get_8074v1(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_8074v1(): API to get_8074v1 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { /* init and setup */ @@ -183,6 +201,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { hal_tx_update_tidmap_prty_generic, hal_rx_get_rx_fragment_number_8074v1, hal_rx_msdu_end_da_is_mcbc_get_8074v1, + hal_rx_msdu_end_sa_is_valid_get_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 7ffc8461a2..d35a887c4b 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h +++ b/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h @@ -36,6 +36,11 @@ RX_MSDU_END_5_DA_IS_MCBC_MASK, \ RX_MSDU_END_5_DA_IS_MCBC_LSB)) +#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_SA_IS_VALID_OFFSET)), \ + RX_MSDU_END_5_SA_IS_VALID_MASK, \ + RX_MSDU_END_5_SA_IS_VALID_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 8fd544a39a..2c437fab4f 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2.c +++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c @@ -139,6 +139,25 @@ hal_rx_msdu_end_da_is_mcbc_get_8074v2(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_8074v2(): API to get_8074v2 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} + struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { /* init and setup */ @@ -183,6 +202,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { hal_tx_update_tidmap_prty_generic, hal_rx_get_rx_fragment_number_8074v2, hal_rx_msdu_end_da_is_mcbc_get_8074v2, + hal_rx_msdu_end_sa_is_valid_get_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 d4ea385803..dc842e1672 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h +++ b/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h @@ -39,6 +39,12 @@ RX_MSDU_END_5_DA_IS_MCBC_MASK, \ RX_MSDU_END_5_DA_IS_MCBC_LSB)) +#define HAL_RX_MSDU_END_SA_IS_VALID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_5_SA_IS_VALID_OFFSET)), \ + RX_MSDU_END_5_SA_IS_VALID_MASK, \ + RX_MSDU_END_5_SA_IS_VALID_LSB)) + #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ RX_MSDU_START_5_MIMO_SS_BITMAP_OFFSET)), \ diff --git a/hal/wifi3.0/qcn9000/hal_9000.c b/hal/wifi3.0/qcn9000/hal_9000.c index 62a0af120d..7ece960d0d 100644 --- a/hal/wifi3.0/qcn9000/hal_9000.c +++ b/hal/wifi3.0/qcn9000/hal_9000.c @@ -148,6 +148,25 @@ hal_rx_msdu_end_da_is_mcbc_get_9000(uint8_t *buf) return HAL_RX_MSDU_END_DA_IS_MCBC_GET(msdu_end); } +/** + * hal_rx_msdu_end_sa_is_valid_get_9000(): API to get_9000 the + * sa_is_valid bit from rx_msdu_end TLV + * + * @ buf: pointer to the start of RX PKT TLV headers + * Return: sa_is_valid bit + */ +static uint8_t +hal_rx_msdu_end_sa_is_valid_get_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; + uint8_t sa_is_valid; + + sa_is_valid = HAL_RX_MSDU_END_SA_IS_VALID_GET(msdu_end); + + return sa_is_valid; +} + struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { /* init and setup */ @@ -192,6 +211,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { hal_tx_update_tidmap_prty_generic, hal_rx_get_rx_fragment_number_9000, hal_rx_msdu_end_da_is_mcbc_get_9000, + hal_rx_msdu_end_sa_is_valid_get_9000, }; struct hal_hw_srng_config hw_srng_table_9000[] = {