From: Will Deacon <will@kernel.org>
To: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: iommu@lists.linux-foundation.org, robin.murphy@arm.com,
joro@8bytes.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/2] iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing
Date: Mon, 11 Nov 2019 14:36:57 +0000 [thread overview]
Message-ID: <20191111143656.GA10488@willie-the-truck> (raw)
In-Reply-To: <20191111111721.4145919-1-jean-philippe@linaro.org>
On Mon, Nov 11, 2019 at 12:17:20PM +0100, Jean-Philippe Brucker wrote:
> Since commit 7723f4c5ecdb ("driver core: platform: Add an error message
> to platform_get_irq*()"), platform_get_irq_byname() displays an error
> when the IRQ isn't found. Since the SMMUv3 driver uses that function to
> query which interrupt method is available, the message is now displayed
> during boot for any SMMUv3 that doesn't implement the combined
> interrupt, or that implements MSIs.
>
> [ 20.700337] arm-smmu-v3 arm-smmu-v3.7.auto: IRQ combined not found
> [ 20.706508] arm-smmu-v3 arm-smmu-v3.7.auto: IRQ eventq not found
> [ 20.712503] arm-smmu-v3 arm-smmu-v3.7.auto: IRQ priq not found
> [ 20.718325] arm-smmu-v3 arm-smmu-v3.7.auto: IRQ gerror not found
>
> Use platform_get_irq_byname_optional() to avoid displaying a spurious
> error.
>
> Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()")
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
> drivers/iommu/arm-smmu-v3.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> index bfa4a0f39ed0..a89797f346a4 100644
> --- a/drivers/iommu/arm-smmu-v3.c
> +++ b/drivers/iommu/arm-smmu-v3.c
> @@ -5207,19 +5207,19 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
>
> /* Interrupt lines */
>
> - irq = platform_get_irq_byname(pdev, "combined");
> + irq = platform_get_irq_byname_optional(pdev, "combined");
> if (irq > 0)
> smmu->combined_irq = irq;
> else {
> - irq = platform_get_irq_byname(pdev, "eventq");
> + irq = platform_get_irq_byname_optional(pdev, "eventq");
> if (irq > 0)
> smmu->evtq.q.irq = irq;
>
> - irq = platform_get_irq_byname(pdev, "priq");
> + irq = platform_get_irq_byname_optional(pdev, "priq");
> if (irq > 0)
> smmu->priq.q.irq = irq;
>
> - irq = platform_get_irq_byname(pdev, "gerror");
> + irq = platform_get_irq_byname_optional(pdev, "gerror");
> if (irq > 0)
> smmu->gerr_irq = irq;
> }
Thanks, looks mechanical enough for me:
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-11 14:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 11:17 [PATCH 1/2] iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing Jean-Philippe Brucker
2019-11-11 11:17 ` [PATCH 2/2] iommu/arm-smmu: Remove duplicate error message Jean-Philippe Brucker
2019-11-11 14:37 ` Will Deacon
2019-11-11 14:43 ` Robin Murphy
2019-11-11 11:52 ` [PATCH 1/2] iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing John Garry
2019-11-11 14:23 ` Jean-Philippe Brucker
2019-11-11 14:36 ` Will Deacon [this message]
2019-11-11 14:44 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111143656.GA10488@willie-the-truck \
--to=will@kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=robin.murphy@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox