qcacmn: Move wakelock to psoc level

Wakelock is system level lock not required to be taken
for every vdev, Hence move the wakelock to the psoc
hierarchy.

Change-Id: I525baf5f4b5dcadb493d84900dbd0a2e7c6407f6
CRs-Fixed: 2563406

umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -210,6 +210,8 @@ enum wlan_mlme_cfg_id;
  * @psoc_vdev_rsp_timer_inuse: function to determine whether the vdev rsp
  * timer is inuse or not
  * @psoc_vdev_rsp_timer_mod: function to modify the time of vdev rsp timer
+ * @psoc_wake_lock_init: Initialize psoc wake lock for vdev response timer
+ * @psoc_wake_lock_deinit: De-Initialize psoc wake lock for vdev response timer
  */
 struct wlan_lmac_if_mlme_tx_ops {
 	uint32_t (*get_wifi_iface_id) (struct wlan_objmgr_pdev *pdev);
@@ -281,7 +283,10 @@ struct wlan_lmac_if_mlme_tx_ops {
 					struct wlan_objmgr_psoc *psoc,
 					uint8_t vdev_id,
 					int mseconds);
-
+	void (*psoc_wake_lock_init)(
+				struct wlan_objmgr_psoc *psoc);
+	void (*psoc_wake_lock_deinit)(
+				struct wlan_objmgr_psoc *psoc);
 };
 
 /**
@@ -1507,7 +1512,7 @@ struct wlan_lmac_if_dfs_rx_ops {
  * @vdev_mgr_tbttoffset_update_handle: function to handle tbtt offset event
  * @vdev_mgr_peer_delete_all_response: function to handle vdev delete all peer
  * event
- * @vdev_mgr_get_wakelock_info: function to get wakelock info
+ * @psoc_get_wakelock_info: function to get wakelock info
  * @psoc_get_vdev_response_timer_info: function to get vdev response timer
  * structure for a specific vdev id
  */
@@ -1531,8 +1536,8 @@ struct wlan_lmac_if_mlme_rx_ops {
 					struct wlan_objmgr_psoc *psoc,
 					struct peer_delete_all_response *rsp);
 #ifdef FEATURE_VDEV_RSP_WAKELOCK
-	struct vdev_mlme_wakelock *(*vdev_mgr_get_wakelock_info)(
-					struct wlan_objmgr_vdev *vdev);
+	struct vdev_mlme_wakelock *(*psoc_get_wakelock_info)(
+				    struct wlan_objmgr_psoc *psoc);
 #endif
 	struct vdev_response_timer *(*psoc_get_vdev_response_timer_info)(
 						struct wlan_objmgr_psoc *psoc,

umac/mlme/include/wlan_psoc_mlme.h

@@ -29,11 +29,15 @@
  * @psoc:                  PSoC object
  * @ext_psoc_ptr:        PSoC legacy pointer
  * @psoc_vdev_rt:       PSoC Vdev response timer
+ * @psoc_mlme_wakelock:     Wakelock to prevent system going to suspend
  */
 struct psoc_mlme_obj {
 	struct wlan_objmgr_psoc *psoc;
 	mlme_psoc_ext_t *ext_psoc_ptr;
 	struct vdev_response_timer psoc_vdev_rt[WLAN_UMAC_PSOC_MAX_VDEVS];
+#ifdef FEATURE_VDEV_RSP_WAKELOCK
+	struct psoc_mlme_wakelock psoc_mlme_wakelock;
+#endif
 };
 
 #endif

umac/mlme/include/wlan_vdev_mlme.h

@@ -527,22 +527,6 @@ struct vdev_mlme_ops {
 				struct peer_delete_all_response *rsp);
 };
 
