From c2cd5d472ea62af791d62d7e6e168b6c06c18f44 Mon Sep 17 00:00:00 2001
From: Houston Hoffman <hhoffman@codeaurora.org>
Date: Tue, 16 Feb 2016 14:57:56 -0800
Subject: [PATCH] qcacld-3.0: Remove power_gating from upper layers

These are pci specific power management features.  These should
be consolidated instead of littering bus agnostic code.

Change-Id: I366f1d14ab04368d77a144bebaeb038c1469abed
CRs-Fixed: 986480
---
 core/dp/htt/htt.c                  | 6 ------
 core/dp/htt/htt_h2t.c              | 2 --
 core/dp/htt/htt_internal.h         | 2 --
 core/hdd/src/wlan_hdd_driver_ops.c | 2 +-
 core/hdd/src/wlan_hdd_main.c       | 2 --
 core/hdd/src/wlan_hdd_power.c      | 1 -
 6 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c
index 58a7dccd2ab3..840692b82dce 100644
--- a/core/dp/htt/htt.c
+++ b/core/dp/htt/htt.c
@@ -463,12 +463,6 @@ void htt_display(htt_pdev_handle pdev, int indent)
 }
 #endif
 
-/* Disable ASPM : Disable PCIe low power */
-void htt_htc_disable_aspm(struct htt_pdev_t *pdev)
-{
-	htc_disable_aspm(pdev->htc_pdev);
-}
-
 #ifdef IPA_OFFLOAD
 /**
  * htt_ipa_uc_attach() - Allocate UC data path resources
diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c
index 39762b5ae614..2246e7fda1b8 100644
--- a/core/dp/htt/htt_h2t.c
+++ b/core/dp/htt/htt_h2t.c
@@ -332,9 +332,7 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev)
 		enable_hdr = 1;
 		enable_ppdu_start = 1;
 		enable_ppdu_end = 1;
-		/* Disable ASPM when pkt log is enabled */
 		qdf_print("Pkt log is enabled\n");
-		htt_htc_disable_aspm(pdev);
 	} else {
 		qdf_print("Pkt log is disabled\n");
 		enable_ctrl_data = 0;
diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h
index 454327543b95..8b371ae5f58e 100644
--- a/core/dp/htt/htt_internal.h
+++ b/core/dp/htt/htt_internal.h
@@ -459,8 +459,6 @@ 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(struct htt_pdev_t *pdev);
-
 int
 htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr,
 			qdf_nbuf_t netbuf);
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 0077b66ddbf5..f9345755bcf1 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -386,7 +386,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid,
 	if (ret)
 		goto err_bmi_close;
 
-	hif_enable_power_management(hif_ctx);
+	hif_enable_power_management(hif_ctx, cds_is_packet_log_enabled());
 
 	if (reinit) {
 		cds_set_recovery_in_progress(false);
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index f9ae7bd2ff26..d399859d7385 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -5784,8 +5784,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 		}
 	}
 
-	hif_enable_power_gating(hif_sc);
-
 	memdump_init();
 
 	goto success;
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index cff0d5c0c48f..238158b8036d 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1601,7 +1601,6 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 				  pHddCtx->target_hw_name);
 #endif
 
-	hif_enable_power_gating(hif_sc);
 	hddLog(LOGE,
 		"%s: WLAN host driver reinitiation completed!", __func__);
 	goto success;