diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index 5f2f0235ca..e6e4c5eabe 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -2910,8 +2910,8 @@ done: (uint8_t *)&wbm_err_info, sizeof(wbm_err_info)); - peer_meta_data = hal_rx_mpdu_peer_meta_data_get(soc->hal_soc, - rx_tlv_hdr); + peer_meta_data = hal_rx_tlv_peer_meta_data_get(soc->hal_soc, + rx_tlv_hdr); peer_id = dp_rx_peer_metadata_peer_id_get(soc, peer_meta_data); txrx_peer = dp_tgt_txrx_peer_get_ref_by_id(soc, peer_id, &txrx_ref_handle, diff --git a/hal/wifi3.0/be/hal_be_rx_tlv.h b/hal/wifi3.0/be/hal_be_rx_tlv.h index 73ae77d9bf..9a598c2a8f 100644 --- a/hal/wifi3.0/be/hal_be_rx_tlv.h +++ b/hal/wifi3.0/be/hal_be_rx_tlv.h @@ -229,6 +229,11 @@ struct rx_pkt_tlvs { #define HAL_RX_TLV_L3_TYPE_GET(_rx_pkt_tlv) \ HAL_RX_MSDU_END(_rx_pkt_tlv).l3_type +#ifdef RX_MSDU_END_PEER_META_DATA_OFFSET +#define HAL_RX_TLV_MSDU_PEER_META_DATA_GET(_rx_pkt_tlv) \ + HAL_RX_MSDU_END(_rx_pkt_tlv).peer_meta_data +#endif + #define HAL_RX_GET_FILTER_CATEGORY(_rx_pkt_tlv) \ HAL_RX_MPDU_START(_rx_pkt_tlv).rxpcu_mpdu_filter_in_category @@ -522,6 +527,19 @@ static inline uint32_t hal_rx_mpdu_peer_meta_data_get_be(uint8_t *buf) return HAL_RX_TLV_PEER_META_DATA_GET(rx_pkt_tlvs); } +#ifdef RX_MSDU_END_PEER_META_DATA_OFFSET +/* + * Get peer_meta_data from RX_MSDU_END + */ + +static inline uint32_t hal_rx_msdu_peer_meta_data_get_be(uint8_t *buf) +{ + struct rx_pkt_tlvs *rx_pkt_tlvs = (struct rx_pkt_tlvs *)buf; + + return HAL_RX_TLV_MSDU_PEER_META_DATA_GET(rx_pkt_tlvs); +} +#endif + /** * hal_rx_mpdu_info_ampdu_flag_get_be(): get ampdu flag bit * from rx mpdu info diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h index 1680e75559..06ed043826 100644 --- a/hal/wifi3.0/hal_internal.h +++ b/hal/wifi3.0/hal_internal.h @@ -939,7 +939,7 @@ struct hal_hw_txrx_ops { uint8_t (*hal_rx_msdu_end_last_msdu_get)(uint8_t *buf); bool (*hal_rx_get_mpdu_mac_ad4_valid)(uint8_t *buf); uint32_t (*hal_rx_mpdu_start_sw_peer_id_get)(uint8_t *buf); - uint32_t (*hal_rx_mpdu_peer_meta_data_get)(uint8_t *buf); + uint32_t (*hal_rx_tlv_peer_meta_data_get)(uint8_t *buf); uint32_t (*hal_rx_mpdu_get_to_ds)(uint8_t *buf); uint32_t (*hal_rx_mpdu_get_fr_ds)(uint8_t *buf); uint8_t (*hal_rx_get_mpdu_frame_control_valid)(uint8_t *buf); diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index 437110149f..504bdbef4e 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -959,19 +959,19 @@ hal_rx_mpdu_start_sw_peer_id_get(hal_soc_handle_t hal_soc_hdl, } /** - * hal_rx_mpdu_peer_meta_data_get() - Retrieve PEER_META_DATA + * hal_rx_tlv_peer_meta_data_get() - Retrieve PEER_META_DATA * @hal_soc_hdl: hal soc handle * @buf: pointer to rx pkt TLV. * * Return: peer meta data */ static inline uint32_t -hal_rx_mpdu_peer_meta_data_get(hal_soc_handle_t hal_soc_hdl, - uint8_t *buf) +hal_rx_tlv_peer_meta_data_get(hal_soc_handle_t hal_soc_hdl, + uint8_t *buf) { struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl; - return hal_soc->ops->hal_rx_mpdu_peer_meta_data_get(buf); + return hal_soc->ops->hal_rx_tlv_peer_meta_data_get(buf); } /* diff --git a/hal/wifi3.0/kiwi/hal_kiwi.c b/hal/wifi3.0/kiwi/hal_kiwi.c index 1e13d274ab..139831940e 100644 --- a/hal/wifi3.0/kiwi/hal_kiwi.c +++ b/hal/wifi3.0/kiwi/hal_kiwi.c @@ -1909,7 +1909,7 @@ static void hal_hw_txrx_ops_attach_kiwi(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_be; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_be; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_be; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_be; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_be; diff --git a/hal/wifi3.0/qca5018/hal_5018.c b/hal/wifi3.0/qca5018/hal_5018.c index 32044a150c..ec36e788c1 100644 --- a/hal/wifi3.0/qca5018/hal_5018.c +++ b/hal/wifi3.0/qca5018/hal_5018.c @@ -1780,7 +1780,7 @@ static void hal_hw_txrx_ops_attach_qca5018(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_5018; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_5018; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_5018; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_5018; diff --git a/hal/wifi3.0/qca5332/hal_5332.c b/hal/wifi3.0/qca5332/hal_5332.c index 2dfcf4a421..af126e5e1e 100644 --- a/hal/wifi3.0/qca5332/hal_5332.c +++ b/hal/wifi3.0/qca5332/hal_5332.c @@ -1763,7 +1763,7 @@ static void hal_hw_txrx_ops_attach_qca5332(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_be; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_be; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_be; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_be; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_be; diff --git a/hal/wifi3.0/qca6290/hal_6290.c b/hal/wifi3.0/qca6290/hal_6290.c index d8cddd3587..532da0a926 100644 --- a/hal/wifi3.0/qca6290/hal_6290.c +++ b/hal/wifi3.0/qca6290/hal_6290.c @@ -1161,7 +1161,7 @@ static void hal_hw_txrx_ops_attach_6290(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_6290; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_6290; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_6290; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_6290; diff --git a/hal/wifi3.0/qca6390/hal_6390.c b/hal/wifi3.0/qca6390/hal_6390.c index b4c184d736..796fba6c68 100644 --- a/hal/wifi3.0/qca6390/hal_6390.c +++ b/hal/wifi3.0/qca6390/hal_6390.c @@ -1228,7 +1228,7 @@ static void hal_hw_txrx_ops_attach_qca6390(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_6390; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_6390; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_6390; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_6390; diff --git a/hal/wifi3.0/qca6490/hal_6490.c b/hal/wifi3.0/qca6490/hal_6490.c index 24f5561dfb..b21c0e3d4b 100644 --- a/hal/wifi3.0/qca6490/hal_6490.c +++ b/hal/wifi3.0/qca6490/hal_6490.c @@ -1847,7 +1847,7 @@ static void hal_hw_txrx_ops_attach_qca6490(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_6490; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_6490; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_6490; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_6490; diff --git a/hal/wifi3.0/qca6750/hal_6750.c b/hal/wifi3.0/qca6750/hal_6750.c index 0f260e8bed..ceb8cf5c81 100644 --- a/hal/wifi3.0/qca6750/hal_6750.c +++ b/hal/wifi3.0/qca6750/hal_6750.c @@ -1983,7 +1983,7 @@ static void hal_hw_txrx_ops_attach_qca6750(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_6750; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_6750; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_6750; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_6750; diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1.c b/hal/wifi3.0/qca8074v1/hal_8074v1.c index 91f0d95fc3..d6627f0733 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1.c +++ b/hal/wifi3.0/qca8074v1/hal_8074v1.c @@ -1325,7 +1325,7 @@ static void hal_hw_txrx_ops_attach_qca8074(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_8074v1; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_8074v1; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_8074v1; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_8074v1; diff --git a/hal/wifi3.0/qca8074v2/hal_8074v2.c b/hal/wifi3.0/qca8074v2/hal_8074v2.c index 4f3eab39e8..fe14eaf976 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2.c +++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c @@ -1322,7 +1322,7 @@ static void hal_hw_txrx_ops_attach_qca8074v2(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_8074v2; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_8074v2; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_8074v2; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_8074v2; diff --git a/hal/wifi3.0/qcn6122/hal_qcn6122.c b/hal/wifi3.0/qcn6122/hal_qcn6122.c index af4b827f94..697258abfe 100644 --- a/hal/wifi3.0/qcn6122/hal_qcn6122.c +++ b/hal/wifi3.0/qcn6122/hal_qcn6122.c @@ -1831,7 +1831,7 @@ static void hal_hw_txrx_ops_attach_qcn6122(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_6122; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_6122; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_6122; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_6122; diff --git a/hal/wifi3.0/qcn9000/hal_9000.c b/hal/wifi3.0/qcn9000/hal_9000.c index c7fe1615d2..02d35c1d6a 100644 --- a/hal/wifi3.0/qcn9000/hal_9000.c +++ b/hal/wifi3.0/qcn9000/hal_9000.c @@ -1875,7 +1875,7 @@ static void hal_hw_txrx_ops_attach_qcn9000(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_9000; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_9000; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = hal_rx_mpdu_peer_meta_data_get_li; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_9000; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_9000; diff --git a/hal/wifi3.0/qcn9224/hal_9224.h b/hal/wifi3.0/qcn9224/hal_9224.h index f5b69cb144..2d685b4eea 100644 --- a/hal/wifi3.0/qcn9224/hal_9224.h +++ b/hal/wifi3.0/qcn9224/hal_9224.h @@ -1900,8 +1900,8 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc) hal_rx_get_mpdu_mac_ad4_valid_be; hal_soc->ops->hal_rx_mpdu_start_sw_peer_id_get = hal_rx_mpdu_start_sw_peer_id_get_be; - hal_soc->ops->hal_rx_mpdu_peer_meta_data_get = - hal_rx_mpdu_peer_meta_data_get_be; + hal_soc->ops->hal_rx_tlv_peer_meta_data_get = + hal_rx_msdu_peer_meta_data_get_be; hal_soc->ops->hal_rx_mpdu_get_to_ds = hal_rx_mpdu_get_to_ds_be; hal_soc->ops->hal_rx_mpdu_get_fr_ds = hal_rx_mpdu_get_fr_ds_be; hal_soc->ops->hal_rx_get_mpdu_frame_control_valid =