qcacld-3.0: Move pre cac cleanup code to pre cac component

Move pre cac cleanup code from HDD to pre cac component.

Change-Id: I2839d447420e980941bfa271305685224b147cd8
CRs-Fixed: 3199949

components/pre_cac/core/src/wlan_pre_cac_main.c

@@ -28,6 +28,17 @@
 
 struct pre_cac_ops *glbl_pre_cac_ops;
 
+void pre_cac_stop(struct wlan_objmgr_psoc *psoc)
+{
+	struct pre_cac_psoc_priv *psoc_priv = pre_cac_psoc_get_priv(psoc);
+
+	if (!psoc_priv)
+		return;
+
+	if (psoc_priv->pre_cac_work.fn)
+		qdf_cancel_work(&psoc_priv->pre_cac_work);
+}
+
 void pre_cac_set_freq(struct wlan_objmgr_vdev *vdev,
 		      qdf_freq_t freq)
 {
@@ -163,7 +174,36 @@ static void pre_cac_handle_failure(void *data)
 {
 	struct wlan_objmgr_vdev *vdev = (struct wlan_objmgr_vdev *)data;
 
-	pre_cac_complete(vdev, false);
+	pre_cac_complete(vdev, QDF_STATUS_E_FAILURE);
+}
+
+void pre_cac_clean_up(struct wlan_objmgr_psoc *psoc)
+{
+	struct pre_cac_psoc_priv *psoc_priv = pre_cac_psoc_get_priv(psoc);
+	struct wlan_objmgr_vdev *vdev;
+	uint8_t vdev_id;
+
+	if (!psoc_priv) {
+		pre_cac_err("invalid psoc");
+		return;
+	}
+
+	if (!pre_cac_is_active(psoc))
+		return;
+
+	pre_cac_get_vdev_id(psoc, &vdev_id);
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
+						    WLAN_PRE_CAC_ID);
+	if (!vdev) {
+		pre_cac_err("Invalid vdev");
+		return;
+	}
+
+	qdf_create_work(0, &psoc_priv->pre_cac_work,
+			pre_cac_handle_failure,
+			vdev);
+	qdf_sched_work(0, &psoc_priv->pre_cac_work);
 }
 
 void pre_cac_handle_radar_ind(struct wlan_objmgr_vdev *vdev)
