Merge "qcacmn: Add missing entry to VERBOSE_STR[]"

dp/inc/cdp_txrx_stats_struct.h

@@ -185,7 +185,7 @@ struct cdp_rx_stats {
 	/* Raw Pakets received */
 	struct cdp_pkt_info raw;
 	/* Total multicast packets */
-	struct cdp_pkt_info nawds_mcast_drop;
+	uint32_t nawds_mcast_drop;
 
 	struct {
 	/* Intra BSS packets received */

dp/wifi3.0/dp_main.c

@@ -5705,9 +5705,7 @@ static inline void dp_print_peer_stats(struct dp_peer *peer)
 			peer->stats.rx.amsdu_cnt);
 	DP_PRINT_STATS("NAWDS : ");
 	DP_PRINT_STATS("	Nawds multicast Drop Rx Packet = %d",
-			peer->stats.rx.nawds_mcast_drop.num);
-	DP_PRINT_STATS("	Nawds multicast Drop Rx Packet Bytes = %llu",
-			peer->stats.rx.nawds_mcast_drop.bytes);
+			peer->stats.rx.nawds_mcast_drop);
 	DP_PRINT_STATS("SGI ="
 			" 0.8us %d"
 			" 0.4us %d"

dp/wifi3.0/dp_rx.c

@@ -1510,8 +1510,7 @@ done:
 		if (qdf_unlikely(peer && (peer->nawds_enabled == true) &&
 			(hal_rx_msdu_end_da_is_mcbc_get(rx_tlv_hdr)) &&
 			(hal_rx_get_mpdu_mac_ad4_valid(rx_tlv_hdr) == false))) {
-			DP_STATS_INC_PKT(peer, rx.nawds_mcast_drop, 1,
-				qdf_nbuf_len(nbuf));
+			DP_STATS_INC(peer, rx.nawds_mcast_drop, 1);
 			qdf_nbuf_free(nbuf);
 			nbuf = next;
 			continue;

dp/wifi3.0/dp_rx_defrag.c

@@ -991,8 +991,7 @@ dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t nbuf, uint16_t hdrsize)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	hal_rxdma_buff_addr_info_set(msdu0, paddr, cookie,
-					HAL_RX_BUF_RBM_SW3_BM);
+	hal_rxdma_buff_addr_info_set(msdu0, paddr, cookie, DP_WBM2SW_RBM);
 
 	/* Lets fill entrance ring now !!! */
 	if (qdf_unlikely(hal_srng_access_start(soc->hal_soc, hal_srng))) {

dp/wifi3.0/dp_rx_err.c

@@ -583,8 +583,7 @@ dp_rx_null_q_desc_handle(struct dp_soc *soc,
 					QDF_TRACE_LEVEL_DEBUG,
 					"%s free buffer for multicast packet",
 					 __func__);
-		DP_STATS_INC_PKT(peer, rx.nawds_mcast_drop,
-					1, qdf_nbuf_len(nbuf));
+		DP_STATS_INC(peer, rx.nawds_mcast_drop, 1);
 		qdf_nbuf_free(nbuf);
 		return;
 	}
@@ -919,15 +918,14 @@ dp_rx_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota)
 		link_desc_va = dp_rx_cookie_2_link_desc_va(soc, &hbi);
 		hal_rx_msdu_list_get(link_desc_va, &msdu_list, &num_msdus);
 
-		if (qdf_unlikely((msdu_list.rbm[0] !=
-						HAL_RX_BUF_RBM_SW3_BM) &&
+		if (qdf_unlikely((msdu_list.rbm[0] != DP_WBM2SW_RBM) &&
 				(msdu_list.rbm[0] !=
 					HAL_RX_BUF_RBM_WBM_IDLE_DESC_LIST))) {
 			/* TODO */
 			/* Call appropriate handler */
 			DP_STATS_INC(soc, rx.err.invalid_rbm, 1);
 			QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
-				FL("Invalid RBM %d"), rbm);
+				FL("Invalid RBM %d"), msdu_list.rbm[0]);
 
 			/* Return link descriptor through WBM ring (SW2WBM)*/
 			dp_rx_link_desc_return(soc, ring_desc,
@@ -935,7 +933,6 @@ dp_rx_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota)
 			continue;
 		}
 
