qcacmn: Add hal_rx_msdu_flow_idx_get API

Implement hal_rx_msdu_flow_idx_get API
per chipset as the macro
to retrieve the flow_idx value is
chipset dependent.

Change-Id: I75131d7c048f5b67489ed25fbd52bfcf01bab782
CRs-Fixed: 2522133

hal/wifi3.0/hal_internal.h

@@ -437,6 +437,7 @@ struct hal_hw_txrx_ops {
 	void (*hal_reo_config)(struct hal_soc *soc,
 			       uint32_t reg_val,
 			       struct hal_reo_params *reo_params);
+	uint32_t (*hal_rx_msdu_flow_idx_get)(uint8_t *buf);
 };
 
 /**

hal/wifi3.0/hal_rx.h

@@ -3203,12 +3203,6 @@ static inline uint32_t hal_rx_msdu_fse_metadata_get(uint8_t *buf)
 	return fse_metadata;
 }
 
-#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
-		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
-		RX_MSDU_END_14_FLOW_IDX_OFFSET)),  \
-		RX_MSDU_END_14_FLOW_IDX_MASK,    \
-		RX_MSDU_END_14_FLOW_IDX_LSB))
-
 /**
  * hal_rx_msdu_flow_idx_get: API to get flow index
  * from rx_msdu_end TLV
@@ -3216,14 +3210,13 @@ static inline uint32_t hal_rx_msdu_fse_metadata_get(uint8_t *buf)
  *
  * Return: flow index value from MSDU END TLV
  */
-static inline uint32_t hal_rx_msdu_flow_idx_get(uint8_t *buf)
+static inline uint32_t
+hal_rx_msdu_flow_idx_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;
-	uint32_t flow_idx;
+	struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
 
-	flow_idx = HAL_RX_MSDU_END_FLOW_IDX_GET(msdu_end);
-	return flow_idx;
+	return hal_soc->ops->hal_rx_msdu_flow_idx_get(buf);
 }
 
 #define HAL_RX_MSDU_END_FLOW_IDX_TIMEOUT_GET(_rx_msdu_end)  \

hal/wifi3.0/qca6290/hal_6290.c

@@ -849,6 +849,22 @@ static void *hal_rx_link_desc_msdu0_ptr_6290(void *link_desc)
 {
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
+
+/**
+ * hal_rx_msdu_flow_idx_get_6290: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -926,6 +942,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_6290,
 	hal_rx_get_ppdu_id_6290,
 	hal_reo_config_6290,
+	hal_rx_msdu_flow_idx_get_6290,
 };
 
 struct hal_hw_srng_config hw_srng_table_6290[] = {

hal/wifi3.0/qca6290/hal_6290_rx.h

@@ -294,6 +294,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 	 _OFFSET_TO_BYTE_PTR((link_desc),\
 	UNIFIED_RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET))
 
+#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
+		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
+		RX_MSDU_END_14_FLOW_IDX_OFFSET)),  \
+		RX_MSDU_END_14_FLOW_IDX_MASK,    \
+		RX_MSDU_END_14_FLOW_IDX_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),\

hal/wifi3.0/qca6390/hal_6390.c

@@ -846,6 +846,21 @@ static void *hal_rx_link_desc_msdu0_ptr_6390(void *link_desc)
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
 
+/**
+ * hal_rx_msdu_flow_idx_get_6390: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -923,6 +938,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_6390,
 	hal_rx_get_ppdu_id_6390,
 	hal_reo_config_6390,
+	hal_rx_msdu_flow_idx_get_6390,
 };
 
 struct hal_hw_srng_config hw_srng_table_6390[] = {

hal/wifi3.0/qca6390/hal_6390_rx.h

@@ -299,6 +299,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 	((struct rx_msdu_details *) \
 	 _OFFSET_TO_BYTE_PTR((link_desc),\
 	UNIFIED_RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET))
+
+#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
+		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
+		RX_MSDU_END_14_FLOW_IDX_OFFSET)),  \
+		RX_MSDU_END_14_FLOW_IDX_MASK,    \
+		RX_MSDU_END_14_FLOW_IDX_LSB))
 /*
  * hal_rx_msdu_start_nss_get_6390(): API to get the NSS
  * Interval from rx_msdu_start

hal/wifi3.0/qca6490/hal_6490.c

@@ -719,6 +719,22 @@ static void *hal_rx_link_desc_msdu0_ptr_6490(void *link_desc)
 {
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
+
+/**
+ * hal_rx_msdu_flow_idx_get_6490: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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;
+
+	return HAL_RX_MSDU_END_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	/* tx */
 	hal_tx_desc_set_mesh_en_6490,
@@ -758,4 +774,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_6490,
 	hal_rx_get_ppdu_id_6490,
 	hal_reo_config_6490,
+	hal_rx_msdu_flow_idx_get_6490,
 };

