From 4c592715af77948c4c10a128e1f4a88d90fe6637 Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Mon, 12 Nov 2018 11:01:21 -0800 Subject: [PATCH] soc: pil: Disable error-ready timeout Disable the timeout where PIL waits for an error-ready interrupt from the subsystems. This is needed for emulation platform where the time doesn't scale well with the actual time. Change-Id: I9d7bb40c6d490a439c76be116d5968ea43723650 Signed-off-by: Raghavendra Rao Ananta --- drivers/soc/qcom/subsystem_restart.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/soc/qcom/subsystem_restart.c b/drivers/soc/qcom/subsystem_restart.c index 53d1f7c3191c..f5da1990d992 100644 --- a/drivers/soc/qcom/subsystem_restart.c +++ b/drivers/soc/qcom/subsystem_restart.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "subsys-restart: %s(): " fmt, __func__ @@ -682,8 +682,6 @@ static void disable_all_irqs(struct subsys_device *dev) static int wait_for_err_ready(struct subsys_device *subsys) { - int ret; - /* * If subsys is using generic_irq in which case err_ready_irq will be 0, * don't return. @@ -692,14 +690,7 @@ static int wait_for_err_ready(struct subsys_device *subsys) enable_debug == 1) return 0; - ret = wait_for_completion_timeout(&subsys->err_ready, - msecs_to_jiffies(10000)); - if (!ret) { - pr_err("[%s]: Error ready timed out\n", subsys->desc->name); - return -ETIMEDOUT; - } - - return 0; + return wait_for_completion_interruptible(&subsys->err_ready); } static int subsystem_shutdown(struct subsys_device *dev, void *data)