Forráskód Böngészése

qcacmn: Add hal_rx_msdu_end_first_msdu_get API

Implement hal_rx_msdu_end_first_msdu_get API
based on the chipset as the macro to retrieve
first_msdu value is chipset dependent.

Change-Id: Iea325159a0349c45a249c1ae113664c41a54b0f1
CRs-Fixed: 2522133
Venkata Sharath Chandra Manchala 5 éve
szülő
commit
cb255b4834

+ 6 - 3
dp/wifi3.0/dp_rx_err.c

@@ -697,7 +697,8 @@ dp_rx_null_q_desc_handle(struct dp_soc *soc, qdf_nbuf_t nbuf,
 	qdf_ether_header_t *eh;
 
 	qdf_nbuf_set_rx_chfrag_start(nbuf,
-				hal_rx_msdu_end_first_msdu_get(rx_tlv_hdr));
+				hal_rx_msdu_end_first_msdu_get(soc->hal_soc,
+							       rx_tlv_hdr));
 	qdf_nbuf_set_rx_chfrag_end(nbuf,
 				   hal_rx_msdu_end_last_msdu_get(rx_tlv_hdr));
 	qdf_nbuf_set_da_mcbc(nbuf, hal_rx_msdu_end_da_is_mcbc_get(soc->hal_soc,
@@ -1049,7 +1050,8 @@ void dp_rx_process_mic_error(struct dp_soc *soc, qdf_nbuf_t nbuf,
 	QDF_STATUS status;
 	struct cdp_rx_mic_err_info mic_failure_info;
 
-	if (!hal_rx_msdu_end_first_msdu_get(rx_tlv_hdr))
+	if (!hal_rx_msdu_end_first_msdu_get(soc->hal_soc,
+					    rx_tlv_hdr))
 		return;
 
 	if (!peer) {
@@ -1500,7 +1502,8 @@ done:
 				case HAL_REO_ERR_REGULAR_FRAME_2K_JUMP:
 					pool_id = wbm_err_info.pool_id;
 
-					if (hal_rx_msdu_end_first_msdu_get(rx_tlv_hdr)) {
+					if (hal_rx_msdu_end_first_msdu_get(soc->hal_soc,
+									   rx_tlv_hdr)) {
 						peer_id =
 						hal_rx_mpdu_start_sw_peer_id_get(rx_tlv_hdr);
 						tid =

+ 1 - 0
hal/wifi3.0/hal_internal.h

@@ -388,6 +388,7 @@ struct hal_hw_txrx_ops {
 	uint32_t (*hal_rx_msdu_end_l3_hdr_padding_get)(uint8_t *buf);
 	uint32_t (*hal_rx_encryption_info_valid)(uint8_t *buf);
 	void (*hal_rx_print_pn)(uint8_t *buf);
+	uint8_t (*hal_rx_msdu_end_first_msdu_get)(uint8_t *buf);
 };
 
 /**

+ 7 - 15
hal/wifi3.0/hal_rx.h

@@ -1802,29 +1802,21 @@ hal_rx_msdu_end_da_is_mcbc_get(hal_soc_handle_t hal_soc_hdl, uint8_t *buf)
 	return hal_soc->ops->hal_rx_msdu_end_da_is_mcbc_get(buf);
 }
 
-#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
-	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
-		RX_MSDU_END_5_FIRST_MSDU_OFFSET)),	\
-		RX_MSDU_END_5_FIRST_MSDU_MASK,		\
-		RX_MSDU_END_5_FIRST_MSDU_LSB))
-
- /**
+/**
  * hal_rx_msdu_end_first_msdu_get: API to get first msdu status
  * from rx_msdu_end TLV
+ * @hal_soc_hdl: hal soc handle
+ * @buf: pointer to the start of RX PKT TLV headers
  *
- * @ buf: pointer to the start of RX PKT TLV headers
  * Return: first_msdu
  */
 static inline uint8_t
-hal_rx_msdu_end_first_msdu_get(uint8_t *buf)
+hal_rx_msdu_end_first_msdu_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;
-	uint8_t first_msdu;
-
-	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+	struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
 
-	return first_msdu;
+	return hal_soc->ops->hal_rx_msdu_end_first_msdu_get(buf);
 }
 
 #define HAL_RX_MSDU_END_LAST_MSDU_GET(_rx_msdu_end)	\

+ 20 - 0
hal/wifi3.0/qca6290/hal_6290.c

@@ -254,6 +254,25 @@ static void hal_rx_print_pn_6290(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msdu_get_6290: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t
+hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
+
 struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -303,6 +322,7 @@ struct hal_hw_txrx_ops qca6290_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_6290,
 	hal_rx_encryption_info_valid_6290,
 	hal_rx_print_pn_6290,
+	hal_rx_msdu_end_first_msdu_get_6290,
 };
 
 struct hal_hw_srng_config hw_srng_table_6290[] = {

+ 6 - 0
hal/wifi3.0/qca6290/hal_6290_rx.h

@@ -95,6 +95,12 @@
 	RX_MPDU_INFO_7_PN_127_96_MASK,			\
 	RX_MPDU_INFO_7_PN_127_96_LSB))
 
+#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_5_FIRST_MSDU_OFFSET)),	\
+		RX_MSDU_END_5_FIRST_MSDU_MASK,		\
+		RX_MSDU_END_5_FIRST_MSDU_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),\

+ 19 - 0
hal/wifi3.0/qca6390/hal_6390.c

@@ -254,6 +254,24 @@ static void hal_rx_print_pn_6390(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msduget_6390: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @ buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
+
 struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	/* init and setup */
 	hal_srng_dst_hw_init_generic,
@@ -303,6 +321,7 @@ struct hal_hw_txrx_ops qca6390_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_6390,
 	hal_rx_encryption_info_valid_6390,
 	hal_rx_print_pn_6390,
+	hal_rx_msdu_end_first_msdu_get_6390,
 };
 
 struct hal_hw_srng_config hw_srng_table_6390[] = {

+ 6 - 0
hal/wifi3.0/qca6390/hal_6390_rx.h

@@ -95,6 +95,12 @@
 	RX_MPDU_INFO_7_PN_127_96_MASK,			\
 	RX_MPDU_INFO_7_PN_127_96_LSB))
 
+#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_5_FIRST_MSDU_OFFSET)),	\
+		RX_MSDU_END_5_FIRST_MSDU_MASK,		\
+		RX_MSDU_END_5_FIRST_MSDU_LSB))
+
 #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\
 	(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
 	RX_MSDU_START_5_MIMO_SS_BITMAP_OFFSET)),	\

