From bccdbc1d48fc21eecfbba6b2efa78a12463564ec Mon Sep 17 00:00:00 2001 From: Tony Truong Date: Fri, 27 Mar 2020 11:27:22 -0700 Subject: [PATCH] msm: pcie: remove read to PCIe ELBI_SYS_CTRL reg after PME_TURNOFF After sending PME_TURNOFF message via ELBI_SYS_CTRL register, remove read back to the register to avoid possible hang. Change-Id: Ie424006991f10f12127f9b5a07a93c291c7a2f10 Signed-off-by: Tony Truong --- drivers/pci/controller/pci-msm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pci-msm.c b/drivers/pci/controller/pci-msm.c index b503e63774c9..37aa1fc98951 100644 --- a/drivers/pci/controller/pci-msm.c +++ b/drivers/pci/controller/pci-msm.c @@ -6643,8 +6643,8 @@ static int msm_pcie_pm_suspend(struct pci_dev *dev, spin_unlock_irqrestore(&pcie_dev->cfg_lock, pcie_dev->irqsave_flags); - msm_pcie_write_mask(pcie_dev->elbi + PCIE20_ELBI_SYS_CTRL, 0, - BIT(4)); + writel_relaxed(BIT(4), pcie_dev->elbi + PCIE20_ELBI_SYS_CTRL); + wmb(); /* ensure changes propagated to the hardware */ PCIE_DBG(pcie_dev, "RC%d: PME_TURNOFF_MSG is sent out\n", pcie_dev->rc_idx);