Эх сурвалжийг харах

qcacmn: Address asserts in monitor path

Address asserts in monitor path

CRs-Fixed: 3591470
Change-Id: I4a5fbda57e91da6579ca945ecfcb12488b4413f1
Amir Patel 1 жил өмнө
parent
commit
32c2f949a6

+ 8 - 0
dp/inc/cdp_txrx_mon_struct.h

@@ -449,6 +449,10 @@ enum cdp_mon_phyrx_abort_reason_code {
  * @end_of_ppdu_drop_cnt: Total end of ppdu drop count
  * @tlv_drop_cnt: TLV drop count
  * @rx_hdr_invalid_cnt: Rx header invalid count
+ * @null_status_desc: NULL packet desc count
+ * @null_pkt_desc: NULL packet desc count
+ * @desc_magic_mismatch: desc magic number mismatch count;
+ * @null_pkt_addr: NULL packet address count;
  */
 struct cdp_pdev_mon_stats {
 #ifndef REMOVE_MON_DBG_STATS
@@ -510,6 +514,10 @@ struct cdp_pdev_mon_stats {
 	uint32_t end_of_ppdu_drop_cnt;
 	uint32_t tlv_drop_cnt;
 	uint32_t rx_hdr_invalid_cnt;
+	uint32_t null_status_desc;
+	uint32_t null_pkt_desc;
+	uint32_t desc_magic_mismatch;
+	uint32_t null_pkt_addr;
 };
 
 #ifdef QCA_SUPPORT_LITE_MONITOR

+ 2 - 1
dp/wifi3.0/monitor/2.0/dp_mon_2.0.h

@@ -463,7 +463,8 @@ void __dp_mon_add_to_free_desc_list(union dp_mon_desc_list_elem_t **head,
 				    struct dp_mon_desc *new,
 				    const char *func_name)
 {
-	qdf_assert(head && new);
+	if (!(head && new))
+		return;
 
 	new->buf_addr = NULL;
 	new->in_use = 0;

+ 0 - 2
dp/wifi3.0/monitor/2.0/dp_rx_mon_2.0.c

@@ -237,7 +237,6 @@ dp_rx_mon_shift_pf_tag_in_headroom(qdf_nbuf_t nbuf, struct dp_soc *soc,
 	if (qdf_unlikely(!soc)) {
 		dp_mon_err("Soc[%pK] Null. Can't update pftag to nbuf headroom",
 			   soc);
-		qdf_assert_always(0);
 	}
 
 	if (!wlan_cfg_is_rx_mon_protocol_flow_tag_enabled(soc->wlan_cfg_ctx))
@@ -1901,7 +1900,6 @@ dp_rx_mon_process_status_tlv(struct dp_pdev *pdev)
 	for (idx = 0; idx < status_buf_count; idx++) {
 		mon_desc = mon_pdev_be->status[idx];
 		if (!mon_desc) {
-			qdf_assert_always(0);
 			return NULL;
 		}