+ 19 - 0
hal/wifi3.0/qca6490/hal_6490.c

@@ -160,6 +160,24 @@ static void hal_rx_print_pn_6490(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msdu_get_6490: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @ buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
+
 struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	/* rx */
 	hal_rx_get_rx_fragment_number_6490,
@@ -169,4 +187,5 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_6490,
 	hal_rx_encryption_info_valid_6490,
 	hal_rx_print_pn_6490,
+	hal_rx_msdu_end_first_msdu_get_6490,
 };

+ 6 - 0
hal/wifi3.0/qca6490/hal_6490_rx.h

@@ -75,3 +75,9 @@
 	RX_MPDU_INFO_6_PN_127_96_OFFSET)),		\
 	RX_MPDU_INFO_6_PN_127_96_MASK,			\
 	RX_MPDU_INFO_6_PN_127_96_LSB))
+
+#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_10_FIRST_MSDU_OFFSET)),	\
+		RX_MSDU_END_10_FIRST_MSDU_MASK,		\
+		RX_MSDU_END_10_FIRST_MSDU_LSB))

+ 19 - 0
hal/wifi3.0/qca8074v1/hal_8074v1.c

@@ -249,6 +249,24 @@ static void hal_rx_print_pn_8074v1(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msdu_get_8074v1: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @ buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t
+hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
 struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -299,6 +317,7 @@ struct hal_hw_txrx_ops qca8074_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_8074v1,
 	hal_rx_encryption_info_valid_8074v1,
 	hal_rx_print_pn_8074v1,
+	hal_rx_msdu_end_first_msdu_get_8074v1,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074[] = {

+ 6 - 0
hal/wifi3.0/qca8074v1/hal_8074v1_rx.h

@@ -84,6 +84,12 @@
 	RX_MPDU_INFO_7_PN_127_96_MASK,			\
 	RX_MPDU_INFO_7_PN_127_96_LSB))
 
+#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_5_FIRST_MSDU_OFFSET)),	\
+		RX_MSDU_END_5_FIRST_MSDU_MASK,		\
+		RX_MSDU_END_5_FIRST_MSDU_LSB))
+
 /*
  * hal_rx_msdu_start_nss_get_8074(): API to get the NSS
  * Interval from rx_msdu_start

+ 19 - 0
hal/wifi3.0/qca8074v2/hal_8074v2.c

@@ -249,6 +249,24 @@ static void hal_rx_print_pn_8074v2(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msdu_get_8074v2: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @ buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
+
 struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -299,6 +317,7 @@ struct hal_hw_txrx_ops qca8074v2_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_8074v2,
 	hal_rx_encryption_info_valid_8074v2,
 	hal_rx_print_pn_8074v2,
+	hal_rx_msdu_end_first_msdu_get_8074v2,
 };
 
 struct hal_hw_srng_config hw_srng_table_8074v2[] = {

+ 6 - 0
hal/wifi3.0/qca8074v2/hal_8074v2_rx.h

@@ -87,6 +87,12 @@
 	RX_MPDU_INFO_7_PN_127_96_MASK,			\
 	RX_MPDU_INFO_7_PN_127_96_LSB))
 
+#define HAL_RX_MSDU_END_FIRST_MSDU_GET(_rx_msdu_end)	\
+	(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end,	\
+		RX_MSDU_END_5_FIRST_MSDU_OFFSET)),	\
+		RX_MSDU_END_5_FIRST_MSDU_MASK,		\
+		RX_MSDU_END_5_FIRST_MSDU_LSB))
+
 #define HAL_RX_MSDU_START_MIMO_SS_BITMAP(_rx_msdu_start)\
 	(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
 	RX_MSDU_START_5_MIMO_SS_BITMAP_OFFSET)),	\

+ 19 - 0
hal/wifi3.0/qcn9000/hal_9000.c

@@ -258,6 +258,24 @@ static void hal_rx_print_pn_9000(uint8_t *buf)
 		  pn_127_96, pn_95_64, pn_63_32, pn_31_0);
 }
 
+/**
+ * hal_rx_msdu_end_first_msdu_get_9000: API to get first msdu status
+ * from rx_msdu_end TLV
+ *
+ * @ buf: pointer to the start of RX PKT TLV headers
+ * Return: first_msdu
+ */
+static uint8_t hal_rx_msdu_end_first_msdu_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;
+	uint8_t first_msdu;
+
+	first_msdu = HAL_RX_MSDU_END_FIRST_MSDU_GET(msdu_end);
+
+	return first_msdu;
+}
+
 struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 
 	/* init and setup */
@@ -308,6 +326,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
 	hal_rx_msdu_end_l3_hdr_padding_get_9000,
 	hal_rx_encryption_info_valid_9000,
 	hal_rx_print_pn_9000,
+	hal_rx_msdu_end_first_msdu_get_9000,
 };
 
 struct hal_hw_srng_config hw_srng_table_9000[] = {