From 376e5f1e3fa485a3f6b81fcc5abfd7ac96403a4a Mon Sep 17 00:00:00 2001
From: Sravan Kumar Kairam <sgoud@codeaurora.org>
Date: Wed, 7 Mar 2018 15:56:21 +0530
Subject: [PATCH] qcacmn: Add IPA component related definitions

As part of IPA componentization remove IPA from HDD module
and make it as an independent component. Add qdf module ID
and Objmgr ID for IPA module.

Change-Id: Id99089f8188e8b1dbf7e1f60d3a127bec770706d
CRs-Fixed: 2180176
---
 qdf/inc/qdf_types.h                             | 2 ++
 qdf/linux/src/qdf_trace.c                       | 1 +
 umac/cmn_services/inc/wlan_cmn.h                | 4 +++-
 umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h
index 384550a87540..54f8bce7802c 100644
--- a/qdf/inc/qdf_types.h
+++ b/qdf/inc/qdf_types.h
@@ -359,6 +359,7 @@ typedef void (*qdf_timer_func_t)(void *);
  * @QDF_MODULE_ID_EXTAP: Extender AP module ID
  * @QDF_MODULE_ID_FD: FILS discovery logging
  * @QDF_MODULE_ID_OCB: OCB module ID
+ * @QDF_MODULE_ID_IPA: IPA module ID
  * @QDF_MODULE_ID_ANY: anything
  * @QDF_MODULE_ID_MAX: Max place holder module ID
  */
@@ -460,6 +461,7 @@ typedef enum {
 	QDF_MODULE_ID_EXTAP,
 	QDF_MODULE_ID_FD,
 	QDF_MODULE_ID_OCB,
+	QDF_MODULE_ID_IPA,
 	QDF_MODULE_ID_ANY,
 	QDF_MODULE_ID_MAX,
 } QDF_MODULE_ID;
diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c
index f9e27c71dab0..081bcb64ecf7 100644
--- a/qdf/linux/src/qdf_trace.c
+++ b/qdf/linux/src/qdf_trace.c
@@ -2124,6 +2124,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_FTM] = {"FTM"},
 	[QDF_MODULE_ID_OCB] = {"OCB"},
 	[QDF_MODULE_ID_CONFIG] = {"CONFIG"},
+	[QDF_MODULE_ID_IPA] = {"IPA"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},
 };
 qdf_export_symbol(g_qdf_category_name);
diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index 72f6ad41fc2f..74861c18f85f 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -25,7 +25,7 @@
 #include <qdf_types.h>
 
 /* Max no of UMAC components */
-#define WLAN_UMAC_MAX_COMPONENTS 25
+#define WLAN_UMAC_MAX_COMPONENTS WLAN_UMAC_COMP_ID_MAX
 /* Max no. of radios, a pSoc/Device can support */
 #define WLAN_UMAC_MAX_PDEVS 3
 /* Max no. of VDEV per PSOC */
@@ -242,6 +242,7 @@
  * @WLAN_UMAC_COMP_FTM:           FTM component
  * @WLAN_UMAC_COMP_FD:            FILS Discovery
  * @WLAN_UMAC_COMP_OCB:           OCB
+ * @WLAN_UMAC_COMP_IPA:           IPA
  * @WLAN_UMAC_COMP_ID_MAX:        Maximum components in UMAC
  *
  * This id is static.
@@ -274,6 +275,7 @@ enum wlan_umac_comp_id {
 	WLAN_UMAC_COMP_FTM,
 	WLAN_UMAC_COMP_FD,
 	WLAN_UMAC_COMP_OCB,
+	WLAN_UMAC_COMP_IPA,
 	WLAN_UMAC_COMP_ID_MAX,
 };
 
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
index b4f9122b327c..296b8acb2ca4 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -214,6 +214,7 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_OCB_NB_ID:             OCB Northbound operations
  * @WLAN_OCB_SB_ID:             OCB Southbound operations
  * @WLAN_INIT_DEINIT_ID:        Init deinit module
+ * @WLAN_IPA_ID:                IPA operations
  * @WLAN_REF_ID_MAX:            Max id used to generate ref count tracking array
  */
  /* New value added to the enum must also be reflected in function
@@ -257,6 +258,7 @@ typedef enum {
 	WLAN_OCB_NB_ID        = 34,
 	WLAN_OCB_SB_ID        = 35,
 	WLAN_INIT_DEINIT_ID   = 36,
+	WLAN_IPA_ID           = 37,
 	WLAN_REF_ID_MAX,
 } wlan_objmgr_ref_dbgid;
 
@@ -307,6 +309,7 @@ static inline char *string_from_dbgid(wlan_objmgr_ref_dbgid id)
 					"WLAN_OCB_NB_ID",
 					"WLAN_OCB_SB_ID",
 					"WLAN_INIT_DEINIT_ID",
+					"WLAN_IPA_ID",
 					"WLAN_REF_ID_MAX" };
 
 	return (char *)strings[id];