qcacld-3.0: Use FW stats to update TX/RX stats

Currently we use sta_info TX/RX counters to update stats request from
upper layers. This requires these counters to be updated in per packet
path during TX/RX. These counters are already available from FW stats.
Hence use FW stats to update TX/RX packet and byte count.

Obtain last_tx_rx timestamp from DP layer.

CRs-Fixed: 3059244
Change-Id: Ic36c025992bf1dca6702e4b39efd797f5735f78a

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -1180,7 +1180,6 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *adapter_context, qdf_nbuf_t rx_buf)
 		if (sta_info) {
 			sta_info->rx_packets++;
 			sta_info->rx_bytes += skb->len;
-			sta_info->last_tx_rx_ts = qdf_system_ticks();
 			hdd_softap_inspect_dhcp_packet(adapter, skb, QDF_RX);
 			hdd_put_sta_info_ref(&adapter->sta_info_list, &sta_info,
 					     true,

core/hdd/src/wlan_hdd_station_info.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1412,6 +1413,10 @@ static int hdd_get_connected_station_info(struct hdd_context *hdd_ctx,
 	if (txrx_rate) {
 		stainfo->tx_rate = stats->peer_stats_info_ext->tx_rate;
 		stainfo->rx_rate = stats->peer_stats_info_ext->rx_rate;
+		stainfo->tx_packets = stats->peer_stats_info_ext->tx_packets;
+		stainfo->tx_bytes = stats->peer_stats_info_ext->tx_bytes;
+		stainfo->rx_packets = stats->peer_stats_info_ext->rx_packets;
+		stainfo->rx_bytes = stats->peer_stats_info_ext->rx_bytes;
 		nl_buf_len += (sizeof(stainfo->tx_rate) + NLA_HDRLEN) +
 			(sizeof(stainfo->rx_rate) + NLA_HDRLEN);
 		wlan_cfg80211_mc_cp_stats_free_stats_event(stats);

core/hdd/src/wlan_hdd_stats.c

@@ -4907,11 +4907,36 @@ static void hdd_fill_rate_info(struct wlan_objmgr_psoc *psoc,
  * Return: None
  */
 static void wlan_hdd_fill_station_info(struct wlan_objmgr_psoc *psoc,
+				       struct hdd_adapter *adapter,
 				       struct station_info *sinfo,
 				       struct hdd_station_info *stainfo,
 				       struct hdd_fw_txrx_stats *stats)
 {
 	qdf_time_t curr_time, dur;
+	struct cdp_peer_stats *peer_stats;
+	QDF_STATUS status;
+
+	peer_stats = qdf_mem_malloc(sizeof(*peer_stats));
+	if (!peer_stats)
+		return;
+
+	status =
+		cdp_host_get_peer_stats(cds_get_context(QDF_MODULE_ID_SOC),
+					adapter->vdev_id,
+					stainfo->sta_mac.bytes,
+					peer_stats);
+
+	if (QDF_IS_STATUS_ERROR(status)) {
+		hdd_err("cdp_host_get_peer_stats failed. error: %u", status);
+		qdf_mem_free(peer_stats);
+		return;
+	}
+
+	stainfo->last_tx_rx_ts =
+		peer_stats->tx.last_tx_ts > peer_stats->rx.last_rx_ts ?
+		peer_stats->tx.last_tx_ts : peer_stats->rx.last_rx_ts;
+
+	qdf_mem_free(peer_stats);
 
 	curr_time = qdf_system_ticks();
 	dur = curr_time - stainfo->assoc_ts;
@@ -5215,7 +5240,8 @@ static int wlan_hdd_get_station_remote(struct wiphy *wiphy,
 	txrx_stats.rssi = stats->peer_stats_info_ext->rssi
 			+ WLAN_HDD_TGT_NOISE_FLOOR_DBM;
 	wlan_hdd_fill_rate_info(&txrx_stats, stats->peer_stats_info_ext);
-	wlan_hdd_fill_station_info(hddctx->psoc, sinfo, stainfo, &txrx_stats);
+	wlan_hdd_fill_station_info(hddctx->psoc, adapter,
+				   sinfo, stainfo, &txrx_stats);
 	wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
 	hdd_put_sta_info_ref(&adapter->sta_info_list, &stainfo, true,
 			     STA_INFO_WLAN_HDD_GET_STATION_REMOTE);