hal/wifi3.0/qca6490/hal_6490_rx.h

@@ -284,3 +284,9 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
 	((struct rx_msdu_details *) \
 	 _OFFSET_TO_BYTE_PTR((link_desc),\
 	RX_MSDU_LINK_8_MSDU_0_BUFFER_ADDR_INFO_DETAILS_BUFFER_ADDR_31_0_OFFSET))
+
+#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
+		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
+		RX_MSDU_END_12_FLOW_IDX_OFFSET)),  \
+		RX_MSDU_END_12_FLOW_IDX_MASK,    \
+		RX_MSDU_END_12_FLOW_IDX_LSB))

hal/wifi3.0/qca8074v1/hal_8074v1.c

@@ -846,6 +846,21 @@ static void *hal_rx_link_desc_msdu0_ptr_8074v1(void *link_desc)
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
 
+/**
+ * hal_rx_msdu_flow_idx_get_8074v1: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -924,6 +939,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_8074v1,
 	hal_rx_get_ppdu_id_8074v1,
 	hal_reo_config_8074v1,
+	hal_rx_msdu_flow_idx_get_8074v1,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074[] = {

hal/wifi3.0/qca8074v1/hal_8074v1_rx.h

@@ -283,6 +283,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 	 _OFFSET_TO_BYTE_PTR((link_desc),\
 	UNIFIED_RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET))
 
+#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
+		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
+		RX_MSDU_END_14_FLOW_IDX_OFFSET)),  \
+		RX_MSDU_END_14_FLOW_IDX_MASK,    \
+		RX_MSDU_END_14_FLOW_IDX_LSB))
+
 /*
  * hal_rx_msdu_start_nss_get_8074(): API to get the NSS
  * Interval from rx_msdu_start

hal/wifi3.0/qca8074v2/hal_8074v2.c

@@ -843,6 +843,21 @@ static void *hal_rx_link_desc_msdu0_ptr_8074v2(void *link_desc)
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
 
+/**
+ * hal_rx_msdu_flow_idx_get_8074v2: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -922,6 +937,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_8074v2,
 	hal_rx_get_ppdu_id_8074v2,
 	hal_reo_config_8074v2,
+	hal_rx_msdu_flow_idx_get_8074v2,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074v2[] = {

hal/wifi3.0/qca8074v2/hal_8074v2_rx.h

@@ -292,6 +292,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 	 _OFFSET_TO_BYTE_PTR((link_desc),\
 	UNIFIED_RX_MSDU_LINK_8_RX_MSDU_DETAILS_MSDU_0_OFFSET))
 
+#define HAL_RX_MSDU_END_FLOW_IDX_GET(_rx_msdu_end)  \
+		(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,  \
+		RX_MSDU_END_14_FLOW_IDX_OFFSET)),  \
+		RX_MSDU_END_14_FLOW_IDX_MASK,    \
+		RX_MSDU_END_14_FLOW_IDX_LSB))
+
 /*
  * hal_rx_msdu_start_nss_get_8074v2(): API to get the NSS
  * Interval from rx_msdu_start

hal/wifi3.0/qcn9000/hal_9000.c

@@ -852,6 +852,21 @@ static void *hal_rx_link_desc_msdu0_ptr_9000(void *link_desc)
 	return HAL_RX_LINK_DESC_MSDU0_PTR(link_desc);
 }
 
+/**
+ * hal_rx_msdu_flow_idx_get_9000: API to get flow index
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: flow index value from MSDU END TLV
+ */
+static inline uint32_t hal_rx_msdu_flow_idx_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_FLOW_IDX_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -931,6 +946,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 	hal_rx_get_filter_category_9000,
 	hal_rx_get_ppdu_id_9000,
 	hal_reo_config_9000,
+	hal_rx_msdu_flow_idx_get_9000,
 };
 
 struct hal_hw_srng_config hw_srng_table_9000[] = {