qcacmn: Move power_gating to centralized power management api.

Upper layers should not need to know about pci specific power management
features.

Change-Id: I841af588246d328f12fa69d8c0394ec1eafaa236
CRs-Fixed: 986480

hif/inc/hif.h

@@ -403,7 +403,6 @@ void hif_get_hw_info(struct hif_opaque_softc *scn, u32 *version, u32 *revision,
 		     const char **target_name);
 void hif_disable_isr(struct hif_opaque_softc *scn);
 void hif_reset_soc(struct hif_opaque_softc *scn);
-void hif_disable_aspm(struct hif_opaque_softc *);
 void hif_save_htc_htt_config_endpoint(struct hif_opaque_softc *hif_ctx,
 				      int htc_endpoint);
 struct hif_opaque_softc *hif_open(qdf_device_t qdf_ctx, uint32_t mode,
@@ -415,7 +414,6 @@ QDF_STATUS hif_enable(struct hif_opaque_softc *hif_ctx, struct device *dev,
 		      enum qdf_bus_type bus_type,
 		      enum hif_enable_type type);
 void hif_disable(struct hif_opaque_softc *hif_ctx, enum hif_disable_type type);
-void hif_enable_power_gating(struct hif_opaque_softc *hif_ctx);
 
 #ifdef FEATURE_RUNTIME_PM
 struct hif_pm_runtime_lock;
@@ -462,7 +460,8 @@ hif_pm_runtime_prevent_suspend_timeout(struct hif_opaque_softc *ol_sc,
 { return 0; }
 #endif
 
-void hif_enable_power_management(struct hif_opaque_softc *hif_ctx);
+void hif_enable_power_management(struct hif_opaque_softc *hif_ctx,
+				 bool is_packet_log_enabled);
 void hif_disable_power_management(struct hif_opaque_softc *hif_ctx);
 
 void hif_vote_link_down(struct hif_opaque_softc *);

hif/src/pcie/if_pci.c

@@ -1139,7 +1139,50 @@ static void hif_pm_runtime_stop(struct hif_pci_softc *sc) {}
 #endif
 
 /**
- * hif_enable_power_management(): enable power management
+ * hif_disable_power_gating() - disable HW power gating
+ * @hif_ctx: hif context
+ *
+ * disables pcie L1 power states
+ */
+static void hif_disable_power_gating(struct hif_opaque_softc *hif_ctx)
+{
+	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
+	struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(hif_ctx);
+
+	if (NULL == scn) {
+		HIF_ERROR("%s: Could not disable ASPM scn is null",
+		       __func__);
+		return;
+	}
+
+	/* Disable ASPM when pkt log is enabled */
+	pci_read_config_dword(sc->pdev, 0x80, &sc->lcr_val);
+	pci_write_config_dword(sc->pdev, 0x80, (sc->lcr_val & 0xffffff00));
+}
+
+/**
+ * hif_enable_power_gating() - enable HW power gating
+ * @hif_ctx: hif context
+ *
+ * enables pcie L1 power states
+ */
+static void hif_enable_power_gating(struct hif_opaque_softc *hif_ctx)
+{
+	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
+	struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(hif_ctx);
+
+	if (NULL == scn) {
+		HIF_ERROR("%s: Could not disable ASPM scn is null",
+		       __func__);
+		return;
+	}
+
+	/* Re-enable ASPM after firmware/OTP download is complete */
+	pci_write_config_dword(sc->pdev, 0x80, sc->lcr_val);
+}
+
+/**
+ * hif_enable_power_management() - enable power management
  * @hif_ctx: hif context
  *
  * Currently only does runtime pm.  Eventually this function could
@@ -1147,9 +1190,11 @@ static void hif_pm_runtime_stop(struct hif_pci_softc *sc) {}
  * the soc sleep after the driver finishes loading and re-enabling
  * aspm (hif_enable_power_gating).
  */
-void hif_enable_power_management(struct hif_opaque_softc *hif_ctx)
+void hif_enable_power_management(struct hif_opaque_softc *hif_ctx,
+				 bool is_packet_log_enabled)
 {
 	struct hif_pci_softc *pci_ctx = HIF_GET_PCI_SOFTC(hif_ctx);
+	struct hif_softc *hif_sc = HIF_GET_SOFTC(hif_ctx);
 
 	if (pci_ctx == NULL) {
 		HIF_ERROR("%s, hif_ctx null", __func__);
@@ -1157,10 +1202,13 @@ void hif_enable_power_management(struct hif_opaque_softc *hif_ctx)
 	}
 
 	hif_pm_runtime_start(pci_ctx);
+
+	if (!is_packet_log_enabled)
+		hif_enable_power_gating(hif_ctx);
 }
 
 /**
- * hif_disable_power_management(): disable power management
+ * hif_disable_power_management() - disable power management
  * @hif_ctx: hif context
  *
  * Currently disables runtime pm. Should be updated to behave
@@ -2602,44 +2650,6 @@ void hif_reset_soc(struct hif_opaque_softc *ol_sc)
 #endif
 }
 
-void hif_disable_aspm(struct hif_opaque_softc *hif_ctx)
-{
-	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
-	struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(hif_ctx);
-
-	if (NULL == scn) {
-		HIF_ERROR("%s: Could not disable ASPM scn is null",
-		       __func__);
-		return;
-	}
-
-	/* Disable ASPM when pkt log is enabled */
-	pci_read_config_dword(sc->pdev, 0x80, &sc->lcr_val);
-	pci_write_config_dword(sc->pdev, 0x80, (sc->lcr_val & 0xffffff00));
-}
-
-/**
- * hif_enable_power_gating(): enable HW power gating
- *
- * This function enables HW gating
- *
- * Return: none
- */
-void hif_enable_power_gating(struct hif_opaque_softc *hif_ctx)
-{
-	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
-	struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(hif_ctx);
-
-	if (NULL == scn) {
-		HIF_ERROR("%s: Could not disable ASPM scn is null",
-		       __func__);
-		return;
-	}
-
-	/* Re-enable ASPM after firmware/OTP download is complete */
-	pci_write_config_dword(sc->pdev, 0x80, sc->lcr_val);
-}
-
 #ifdef CONFIG_PCI_MSM
 static inline void hif_msm_pcie_debug_info(struct hif_pci_softc *sc)
 {
@@ -3113,7 +3123,6 @@ QDF_STATUS hif_enable_bus(struct hif_softc *ol_sc,
 	struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(ol_sc);
 	struct hif_opaque_softc *hif_hdl = GET_HIF_OPAQUE_HDL(ol_sc);
 	uint16_t revision_id;
-	uint32_t lcr_val;
 	int probe_again = 0;
 	struct pci_dev *pdev = bdev;
 	const struct pci_device_id *id = (const struct pci_device_id *)bid;
@@ -3144,8 +3153,7 @@ again:
 	/* Temporary FIX: disable ASPM on peregrine.
 	 * Will be removed after the OTP is programmed
 	 */
-	pci_read_config_dword(pdev, 0x80, &lcr_val);
+	hif_disable_power_gating(hif_hdl);
-	pci_write_config_dword(pdev, 0x80, (lcr_val & 0xffffff00));
 
 	device_disable_async_suspend(&pdev->dev);
 	pci_read_config_word(pdev, 0x08, &revision_id);

hif/src/snoc/if_snoc.c

@@ -161,24 +161,6 @@ int hif_bus_resume(struct hif_opaque_softc *hif_ctx)
 	return 0;
 }
 
-/**
- * hif_enable_power_gating(): enable HW power gating
- *
- * Return: n/a
- */
-void hif_enable_power_gating(struct hif_opaque_softc *hif_ctx)
-{
-}
-
-/**
- * hif_disable_aspm(): hif_disable_aspm
- *
- * Return: n/a
- */
-void hif_disable_aspm(struct hif_opaque_softc *hif_ctx)
-{
-}
-
 /**
  * hif_bus_close(): hif_bus_close
  *

htc/htc_api.h

@@ -709,7 +709,6 @@ int htc_runtime_suspend(void);
 int htc_runtime_resume(void);
 
 /* Disable ASPM : Disable PCIe low power */
-void htc_disable_aspm(HTC_HANDLE HTCHandle);
 bool htc_can_suspend_link(HTC_HANDLE HTCHandle);
 void htc_vote_link_down(HTC_HANDLE HTCHandle);
 void htc_vote_link_up(HTC_HANDLE HTCHandle);

htc/htc_services.c

@@ -365,14 +365,3 @@ void htc_fw_event_handler(void *context, QDF_STATUS status)
 		initInfo->TargetFailure(initInfo->pContext, status);
 	}
 }
-
-/* Disable ASPM : disable PCIe low power */
-void htc_disable_aspm(HTC_HANDLE HTCHandle)
-{
-	HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-
-	if (!target->hif_dev)
-		return;
-
-	hif_disable_aspm(target->hif_dev);
-}