From patchwork Thu Sep 20 01:51:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 147080 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1384358ljw; Wed, 19 Sep 2018 18:49:37 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYjSCCx+ikfQ0t6KetMf/bVx1ROT5dYNSdBEfRNi4PriysfSHLO4ZPwvISoOcxW6uespvnM X-Received: by 2002:a63:1921:: with SMTP id z33-v6mr35355632pgl.302.1537408176877; Wed, 19 Sep 2018 18:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537408176; cv=none; d=google.com; s=arc-20160816; b=g1MFxjGk01liMFjG+/0jy4+PFd5G8wUGnwXUUmpH+l3S9MiD5+/nzBo1avY7KE0olq qsVIvdG6e1lu1lfqk5DT+XGO8VWyDD4X/cBLZIn9Ev2ZCUE5e5QaSKpeYf0GHVMc1MsM uzRzEq3lrnDHXvdE0sJ/gI5NqAxvRwdQnvP5F8/rNXOWbCRL1JL+E9E3Xto4ufocNIpU dEF9XnMEzJpCQlDkkEVa+4+Kr9yW1D2b7l5TJTF9XwhqMXiZTog3/GmIlqGfLNYd1XKb NR5ssR/Sd0Qca/kENE8hBpstBPj+foIGH6UEAiHmlFhc3xXj1NzpwhQqVk09f9lJ5R8G n+0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=TH6B8WSzd10W48SEVbkFc6rDiVSy0C3hDys859up1d4=; b=dsI0zBLFIAmCpCVvDzxPtAc5QUYHgB7lgffPgBxjDtXfsQ3m04GJ4aibTSQtiny3En xzwf5gwTi0tFGQmhbv3o0hW/s1kR28EyHjPMIxF+uVBzsXvJyH2z//U7568SPaOsB8Sd BmJ8eC79DC3iozdUFkLyS1WTya26AMJd0k8ImpxIRD6nZIq08lKZbdcAvZZGlYOnk5KO /D2gUK5AYN8lMS5ctRJw0frNvWPjgkYSsffM3WPnWIXsIKMCAzNw3QABTzrvxEO2uauB Vwye+0SSt34/1G5G6XMlBX/Zo9R7rkZ1eWMAqQB2o4dPteR8+/irGJr82EbC99WWURki kCQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="daH5aI5/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r84-v6si23516773pfj.355.2018.09.19.18.49.35; Wed, 19 Sep 2018 18:49:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="daH5aI5/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731782AbeITHaT (ORCPT + 13 others); Thu, 20 Sep 2018 03:30:19 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33714 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726065AbeITHaT (ORCPT ); Thu, 20 Sep 2018 03:30:19 -0400 Received: by mail-pg1-f194.google.com with SMTP id y18-v6so304706pge.0 for ; Wed, 19 Sep 2018 18:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=TH6B8WSzd10W48SEVbkFc6rDiVSy0C3hDys859up1d4=; b=daH5aI5/54SMpB6AWMNqMhS1OY1gIsDRikwSaVsKuoQZS5lZEhNkCHn5J1EbXydWQQ 48cEAl14YHVPQv8TAtYAkqDUX+rYyuG+tMhbZXF3gmoYNitM/NsBgdcqOZEdoyjqeigk yjfgcx275l0YYDjgDoUygJ93zy6o8+5osRjjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TH6B8WSzd10W48SEVbkFc6rDiVSy0C3hDys859up1d4=; b=VcpP9fEWMpG1BpfzosjD/inshhbfXg2cFL75caxxqkeQvPG2lPaWn5eV4p8vL1PWds YyBDXjLAC3GpywsgsMfEs8ppjmI1SrZ/xNUuwS3s2bE3GybwtK6zOSUXIlx16MFIe0aa 5QCaxk1bcFgCe4QRn9USmDeiPE0tT6UpDqyGJ57dOiN/2qRD9Ih71SjCbjr/jSwAmr9H SjERzGHPYElj2ZmXDvyl/k0LAKtqjHVnwjiUcf86Q4e9gaFoThAouDEQ9HIdr/KZaBz4 sbHMo5uY6moHQ1xKYx8SNDvm1vZSUvLGJLF2FRg12iTTGNyOVcPbz8hPB+w/z+Rvyl9t znDw== X-Gm-Message-State: APzg51CCzlsrdp1MO5GC7fsBvhxKaTxmvFX+A14MEOwFMec4XK2Hbj4H nPsuCIdQwhJhgajmL2d/2F4T6g== X-Received: by 2002:a62:c0a:: with SMTP id u10-v6mr39027862pfi.43.1537408174380; Wed, 19 Sep 2018 18:49:34 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x24-v6sm28927336pfh.67.2018.09.19.18.49.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 18:49:33 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] remoteproc: qcom: q6v5: Propagate EPROBE_DEFER Date: Wed, 19 Sep 2018 18:51:51 -0700 Message-Id: <20180920015151.15957-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In the case that the interrupts fail to result because of the interrupt-controller not yet being registered the platform_get_irq_byname() call will fail with -EPROBE_DEFER, but passing this into devm_request_threaded_irq() will result in -EINVAL being returned, the driver is therefor not reprobed later. Fixes: 3b415c8fb263 ("remoteproc: q6v5: Extract common resource handling") Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson --- drivers/remoteproc/qcom_q6v5.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.18.0 diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c index 61a760ee4aac..e9ab90c19304 100644 --- a/drivers/remoteproc/qcom_q6v5.c +++ b/drivers/remoteproc/qcom_q6v5.c @@ -198,6 +198,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev, } q6v5->fatal_irq = platform_get_irq_byname(pdev, "fatal"); + if (q6v5->fatal_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + ret = devm_request_threaded_irq(&pdev->dev, q6v5->fatal_irq, NULL, q6v5_fatal_interrupt, IRQF_TRIGGER_RISING | IRQF_ONESHOT, @@ -208,6 +211,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev, } q6v5->ready_irq = platform_get_irq_byname(pdev, "ready"); + if (q6v5->ready_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + ret = devm_request_threaded_irq(&pdev->dev, q6v5->ready_irq, NULL, q6v5_ready_interrupt, IRQF_TRIGGER_RISING | IRQF_ONESHOT, @@ -218,6 +224,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev, } q6v5->handover_irq = platform_get_irq_byname(pdev, "handover"); + if (q6v5->handover_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + ret = devm_request_threaded_irq(&pdev->dev, q6v5->handover_irq, NULL, q6v5_handover_interrupt, IRQF_TRIGGER_RISING | IRQF_ONESHOT, @@ -229,6 +238,9 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev, disable_irq(q6v5->handover_irq); q6v5->stop_irq = platform_get_irq_byname(pdev, "stop-ack"); + if (q6v5->stop_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + ret = devm_request_threaded_irq(&pdev->dev, q6v5->stop_irq, NULL, q6v5_stop_interrupt, IRQF_TRIGGER_RISING | IRQF_ONESHOT,