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

Commit 137abc55 authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Avoid trying DRV suspend if PCIe link speed is Gen 3 



Commit baa52351 ("cnss2: change for fixed link speed") has a side
effect that driver may try to enter DRV suspend with Gen 3 link speed
which is currently not supported. This change will fix the original
issue and side effect properly.

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

drivers/net/wireless/cnss2/pci.c

+14 −5
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ static int cnss_pci_get_link_status(struct cnss_pci_data *pci_priv) 
	pci_priv->def_link_speed = link_status & PCI_EXP_LNKSTA_CLS;

	pci_priv->def_link_width =

		(link_status & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;

	pci_priv->cur_link_speed = pci_priv->def_link_speed;



	cnss_pr_dbg("Default PCI link speed is 0x%x, link width is 0x%x\n",

		    pci_priv->def_link_speed, pci_priv->def_link_width);
@@ -695,6 +696,7 @@ static int cnss_set_pci_link_status(struct cnss_pci_data *pci_priv, 
				    enum pci_link_status status)

{

	u16 link_speed, link_width;

	int ret;



	cnss_pr_vdbg("Set PCI link status to: %u\n", status);
@@ -720,8 +722,12 @@ static int cnss_set_pci_link_status(struct cnss_pci_data *pci_priv, 
		return -EINVAL;

	}



	return msm_pcie_set_link_bandwidth(pci_priv->pci_dev,

	ret = msm_pcie_set_link_bandwidth(pci_priv->pci_dev,

					  link_speed, link_width);

	if (!ret)

		pci_priv->cur_link_speed = link_speed;



	return ret;

}



static int cnss_set_pci_link(struct cnss_pci_data *pci_priv, bool link_up)
@@ -740,9 +746,12 @@ static int cnss_set_pci_link(struct cnss_pci_data *pci_priv, bool link_up) 
		if (pci_priv->drv_connected_last) {

			cnss_pr_vdbg("Use PCIe DRV suspend\n");

			pm_ops = MSM_PCIE_DRV_SUSPEND;

			if (pci_priv->device_id != QCA6390_DEVICE_ID &&

			    pci_priv->device_id != QCA6490_DEVICE_ID)

				cnss_set_pci_link_status(pci_priv, PCI_GEN1);

			/* Since DRV suspend cannot be done in Gen 3, set it to

			 * Gen 2 if current link speed is larger than Gen 2.

			 */

			if (pci_priv->cur_link_speed >

			    PCI_EXP_LNKSTA_CLS_5_0GB)

				cnss_set_pci_link_status(pci_priv, PCI_GEN2);

		} else {

			pm_ops = MSM_PCIE_SUSPEND;

		}

drivers/net/wireless/cnss2/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ struct cnss_pci_data { 
	u32 qmi_send_usage_count;

	u16 def_link_speed;

	u16 def_link_width;

	u16 cur_link_speed;

	struct completion wake_event;

	u8 monitor_wake_intr;

	struct iommu_domain *iommu_domain;