From 41b3ee2015b5836ba44b93cd06a00fc2be114c3b Mon Sep 17 00:00:00 2001 From: Santosh Dronamraju Date: Wed, 7 Oct 2020 23:11:54 +0530 Subject: [PATCH] soc: qcom: Update the probe error path when rmb status register not present Some of the SoCs may not have support "rmb_general_purpose" register, So handle the error path to load the firmware from kernel. Change-Id: Id64c8e531bb6fe79ea40e6fa34b20aa2e1891ad8 Signed-off-by: Santosh Dronamraju --- drivers/soc/qcom/subsys-pil-tz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/subsys-pil-tz.c b/drivers/soc/qcom/subsys-pil-tz.c index 86d790180a61..c4e6bfc8a985 100644 --- a/drivers/soc/qcom/subsys-pil-tz.c +++ b/drivers/soc/qcom/subsys-pil-tz.c @@ -1440,7 +1440,7 @@ static int pil_tz_generic_probe(struct platform_device *pdev) if (IS_ERR(d->rmb_gp_reg)) { dev_err(&pdev->dev, "Invalid resource for rmb_gp_reg\n"); rc = PTR_ERR(d->rmb_gp_reg); - goto err_ramdump; + goto load_from_pil; } rmb_gp_reg_val = __raw_readl(d->rmb_gp_reg); @@ -1455,7 +1455,7 @@ static int pil_tz_generic_probe(struct platform_device *pdev) pr_info("spss is brought out of reset by UEFI\n"); d->subsys_desc.powerup = subsys_powerup_boot_enabled; } - +load_from_pil: res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sp2soc_irq_status"); d->irq_status = devm_ioremap_resource(&pdev->dev, res);