Browse Source

qcacmn: Fix the identifier names for SWLM

The identifiers for SWLM are named incorrectly.
Fix these incorrect naming in SWLM.

Change-Id: I107c22df96c65997a349c0dc1a746e06f1c5b5fa
Rakesh Pillai 4 years ago
parent
commit
c013de5747
2 changed files with 21 additions and 20 deletions
  1. 10 9
      dp/wifi3.0/dp_tx.c
  2. 11 11
      dp/wifi3.0/dp_types.h

+ 10 - 9
dp/wifi3.0/dp_tx.c

@@ -1177,14 +1177,15 @@ dp_tx_attempt_coalescing(struct dp_soc *soc, struct dp_vdev *vdev,
 	status = dp_swlm_tcl_pre_check(soc, &tcl_data);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		dp_swlm_tcl_reset_session_data(soc);
+		DP_STATS_INC(swlm, tcl.coalesce_fail, 1);
 		return 0;
 	}
 
 	ret = dp_swlm_query_policy(soc, TCL_DATA, swlm_query_data);
 	if (ret) {
-		DP_STATS_INC(swlm, tcl.coalesc_success, 1);
+		DP_STATS_INC(swlm, tcl.coalesce_success, 1);
 	} else {
-		DP_STATS_INC(swlm, tcl.coalesc_fail, 1);
+		DP_STATS_INC(swlm, tcl.coalesce_fail, 1);
 	}
 
 	return ret;
@@ -1194,15 +1195,15 @@ dp_tx_attempt_coalescing(struct dp_soc *soc, struct dp_vdev *vdev,
  * dp_tx_ring_access_end() - HAL ring access end for data transmission
  * @soc: Datapath soc handle
  * @hal_ring_hdl: HAL ring handle
- * @coalesc: Coalesc the current write or not
+ * @coalesce: Coalesce the current write or not
  *
  * Returns: none
  */
 static inline void
 dp_tx_ring_access_end(struct dp_soc *soc, hal_ring_handle_t hal_ring_hdl,
-		      int coalesc)
+		      int coalesce)
 {
-	if (coalesc)
+	if (coalesce)
 		dp_tx_hal_ring_access_end_reap(soc, hal_ring_hdl);
 	else
 		dp_tx_hal_ring_access_end(soc, hal_ring_hdl);
@@ -1224,7 +1225,7 @@ dp_tx_attempt_coalescing(struct dp_soc *soc, struct dp_vdev *vdev,
 
 static inline void
 dp_tx_ring_access_end(struct dp_soc *soc, hal_ring_handle_t hal_ring_hdl,
-		      int coalesc)
+		      int coalesce)
 {
 	dp_tx_hal_ring_access_end(soc, hal_ring_hdl);
 }
@@ -1255,7 +1256,7 @@ static QDF_STATUS dp_tx_hw_enqueue(struct dp_soc *soc, struct dp_vdev *vdev,
 	uint8_t type;
 	void *hal_tx_desc;
 	uint32_t *hal_tx_desc_cached;
-	int coalesc = 0;
+	int coalesce = 0;
 
 	/*
 	 * Setting it initialization statically here to avoid
@@ -1373,7 +1374,7 @@ static QDF_STATUS dp_tx_hw_enqueue(struct dp_soc *soc, struct dp_vdev *vdev,
 	tx_desc->flags |= DP_TX_DESC_FLAG_QUEUED_TX;
 	dp_vdev_peer_stats_update_protocol_cnt_tx(vdev, tx_desc->nbuf);
 	hal_tx_desc_sync(hal_tx_desc_cached, hal_tx_desc);
-	coalesc = dp_tx_attempt_coalescing(soc, vdev, tx_desc, tid);
+	coalesce = dp_tx_attempt_coalescing(soc, vdev, tx_desc, tid);
 	DP_STATS_INC_PKT(vdev, tx_i.processed, 1, tx_desc->length);
 	dp_tx_update_stats(soc, tx_desc->nbuf);
 	status = QDF_STATUS_SUCCESS;
@@ -1381,7 +1382,7 @@ static QDF_STATUS dp_tx_hw_enqueue(struct dp_soc *soc, struct dp_vdev *vdev,
 ring_access_fail:
 	if (hif_pm_runtime_get(soc->hif_handle,
 			       RTPM_ID_DW_TX_HW_ENQUEUE) == 0) {
-		dp_tx_ring_access_end(soc, hal_ring_hdl, coalesc);
+		dp_tx_ring_access_end(soc, hal_ring_hdl, coalesce);
 		hif_pm_runtime_put(soc->hif_handle,
 				   RTPM_ID_DW_TX_HW_ENQUEUE);
 	} else {

+ 11 - 11
dp/wifi3.0/dp_types.h

@@ -1135,7 +1135,7 @@ struct dp_last_op_info {
  * @num_ll_connections: Number of low latency connections on this vdev
  *
  * This structure contains the information required by the software
- * latency manager to decide on whether to coalesc the current TCL
+ * latency manager to decide on whether to coalesce the current TCL
  * register write or not.
  */
 struct dp_swlm_tcl_data {
@@ -1154,12 +1154,12 @@ union swlm_data {
 
 /**
  * struct dp_swlm_ops - SWLM ops
- * @tcl_should_coalesc: Should the current TCL register write be coalesced
- *			or not
+ * @tcl_wr_coalesce_check: handler to check if the current TCL register
+ *			   write can be coalesced or not
  */
 struct dp_swlm_ops {
-	int (*tcl_should_coalesc)(struct dp_soc *soc,
-				  struct dp_swlm_tcl_data *tcl_data);
+	int (*tcl_wr_coalesce_check)(struct dp_soc *soc,
+				     struct dp_swlm_tcl_data *tcl_data);
 };
 
 /**
@@ -1178,8 +1178,8 @@ struct dp_swlm_ops {
  *			    session time expired
  * @tcl.tput_criteria_fail: Num TCL HP writes coalescing fails, since the
  *			   throughput did not meet session threshold
- * @tcl.coalesc_success: Num of TCL HP writes coalesced successfully.
- * @tcl.coalesc_fail: Num of TCL HP writes coalesces failed
+ * @tcl.coalesce_success: Num of TCL HP writes coalesced successfully.
+ * @tcl.coalesce_fail: Num of TCL HP writes coalesces failed
  */
 struct dp_swlm_stats {
 	struct {
@@ -1191,8 +1191,8 @@ struct dp_swlm_stats {
 		uint32_t bytes_thresh_reached;
 		uint32_t time_thresh_reached;
 		uint32_t tput_criteria_fail;
-		uint32_t coalesc_success;
-		uint32_t coalesc_fail;
+		uint32_t coalesce_success;
+		uint32_t coalesce_fail;
 	} tcl;
 };
 
@@ -1211,7 +1211,7 @@ struct dp_swlm_stats {
  * @tcl.tx_thresh_multiplier: Multiplier to deduce the bytes threshold after
  *			      which the TCL HP register is written, thereby
  *			      ending the coalescing.
- * @tcl.coalesc_end_time: End timestamp for current coalescing session
+ * @tcl.coalesce_end_time: End timestamp for current coalescing session
  * @tcl.bytes_coalesced: Num bytes coalesced in the current session
  */
 struct dp_swlm_params {
@@ -1224,7 +1224,7 @@ struct dp_swlm_params {
 		uint32_t bytes_flush_thresh;
 		uint32_t time_flush_thresh;
 		uint32_t tx_thresh_multiplier;
-		uint64_t coalesc_end_time;
+		uint64_t coalesce_end_time;
 		uint32_t bytes_coalesced;
 	} tcl;
 };