-
 		/* Get the MPDU DESC info */
 		hal_rx_mpdu_desc_info_get(ring_desc, &mpdu_desc_info);
 

qdf/inc/qdf_time.h

@@ -168,19 +168,11 @@ static inline qdf_time_t qdf_get_system_uptime(void)
  * The time since system booted in nanoseconds
  */
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 10, 0))
-static inline s64 qdf_get_bootbased_boottime_ns(void)
+static inline uint64_t qdf_get_bootbased_boottime_ns(void)
 {
-	return ktime_get_boot_ns();
+	return __qdf_get_bootbased_boottime_ns();
 }
 
-#else
-static inline s64 qdf_get_bootbased_boottime_ns(void)
-{
-	return ktime_to_ns(ktime_get_boottime());
-}
-#endif
-
 /**
  * qdf_get_system_timestamp - Return current timestamp
  *

qdf/linux/src/i_qdf_time.h

@@ -36,7 +36,9 @@
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/ktime.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
 #include <linux/timekeeping.h>
+#endif
 #ifdef MSM_PLATFORM
 #include <asm/arch_timer.h>
 #endif
@@ -305,4 +307,28 @@ static inline uint64_t __qdf_get_log_timestamp(void)
 }
 #endif /* QCA_WIFI_3_0_ADRASTEA */
 
+/**
+ * __qdf_get_bootbased_boottime_ns() - Get the bootbased time in nanoseconds
+ *
+ * __qdf_get_bootbased_boottime_ns() function returns the number of nanoseconds
+ * that have elapsed since the system was booted. It also includes the time when
+ * system was suspended.
+ *
+ * Return:
+ * The time since system booted in nanoseconds
+ */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
+static inline uint64_t __qdf_get_bootbased_boottime_ns(void)
+{
+	return ktime_get_boot_ns();
+}
+
+#else
+static inline uint64_t __qdf_get_bootbased_boottime_ns(void)
+{
+	return ktime_to_ns(ktime_get_boottime());
+}
+#endif
+
 #endif

qdf/linux/src/qdf_trace.c

