evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm_11ad: Fix config space restore from suspend

Browse source 
Config space was not properly restored when
resuming from suspend.

Change-Id: I6b9188f3989957eb44c93302d7958d422bb29e81
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
This commit is contained in:
Hamad Kadmany 2015-07-09 16:04:26 +03:00 • committed by David Keitel
parent ab30d8cc16
commit 857bd53c2d
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/platform/msm/msm_11ad/msm_11ad.c
View file

@ -30,6 +30,9 @@
#define SMMU_SIZE 0x40000000 /* Device address range size */ #define SMMU_SIZE 0x40000000 /* Device address range size */
#define WIGIG_ENABLE_DELAY 50 #define WIGIG_ENABLE_DELAY 50
#define PM_OPT_SUSPEND (MSM_PCIE_CONFIG_NO_CFG_RESTORE | \
MSM_PCIE_CONFIG_LINKDOWN)
#define PM_OPT_RESUME MSM_PCIE_CONFIG_NO_CFG_RESTORE
struct device; struct device;
@ -85,7 +88,7 @@ static int ops_suspend(void *handle)
return rc; return rc;
} }
rc = msm_pcie_pm_control(MSM_PCIE_SUSPEND, pcidev->bus->number, rc = msm_pcie_pm_control(MSM_PCIE_SUSPEND, pcidev->bus->number,
pcidev, NULL, 0); pcidev, NULL, PM_OPT_SUSPEND);
if (rc) { if (rc) {
dev_err(ctx->dev, "msm_pcie_pm_control(SUSPEND) failed :%d\n", dev_err(ctx->dev, "msm_pcie_pm_control(SUSPEND) failed :%d\n",
rc); rc);
@ -112,13 +115,18 @@ static int ops_resume(void *handle)
msleep(WIGIG_ENABLE_DELAY); msleep(WIGIG_ENABLE_DELAY);
rc = msm_pcie_pm_control(MSM_PCIE_RESUME, pcidev->bus->number, rc = msm_pcie_pm_control(MSM_PCIE_RESUME, pcidev->bus->number,
pcidev, NULL, 0); pcidev, NULL, PM_OPT_RESUME);
if (rc) { if (rc) {
dev_err(ctx->dev, "msm_pcie_pm_control(RESUME) failed :%d\n", dev_err(ctx->dev, "msm_pcie_pm_control(RESUME) failed :%d\n",
rc); rc);
return rc; return rc;
} }
pci_restore_state(pcidev); rc = msm_pcie_recover_config(pcidev);
if (rc) {
dev_err(ctx->dev, "msm_pcie_recover_config failed :%d\n",
rc);
return rc;
}
return rc; return rc;
} }