diff --git a/core/hdd/inc/wlan_hdd_trace.h b/core/hdd/inc/wlan_hdd_trace.h
index 12e25d5b1a..0703b2e884 100644
--- a/core/hdd/inc/wlan_hdd_trace.h
+++ b/core/hdd/inc/wlan_hdd_trace.h
@@ -108,7 +108,8 @@
 	ENUM(TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN) \
 	ENUM(TRACE_CODE_HDD_CFG80211_SET_MAC_ACL) \
 	ENUM(TRACE_CODE_HDD_CFG80211_TESTMODE) \
-	ENUM(TRACE_CODE_HDD_CFG80211_DUMP_SURVEY)
+	ENUM(TRACE_CODE_HDD_CFG80211_DUMP_SURVEY) \
+	ENUM(TRACE_CODE_HDD_RX_SME_MSG)
 
 enum {
 #undef ENUM
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index a7fc30d4be..e69f3c725c 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -36,6 +36,7 @@
 #include <ani_global.h>
 #include "dot11f.h"
 #include "wlan_hdd_power.h"
+#include "wlan_hdd_trace.h"
 #include <linux/ieee80211.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
@@ -3852,6 +3853,9 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
 	pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 
+	MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
+				pAdapter->sessionId, roamStatus));
+
 	switch (roamStatus) {
 	case eCSR_ROAM_SESSION_OPENED:
 		set_bit(SME_SESSION_OPENED, &pAdapter->event_flags);
diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c
index f89bfb04ce..a5cec605bd 100644
--- a/core/hdd/src/wlan_hdd_trace.c
+++ b/core/hdd/src/wlan_hdd_trace.c
@@ -50,10 +50,14 @@
 static void
 hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index)
 {
-	hddLog(LOG1, "%04d %012llu S%d %-14s %-30s(0x%x)",
-	       index, record->time, record->session,
-	       "HDD Event:", hdd_trace_event_string(record->code),
-	       record->data);
+	if (TRACE_CODE_HDD_RX_SME_MSG == record->code)
+		hddLog(LOGE, "%04d    %012llu  S%d    %-14s  %-30s(0x%x) ",
+			index, record->time, record->session, "RX SME MSG:",
+			get_e_roam_cmd_status_str(record->data), record->data);
+	else
+		hddLog(LOGE, "%04d    %012llu  S%d    %-14s  %-30s(0x%x) ",
+			index, record->time, record->session, "HDD Event:",
+			hdd_trace_event_string(record->code), record->data);
 }
 
 /**
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 189e3b2770..88ecfcbcd2 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -179,14 +179,62 @@ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val)
 {
 	switch (val) {
 		CASE_RETURN_STR(eCSR_ROAM_CANCELLED);
+		CASE_RETURN_STR(eCSR_ROAM_FAILED);
 		CASE_RETURN_STR(eCSR_ROAM_ROAMING_START);
 		CASE_RETURN_STR(eCSR_ROAM_ROAMING_COMPLETION);
+		CASE_RETURN_STR(eCSR_ROAM_CONNECT_COMPLETION);
 		CASE_RETURN_STR(eCSR_ROAM_ASSOCIATION_START);
 		CASE_RETURN_STR(eCSR_ROAM_ASSOCIATION_COMPLETION);
 		CASE_RETURN_STR(eCSR_ROAM_DISASSOCIATED);
+		CASE_RETURN_STR(eCSR_ROAM_ASSOCIATION_FAILURE);
 		CASE_RETURN_STR(eCSR_ROAM_SHOULD_ROAM);
 		CASE_RETURN_STR(eCSR_ROAM_SCAN_FOUND_NEW_BSS);
 		CASE_RETURN_STR(eCSR_ROAM_LOSTLINK);
+		CASE_RETURN_STR(eCSR_ROAM_LOSTLINK_DETECTED);
+		CASE_RETURN_STR(eCSR_ROAM_MIC_ERROR_IND);
+		CASE_RETURN_STR(eCSR_ROAM_IBSS_IND);
+		CASE_RETURN_STR(eCSR_ROAM_CONNECT_STATUS_UPDATE);
+		CASE_RETURN_STR(eCSR_ROAM_GEN_INFO);
+		CASE_RETURN_STR(eCSR_ROAM_SET_KEY_COMPLETE);
+		CASE_RETURN_STR(eCSR_ROAM_IBSS_LEAVE);
+		CASE_RETURN_STR(eCSR_ROAM_INFRA_IND);
+		CASE_RETURN_STR(eCSR_ROAM_WPS_PBC_PROBE_REQ_IND);
+#ifdef WLAN_FEATURE_VOWIFI_11R
+		CASE_RETURN_STR(eCSR_ROAM_FT_RESPONSE);
+#endif
+		CASE_RETURN_STR(eCSR_ROAM_FT_START);
+		CASE_RETURN_STR(eCSR_ROAM_INDICATE_MGMT_FRAME);
+		CASE_RETURN_STR(eCSR_ROAM_REMAIN_CHAN_READY);
+		CASE_RETURN_STR(eCSR_ROAM_SEND_ACTION_CNF);
+		CASE_RETURN_STR(eCSR_ROAM_SESSION_OPENED);
+		CASE_RETURN_STR(eCSR_ROAM_FT_REASSOC_FAILED);
+#ifdef FEATURE_WLAN_LFR
+		CASE_RETURN_STR(eCSR_ROAM_PMK_NOTIFY);
+#endif
+#ifdef FEATURE_WLAN_LFR_METRICS
+		CASE_RETURN_STR(eCSR_ROAM_PREAUTH_INIT_NOTIFY);
+		CASE_RETURN_STR(eCSR_ROAM_PREAUTH_STATUS_SUCCESS);
+		CASE_RETURN_STR(eCSR_ROAM_PREAUTH_STATUS_FAILURE);
+		CASE_RETURN_STR(eCSR_ROAM_HANDOVER_SUCCESS);
+#endif
+#ifdef FEATURE_WLAN_TDLS
+		CASE_RETURN_STR(eCSR_ROAM_TDLS_STATUS_UPDATE);
+		CASE_RETURN_STR(eCSR_ROAM_RESULT_MGMT_TX_COMPLETE_IND);
+#endif
+		CASE_RETURN_STR(eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS);
+		CASE_RETURN_STR(eCSR_ROAM_SEND_P2P_STOP_BSS);
+#ifdef WLAN_FEATURE_11W
+		CASE_RETURN_STR(eCSR_ROAM_UNPROT_MGMT_FRAME_IND);
+#endif
+#ifdef WLAN_FEATURE_RMC
+		CASE_RETURN_STR(eCSR_ROAM_IBSS_PEER_INFO_COMPLETE);
+#endif
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+		CASE_RETURN_STR(eCSR_ROAM_TSM_IE_IND);
+		CASE_RETURN_STR(eCSR_ROAM_CCKM_PREAUTH_NOTIFY);
+		CASE_RETURN_STR(eCSR_ROAM_ESE_ADJ_AP_REPORT_IND);
+		CASE_RETURN_STR(eCSR_ROAM_ESE_BCN_REPORT_IND);
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
 	default:
 		return "unknown";
 	}