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

Commit b7df8c42 authored by Yue Ma's avatar Yue Ma Committed by David Keitel
Browse files

cnss: Recover PCIe configuration space during normal WLAN recovery 



During normal SSR there is a corner case that somehow WLAN driver fails to
read PCIe configuration space which can result corruption when it tries to
save it. Hence recover PCIe configuration space from shadow registers as
well in normal SSR. This is same as the recovery for real PCIe link down.

Change-Id: I2bae0f2e322829a9689d3a129145b54c079dccdf
CRs-fixed: 886245
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent f6c9eb51

drivers/net/wireless/cnss/cnss_pci.c

+2 −23
Original line number Diff line number Diff line
@@ -2281,17 +2281,7 @@ static int cnss_shutdown(const struct subsys_desc *subsys, bool force_stop) 
	if (wdrv && wdrv->shutdown)

		wdrv->shutdown(pdev);



	if (penv->pcie_link_state && !penv->pcie_link_down_ind) {

		pci_save_state(pdev);

		penv->saved_state = pci_store_saved_state(pdev);

		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

					cnss_get_pci_dev_bus_number(pdev),

					pdev, NULL, PM_OPTIONS)) {

			pr_debug("cnss: Failed to shutdown PCIe link!\n");

			ret = -EFAULT;

		}

		penv->pcie_link_state = PCIE_LINK_DOWN;

	} else if (penv->pcie_link_state && penv->pcie_link_down_ind) {

	if (penv->pcie_link_state) {

		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

				cnss_get_pci_dev_bus_number(pdev),

				pdev, NULL, PM_OPTIONS_SUSPEND_LINK_DOWN)) {
@@ -2345,18 +2335,7 @@ static int cnss_powerup(const struct subsys_desc *subsys) 
		goto err_pcie_link_up;

	}



	if (!penv->pcie_link_state && !penv->pcie_link_down_ind) {

		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

				  cnss_get_pci_dev_bus_number(pdev),

				  pdev, NULL, PM_OPTIONS);



		if (ret) {

			pr_err("cnss: Failed to bring-up PCIe link!\n");

			goto err_pcie_link_up;

		}

		penv->pcie_link_state = PCIE_LINK_UP;



	} else if (!penv->pcie_link_state && penv->pcie_link_down_ind) {

	if (!penv->pcie_link_state) {

		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

			cnss_get_pci_dev_bus_number(pdev),

			pdev, NULL, PM_OPTIONS_RESUME_LINK_DOWN);