From f98759dad48f2e1e00c5daaeb5b512af8efd1c56 Mon Sep 17 00:00:00 2001
From: Jinwei Chen <jinweic@codeaurora.org>
Date: Thu, 7 Jan 2021 17:54:22 -0800
Subject: [PATCH] qcacmn: remove CONFIG_PCI_MSM compilation flag for link vote

CONFIG_PCI_MSM will not be defined if MSM PCI driver is compiled
as a module, so if wlan driver invoke hif_pci_prevent_linkdown to
prevent linkdown, pld_wlan_pm_control() actually is not invoked,
result in Noc error due to inactive PCIe link.

PLD driver already abstract MSM specific feature, remove CONFIG_PCI_MSM
complilation flag in wlan driver.

Change-Id: Iaaf929a74b44ac94370f1d98b7aef7aaec308e0f
CRs-Fixed: 2850839
---
 hif/src/ipcie/if_ipci.c |  7 +------
 hif/src/pcie/if_pci.c   | 20 ++------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/hif/src/ipcie/if_ipci.c b/hif/src/ipcie/if_ipci.c
index c665f243026a..60d63d94d99b 100644
--- a/hif/src/ipcie/if_ipci.c
+++ b/hif/src/ipcie/if_ipci.c
@@ -17,9 +17,6 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/if_arp.h>
-#ifdef CONFIG_PCI_MSM
-#include <linux/msm_pcie.h>
-#endif
 #include "hif_io32.h"
 #include "if_ipci.h"
 #include "hif.h"
@@ -288,7 +285,7 @@ void hif_ipci_disable_bus(struct hif_softc *scn)
 	hif_info("X");
 }
 
-#if defined(CONFIG_PCI_MSM)
+#ifdef CONFIG_PLD_PCIE_CNSS
 void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag)
 {
 	int errno;
@@ -303,8 +300,6 @@ void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag)
 #else
 void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag)
 {
-	hif_info("wlan: %s pcie power collapse", (flag ? "disable" : "enable"));
-	hif_runtime_prevent_linkdown(scn, flag);
 }
 #endif
 
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index c66a9dc40870..c0ae07bb08e8 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -21,9 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/if_arp.h>
 #include <linux/of_pci.h>
-#ifdef CONFIG_PCI_MSM
-#include <linux/msm_pcie.h>
-#endif
 #include <linux/version.h>
 #include "hif_io32.h"
 #include "if_pci.h"
@@ -2246,9 +2243,9 @@ struct device *hif_pci_get_dev(struct hif_softc *scn)
 
 #define OL_ATH_PCI_PM_CONTROL 0x44
 
-#if defined(CONFIG_PCI_MSM)
+#ifdef CONFIG_PLD_PCIE_CNSS
 /**
- * hif_bus_prevent_linkdown(): allow or permit linkdown
+ * hif_pci_prevent_linkdown(): allow or permit linkdown
  * @flag: true prevents linkdown, false allows
  *
  * Calls into the platform driver to vote against taking down the
@@ -2270,8 +2267,6 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag)
 #else
 void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag)
 {
-	hif_info("wlan: %s pcie power collapse", (flag ? "disable" : "enable"));
-	hif_runtime_prevent_linkdown(scn, flag);
 }
 #endif
 
@@ -2489,16 +2484,6 @@ void hif_pci_reset_soc(struct hif_softc *hif_sc)
 #endif
 }
 
-#ifdef CONFIG_PCI_MSM
-static inline void hif_msm_pcie_debug_info(struct hif_pci_softc *sc)
-{
-	msm_pcie_debug_info(sc->pdev, 13, 1, 0, 0, 0);
-	msm_pcie_debug_info(sc->pdev, 13, 2, 0, 0, 0);
-}
-#else
-static inline void hif_msm_pcie_debug_info(struct hif_pci_softc *sc) {};
-#endif
-
 /**
  * hif_log_soc_wakeup_timeout() - API to log PCIe and SOC Info
  * @sc: HIF PCIe Context
@@ -2549,7 +2534,6 @@ static int hif_log_soc_wakeup_timeout(struct hif_pci_softc *sc)
 							RTC_STATE_ADDRESS));
 
 	hif_info("wakeup target");
-	hif_msm_pcie_debug_info(sc);
 
 	if (!cfg->enable_self_recovery)
 		QDF_BUG(0);