samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: remove CONFIG_PCI_MSM compilation flag for link vote

Browse Source 
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
This commit is contained in:
Jinwei Chen
2021-01-07 17:54:22 -08:00
committed by snandini
parent ce7ed5dc37
commit 7475f6c62c
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hif/src/ipcie/if_ipci.c
View File

@@ -17,9 +17,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#ifdef CONFIG_PCI_MSM
#include <linux/msm_pcie.h>
#endif
#include "hif_io32.h" #include "hif_io32.h"
#include "if_ipci.h" #include "if_ipci.h"
#include "hif.h" #include "hif.h"
@@ -288,7 +285,7 @@ void hif_ipci_disable_bus(struct hif_softc *scn)
hif_info("X"); hif_info("X");
} }
#if defined(CONFIG_PCI_MSM) #ifdef CONFIG_PLD_PCIE_CNSS
void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag) void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag)
{ {
int errno; int errno;
@@ -303,8 +300,6 @@ void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag)
#else #else
void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag) 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 #endif

20
hif/src/pcie/if_pci.c
View File

@@ -21,9 +21,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/of_pci.h> #include <linux/of_pci.h>
#ifdef CONFIG_PCI_MSM
#include <linux/msm_pcie.h>
#endif
#include <linux/version.h> #include <linux/version.h>
#include "hif_io32.h" #include "hif_io32.h"
#include "if_pci.h" #include "if_pci.h"
@@ -2251,9 +2248,9 @@ struct device *hif_pci_get_dev(struct hif_softc *scn)
#define OL_ATH_PCI_PM_CONTROL 0x44 #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 * @flag: true prevents linkdown, false allows
* *
* Calls into the platform driver to vote against taking down the * Calls into the platform driver to vote against taking down the
@@ -2275,8 +2272,6 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag)
#else #else
void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) 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 #endif
@@ -2502,16 +2497,6 @@ void hif_pci_reset_soc(struct hif_softc *hif_sc)
#endif #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 * hif_log_soc_wakeup_timeout() - API to log PCIe and SOC Info
* @sc: HIF PCIe Context * @sc: HIF PCIe Context
@@ -2562,7 +2547,6 @@ static int hif_log_soc_wakeup_timeout(struct hif_pci_softc *sc)
RTC_STATE_ADDRESS)); RTC_STATE_ADDRESS));
hif_info("wakeup target"); hif_info("wakeup target");
hif_msm_pcie_debug_info(sc);
if (!cfg->enable_self_recovery) if (!cfg->enable_self_recovery)
QDF_BUG(0); QDF_BUG(0);