ソースを参照

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
Venkata Sharath Chandra Manchala 5 年 前
コミット
685045eb9c

+ 1 - 0
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);
 };
 
 /**

+ 25 - 25
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 */

+ 16 - 0
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[] = {

+ 6 - 0
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),\

+ 18 - 0
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[] = {

+ 6 - 0
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

+ 1 - 0
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,
 };

+ 6 - 0
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))

+ 17 - 0
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[] = {

+ 6 - 0
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

+ 17 - 0
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[] = {

+ 7 - 0
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

+ 17 - 0
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[] = {