qcacld-3.0: Remove cds_get_context in HIF

Refactor Transport Layer from cds_get_context and pass the hif context
to all the API's to operate.

Change-Id: I2fb376fda12951a77007f46ceb351bb2e7740ace
CRs-Fixed: 967765

core/cdf/src/cdf_lock.c

@@ -643,5 +643,6 @@ cdf_runtime_lock_t cdf_runtime_lock_init(const char *name)
  */
 void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock)
 {
-	hif_runtime_lock_deinit(lock);
+	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	hif_runtime_lock_deinit(hif_ctx, lock);
 }

core/dp/htt/htt.c

@@ -434,9 +434,6 @@ int htt_htc_attach(struct htt_pdev_t *pdev)
 		return -EIO;       /* failure */
 
 	pdev->htc_endpoint = response.Endpoint;
-#if defined(HIF_PCI)
-	hif_save_htc_htt_config_endpoint(pdev->htc_endpoint);
-#endif
 
 	return 0;               /* success */
 }
@@ -467,9 +464,9 @@ void htt_display(htt_pdev_handle pdev, int indent)
 #endif
 
 /* Disable ASPM : Disable PCIe low power */
-void htt_htc_disable_aspm(void)
+void htt_htc_disable_aspm(struct htt_pdev_t *pdev)
 {
-	htc_disable_aspm();
+	htc_disable_aspm(pdev->htc_pdev);
 }
 
 #ifdef IPA_OFFLOAD

core/dp/htt/htt_h2t.c

@@ -334,7 +334,7 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev)
 		enable_ppdu_end = 1;
 		/* Disable ASPM when pkt log is enabled */
 		cdf_print("Pkt log is enabled\n");
-		htt_htc_disable_aspm();
+		htt_htc_disable_aspm(pdev);
 	} else {
 		cdf_print("Pkt log is disabled\n");
 		enable_ctrl_data = 0;

core/dp/htt/htt_internal.h

@@ -459,7 +459,7 @@ htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt);
 void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev);
 #endif
 
-void htt_htc_disable_aspm(void);
+void htt_htc_disable_aspm(struct htt_pdev_t *pdev);
 
 int
 htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr,

core/hdd/src/wlan_hdd_driver_ops.c

@@ -124,8 +124,9 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid,
 	CDF_STATUS status;
 	int ret = 0;
 	void *hif_ctx;
+	cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
 
-	status = hif_open(bus_type);
+	status = hif_open(cdf_ctx, bus_type);
 	if (!CDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("hif_open error = %d", status);
 		return cdf_status_to_os_return(status);
@@ -413,6 +414,7 @@ void wlan_hdd_notify_handler(int state)
 static int __wlan_hdd_bus_suspend(pm_message_t state)
 {
 	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
 	int err = wlan_hdd_validate_context(hdd_ctx);
 	int status;
 
@@ -430,7 +432,7 @@ static int __wlan_hdd_bus_suspend(pm_message_t state)
 	if (err)
 		goto resume_oltxrx;
 
-	err = hif_bus_suspend();
+	err = hif_bus_suspend(hif_ctx);
 	if (err)
 		goto resume_wma;
 
@@ -485,6 +487,7 @@ int wlan_hdd_bus_suspend(pm_message_t state)
 static int __wlan_hdd_bus_resume(void)
 {
 	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
 	int status = wlan_hdd_validate_context(hdd_ctx);
 
 	if (0 != status) {
@@ -492,7 +495,7 @@ static int __wlan_hdd_bus_resume(void)
 		return status;
 	}
 
-	status = hif_bus_resume();
+	status = hif_bus_resume(hif_ctx);
 	CDF_BUG(!status);
 
 	status = wma_bus_resume();
@@ -537,12 +540,13 @@ static int wlan_hdd_bus_resume(void)
 static int __wlan_hdd_runtime_suspend(void)
 {
 	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
 	int status = wlan_hdd_validate_context(hdd_ctx);
 
 	if (0 != status)
 		goto process_failure;
 
-	status = hif_pre_runtime_suspend();
+	status = hif_pre_runtime_suspend(hif_ctx);
 	if (status)
 		goto process_failure;
 
@@ -554,7 +558,7 @@ static int __wlan_hdd_runtime_suspend(void)
 	if (status)
 		goto resume_htc;
 
-	status = hif_runtime_suspend();
+	status = hif_runtime_suspend(hif_ctx);
 	if (status)
 		goto resume_wma;
 
@@ -562,17 +566,17 @@ static int __wlan_hdd_runtime_suspend(void)
 	if (status)
 		goto resume_hif;
 
-	hif_process_runtime_suspend_success();
+	hif_process_runtime_suspend_success(hif_ctx);
 	return status;
 
 resume_hif:
-	CDF_BUG(!hif_runtime_resume());
+	CDF_BUG(!hif_runtime_resume(hif_ctx));
 resume_wma:
 	CDF_BUG(!wma_runtime_resume());
 resume_htc:
 	CDF_BUG(!htc_runtime_resume());
 process_failure:
-	hif_process_runtime_suspend_failure();
+	hif_process_runtime_suspend_failure(hif_ctx);
 	return status;
 }
 
@@ -606,12 +610,14 @@ static int wlan_hdd_runtime_suspend(void)
  */
 static int __wlan_hdd_runtime_resume(void)
 {
-	hif_pre_runtime_resume();
+	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+
+	hif_pre_runtime_resume(hif_ctx);
 	CDF_BUG(!cnss_auto_resume());
-	CDF_BUG(!hif_runtime_resume());
+	CDF_BUG(!hif_runtime_resume(hif_ctx));
 	CDF_BUG(!wma_runtime_resume());
 	CDF_BUG(!htc_runtime_resume());
-	hif_process_runtime_resume_success();
+	hif_process_runtime_resume_success(hif_ctx);
 	return 0;
 }
 

core/hdd/src/wlan_hdd_napi.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -269,5 +269,5 @@ int hdd_napi_event(enum qca_napi_event event, void *data)
  */
 int hdd_napi_poll(struct napi_struct *napi, int budget)
 {
-	return hif_napi_poll(napi, budget);
+	return hif_napi_poll(cds_get_context(CDF_MODULE_ID_HIF), napi, budget);
 }

core/wma/src/wma_dev_if.c

@@ -4533,7 +4533,7 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 	/* IBSS should share the same code as AP mode */
 	case BSS_OPERATIONAL_MODE_IBSS:
 	case BSS_OPERATIONAL_MODE_AP:
-		hif_vote_link_up();
+		htc_vote_link_down(wma->htc_handle);
 		wma_add_sta_req_ap_mode(wma, add_sta);
 		break;
 	}
@@ -4575,7 +4575,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta)
 
 	case BSS_OPERATIONAL_MODE_IBSS: /* IBSS shares AP code */
 	case BSS_OPERATIONAL_MODE_AP:
-		hif_vote_link_down();
+		htc_vote_link_up(wma->htc_handle);
 		wma_delete_sta_req_ap_mode(wma, del_sta);
 		break;
 	}

core/wma/src/wma_features.c

@@ -3567,7 +3567,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle)
 		       WMITLV_GET_STRUCT_TLVLEN
 			       (wmi_wow_enable_cmd_fixed_param));
 	cmd->enable = true;
-	if (hif_can_suspend_link())
+	if (htc_can_suspend_link(wma->htc_handle))
 		cmd->pause_iface_config = WOW_IFACE_PAUSE_ENABLED;
 	else
 		cmd->pause_iface_config = WOW_IFACE_PAUSE_DISABLED;