Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75967b45 authored by Yue Ma's avatar Yue Ma Committed by Gerrit - the friendly Code Review server
Browse files

cnss2: Retry if PCI link training fails 



Retry a few times if PCI link training fails to avoid device side is
not ready in time.

Change-Id: Icd88673b19a4d6f877f597d1c636438f932f85a7
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent 13667470

drivers/net/wireless/cnss2/pci.c

+18 −2
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ static DEFINE_SPINLOCK(time_sync_lock); 
#define POWER_ON_RETRY_MAX_TIMES		3

#define POWER_ON_RETRY_DELAY_MS			200



#define LINK_TRAINING_RETRY_MAX_TIMES		3



static struct cnss_pci_reg ce_src[] = {

	{ "SRC_RING_BASE_LSB", QCA6390_CE_SRC_RING_BASE_LSB_OFFSET },

	{ "SRC_RING_BASE_MSB", QCA6390_CE_SRC_RING_BASE_MSB_OFFSET },
@@ -642,6 +644,7 @@ static int cnss_set_pci_link(struct cnss_pci_data *pci_priv, bool link_up) 
	int ret = 0;

	struct pci_dev *pci_dev = pci_priv->pci_dev;

	enum msm_pcie_pm_opt pm_ops;

	int retry = 0;



	cnss_pr_vdbg("%s PCI link\n", link_up ? "Resuming" : "Suspending");
@@ -657,11 +660,17 @@ static int cnss_set_pci_link(struct cnss_pci_data *pci_priv, bool link_up) 
		}

	}



retry:

	ret = msm_pcie_pm_control(pm_ops, pci_dev->bus->number, pci_dev,

				  NULL, PM_OPTIONS_DEFAULT);

	if (ret)

	if (ret) {

		cnss_pr_err("Failed to %s PCI link with default option, err = %d\n",

			    link_up ? "resume" : "suspend", ret);

		if (link_up && retry++ < LINK_TRAINING_RETRY_MAX_TIMES) {

			cnss_pr_dbg("Retry PCI link training #%d\n", retry);

			goto retry;

		}

	}



	if (pci_priv->drv_connected_last) {

		if ((link_up && !ret) || (!link_up && ret))
@@ -4269,6 +4278,7 @@ int cnss_pci_init(struct cnss_plat_data *plat_priv) 
	int ret = 0;

	struct device *dev = &plat_priv->plat_dev->dev;

	u32 rc_num;

	int retry = 0;



	ret = of_property_read_u32(dev->of_node, "qcom,wlan-rc-num", &rc_num);

	if (ret) {
@@ -4276,12 +4286,18 @@ int cnss_pci_init(struct cnss_plat_data *plat_priv) 
		goto out;

	}



retry:

	ret = msm_pcie_enumerate(rc_num);

	if (ret) {

		cnss_pr_err("Failed to enable PCIe RC%x, err = %d\n",

			    rc_num, ret);

		if (retry++ < LINK_TRAINING_RETRY_MAX_TIMES) {

			cnss_pr_dbg("Retry PCI link training #%d\n", retry);

			goto retry;

		} else {

			goto out;

		}

	}



	ret = pci_register_driver(&cnss_pci_driver);

	if (ret) {