From 0b800d87c4cc3bb63152809e2421083adab5bc7e Mon Sep 17 00:00:00 2001 From: Jyothi Kumar Seerapu Date: Fri, 29 Jul 2022 13:02:56 +0530 Subject: [PATCH] pci: msm: Continue with probe even icc handles are missing on RUMI This change is to proceed PCIe RC probe even icc handles are not present in SDX75 RUMI validations. Currently icc changes are not mainlined and hence avoiding the issues related to icc in PCIe code. Change-Id: Ie66c62fae4e84cc68e08dfcd5a159dbdfaaebed1 Signed-off-by: Jyothi Kumar Seerapu Signed-off-by: Prudhvi Yarlagadda --- drivers/pci/controller/pci-msm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pci-msm.c b/drivers/pci/controller/pci-msm.c index 5185d55e0c0c..1fe65d6bc980 100644 --- a/drivers/pci/controller/pci-msm.c +++ b/drivers/pci/controller/pci-msm.c @@ -4404,6 +4404,10 @@ static int msm_pcie_get_resources(struct msm_pcie_dev_t *dev, PCIE_DBG(dev, "PCIe: RC%d: entry\n", dev->rc_idx); + ret = msm_pcie_get_reg(dev); + if (ret) + return ret; + dev->icc_path = of_icc_get(&pdev->dev, "icc_path"); if (IS_ERR_OR_NULL(dev->icc_path)) { ret = dev->icc_path ? PTR_ERR(dev->icc_path) : -EINVAL; @@ -4411,7 +4415,8 @@ static int msm_pcie_get_resources(struct msm_pcie_dev_t *dev, PCIE_ERR(dev, "PCIe: RC%d: failed to get ICC path: %d\n", dev->rc_idx, ret); - return ret; + if (!dev->rumi) + return ret; } for (i = 0; i < MSM_PCIE_MAX_IRQ; i++) { @@ -4461,10 +4466,6 @@ static int msm_pcie_get_resources(struct msm_pcie_dev_t *dev, if (ret) return ret; - ret = msm_pcie_get_reg(dev); - if (ret) - return ret; - ret = msm_pcie_get_parf_status_reg(dev); if (ret) return ret;