@@ -2690,17 +2690,17 @@ void qdf_trace_msg_cmn(unsigned int idx,
 	 */
 	if (print_ctrl_obj[idx].cat_info[category].category_verbose_mask &
 	    QDF_TRACE_LEVEL_TO_MODULE_BITMASK(verbose)) {
-		/*
-		 * The verbose strings are in an array. These are ordered in
-		 * the same order as the verbose levels are defined in the enum
-		 * (see QDF_TRACE_LEVEL) so we can index into this array with
-		 * the level and get the right string. The qdf verbose
-		 * are... Off, Fatal, Error, Warning, Info, Info_high,
-		 * Info_med, Info_low, Debug
-		 */
-		static const char * const VERBOSE_STR[] = { "  ", "F", "E", "W",
-							"I", "IH", "IM", "IL",
-							"D" };
+		static const char * const VERBOSE_STR[] = {
+			[QDF_TRACE_LEVEL_NONE] = "",
+			[QDF_TRACE_LEVEL_FATAL] = "F",
+			[QDF_TRACE_LEVEL_ERROR] = "E",
+			[QDF_TRACE_LEVEL_WARN] = "W",
+			[QDF_TRACE_LEVEL_INFO] = "I",
+			[QDF_TRACE_LEVEL_INFO_HIGH] = "IH",
+			[QDF_TRACE_LEVEL_INFO_MED] = "IM",
+			[QDF_TRACE_LEVEL_INFO_LOW] = "IL",
+			[QDF_TRACE_LEVEL_DEBUG] = "D",
+			[QDF_TRACE_LEVEL_ALL] = "" };
 
 		/* print the prefix string into the string buffer... */
 		n = scnprintf(str_buffer, QDF_TRACE_BUFFER_SIZE,

target_if/init_deinit/src/init_event_handler.c

@@ -355,7 +355,7 @@ static int init_deinit_ready_event_handler(ol_scn_t scn_handle,
 		/* FW allocated number of peers is different than host
 		 * requested. Update host max with FW reported value.
 		 */
-		target_if_info("Host Requested %d peers. FW Supports %d peers",
+		target_if_err("Host Requested %d peers. FW Supports %d peers",
 			       info->wlan_res_cfg.num_peers,
 			       ready_ev.num_total_peer);
 		info->wlan_res_cfg.num_peers = ready_ev.num_total_peer;

umac/cmn_services/inc/wlan_cmn.h

@@ -33,7 +33,7 @@
 /* Max no. of VDEVs, a PDEV can support */
 #define WLAN_UMAC_PDEV_MAX_VDEVS 17
 /* Max no. of Peers, a device can support */
-#define WLAN_UMAC_PSOC_MAX_PEERS 1024
+#define WLAN_UMAC_PSOC_MAX_PEERS (1024 + WLAN_UMAC_PSOC_MAX_VDEVS)
 
 /* Max length of a SSID */
 #define WLAN_SSID_MAX_LEN 32

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -1357,7 +1357,7 @@ policy_mgr_get_nondfs_preferred_channel(struct wlan_objmgr_psoc *psoc,
 	 * under 5G MCC scenario
 	 */
 	uint8_t channel = PM_24_GHZ_CHANNEL_6;
-	uint32_t i, pcl_len;
+	uint32_t i, pcl_len = 0;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {

umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -536,8 +536,8 @@ static void utils_dfs_get_channel_list(struct wlan_objmgr_pdev *pdev,
 static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
 	struct dfs_channel *chan_list, uint32_t *num_chan)
 {
-	uint8_t pcl_ch[NUM_CHANNELS];
-	uint8_t weight_list[NUM_CHANNELS];
+	uint8_t pcl_ch[NUM_CHANNELS] = {0};
+	uint8_t weight_list[NUM_CHANNELS] = {0};
 	uint32_t len;
 	uint32_t weight_len;
 	int i;

umac/p2p/core/src/wlan_p2p_off_chan_tx.c

@@ -1214,8 +1214,10 @@ static QDF_STATUS p2p_remove_tx_context(
 					&is_ack_q);
 
 	/* for not off channel tx case, won't find from queue */
-	if (!cur_tx_ctx)
+	if (!cur_tx_ctx) {
 		p2p_debug("Do not find tx context from queue");
+		goto end;
+	}
 
 	if (is_roc_q) {
 		status = qdf_list_remove_node(
@@ -1233,6 +1235,7 @@ static QDF_STATUS p2p_remove_tx_context(
 			p2p_err("Failed to  tx context from wait ack req queue");
 	}
 
+end:
 	qdf_mem_free(tx_ctx->buf);
 	qdf_mem_free(tx_ctx);
 

umac/scan/dispatcher/src/wlan_scan_tgt_api.c

@@ -77,7 +77,15 @@ QDF_STATUS tgt_scan_pno_start(struct wlan_objmgr_vdev *vdev,
 
 	psoc = wlan_vdev_get_psoc(vdev);
 
+	if (!psoc) {
+		scm_err("NULL PSOC");
+		return QDF_STATUS_E_FAILURE;
+	}
 	scan_ops = wlan_psoc_get_scan_txops(psoc);
+	if (!scan_ops) {
+		scm_err("NULL scan_ops");
+		return QDF_STATUS_E_FAILURE;
+	}
 	/* invoke wmi_unified_pno_start_cmd() */
 	QDF_ASSERT(scan_ops->pno_start);
 	if (scan_ops->pno_start)
@@ -94,7 +102,15 @@ QDF_STATUS tgt_scan_pno_stop(struct wlan_objmgr_vdev *vdev,
 
 	psoc = wlan_vdev_get_psoc(vdev);
 
+	if (!psoc) {
+		scm_err("NULL PSOC");
+		return QDF_STATUS_E_FAILURE;
+	}
 	scan_ops = wlan_psoc_get_scan_txops(psoc);
+	if (!scan_ops) {
+		scm_err("NULL scan_ops");
+		return QDF_STATUS_E_FAILURE;
+	}
 	/* invoke wmi_unified_pno_stop_cmd() */
 	QDF_ASSERT(scan_ops->pno_stop);
 	if (scan_ops->pno_stop)