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

Commit 5091d849 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Suspend/resume PCIe link in no_irq phase"

parents 22281d82 fad13949

drivers/net/wireless/cnss2/pci.c

+20 −37
Original line number Diff line number Diff line
@@ -887,7 +887,6 @@ static int cnss_pci_suspend(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	pm_message_t state = { .event = PM_EVENT_SUSPEND };
@@ -895,10 +894,6 @@ static int cnss_pci_suspend(struct device *dev) 
	if (!pci_priv)

		goto out;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		goto out;



	driver_ops = pci_priv->driver_ops;

	if (driver_ops && driver_ops->suspend) {

		ret = driver_ops->suspend(pci_dev, state);
@@ -910,7 +905,7 @@ static int cnss_pci_suspend(struct device *dev) 
		}

	}



	if (pci_priv->pci_link_state) {

	if (pci_priv->pci_link_state == PCI_LINK_UP) {

		ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_SUSPEND);

		if (ret) {

			if (driver_ops && driver_ops->resume)
@@ -942,22 +937,19 @@ static int cnss_pci_resume(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	if (!pci_priv)

		goto out;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		goto out;



	if (pci_priv->pci_link_down_ind)

		goto out;



	if (pci_priv->pci_link_state == PCI_LINK_UP) {

		ret = pci_enable_device(pci_dev);

		if (ret)

		cnss_pr_err("Failed to enable PCI device, err = %d\n", ret);

			cnss_pr_err("Failed to enable PCI device, err = %d\n",

				    ret);



		if (pci_priv->saved_state)

			cnss_set_pci_config_space(pci_priv,
@@ -965,6 +957,7 @@ static int cnss_pci_resume(struct device *dev) 


		pci_set_master(pci_dev);

		cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_RESUME);

	}



	driver_ops = pci_priv->driver_ops;

	if (driver_ops && driver_ops->resume) {
@@ -985,20 +978,20 @@ static int cnss_pci_suspend_noirq(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	if (!pci_priv)

		goto out;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		goto out;



	driver_ops = pci_priv->driver_ops;

	if (driver_ops && driver_ops->suspend_noirq)

		ret = driver_ops->suspend_noirq(pci_dev);



	ret = cnss_set_pci_link(pci_priv, PCI_LINK_DOWN);

	if (ret)

		goto out;

	pci_priv->pci_link_state = PCI_LINK_DOWN;



out:

	return ret;

}
@@ -1008,15 +1001,15 @@ static int cnss_pci_resume_noirq(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	if (!pci_priv)

		goto out;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

	ret = cnss_set_pci_link(pci_priv, PCI_LINK_UP);

	if (ret)

		goto out;

	pci_priv->pci_link_state = PCI_LINK_UP;



	driver_ops = pci_priv->driver_ops;

	if (driver_ops && driver_ops->resume_noirq &&
@@ -1032,16 +1025,11 @@ static int cnss_pci_runtime_suspend(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	if (!pci_priv)

		return -EAGAIN;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		return -EAGAIN;



	if (pci_priv->pci_link_down_ind) {

		cnss_pr_dbg("PCI link down recovery is in progress!\n");

		return -EAGAIN;
@@ -1064,16 +1052,11 @@ static int cnss_pci_runtime_resume(struct device *dev) 
	int ret = 0;

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(pci_dev);

	struct cnss_plat_data *plat_priv;

	struct cnss_wlan_driver *driver_ops;



	if (!pci_priv)

		return -EAGAIN;



	plat_priv = pci_priv->plat_priv;

	if (!plat_priv)

		return -EAGAIN;



	if (pci_priv->pci_link_down_ind) {

		cnss_pr_dbg("PCI link down recovery is in progress!\n");

		return -EAGAIN;