qcacld-3.0: Fix the RX rate report issue in some old chips

Driver obtains RX rates info from data frames and reports them to
kernel in chips which the MACRO FEATURE_RX_LINKSPEED_ROAM_TRIGGER
is enabled. However, in some old chips that the MACRO is disabled,
no rates info will be reported. To address this issue, this change
adds the RX rate reporting func(using rate_flags and FW raw_rate).

Change-Id: I75235137ba82d325d8af0664f616bd99ac3140dc
CRs-Fixed: 3449897

core/hdd/src/wlan_hdd_stats.c

@@ -6134,57 +6134,81 @@ wlan_hdd_refill_os_rateflags(struct rate_info *os_rate, uint8_t preamble)
 
 /**
  * wlan_hdd_refill_actual_rate() - Refill actual rates info stats
- * @os_rate: rate info for os
- * @link_info: pointer to link_info struct in adapter
+ * @sinfo: kernel station_info struct to populate
+ * @link_info: pointer to link_info struct in adapter,
+ *             where hdd_stats is located in this struct
+ * @mac_handle: opaque handle to MAC context
+ * @rate_flags: indicating phy mode and bandwidth
+ * @fw_mcs_index: MCS from parsing rate_flags and fw_raw_rate
+ * @fw_rate: raw_rate from fw
+ * @nss_max: max nss
  *
  * When rates info reported is provided by driver, this function
  * will take effect to replace the bandwidth calculated from fw.
  *
  * Return: None
  */
-static void wlan_hdd_refill_actual_rate(struct rate_info *os_rate,
-					struct wlan_hdd_link_info *link_info)
+static void
+wlan_hdd_refill_actual_rate(struct station_info *sinfo,
+			    struct wlan_hdd_link_info *link_info,
+			    mac_handle_t mac_handle,
+			    enum tx_rate_info rate_flags,
+			    uint8_t fw_mcs_index,
+			    uint16_t fw_rate, uint8_t nss_max)
 {
-	ol_txrx_soc_handle soc;
-	uint32_t rate;
-	enum txrate_gi guard_interval;
-	enum rx_tlv_bw bw;
-	uint8_t preamble, mcs_index, nss;
+	uint8_t preamble = link_info->hdd_stats.class_a_stat.rx_preamble;
 
-	soc = cds_get_context(QDF_MODULE_ID_SOC);
-	rate = link_info->hdd_stats.class_a_stat.rx_rate;
-	guard_interval = link_info->hdd_stats.class_a_stat.rx_gi;
-	preamble = link_info->hdd_stats.class_a_stat.rx_preamble;
-	bw = link_info->hdd_stats.class_a_stat.rx_bw;
-	mcs_index = link_info->hdd_stats.class_a_stat.rx_mcs_index;
-	nss = link_info->hdd_stats.class_a_stat.rx_nss;
-
-	os_rate->nss = nss;
+	sinfo->rxrate.nss = link_info->hdd_stats.class_a_stat.rx_nss;
 	if (preamble == DOT11_A || preamble == DOT11_B) {
-		os_rate->legacy = rate;
-		hdd_debug("Reporting legacy rate %d", os_rate->legacy);
+		sinfo->rxrate.legacy =
+			link_info->hdd_stats.class_a_stat.rx_rate;
+		hdd_debug("Reporting legacy rate %d", sinfo->rxrate.legacy);
+		return;
+	} else if (qdf_unlikely(preamble == INVALID_PREAMBLE)) {
+		/*
+		 * If preamble is invalid, it means that DP has not received
+		 * a data frame since assoc or roaming so there is no rates
+		 * info. In this case, we report max rate with FW rates info.
+		 */
+		hdd_report_max_rate(link_info, mac_handle,
+				    &sinfo->rxrate,
+				    sinfo->signal,
+				    rate_flags,
+				    fw_mcs_index,
+				    fw_rate,
+				    nss_max);
 		return;
 	}
 
-	wlan_hdd_refill_os_rateflags(os_rate, preamble);
+	wlan_hdd_refill_os_rateflags(&sinfo->rxrate, preamble);
 
-	os_rate->mcs = mcs_index;
+	sinfo->rxrate.mcs = link_info->hdd_stats.class_a_stat.rx_mcs_index;
 
-	wlan_hdd_refill_os_bw(os_rate, bw);
+	wlan_hdd_refill_os_bw(&sinfo->rxrate,
+			      link_info->hdd_stats.class_a_stat.rx_bw);
 	/* Fill out gi and dcm in HE mode */
-	os_rate->he_gi = hdd_map_he_gi_to_os(guard_interval);
-	os_rate->he_dcm = 0;
+	sinfo->rxrate.he_gi =
+		hdd_map_he_gi_to_os(link_info->hdd_stats.class_a_stat.rx_gi);
+	sinfo->rxrate.he_dcm = 0;
 
-	if (guard_interval == TXRATE_GI_0_4_US)
-		os_rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
+	if (link_info->hdd_stats.class_a_stat.rx_gi == TXRATE_GI_0_4_US)
+		sinfo->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
 
 	hdd_debug("sgi=%d, preamble=%d, bw=%d, mcs=%d, nss=%d, rate_flag=0x%x",
-		  guard_interval, preamble, bw, mcs_index, nss, os_rate->flags);
+		  link_info->hdd_stats.class_a_stat.rx_gi, preamble,
+		  link_info->hdd_stats.class_a_stat.rx_bw,
+		  link_info->hdd_stats.class_a_stat.rx_mcs_index,
+		  link_info->hdd_stats.class_a_stat.rx_nss,
+		  sinfo->rxrate.flags);
 }
 #else
 static inline void
