qcacld-3.0: Make Ramdump Work as member of ol_context

Initialize Ramdump Work as member of ol_context instead of
global work. Pass ol_context as private data to host to target
module.

Change-Id: I97712f40c4bfcd7d854e2a89727d73fd7178598c
CRs-Fixed: 967765

core/bmi/src/bmi.c

@@ -544,6 +544,8 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx)
 	ol_info->cdf_dev = cdf_dev;
 	ol_info->scn = hif_ctx;
 
+	cdf_create_work(&ol_info->ramdump_work, ramdump_work_handler, ol_info);
+
 	return status;
 }
 

core/bmi/src/i_bmi.h

@@ -125,12 +125,14 @@ typedef enum _ATH_BIN_FILE {
  * struct ol_context - Structure to hold OL context
  * @cdf_dev: CDF Device
  * @scn: HIF Context
+ * @ramdump_work: WorkQueue for Ramdump collection
  *
  * Structure to hold all ol BMI/Ramdump info
  */
 struct ol_context {
 	cdf_device_t cdf_dev;
 	struct ol_softc *scn;
+	cdf_work_t ramdump_work;
 };
 
 CDF_STATUS bmi_execute(uint32_t address, uint32_t *param,
@@ -148,9 +150,10 @@ CDF_STATUS bmi_read_soc_register(uint32_t address,
 CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param,
 					struct ol_context *ol_ctx);
 CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info,
-				struct ol_context *ol_ctx);
+			       struct ol_context *ol_ctx);
 CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx);
 CDF_STATUS bmi_done_local(struct ol_context *ol_ctx);
 CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx);
 CDF_STATUS ol_configure_target(struct ol_context *ol_ctx);
+void ramdump_work_handler(void *arg);
 #endif

core/bmi/src/ol_fw.c

@@ -482,8 +482,6 @@ ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 
 #if  defined(CONFIG_CNSS)
 
-static struct ol_softc *ramdump_scn;
-
 /**
  * struct ramdump_info: Structure to hold ramdump information
  * @base: Base address for Ramdump collection
@@ -529,18 +527,20 @@ int ol_copy_ramdump(struct ol_softc *scn)
 	return ret;
 }
 
-static void ramdump_work_handler(struct work_struct *ramdump)
+void ramdump_work_handler(void *ol_context)
 {
 	int ret;
 	uint32_t host_interest_address;
 	uint32_t dram_dump_values[4];
 	uint32_t target_type;
 	struct hif_target_info *tgt_info;
+	struct ol_context *ol_ctx = ol_context;
+	struct ol_softc *ramdump_scn = ol_ctx->scn;
+
 	if (!ramdump_scn) {
 		BMI_ERR("%s:Ramdump_scn is null:", __func__);
 		goto out_fail;
 	}
-
 	tgt_info = hif_get_target_info_handle(ramdump_scn);
 	target_type = tgt_info->target_type;
 #ifdef DEBUG
@@ -594,14 +594,6 @@ out_fail:
 	return;
 }
 
-static DECLARE_WORK(ramdump_work, ramdump_work_handler);
-
-void ol_schedule_ramdump_work(struct ol_softc *scn)
-{
-	ramdump_scn = scn;
-	schedule_work(&ramdump_work);
-}
-
 static void fw_indication_work_handler(struct work_struct *fw_indication)
 {
 	cnss_device_self_recovery();
@@ -617,7 +609,8 @@ void ol_schedule_fw_indication_work(struct ol_softc *scn)
 
 void ol_target_failure(void *instance, CDF_STATUS status)
 {
-	struct ol_softc *scn = (struct ol_softc *)instance;
+	struct ol_context *ol_ctx = instance;
+	struct ol_softc *scn = ol_ctx->scn;
 	tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA);
 	struct hif_config_info *ini_cfg = hif_get_ini_handle(scn);
 	int ret;
@@ -662,7 +655,7 @@ void ol_target_failure(void *instance, CDF_STATUS status)
 #if  defined(CONFIG_CNSS)
 	/* Collect the RAM dump through a workqueue */
 	if (ini_cfg->enable_ramdump_collection)
-		ol_schedule_ramdump_work(scn);
+		cdf_schedule_work(&ol_ctx->ramdump_work);
 	else
 		pr_debug("%s: athdiag read for target reg\n", __func__);
 #endif

core/cds/src/cds_api.c

@@ -266,14 +266,14 @@ CDF_STATUS cds_open(void)
 		goto err_bmi_close;
 	}
 
-	htcInfo.pContext = gp_cds_context->pHIFContext;
+	htcInfo.pContext = ol_ctx;
 	htcInfo.TargetFailure = ol_target_failure;
 	htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge;
 	cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
 
 	/* Create HTC */
 	gp_cds_context->htc_ctx =
-		htc_create(htcInfo.pContext, &htcInfo, cdf_ctx);
+		htc_create(scn, &htcInfo, cdf_ctx);
 	if (!gp_cds_context->htc_ctx) {
 		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);

core/hdd/src/wlan_hdd_ftm.c

@@ -258,14 +258,15 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 			  "%s: BMI failed to download target", __func__);
 		goto err_bmi_close;
 	}
-	htcInfo.pContext = gp_cds_context->pHIFContext;
+
+	htcInfo.pContext = ol_ctx;
 	htcInfo.TargetFailure = ol_target_failure;
 	htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge;
 	cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
 
 	/* Create HTC */
 	gp_cds_context->htc_ctx =
-		htc_create(htcInfo.pContext, &htcInfo, cdf_ctx);
+		htc_create(pHifContext, &htcInfo, cdf_ctx);
 	if (!gp_cds_context->htc_ctx) {
 		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);

core/utils/epping/src/epping_main.c

@@ -239,13 +239,13 @@ int epping_enable(struct device *parent_dev)
 	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
 		   "%s: bmi_download_firmware done", __func__);
 
-	htcInfo.pContext = p_cds_context->pHIFContext;
+	htcInfo.pContext = ol_ctx;
 	htcInfo.TargetFailure = ol_target_failure;
 	htcInfo.TargetSendSuspendComplete = epping_target_suspend_acknowledge;
 	cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
 
 	/* Create HTC */
-	p_cds_context->htc_ctx = htc_create(htcInfo.pContext, &htcInfo, cdf_ctx);
+	p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx);
 	if (!p_cds_context->htc_ctx) {
 		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);