qcacld-3.0: Channel load is zero when issued back to back req

As per current logic FW sends value of cycle_count, rx_clear_count
and tx_frame_count in usec not in ticks for all chipsets.

No need to divide cycle_count, rx_clear_count and tx_frame_count
by FW clock frequency in host.

Change-Id: Ic319ff3f0b6a776b0522471d51f01f7eeafa1dd5
CRs-Fixed: 3602740

components/cp_stats/dispatcher/src/wlan_cp_stats_mc_ucfg_api.c

@@ -1060,8 +1060,7 @@ void wlan_cp_stats_get_rx_clear_count(struct wlan_objmgr_psoc *psoc,
 	struct channel_status *channel_status_list;
 	uint8_t total_channel;
 	uint8_t i;
-	uint32_t rx_clear_count = 0, cycle_count = 0, mac_clk_mhz = 0;
-	uint64_t clock_freq, time, time_busy;
+	uint32_t rx_clear_count = 0, cycle_count = 0;
 
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
 						    WLAN_CP_STATS_ID);
@@ -1088,7 +1087,6 @@ void wlan_cp_stats_get_rx_clear_count(struct wlan_objmgr_psoc *psoc,
 		if (channel_status_list[i].channel_id == channel) {
 			rx_clear_count = channel_status_list[i].rx_clear_count;
 			cycle_count = channel_status_list[i].cycle_count;
-			mac_clk_mhz = channel_status_list[i].mac_clk_mhz;
 			break;
 		}
 	}
@@ -1098,25 +1096,16 @@ void wlan_cp_stats_get_rx_clear_count(struct wlan_objmgr_psoc *psoc,
 		goto release_ref;
 	}
 
-	clock_freq = mac_clk_mhz * 1000;
-	if (clock_freq == 0) {
-		cp_stats_debug("clock_freq is zero");
+	if (cycle_count == 0) {
+		cp_stats_debug("cycle_count is zero");
 		goto release_ref;
 	}
 
-	time = qdf_do_div(cycle_count, clock_freq);
-	if (time == 0) {
-		cp_stats_debug("time is zero");
-		goto release_ref;
-	}
-
-	time_busy = qdf_do_div(rx_clear_count, clock_freq);
-
-	*chan_load = ((time_busy * 255) / time);
+	*chan_load = ((rx_clear_count * 255) / cycle_count);
 
-	cp_stats_debug("t_chan:%d, chan:%d, rcc:%u, cc:%u, cf:%u, time:%u, time_busy:%u, chan_load:%d",
+	cp_stats_debug("t_chan:%d, chan:%d, rcc:%u, cc:%u, chan_load:%d",
 		       total_channel, channel, rx_clear_count, cycle_count,
-		       clock_freq, time, time_busy, *chan_load);
+		       *chan_load);
 
 release_ref:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_CP_STATS_ID);

core/hdd/src/wlan_hdd_stats.c

@@ -8221,22 +8221,14 @@ struct net_device_stats *hdd_get_stats(struct net_device *dev)
 	return (struct net_device_stats *)ucfg_dp_get_dev_stats(dev);
 }
 
-
 /*
- * time = cycle_count * cycle
- * cycle = 1 / clock_freq
- * Since the unit of clock_freq reported from
- * FW is MHZ, and we want to calculate time in
- * ms level, the result is
- * time = cycle / (clock_freq * 1000)
+ * FW sends value of cycle_count, rx_clear_count and tx_frame_count in usec.
  */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
 static bool wlan_fill_survey_result(struct survey_info *survey, int opfreq,
 				    struct scan_chan_info *chan_info,
 				    struct ieee80211_channel *channels)
 {
-	uint64_t clock_freq = chan_info->clock_freq * 1000;
-
 	if (channels->center_freq != (uint16_t)chan_info->freq)
 		return false;
 
@@ -8250,14 +8242,9 @@ static bool wlan_fill_survey_result(struct survey_info *survey, int opfreq,
 	if (opfreq == chan_info->freq)
 		survey->filled |= SURVEY_INFO_IN_USE;
 
-	if (clock_freq == 0)
-		return true;
-
-	survey->time = qdf_do_div(chan_info->cycle_count, clock_freq);
-
-	survey->time_busy = qdf_do_div(chan_info->rx_clear_count, clock_freq);
-
-	survey->time_tx = qdf_do_div(chan_info->tx_frame_count, clock_freq);
+	survey->time = chan_info->cycle_count;
+	survey->time_busy = chan_info->rx_clear_count;
+	survey->time_tx = chan_info->tx_frame_count;
 
 	survey->filled |= SURVEY_INFO_TIME |
 			  SURVEY_INFO_TIME_BUSY |
@@ -8269,8 +8256,6 @@ static bool wlan_fill_survey_result(struct survey_info *survey, int opfreq,
 				    struct scan_chan_info *chan_info,
 				    struct ieee80211_channel *channels)
 {
-	uint64_t clock_freq = chan_info->clock_freq * 1000;
-
 	if (channels->center_freq != (uint16_t)chan_info->freq)
 		return false;
 
@@ -8284,16 +8269,9 @@ static bool wlan_fill_survey_result(struct survey_info *survey, int opfreq,
 	if (opfreq == chan_info->freq)
 		survey->filled |= SURVEY_INFO_IN_USE;
 
-	if (clock_freq == 0)
-		return true;
-
-	survey->channel_time = qdf_do_div(chan_info->cycle_count, clock_freq);
-
-	survey->channel_time_busy = qdf_do_div(chan_info->rx_clear_count,
-							 clock_freq);
-
-	survey->channel_time_tx = qdf_do_div(chan_info->tx_frame_count,
-							 clock_freq);
+	survey->channel_time = chan_info->cycle_count;
+	survey->channel_time_busy = chan_info->rx_clear_count;
+	survey->channel_time_tx = chan_info->tx_frame_count;
 
 	survey->filled |= SURVEY_INFO_CHANNEL_TIME |
 			  SURVEY_INFO_CHANNEL_TIME_BUSY |