Revert "qcacmn: Debug patch for delay reg queue corrupt"

This reverts Change-Id:Ib14634fe31bfdae86aac6c89e5d65618ae5c753e.

CRs-Fixed: 3568037
Change-Id: I8426812fd071bf41a15e1ebb776beeb6da865a00

hal/wifi3.0/hal_internal.h

@@ -497,7 +497,6 @@ typedef struct hal_ring_handle *hal_ring_handle_t;
  * @work_scheduled_time: work scheduled time (qdf_log_timestamp)
  * @dequeue_time: dequeue time (qdf_log_timestamp)
  * @cpu_id: record cpuid when schedule work
- * @ring_id: record srng id
  */
 struct hal_reg_write_q_elem {
 	struct hal_srng *srng;
@@ -509,7 +508,6 @@ struct hal_reg_write_q_elem {
 	qdf_time_t work_scheduled_time;
 	qdf_time_t dequeue_time;
 	int cpu_id;
-	int ring_id;
 };
 
 /**
@@ -519,7 +517,6 @@ struct hal_reg_write_q_elem {
  * @coalesces: writes not enqueued since srng is already queued up
  * @direct: writes not enqueued and written to register directly
  * @dequeue_delay: dequeue operation be delayed
- * @pending: number of buffers pending in delay reg write
  */
 struct hal_reg_write_srng_stats {
 	uint32_t enqueues;
@@ -527,7 +524,6 @@ struct hal_reg_write_srng_stats {
 	uint32_t coalesces;
 	uint32_t direct;
 	uint32_t dequeue_delay;
-	qdf_atomic_t pending;
 };
 
 /**

hal/wifi3.0/hal_srng.c

@@ -687,8 +687,6 @@ hal_process_reg_write_q_elem(struct hal_soc *hal,
 	struct hal_srng *srng = q_elem->srng;
 	uint32_t write_val;
 
-	QDF_BUG(q_elem->ring_id == srng->ring_id);
-
 	SRNG_LOCK(&srng->lock);
 
 	srng->reg_write_in_progress = false;
@@ -711,7 +709,6 @@ hal_process_reg_write_q_elem(struct hal_soc *hal,
 
 	q_elem->valid = 0;
 	srng->last_dequeue_time = q_elem->dequeue_time;
-	qdf_atomic_set(&srng->wstats.pending, 0);
 	SRNG_UNLOCK(&srng->lock);
 
 	return write_val;
@@ -914,7 +911,6 @@ static void hal_reg_write_enqueue(struct hal_soc *hal_soc,
 		hal_verbose_debug("Already in progress srng ring id 0x%x addr 0x%pK val %u",
 				  srng->ring_id, addr, value);
 		qdf_atomic_inc(&hal_soc->stats.wstats.coalesces);
-		qdf_atomic_inc(&srng->wstats.pending);
 		srng->wstats.coalesces++;
 		return;
 	}
@@ -949,7 +945,7 @@ static void hal_reg_write_enqueue(struct hal_soc *hal_soc,
 	 */
 	qdf_wmb();
 	q_elem->valid = true;
-	q_elem->ring_id = srng->ring_id;
+
 	/*
 	 * After all other fields in the q_elem has been updated
 	 * in memory successfully, the valid flag needs to be updated