From a85bf9cb8b56e5cc4ab7a0cf23e31b293c4fcd76 Mon Sep 17 00:00:00 2001 From: Tony Truong Date: Fri, 16 Oct 2020 13:49:28 -0700 Subject: [PATCH] msm: pcie: update with link power on check for user PCIe resume Instead of checking PCIe S/W link state, check if the link is on is on or off to determine whether PCIe resume should be allowed or not. PCIe S/W link state is not enough to determine since MSM_PCIE_LINK_DOWN state can be set for link on or off. Change-Id: I23a27007eb90134c90d5a20034248697423ebeeb Signed-off-by: Tony Truong --- drivers/pci/controller/pci-msm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pci-msm.c b/drivers/pci/controller/pci-msm.c index 674ade11c1f8..efbcf874a0a5 100644 --- a/drivers/pci/controller/pci-msm.c +++ b/drivers/pci/controller/pci-msm.c @@ -7041,12 +7041,10 @@ int msm_pcie_pm_control(enum msm_pcie_pm_opt pm_opt, u32 busnr, void *user, break; } - if (msm_pcie_dev[rc_idx].link_status != - MSM_PCIE_LINK_DISABLED) { + if (msm_pcie_dev[rc_idx].power_on) { PCIE_ERR(&msm_pcie_dev[rc_idx], - "PCIe: RC%d: requested to resume when link is not disabled:%d. Number of active EP(s): %d\n", - rc_idx, msm_pcie_dev[rc_idx].link_status, - msm_pcie_dev[rc_idx].num_active_ep); + "PCIe: RC%d: requested to resume when link is already powered on. Number of active EP(s): %d\n", + rc_idx, msm_pcie_dev[rc_idx].num_active_ep); break; }