-wlan_hdd_refill_actual_rate(struct rate_info *os_rate,
-			    struct wlan_hdd_link_info *link_info)
+wlan_hdd_refill_actual_rate(struct station_info *sinfo,
+			    struct wlan_hdd_link_info *link_info,
+			    mac_handle_t mac_handle,
+			    enum tx_rate_info rate_flags,
+			    uint8_t fw_mcs_index,
+			    uint16_t fw_rate, uint8_t nss_max)
 {
 }
 #endif
@@ -6429,7 +6453,7 @@ static int wlan_hdd_update_rate_info(struct hdd_adapter *adapter,
 					       rx_nss, rx_dcm, rx_gi);
 		}
 	} else {
-		uint8_t rx_nss_max, rx_preamble;
+		uint8_t rx_nss_max = wlan_vdev_mlme_get_nss(vdev);
 
 		/* Fill TX stats */
 		hdd_report_actual_rate(tx_rate_flags, my_tx_rate,
@@ -6437,25 +6461,14 @@ static int wlan_hdd_update_rate_info(struct hdd_adapter *adapter,
 				       tx_nss, tx_dcm, tx_gi);
 
 		/* Fill RX stats */
-		rx_nss_max = wlan_vdev_mlme_get_nss(vdev);
-		rx_preamble = hdd_stats->class_a_stat.rx_preamble;
-
-		/*
-		 * If rx_preamble has been marked invalid, it means that DP
-		 * has not received a data frame since assoc or roaming so
-		 * that the rates info has not been updated, report max rate.
-		 */
-		if (qdf_unlikely(rx_preamble == INVALID_PREAMBLE))
-			hdd_report_max_rate(adapter->deflink, mac_handle,
-					    &sinfo->rxrate,
-					    sinfo->signal,
-					    rx_rate_flags,
-					    rx_mcs_index,
-					    my_rx_rate,
-					    rx_nss_max);
-		else
-			wlan_hdd_refill_actual_rate(&sinfo->rxrate,
-						    adapter->deflink);
+		hdd_report_actual_rate(rx_rate_flags, my_rx_rate,
+				       &sinfo->rxrate, rx_mcs_index,
+				       rx_nss, rx_dcm, rx_gi);
+
+		/* Using driver RX rate to replace the FW RX rate */
+		wlan_hdd_refill_actual_rate(sinfo, adapter->deflink, mac_handle,
+					    rx_rate_flags, rx_mcs_index,
+					    my_rx_rate, rx_nss_max);
 	}
 
 	wlan_hdd_fill_summary_stats(&hdd_stats->summary_stat,