qcacmn: Add hal_rx_msdu_cce_metadata_get API

Implement hal_rx_msdu_cce_metadata API per
chipset as the macro to retrieve the cce_metadata
value is chipset dependent.

Change-Id: Icd87d4ac32be78d69b24da106381a7669c86ada6
CRs-Fixed: 2522133

hal/wifi3.0/hal_internal.h

@@ -441,6 +441,7 @@ struct hal_hw_txrx_ops {
 	bool (*hal_rx_msdu_flow_idx_invalid)(uint8_t *buf);
 	bool (*hal_rx_msdu_flow_idx_timeout)(uint8_t *buf);
 	uint32_t (*hal_rx_msdu_fse_metadata_get)(uint8_t *buf);
+	uint16_t (*hal_rx_msdu_cce_metadata_get)(uint8_t *buf);
 };
 
 /**

hal/wifi3.0/hal_rx.h

@@ -1637,28 +1637,19 @@ hal_rx_msdu_end_last_msdu_get(hal_soc_handle_t hal_soc_hdl,
 	return hal_soc->ops->hal_rx_msdu_end_last_msdu_get(buf);
 }
 
-#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
-	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
-		RX_MSDU_END_16_CCE_METADATA_OFFSET)),	\
-		RX_MSDU_END_16_CCE_METADATA_MASK,	\
-		RX_MSDU_END_16_CCE_METADATA_LSB))
-
 /**
  * hal_rx_msdu_cce_metadata_get: API to get CCE metadata
  * from rx_msdu_end TLV
  * @buf: pointer to the start of RX PKT TLV headers
- * Return: last_msdu
+ * Return: cce_meta_data
  */
-
-static inline uint32_t
-hal_rx_msdu_cce_metadata_get(uint8_t *buf)
+static inline uint16_t
+hal_rx_msdu_cce_metadata_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 cce_metadata;
+	struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
 
-	cce_metadata = HAL_RX_MSDU_END_CCE_METADATA_GET(msdu_end);
-	return cce_metadata;
+	return hal_soc->ops->hal_rx_msdu_cce_metadata_get(buf);
 }
 
 /*******************************************************************************

hal/wifi3.0/qca6290/hal_6290.c

@@ -910,6 +910,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_6290(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_6290: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce_metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -991,6 +1007,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_6290,
 	hal_rx_msdu_flow_idx_timeout_6290,
 	hal_rx_msdu_fse_metadata_get_6290,
+	hal_rx_msdu_cce_metadata_get_6290,
 };
 
 struct hal_hw_srng_config hw_srng_table_6290[] = {

hal/wifi3.0/qca6290/hal_6290_rx.h

@@ -318,6 +318,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 		RX_MSDU_END_15_FSE_METADATA_MASK,    \
 		RX_MSDU_END_15_FSE_METADATA_LSB))
 
+#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_16_CCE_METADATA_OFFSET)),	\
+		RX_MSDU_END_16_CCE_METADATA_MASK,	\
+		RX_MSDU_END_16_CCE_METADATA_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

@@ -906,6 +906,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_6390(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_6390: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -987,6 +1003,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_6390,
 	hal_rx_msdu_flow_idx_timeout_6390,
 	hal_rx_msdu_fse_metadata_get_6390,
+	hal_rx_msdu_cce_metadata_get_6390,
 };
 
 struct hal_hw_srng_config hw_srng_table_6390[] = {

hal/wifi3.0/qca6390/hal_6390_rx.h

@@ -323,6 +323,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 		RX_MSDU_END_15_FSE_METADATA_OFFSET)),  \
 		RX_MSDU_END_15_FSE_METADATA_MASK,    \
 		RX_MSDU_END_15_FSE_METADATA_LSB))
+
+#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_16_CCE_METADATA_OFFSET)),	\
+		RX_MSDU_END_16_CCE_METADATA_MASK,	\
+		RX_MSDU_END_16_CCE_METADATA_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

@@ -780,6 +780,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_6490(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_6490: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce_metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	/* tx */
 	hal_tx_desc_set_mesh_en_6490,
@@ -823,4 +839,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_6490,
 	hal_rx_msdu_flow_idx_timeout_6490,
 	hal_rx_msdu_fse_metadata_get_6490,
+	hal_rx_msdu_cce_metadata_get_6490,
 };

hal/wifi3.0/qca6490/hal_6490_rx.h

@@ -308,3 +308,9 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
 		RX_MSDU_END_13_FSE_METADATA_OFFSET)),  \
 		RX_MSDU_END_13_FSE_METADATA_MASK,    \
 		RX_MSDU_END_13_FSE_METADATA_LSB))
+
+#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_14_CCE_METADATA_OFFSET)),	\
+		RX_MSDU_END_14_CCE_METADATA_MASK,	\
+		RX_MSDU_END_14_CCE_METADATA_LSB))

hal/wifi3.0/qca8074v1/hal_8074v1.c

@@ -906,6 +906,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_8074v1(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_8074v1: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce_metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -988,6 +1004,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_8074v1,
 	hal_rx_msdu_flow_idx_timeout_8074v1,
 	hal_rx_msdu_fse_metadata_get_8074v1,
+	hal_rx_msdu_cce_metadata_get_8074v1,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074[] = {

hal/wifi3.0/qca8074v1/hal_8074v1_rx.h

@@ -307,6 +307,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 		RX_MSDU_END_15_FSE_METADATA_MASK,    \
 		RX_MSDU_END_15_FSE_METADATA_LSB))
 
+#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_16_CCE_METADATA_OFFSET)),	\
+		RX_MSDU_END_16_CCE_METADATA_MASK,	\
+		RX_MSDU_END_16_CCE_METADATA_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

@@ -903,6 +903,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_8074v2(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_8074v2: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce_metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -986,6 +1002,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_8074v2,
 	hal_rx_msdu_flow_idx_timeout_8074v2,
 	hal_rx_msdu_fse_metadata_get_8074v2,
+	hal_rx_msdu_cce_metadata_get_8074v2,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074v2[] = {

hal/wifi3.0/qca8074v2/hal_8074v2_rx.h

@@ -316,6 +316,12 @@ UNIFIED_RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_RX_MSDU_DESC_INFO_DETAILS_OFFSET))
 		RX_MSDU_END_15_FSE_METADATA_MASK,    \
 		RX_MSDU_END_15_FSE_METADATA_LSB))
 
+#define HAL_RX_MSDU_END_CCE_METADATA_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_16_CCE_METADATA_OFFSET)),	\
+		RX_MSDU_END_16_CCE_METADATA_MASK,	\
+		RX_MSDU_END_16_CCE_METADATA_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

@@ -912,6 +912,22 @@ static uint32_t hal_rx_msdu_fse_metadata_get_9000(uint8_t *buf)
 	return HAL_RX_MSDU_END_FSE_METADATA_GET(msdu_end);
 }
 
+/**
+ * hal_rx_msdu_cce_metadata_get_9000: API to get CCE metadata
+ * from rx_msdu_end TLV
+ * @buf: pointer to the start of RX PKT TLV headers
+ *
+ * Return: cce_metadata
+ */
+static uint16_t
+hal_rx_msdu_cce_metadata_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_CCE_METADATA_GET(msdu_end);
+}
+
 struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -995,6 +1011,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 	hal_rx_msdu_flow_idx_invalid_9000,
 	hal_rx_msdu_flow_idx_timeout_9000,
 	hal_rx_msdu_fse_metadata_get_9000,
+	hal_rx_msdu_cce_metadata_get_9000,
 };
 
 struct hal_hw_srng_config hw_srng_table_9000[] = {