| Message ID | 20180920015151.15957-1-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Commit | d5269c4553a64b6882f2c019ae21b783a0984a83 |
| Headers | show |
| Series | remoteproc: qcom: q6v5: Propagate EPROBE_DEFER | expand |
On Mon 24 Sep 23:50 PDT 2018, Sibi Sankar wrote: > On 2018-09-20 07:21, Bjorn Andersson wrote: > > 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. > > > > The patch looks fine. > Reviewed-by: Sibi Sankar <sibis@codeaurora.org> > Thanks for the review Sibi, applied the patch. Regards, Bjorn > > Fixes: 3b415c8fb263 ("remoteproc: q6v5: Extract common resource > > handling") > > Cc: stable@vger.kernel.org > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > drivers/remoteproc/qcom_q6v5.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > 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, > > -- > -- Sibi Sankar -- > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, > a Linux Foundation Collaborative Project.
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,
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 <bjorn.andersson@linaro.org> --- drivers/remoteproc/qcom_q6v5.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.18.0