-#ifdef FEATURE_VDEV_RSP_WAKELOCK
-/**
- *  struct wlan_vdev_wakelock - vdev wake lock sub structure
- *  @start_wakelock: wakelock for vdev start
- *  @stop_wakelock: wakelock for vdev stop
- *  @delete_wakelock: wakelock for vdev delete
- *  @wmi_cmd_rsp_runtime_lock: run time lock
- */
-struct vdev_mlme_wakelock {
-	qdf_wake_lock_t start_wakelock;
-	qdf_wake_lock_t stop_wakelock;
-	qdf_wake_lock_t delete_wakelock;
-	qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock;
-};
-#endif
-
 /**
  * struct vdev_mlme_obj - VDEV MLME component object
  * @proto: VDEV MLME proto substructure
@@ -567,9 +551,6 @@ struct vdev_mlme_obj {
 	struct wlan_objmgr_vdev *vdev;
 	struct vdev_mlme_ops *ops;
 	mlme_vdev_ext_t *ext_vdev_ptr;
-#ifdef FEATURE_VDEV_RSP_WAKELOCK
-	struct vdev_mlme_wakelock vdev_wakelock;
-#endif
 };
 
 /**

umac/mlme/mlme_objmgr/dispatcher/src/wlan_psoc_mlme_main.c

@@ -25,6 +25,7 @@
 #include <include/wlan_psoc_mlme.h>
 #include <wlan_psoc_mlme_main.h>
 #include <wlan_psoc_mlme_api.h>
+#include <target_if_psoc_wake_lock.h>
 
 struct psoc_mlme_obj *mlme_psoc_get_priv(struct wlan_objmgr_psoc *psoc)
 {
@@ -69,7 +70,8 @@ static QDF_STATUS mlme_psoc_obj_create_handler(struct wlan_objmgr_psoc *psoc,
 		goto init_failed;
 	}
 
-	return status;
+	target_if_wake_lock_init(psoc);
+	return QDF_STATUS_SUCCESS;
 init_failed:
 	qdf_mem_free(psoc_mlme);
 
@@ -87,6 +89,7 @@ static QDF_STATUS mlme_psoc_obj_destroy_handler(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	target_if_wake_lock_deinit(psoc);
 	wlan_objmgr_psoc_component_obj_detach(psoc, WLAN_UMAC_COMP_MLME,
 					      psoc_mlme);
 

umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c

@@ -31,7 +31,6 @@
 #include <wlan_serialization_api.h>
 #include <wlan_utility.h>
 #include <cdp_txrx_cmn.h>
-#include <target_if_vdev_mgr_wake_lock.h>
 #include <wlan_lmac_if_def.h>
 #include <target_if_vdev_mgr_tx_ops.h>
 
@@ -113,7 +112,6 @@ static QDF_STATUS mlme_vdev_obj_create_handler(struct wlan_objmgr_vdev *vdev,
 					      (void *)vdev_mlme,
 					      QDF_STATUS_SUCCESS);
 
-	target_if_wake_lock_init(vdev);
 	if (mlme_vdev_ops_ext_hdl_post_create(vdev_mlme) !=
 						QDF_STATUS_SUCCESS) {
 		mlme_err("Legacy vdev object post creation failed");
@@ -146,7 +144,6 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
 		mlme_err(" VDEV is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
-	target_if_wake_lock_deinit(vdev);
 
 	vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev);
 	if (!vdev_mlme) {

umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_tgt_if_rx_api.c

@@ -225,30 +225,30 @@ tgt_vdev_mgr_ext_tbttoffset_update_handle(uint32_t num_vdevs, bool is_ext)
 }
 
 #ifdef FEATURE_VDEV_RSP_WAKELOCK
-static struct vdev_mlme_wakelock *
-tgt_vdev_mgr_get_wakelock_info(struct wlan_objmgr_vdev *vdev)
+static struct psoc_mlme_wakelock *
+tgt_psoc_get_wakelock_info(struct wlan_objmgr_psoc *psoc)
 {
-	struct vdev_mlme_obj *vdev_mlme;
+	struct psoc_mlme_obj *psoc_mlme;
 
-	vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev);
-	if (!vdev_mlme) {
-		mlme_err("VDEV_%d: VDEV_MLME is NULL", wlan_vdev_get_id(vdev));
+	psoc_mlme = mlme_psoc_get_priv(psoc);
+	if (!psoc_mlme) {
+		mlme_err("VDEV_%d: VDEV_MLME is NULL", wlan_vdev_get_id(psoc));
 		return NULL;
 	}
 
-	return &vdev_mlme->vdev_wakelock;
+	return &psoc_mlme->psoc_wakelock;
 }
 
 static inline void
-tgt_vdev_mgr_reg_wakelock_info_rx_op(struct wlan_lmac_if_mlme_rx_ops
+tgt_psoc_reg_wakelock_info_rx_op(struct wlan_lmac_if_mlme_rx_ops
 				     *mlme_rx_ops)
 {
-	mlme_rx_ops->vdev_mgr_get_wakelock_info =
-		tgt_vdev_mgr_get_wakelock_info;
+	mlme_rx_ops->psoc_get_wakelock_info =
+		tgt_psoc_get_wakelock_info;
 }
 #else
 static inline void
-tgt_vdev_mgr_reg_wakelock_info_rx_op(struct wlan_lmac_if_mlme_rx_ops
+tgt_psoc_reg_wakelock_info_rx_op(struct wlan_lmac_if_mlme_rx_ops
 				     *mlme_rx_ops)
 {
 }
@@ -272,5 +272,5 @@ void tgt_vdev_mgr_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops)
 		tgt_vdev_mgr_peer_delete_all_response_handler;
 	mlme_rx_ops->psoc_get_vdev_response_timer_info =
 		tgt_vdev_mgr_get_response_timer_info;
-	tgt_vdev_mgr_reg_wakelock_info_rx_op(&rx_ops->mops);
+	tgt_psoc_reg_wakelock_info_rx_op(&rx_ops->mops);
 }