From 685045eb9c8a7f3ba7bf1904d5d798a945cce1ab Mon Sep 17 00:00:00 2001 From: Venkata Sharath Chandra Manchala Date: Sat, 21 Sep 2019 18:32:51 -0700 Subject: [PATCH] qcacmn: Add hal_rx_msdu_end_sa_sw_peer_id_get API Implement hal_rx_msdu_end_sa_sw_peer_id API based on the chipset as the macro to retrieve sa_sw_peer_id value is chipset dependent. Change-Id: I2efd1f851539bbffc8f75c7662045c1f4a3c4469 CRs-Fixed: 2522133 --- hal/wifi3.0/hal_internal.h | 1 + hal/wifi3.0/hal_rx.h | 50 +++++++++++++-------------- hal/wifi3.0/qca6290/hal_6290.c | 16 +++++++++ hal/wifi3.0/qca6290/hal_6290_rx.h | 6 ++++ hal/wifi3.0/qca6390/hal_6390.c | 18 ++++++++++ hal/wifi3.0/qca6390/hal_6390_rx.h | 6 ++++ hal/wifi3.0/qca6490/hal_6490.c | 1 + hal/wifi3.0/qca6490/hal_6490_rx.h | 6 ++++ hal/wifi3.0/qca8074v1/hal_8074v1.c | 17 +++++++++ hal/wifi3.0/qca8074v1/hal_8074v1_rx.h | 6 ++++ hal/wifi3.0/qca8074v2/hal_8074v2.c | 17 +++++++++ hal/wifi3.0/qca8074v2/hal_8074v2_rx.h | 7 ++++ hal/wifi3.0/qcn9000/hal_9000.c | 17 +++++++++ 13 files changed, 143 insertions(+), 25 deletions(-) diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h index 14ec69227f..667850344f 100644 --- a/hal/wifi3.0/hal_internal.h +++ b/hal/wifi3.0/hal_internal.h @@ -409,6 +409,7 @@ struct hal_hw_txrx_ops { uint32_t (*hal_rx_tid_get)(hal_soc_handle_t hal_soc_hdl, uint8_t *buf); uint32_t (*hal_rx_hw_desc_get_ppduid_get)(void *hw_desc_addr); uint32_t (*hal_rx_mpdu_start_mpdu_qos_control_valid_get)(uint8_t *buf); + uint32_t (*hal_rx_msdu_end_sa_sw_peer_id_get)(uint8_t *buf); }; /** diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index 3b1ac96e71..69053359d7 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -1045,31 +1045,6 @@ hal_rx_msdu_end_sa_is_valid_get(hal_soc_handle_t hal_soc_hdl, 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) \ - (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ - RX_MSDU_END_16_SA_SW_PEER_ID_OFFSET)), \ - RX_MSDU_END_16_SA_SW_PEER_ID_MASK, \ - RX_MSDU_END_16_SA_SW_PEER_ID_LSB)) - - /** - * hal_rx_msdu_end_sa_sw_peer_id_get(): API to get the - * sa_sw_peer_id from rx_msdu_end TLV - * - * @ buf: pointer to the start of RX PKT TLV headers - * Return: sa_sw_peer_id index - */ -static inline uint32_t -hal_rx_msdu_end_sa_sw_peer_id_get(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; - uint32_t sa_sw_peer_id; - - sa_sw_peer_id = HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); - - return sa_sw_peer_id; -} - #define HAL_RX_MSDU_START_MSDU_LEN_GET(_rx_msdu_start) \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_start, \ RX_MSDU_START_1_MSDU_LENGTH_OFFSET)), \ @@ -3334,4 +3309,29 @@ uint32_t hal_rx_hw_desc_get_ppduid_get(hal_soc_handle_t hal_soc_hdl, return hal_soc->ops->hal_rx_hw_desc_get_ppduid_get(hw_desc_addr); } + +/** + * hal_rx_msdu_end_sa_sw_peer_id_get() - get sw peer id + * @hal_soc_hdl: hal_soc handle + * @buf: rx tlv address + * + * Return: sw peer id + */ +static inline +uint32_t hal_rx_msdu_end_sa_sw_peer_id_get(hal_soc_handle_t hal_soc_hdl, + uint8_t *buf) +{ + struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl; + + if ((!hal_soc) || (!hal_soc->ops)) { + hal_err("hal handle is NULL"); + QDF_BUG(0); + return QDF_STATUS_E_INVAL; + } + + if (hal_soc->ops->hal_rx_msdu_end_sa_sw_peer_id_get) + return hal_soc->ops->hal_rx_msdu_end_sa_sw_peer_id_get(buf); + + return QDF_STATUS_E_INVAL; +} #endif /* _HAL_RX_H */ diff --git a/hal/wifi3.0/qca6290/hal_6290.c b/hal/wifi3.0/qca6290/hal_6290.c index a4aaad982b..2a4a446e7a 100644 --- a/hal/wifi3.0/qca6290/hal_6290.c +++ b/hal/wifi3.0/qca6290/hal_6290.c @@ -725,6 +725,21 @@ hal_rx_mpdu_start_mpdu_qos_control_valid_get_6290(uint8_t *buf) &mpdu_start->rx_mpdu_info_details); } +/** + * hal_rx_msdu_end_sa_sw_peer_id_get_6290(): API to get the + * sa_sw_peer_id from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: sa_sw_peer_id index + */ +static inline uint32_t +hal_rx_msdu_end_sa_sw_peer_id_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; + + return HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); +} struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -791,6 +806,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = { hal_rx_tid_get_6290, hal_rx_hw_desc_get_ppduid_get_6290, hal_rx_mpdu_start_mpdu_qos_control_valid_get_6290, + hal_rx_msdu_end_sa_sw_peer_id_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 26e02edbbc..1738f53c47 100644 --- a/hal/wifi3.0/qca6290/hal_6290_rx.h +++ b/hal/wifi3.0/qca6290/hal_6290_rx.h @@ -227,6 +227,12 @@ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_MASK, \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_LSB)) +#define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_16_SA_SW_PEER_ID_OFFSET)), \ + RX_MSDU_END_16_SA_SW_PEER_ID_MASK, \ + RX_MSDU_END_16_SA_SW_PEER_ID_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 ccead9aa95..53d3d84fb3 100644 --- a/hal/wifi3.0/qca6390/hal_6390.c +++ b/hal/wifi3.0/qca6390/hal_6390.c @@ -722,6 +722,23 @@ hal_rx_mpdu_start_mpdu_qos_control_valid_get_6390(uint8_t *buf) return HAL_RX_MPDU_INFO_QOS_CONTROL_VALID_GET( &mpdu_start->rx_mpdu_info_details); } + +/** + * hal_rx_msdu_end_sa_sw_peer_id_get_6390(): API to get the + * sa_sw_peer_id from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: sa_sw_peer_id index + */ +static inline uint32_t +hal_rx_msdu_end_sa_sw_peer_id_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; + + return HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); +} + struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { /* init and setup */ hal_srng_dst_hw_init_generic, @@ -788,6 +805,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = { hal_rx_tid_get_6390, hal_rx_hw_desc_get_ppduid_get_6390, hal_rx_mpdu_start_mpdu_qos_control_valid_get_6390, + hal_rx_msdu_end_sa_sw_peer_id_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 ef4cad8a78..eeb480810f 100644 --- a/hal/wifi3.0/qca6390/hal_6390_rx.h +++ b/hal/wifi3.0/qca6390/hal_6390_rx.h @@ -233,6 +233,12 @@ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_MASK, \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_LSB)) +#define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_16_SA_SW_PEER_ID_OFFSET)), \ + RX_MSDU_END_16_SA_SW_PEER_ID_MASK, \ + RX_MSDU_END_16_SA_SW_PEER_ID_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 65c7420574..ab9cb5af55 100644 --- a/hal/wifi3.0/qca6490/hal_6490.c +++ b/hal/wifi3.0/qca6490/hal_6490.c @@ -637,4 +637,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = { hal_rx_tid_get_6490, hal_rx_hw_desc_get_ppduid_get_6490, NULL, + NULL, }; diff --git a/hal/wifi3.0/qca6490/hal_6490_rx.h b/hal/wifi3.0/qca6490/hal_6490_rx.h index b1dc2c800d..2334d3d7ba 100644 --- a/hal/wifi3.0/qca6490/hal_6490_rx.h +++ b/hal/wifi3.0/qca6490/hal_6490_rx.h @@ -207,3 +207,9 @@ RX_MPDU_INFO_11_MPDU_QOS_CONTROL_VALID_OFFSET)),\ RX_MPDU_INFO_11_MPDU_QOS_CONTROL_VALID_MASK, \ RX_MPDU_INFO_11_MPDU_QOS_CONTROL_VALID_LSB)) + +#define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_14_SA_SW_PEER_ID_OFFSET)), \ + RX_MSDU_END_14_SA_SW_PEER_ID_MASK, \ + RX_MSDU_END_14_SA_SW_PEER_ID_LSB)) diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1.c b/hal/wifi3.0/qca8074v1/hal_8074v1.c index 9ccedc47c4..b872c0bec7 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1.c +++ b/hal/wifi3.0/qca8074v1/hal_8074v1.c @@ -721,6 +721,22 @@ hal_rx_mpdu_start_mpdu_qos_control_valid_get_8074v1(uint8_t *buf) &mpdu_start->rx_mpdu_info_details); } +/** + * hal_rx_msdu_end_sa_sw_peer_id_get_8074v1(): API to get the + * sa_sw_peer_id from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: sa_sw_peer_id index + */ +static inline uint32_t +hal_rx_msdu_end_sa_sw_peer_id_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; + + return HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); +} + struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { /* init and setup */ @@ -788,6 +804,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = { hal_rx_tid_get_8074v1, hal_rx_hw_desc_get_ppduid_get_8074v1, hal_rx_mpdu_start_mpdu_qos_control_valid_get_8074v1, + hal_rx_msdu_end_sa_sw_peer_id_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 5bac16b148..87225a0729 100644 --- a/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h +++ b/hal/wifi3.0/qca8074v1/hal_8074v1_rx.h @@ -215,6 +215,12 @@ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_OFFSET)), \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_MASK, \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_LSB)) + +#define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_16_SA_SW_PEER_ID_OFFSET)), \ + RX_MSDU_END_16_SA_SW_PEER_ID_MASK, \ + RX_MSDU_END_16_SA_SW_PEER_ID_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 afecd85c1f..8ad8b9840c 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2.c +++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c @@ -718,6 +718,22 @@ hal_rx_mpdu_start_mpdu_qos_control_valid_get_8074v2(uint8_t *buf) &mpdu_start->rx_mpdu_info_details); } +/** + * hal_rx_msdu_end_sa_sw_peer_id_get_8074v2(): API to get the + * sa_sw_peer_id from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: sa_sw_peer_id index + */ +static inline uint32_t +hal_rx_msdu_end_sa_sw_peer_id_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; + + return HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); +} + struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { /* init and setup */ @@ -785,6 +801,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = { hal_rx_tid_get_8074v2, hal_rx_hw_desc_get_ppduid_get_8074v2, hal_rx_mpdu_start_mpdu_qos_control_valid_get_8074v2, + hal_rx_msdu_end_sa_sw_peer_id_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 d279428508..ae86dfca0b 100644 --- a/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h +++ b/hal/wifi3.0/qca8074v2/hal_8074v2_rx.h @@ -224,6 +224,13 @@ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_OFFSET)), \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_MASK, \ RX_MPDU_INFO_2_MPDU_QOS_CONTROL_VALID_LSB)) + +#define HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(_rx_msdu_end) \ + (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ + RX_MSDU_END_16_SA_SW_PEER_ID_OFFSET)), \ + RX_MSDU_END_16_SA_SW_PEER_ID_MASK, \ + RX_MSDU_END_16_SA_SW_PEER_ID_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 3475fe01f3..3727ffdd21 100644 --- a/hal/wifi3.0/qcn9000/hal_9000.c +++ b/hal/wifi3.0/qcn9000/hal_9000.c @@ -727,6 +727,22 @@ hal_rx_mpdu_start_mpdu_qos_control_valid_get_9000(uint8_t *buf) &mpdu_start->rx_mpdu_info_details); } +/** + * hal_rx_msdu_end_sa_sw_peer_id_get_9000(): API to get the + * sa_sw_peer_id from rx_msdu_end TLV + * @buf: pointer to the start of RX PKT TLV headers + * + * Return: sa_sw_peer_id index + */ +static inline uint32_t +hal_rx_msdu_end_sa_sw_peer_id_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; + + return HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end); +} + struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { /* init and setup */ @@ -794,6 +810,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { hal_rx_tid_get_9000, hal_rx_hw_desc_get_ppduid_get_9000, hal_rx_mpdu_start_mpdu_qos_control_valid_9000, + hal_rx_msdu_end_sa_sw_peer_id_get_9000, }; struct hal_hw_srng_config hw_srng_table_9000[] = {