@@ -227,6 +267,8 @@ int pre_cac_validate_and_get_freq(struct wlan_objmgr_pdev *pdev,
 	QDF_STATUS status;
 	uint32_t i;
 
+	pre_cac_stop(psoc);
+
 	if (pre_cac_is_active(psoc)) {
 		pre_cac_err("pre cac is already in progress");
 		return -EINVAL;

components/pre_cac/core/src/wlan_pre_cac_main.h

@@ -321,4 +321,20 @@ qdf_freq_t pre_cac_get_freq(struct wlan_objmgr_vdev *vdev);
  * Return: None
  */
 void pre_cac_handle_radar_ind(struct wlan_objmgr_vdev *vdev);
+
+/**
+ * pre_cac_stop() - Stop pre cac
+ * @psoc: psoc object manager
+ *
+ * Return: None
+ */
+void pre_cac_stop(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * pre_cac_clean_up() - Cleanup pre cac
+ * @psoc: psoc object manager
+ *
+ * Return: None
+ */
+void pre_cac_clean_up(struct wlan_objmgr_psoc *psoc);
 #endif /* end of _WLAN_PRE_CAC_MAIN_H_ */

components/pre_cac/dispatcher/inc/wlan_pre_cac_ucfg_api.h

@@ -170,6 +170,22 @@ qdf_freq_t ucfg_pre_cac_get_freq(struct wlan_objmgr_vdev *vdev);
  */
 void ucfg_pre_cac_complete_set(struct wlan_objmgr_vdev *vdev,
 			       bool status);
+
+/**
+ * ucfg_pre_cac_stop() - Stop pre cac
+ * @psoc: psoc object manager
+ *
+ * Return: None
+ */
+void ucfg_pre_cac_stop(struct wlan_objmgr_psoc *psoc);
+
+/**
+ * ucfg_pre_cac_clean_up() - Cleanup pre cac
+ * @psoc: psoc object manager
+ *
+ * Return: None
+ */
+void ucfg_pre_cac_clean_up(struct wlan_objmgr_psoc *psoc);
 #else
 static inline
 QDF_STATUS ucfg_pre_cac_init(void)
@@ -230,5 +246,15 @@ ucfg_pre_cac_complete_set(struct wlan_objmgr_vdev *vdev,
 			  bool status)
 {
 }
+
+static inline void
+ucfg_pre_cac_stop(struct wlan_objmgr_psoc *psoc)
+{
+}
+
+static inline void
+ucfg_pre_cac_clean_up(struct wlan_objmgr_psoc *psoc)
+{
+}
 #endif /* PRE_CAC_SUPPORT */
 #endif /* _WLAN_PRE_CAC_UCFG_API_H_ */

components/pre_cac/dispatcher/src/wlan_pre_cac_ucfg_api.c

@@ -27,6 +27,16 @@ void ucfg_pre_cac_complete_set(struct wlan_objmgr_vdev *vdev,
 	pre_cac_complete_set(vdev, status);
 }
 
+void ucfg_pre_cac_clean_up(struct wlan_objmgr_psoc *psoc)
+{
+	pre_cac_clean_up(psoc);
+}
+
+void ucfg_pre_cac_stop(struct wlan_objmgr_psoc *psoc)
+{
+	pre_cac_stop(psoc);
+}
+
 void ucfg_pre_cac_set_freq(struct wlan_objmgr_vdev *vdev,
 			   qdf_freq_t freq)
 {

core/hdd/inc/wlan_hdd_main.h

@@ -2243,7 +2243,13 @@ struct hdd_context {
 
 	/* the radio index assigned by cnss_logger */
 	int radio_index;
+/*
+ * Code under PRE_CAC_COMP will be cleaned up
+ * once pre cac component is done
+ */
+#ifndef PRE_CAC_COMP
 	qdf_work_t sap_pre_cac_work;
+#endif
 	bool hbw_requested;
 	bool pm_qos_request;
 	enum RX_OFFLOAD ol_enable;

core/hdd/inc/wlan_hdd_pre_cac.h

@@ -51,6 +51,11 @@ static inline void wlan_hdd_sap_pre_cac_success(void *data)
  */
 void wlan_hdd_sap_pre_cac_failure(void *data);
 
+/*
+ * Code under PRE_CAC_COMP will be cleaned up
+ * once pre cac component is done
+ */
+#ifndef PRE_CAC_COMP
 /**
  * hdd_clean_up_pre_cac_interface() - Clean up the pre cac interface
  * @hdd_ctx: HDD context
@@ -60,6 +65,7 @@ void wlan_hdd_sap_pre_cac_failure(void *data);
  * Return: None
  */
 void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx);
+#endif
 
 /**
  * wlan_hdd_request_pre_cac() - Start pre CAC in the driver
@@ -140,10 +146,16 @@ static inline void wlan_hdd_sap_pre_cac_failure(void *data)
 {
 }
 
+/*
+ * Code under PRE_CAC_COMP will be cleaned up
+ * once pre cac component is done
+ */
+#ifndef PRE_CAC_COMP
 static inline void
 hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
 {
 }
+#endif
 
 static inline int
 wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx, uint32_t chan_freq)

core/hdd/src/wlan_hdd_hostapd.c

@@ -6635,7 +6635,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		hdd_clean_up_pre_cac_interface(hdd_ctx);
 #else
 	if (ucfg_pre_cac_is_active(hdd_ctx->psoc))
-		hdd_clean_up_pre_cac_interface(hdd_ctx);
+		ucfg_pre_cac_clean_up(hdd_ctx->psoc);
 #endif
 
 	if (status != QDF_STATUS_SUCCESS) {

core/hdd/src/wlan_hdd_main.c

@@ -8342,9 +8342,8 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 			 * don't flush pre-cac destroy if we are destroying
 			 * pre-cac adapter
 			 */
-			if (!ucfg_pre_cac_is_active(hdd_ctx->psoc) &&
-			    hdd_ctx->sap_pre_cac_work.fn)
-				cds_flush_work(&hdd_ctx->sap_pre_cac_work);
+			if (!ucfg_pre_cac_is_active(hdd_ctx->psoc))
+				ucfg_pre_cac_stop(hdd_ctx->psoc);
 
 			hdd_close_pre_cac_adapter(hdd_ctx);
 		} else {
@@ -8531,8 +8530,16 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
 
 	hdd_enter();
 
+/*
+ * The code under this macro will be removed
+ * once pre_cac componentization is done
+ */
+#ifndef PRE_CAC_COMP
 	if (hdd_ctx->sap_pre_cac_work.fn)
 		cds_flush_work(&hdd_ctx->sap_pre_cac_work);
+#else
+	ucfg_pre_cac_stop(hdd_ctx->psoc);
+#endif
 
 	hdd_for_each_adapter_dev_held_safe(hdd_ctx, adapter, next_adapter,
 					   NET_DEV_HOLD_STOP_ALL_ADAPTERS) {

core/hdd/src/wlan_hdd_p2p.c

@@ -952,12 +952,14 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 #ifndef PRE_CAC_COMP
 	if (adapter->device_mode == QDF_SAP_MODE &&
 	    wlan_sap_is_pre_cac_active(hdd_ctx->mac_handle)) {
+		hdd_clean_up_interface(hdd_ctx, adapter);
+		hdd_clean_up_pre_cac_interface(hdd_ctx);
 #else
 	if (adapter->device_mode == QDF_SAP_MODE &&
 	    ucfg_pre_cac_is_active(hdd_ctx->psoc)) {
-#endif
 		hdd_clean_up_interface(hdd_ctx, adapter);
-		hdd_clean_up_pre_cac_interface(hdd_ctx);
+		ucfg_pre_cac_clean_up(hdd_ctx->psoc);
+#endif
 	} else if (wlan_hdd_is_session_type_monitor(
 					adapter->device_mode) &&
 		   ucfg_pkt_capture_get_mode(hdd_ctx->psoc) !=

core/hdd/src/wlan_hdd_pre_cac.c

@@ -273,13 +273,13 @@ void hdd_close_pre_cac_adapter(struct hdd_context *hdd_ctx)
 	osif_vdev_sync_destroy(vdev_sync);
 }
 
-void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
-{
 /*
  * Code under PRE_CAC_COMP will be cleaned up
  * once pre cac component is done
  */
 #ifndef PRE_CAC_COMP
+void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
+{
 	uint8_t vdev_id;
 	QDF_STATUS status;
 	struct hdd_adapter *precac_adapter;
@@ -300,8 +300,8 @@ void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
 			wlan_hdd_sap_pre_cac_failure,
 			(void *)precac_adapter);
 	qdf_sched_work(0, &hdd_ctx->sap_pre_cac_work);
-#endif
 }
+#endif
 
 /*
  * Code under PRE_CAC_COMP will be cleaned up