Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21ec62a2 authored by Yu Tian's avatar Yu Tian Committed by nshrivas
Browse files

qcacmn: Limit the REO cmd number in batch operate 

MCL path add the desc back to freelist when FLUSH
failed. It may cause the CMD pending in free list
is even larger than REO_CMD_RING max size and lead CMD
flood then cause REO HW in an unexpected condition.
So it's needed to limit the number REO cmds in a batch
operation.

Change-Id: Ib6b97f0693feb7bb5829bda4683248b495b6c7b3
CRs-Fixed: 2642516
parent 7b132ad2

dp/wifi3.0/dp_peer.c

+39 −1
Original line number Diff line number Diff line
@@ -1847,6 +1847,7 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt, 
	struct reo_desc_list_node *freedesc =

		(struct reo_desc_list_node *)cb_ctxt;

	struct dp_rx_tid *rx_tid = &freedesc->rx_tid;

	unsigned long curr_ts = qdf_get_system_timestamp();



	if ((reo_status->fl_cache_status.header.status !=

		HAL_REO_CMD_SUCCESS) &&
@@ -1859,7 +1860,8 @@ static void dp_reo_desc_free(struct dp_soc *soc, void *cb_ctxt, 
			  freedesc->rx_tid.tid);

	}

	QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,

		  "%s: hw_qdesc_paddr: %pK, tid:%d", __func__,

		  "%s:%lu hw_qdesc_paddr: %pK, tid:%d", __func__,

		  curr_ts,

		  (void *)(rx_tid->hw_qdesc_paddr), rx_tid->tid);

	qdf_mem_unmap_nbytes_single(soc->osdev,

		rx_tid->hw_qdesc_paddr,
@@ -2088,6 +2090,23 @@ static void dp_reo_desc_clean_up(struct dp_soc *soc, 
			     (qdf_list_node_t *)desc);

}



/*

 * dp_reo_limit_clean_batch_sz() - Limit number REO CMD queued to cmd

 * ring in aviod of REO hang

 *

 * @list_size: REO desc list size to be cleaned

 */

static inline void dp_reo_limit_clean_batch_sz(uint32_t *list_size)

{

	unsigned long curr_ts = qdf_get_system_timestamp();



	if ((*list_size) > REO_DESC_FREELIST_SIZE) {

		dp_err_log("%lu:freedesc number %d in freelist",

			   curr_ts, *list_size);

		/* limit the batch queue size */

		*list_size = REO_DESC_FREELIST_SIZE;

	}

}

#else

/*

 * dp_reo_desc_clean_up() - If send cmd to REO inorder to flush
@@ -2107,6 +2126,16 @@ static void dp_reo_desc_clean_up(struct dp_soc *soc, 
		dp_reo_desc_free(soc, (void *)desc, reo_status);

	}

}



/*

 * dp_reo_limit_clean_batch_sz() - Limit number REO CMD queued to cmd

 * ring in aviod of REO hang

 *

 * @list_size: REO desc list size to be cleaned

 */

static inline void dp_reo_limit_clean_batch_sz(uint32_t *list_size)

{

}

#endif



/*
@@ -2175,6 +2204,7 @@ void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, 
		qdf_mem_zero(reo_status, sizeof(*reo_status));

		reo_status->fl_cache_status.header.status = HAL_REO_CMD_DRAIN;

		dp_reo_desc_free(soc, (void *)freedesc, reo_status);

		DP_STATS_INC(soc, rx.err.reo_cmd_send_drain, 1);

		return;

	} else if (reo_status->rx_queue_status.header.status !=

		HAL_REO_CMD_SUCCESS) {
@@ -2196,6 +2226,14 @@ void dp_rx_tid_delete_cb(struct dp_soc *soc, void *cb_ctxt, 
	qdf_list_insert_back_size(&soc->reo_desc_freelist,

		(qdf_list_node_t *)freedesc, &list_size);



	/* MCL path add the desc back to reo_desc_freelist when REO FLUSH

	 * failed. it may cause the number of REO queue pending  in free

	 * list is even larger than REO_CMD_RING max size and lead REO CMD

	 * flood then cause REO HW in an unexpected condition. So it's

	 * needed to limit the number REO cmds in a batch operation.

	 */

	dp_reo_limit_clean_batch_sz(&list_size);



	while ((qdf_list_peek_front(&soc->reo_desc_freelist,

		(qdf_list_node_t **)&desc) == QDF_STATUS_SUCCESS) &&

		((list_size >= REO_DESC_FREELIST_SIZE) ||

dp/wifi3.0/dp_types.h

+2 −0
Original line number Diff line number Diff line
@@ -786,6 +786,8 @@ struct dp_soc_stats { 
			uint32_t hal_rxdma_err_dup;

			/* REO cmd send fail/requeue count */

			uint32_t reo_cmd_send_fail;

			/* REO cmd send drain count */

			uint32_t reo_cmd_send_drain;

			/* RX msdu drop count due to scatter */

			uint32_t scatter_msdu;

			/* RX msdu drop count due to invalid cookie */