remoteproc: qcom: wcnss: Fix handling of IRQs

[ Upstream commit bed0adac1ded4cb486ba19a3a7e730fbd9a1c9c6 ]

The wcnss_get_irq function is expected to return a value > 0 in the
event that an IRQ is succssfully obtained, but it instead returns 0.
This causes the stop and ready IRQs to never actually be used despite
being defined in the device-tree. This patch fixes that.

Fixes: aed361adca ("remoteproc: qcom: Introduce WCNSS peripheral image loader")
Signed-off-by: Sireesh Kodali <sireeshkodali1@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220526141740.15834-2-sireeshkodali1@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sireesh Kodali 2022-05-26 19:47:39 +05:30 committed by Greg Kroah-Hartman
parent c530595b28
commit 4359f82bea

View File

@ -415,6 +415,7 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss,
irq_handler_t thread_fn) irq_handler_t thread_fn)
{ {
int ret; int ret;
int irq_number;
ret = platform_get_irq_byname(pdev, name); ret = platform_get_irq_byname(pdev, name);
if (ret < 0 && optional) { if (ret < 0 && optional) {
@ -425,14 +426,19 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss,
return ret; return ret;
} }
irq_number = ret;
ret = devm_request_threaded_irq(&pdev->dev, ret, ret = devm_request_threaded_irq(&pdev->dev, ret,
NULL, thread_fn, NULL, thread_fn,
IRQF_TRIGGER_RISING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_ONESHOT,
"wcnss", wcnss); "wcnss", wcnss);
if (ret) if (ret) {
dev_err(&pdev->dev, "request %s IRQ failed\n", name); dev_err(&pdev->dev, "request %s IRQ failed\n", name);
return ret;
}
return ret; /* Return the IRQ number if the IRQ was successfully acquired */
return irq_number;
} }
static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss)