From: "Heiko Stübner" <heiko@sntech.de>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Cc: linux-kernel@vger.kernel.org, dianders@chromium.org,
linux-rockchip@lists.infradead.org,
iommu@lists.linux-foundation.org, mka@chromium.org,
groeck@chromium.org, kernel@collabora.com, bleung@chromium.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] iommu/rockchip: Don't loop until failure to count interrupts
Date: Tue, 08 Oct 2019 19:58:14 +0200 [thread overview]
Message-ID: <3132916.nyj3dfveGU@diego> (raw)
In-Reply-To: <20191008135843.30640-1-enric.balletbo@collabora.com>
Hi Enric,
Am Dienstag, 8. Oktober 2019, 15:58:43 CEST schrieb Enric Balletbo i Serra:
> As platform_get_irq() now prints an error when the interrupt does not
> exist, counting interrupts by looping until failure causes the printing
> of scary messages like:
>
> rk_iommu ff924000.iommu: IRQ index 1 not found
> rk_iommu ff914000.iommu: IRQ index 1 not found
> rk_iommu ff903f00.iommu: IRQ index 1 not found
> rk_iommu ff8f3f00.iommu: IRQ index 1 not found
> rk_iommu ff650800.iommu: IRQ index 1 not found
>
> Fix this by using the platform_irq_count() helper to avoid touching
> non-existent interrupts.
It looks like we did the same fix ... see my patch from september 25:
https://patchwork.kernel.org/patch/11161221/
> Fixes: 7723f4c5ecdb8d83 ("driver core: platform: Add an error message to platform_get_irq*()")
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>
> drivers/iommu/rockchip-iommu.c | 35 +++++++++++++++++++++++-----------
> 1 file changed, 24 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 26290f310f90..8c6318bd1b37 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -1136,7 +1136,7 @@ static int rk_iommu_probe(struct platform_device *pdev)
> struct rk_iommu *iommu;
> struct resource *res;
> int num_res = pdev->num_resources;
> - int err, i, irq;
> + int err, i, irq, num_irqs;
>
> iommu = devm_kzalloc(dev, sizeof(*iommu), GFP_KERNEL);
> if (!iommu)
> @@ -1219,20 +1219,28 @@ static int rk_iommu_probe(struct platform_device *pdev)
>
> pm_runtime_enable(dev);
>
> - i = 0;
> - while ((irq = platform_get_irq(pdev, i++)) != -ENXIO) {
> - if (irq < 0)
> - return irq;
> + num_irqs = platform_irq_count(pdev);
> + if (num_irqs < 0) {
> + err = num_irqs;
> + goto err_disable_pm_runtime;
> + }
By moving the basic irq count above the pm_runtime_enable
you save some lines and the whole goto logic ... see my patch
for reference :-D
Heiko
> +
> + for (i = 0; i < num_irqs; i++) {
> + irq = platform_get_irq(pdev, i);
> + if (irq < 0) {
> + err = irq;
> + goto err_disable_pm_runtime;
> + }
>
> err = devm_request_irq(iommu->dev, irq, rk_iommu_irq,
> IRQF_SHARED, dev_name(dev), iommu);
> - if (err) {
> - pm_runtime_disable(dev);
> - goto err_remove_sysfs;
> - }
> + if (err)
> + goto err_disable_pm_runtime;
> }
>
> return 0;
> +err_disable_pm_runtime:
> + pm_runtime_disable(dev);
> err_remove_sysfs:
> iommu_device_sysfs_remove(&iommu->iommu);
> err_put_group:
> @@ -1245,10 +1253,15 @@ static int rk_iommu_probe(struct platform_device *pdev)
> static void rk_iommu_shutdown(struct platform_device *pdev)
> {
> struct rk_iommu *iommu = platform_get_drvdata(pdev);
> - int i = 0, irq;
> + int i, irq, num_irqs;
>
> - while ((irq = platform_get_irq(pdev, i++)) != -ENXIO)
> + num_irqs = platform_irq_count(pdev);
> + for (i = 0; i < num_irqs; i++) {
> + irq = platform_get_irq(pdev, i);
> + if (irq < 0)
> + continue;
> devm_free_irq(iommu->dev, irq, iommu);
> + }
>
> pm_runtime_force_suspend(&pdev->dev);
> }
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-10-08 17:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 13:58 [PATCH] iommu/rockchip: Don't loop until failure to count interrupts Enric Balletbo i Serra
2019-10-08 17:58 ` Heiko Stübner [this message]
2019-10-08 20:21 ` Enric Balletbo Serra
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=3132916.nyj3dfveGU@diego \
--to=heiko@sntech.de \
--cc=bleung@chromium.org \
--cc=dianders@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=groeck@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mka@chromium.org \
/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;
as well as URLs for NNTP newsgroup(s).