From 09b50e625d19d140f7fbe692c8ec110e64622917 Mon Sep 17 00:00:00 2001
From: Akshay Kosigi <akosigi@codeaurora.org>
Date: Tue, 2 Apr 2019 18:28:20 +0530
Subject: [PATCH] qcacmn: Add psoc id value to debug prints vdev mlme timer
 APIs

Add psoc id value for the debug prints of, error handling vdev mlme timer
APIs

Change-Id: I7d225114e91ff4b6f898450ca3ef7d2e21be631a
CRs-Fixed: 2427905
---
 .../vdev_mgr/src/target_if_vdev_mgr_rx_ops.c    |  6 ++++--
 .../vdev_mgr/src/target_if_vdev_mgr_tx_ops.c    | 13 +++++++++++--
 .../obj_mgr/inc/wlan_objmgr_psoc_obj.h          | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
index 794f8c764104..7f9802418a2a 100644
--- a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
+++ b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
@@ -105,10 +105,12 @@ void target_if_vdev_mgr_rsp_timer_mgmt_cb(void *arg)
 	}
 
 	if (target_if_vdev_mgr_is_panic_on_bug()) {
-		QDF_DEBUG_PANIC("VDEV_%d: Panic on bug enabled, rsp status:%d",
+		QDF_DEBUG_PANIC("PSOC_%d VDEV_%d: Panic on bug, rsp status:%d",
+				wlan_psoc_get_id(psoc),
 			        vdev_id, vdev_rsp->rsp_status);
 	} else {
-		mlme_err("VDEV_%d: Trigger Self recovery, rsp status%d",
+		mlme_err("PSOC_%d VDEV_%d: Trigger Self recovery, rsp status%d",
+			 wlan_psoc_get_id(psoc),
 			 vdev_id, vdev_rsp->rsp_status);
 		wmi_handle = target_if_vdev_mgr_wmi_handle_get(vdev);
 
diff --git a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c
index bffc6dcb1bdc..9033ea669add 100644
--- a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c
+++ b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c
@@ -92,6 +92,13 @@ static QDF_STATUS target_if_vdev_mgr_rsp_timer_start(
 {
 	uint8_t vdev_id;
 	uint8_t rsp_pos;
+	struct wlan_objmgr_psoc *psoc;
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		mlme_err("PSOC is NULL");
+		return QDF_STATUS_E_INVAL;
+	}
 
 	vdev_id = wlan_vdev_get_id(vdev);
 	/* it is expected to be only one command with FW at a time */
@@ -100,7 +107,8 @@ static QDF_STATUS target_if_vdev_mgr_rsp_timer_start(
 		if (rsp_pos != set_bit) {
 			if (qdf_atomic_test_bit(rsp_pos,
 						&vdev_rsp->rsp_status)) {
-				mlme_err("VDEV_%d: Response bit is set %d",
+				mlme_err("PSOC_%d VDEV_%d: Response bit is set %d",
+					 wlan_psoc_get_id(psoc),
 					 vdev_id, vdev_rsp->rsp_status);
 				QDF_ASSERT(0);
 			}
@@ -108,7 +116,8 @@ static QDF_STATUS target_if_vdev_mgr_rsp_timer_start(
 	}
 
 	if (qdf_atomic_test_and_set_bit(set_bit, &vdev_rsp->rsp_status)) {
-		mlme_err("VDEV_%d: Response bit is set %d",
+		mlme_err("PSOC_%d VDEV_%d: Response bit is set %d",
+			 wlan_psoc_get_id(psoc),
 			 vdev_id, vdev_rsp->rsp_status);
 		QDF_ASSERT(0);
 	}
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
index 727e034fb49e..f7eea2d6a495 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
@@ -1532,4 +1532,21 @@ wlan_psoc_get_lmac_if_txops(struct wlan_objmgr_psoc *psoc)
 {
 	return &((psoc->soc_cb.tx_ops));
 }
+
+/**
+ * wlan_psoc_get_id() - get psoc id
+ * @psoc: PSOC object
+ *
+ * API to get psoc id
+ *
+ * Return: @psoc_id: psoc id
+ */
+static inline uint8_t wlan_psoc_get_id(
+			struct wlan_objmgr_psoc *psoc)
+{
+	if (!psoc)
+		return (uint8_t)-1;
+
+	return psoc->soc_objmgr.psoc_id;
+}
 #endif /* _WLAN_OBJMGR_PSOC_OBJ_H_*/