From: Thierry Reding <thierry.reding@gmail.com>
To: Jisheng Zhang <jszhang@marvell.com>
Cc: bhelgaas@google.com, swarren@wwwdotorg.org,
linux-tegra@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq
Date: Tue, 29 Jul 2014 12:34:43 +0200 [thread overview]
Message-ID: <20140729103442.GE21182@ulmo.nvidia.com> (raw)
In-Reply-To: <1406597610-6748-1-git-send-email-jszhang@marvell.com>
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
On Tue, Jul 29, 2014 at 09:33:30AM +0800, Jisheng Zhang wrote:
> We should call tegra_msi_free() to free the MSI bit if
> irq_create_mapping() fails. And we need to dispose the IRQ mapping
> during IRQ teardown.
>
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
> drivers/pci/host/pci-tegra.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
> index 083cf37..4ccc418 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -1203,8 +1203,10 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev,
> return hwirq;
>
> irq = irq_create_mapping(msi->domain, hwirq);
> - if (!irq)
> + if (!irq) {
> + tegra_msi_free(msi, hwirq);
> return -EINVAL;
> + }
>
> irq_set_msi_desc(irq, desc);
>
> @@ -1222,8 +1224,10 @@ static void tegra_msi_teardown_irq(struct msi_chip *chip, unsigned int irq)
> {
> struct tegra_msi *msi = to_tegra_msi(chip);
> struct irq_data *d = irq_get_irq_data(irq);
> + unsigned long hwirq = d->hwirq;
There seems to be an inconsistency regarding the data type of hwirq. The
irq_data structure uses unsigned long, but irqd_to_hwirq() function
returns irq_hw_number_t. Perhaps it would be best to use this instead:
irq_hw_number_t hwirq = irqd_to_hwirq(d);
But I don't have a strong preference for either way, so with or without
that change:
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-07-29 10:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 1:33 [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq Jisheng Zhang
2014-07-29 10:34 ` Thierry Reding [this message]
2014-09-03 22:51 ` Bjorn Helgaas
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=20140729103442.GE21182@ulmo.nvidia.com \
--to=thierry.reding@gmail.com \
--cc=bhelgaas@google.com \
--cc=jszhang@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.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).