From e9c12f5aabfae263df7b21f14338931a06589f14 Mon Sep 17 00:00:00 2001
From: Krunal Soni <ksoni@codeaurora.org>
Date: Thu, 4 Oct 2018 11:45:42 -0700
Subject: [PATCH] qcacld-3.0: Add new INI/CFG infrastructure for Policy Manager

Policy Manager component needs to adopt a new INI/CFG
infrastructure.

Provide a new infrastructure and remove old INI/CFGs related
to policy manager component.

CRs-Fixed: 2324393
Change-Id: Ia16845c2aef3c5877b0b164fcef13fe7cd41c736
---
 Kbuild                       | 1 +
 components/cfg/cfg_all.h     | 2 ++
 core/hdd/src/wlan_hdd_main.c | 9 +++++++++
 3 files changed, 12 insertions(+)

diff --git a/Kbuild b/Kbuild
index 8b2d91d1a793..836c23629d17 100644
--- a/Kbuild
+++ b/Kbuild
@@ -984,6 +984,7 @@ UMAC_POLICY_MGR_OBJS := $(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_action.o \
 	$(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_core.o \
 	$(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_get_set_utils.o \
 	$(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_init_deinit.o \
+	$(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_ucfg.o \
 	$(UMAC_POLICY_MGR_DIR)/src/wlan_policy_mgr_pcl.o \
 
 ###### UMAC TDLS ########
diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h
index ee6134880c36..2af497e04951 100644
--- a/components/cfg/cfg_all.h
+++ b/components/cfg/cfg_all.h
@@ -16,6 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "wlan_policy_mgr_cfg.h"
 #include "cfg_define.h"
 #include "cfg_converged.h"
 #include "cfg_mlme.h"
@@ -48,6 +49,7 @@
 #define CFG_ALL \
 	CFG_CONVERGED_ALL \
 	CFG_FWOL_ALL \
+	CFG_POLICY_MGR_ALL \
 	CFG_HDD_ALL \
 	CFG_HDD_DP_ALL \
 	CFG_IPA \
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 27f907c793df..bba0e7e5ff74 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -48,6 +48,7 @@
 #include "wlan_hdd_power.h"
 #include "wlan_hdd_stats.h"
 #include "wlan_hdd_scan.h"
+#include "wlan_policy_mgr_ucfg.h"
 #include <wlan_osif_request_manager.h>
 #ifdef CONFIG_LEAK_DETECTION
 #include "qdf_debug_domain.h"
@@ -12650,17 +12651,25 @@ QDF_STATUS hdd_component_psoc_open(struct wlan_objmgr_psoc *psoc)
 	if (QDF_IS_STATUS_ERROR(status))
 		goto err_pmo;
 
+	status = ucfg_policy_mgr_psoc_open(psoc);
+	if (QDF_IS_STATUS_ERROR(status))
+		goto err_plcy_mgr;
+
 	return status;
 
+err_plcy_mgr:
+	ucfg_pmo_psoc_close(psoc);
 err_pmo:
 	ucfg_fwol_psoc_close(psoc);
 err_fwol:
 	ucfg_mlme_psoc_close(psoc);
+
 	return status;
 }
 
 void hdd_component_psoc_close(struct wlan_objmgr_psoc *psoc)
 {
+	ucfg_policy_mgr_psoc_close(psoc);
 	ucfg_pmo_psoc_close(psoc);
 	ucfg_fwol_psoc_close(psoc);
 	ucfg_mlme_psoc_close(psoc);