* [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq
@ 2014-07-29 1:33 Jisheng Zhang
2014-07-29 10:34 ` Thierry Reding
2014-09-03 22:51 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Jisheng Zhang @ 2014-07-29 1:33 UTC (permalink / raw)
To: thierry.reding, bhelgaas, swarren
Cc: linux-tegra, linux-pci, linux-kernel, Jisheng Zhang
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;
- tegra_msi_free(msi, d->hwirq);
+ irq_dispose_mapping(irq);
+ tegra_msi_free(msi, hwirq);
}
static struct irq_chip tegra_msi_irq_chip = {
--
2.0.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq
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
2014-09-03 22:51 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2014-07-29 10:34 UTC (permalink / raw)
To: Jisheng Zhang; +Cc: bhelgaas, swarren, linux-tegra, linux-pci, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] PCI: tegra: add missing cleanup in error path and teardown_irq
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
@ 2014-09-03 22:51 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2014-09-03 22:51 UTC (permalink / raw)
To: Jisheng Zhang
Cc: thierry.reding, swarren, linux-tegra, linux-pci, linux-kernel
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>
Applied to pci/host-tegra for v3.18, with the irqd_to_hwirq() change
Thierry suggested and his Reviewed-by and Ack, thanks!
> ---
> 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;
>
> - tegra_msi_free(msi, d->hwirq);
> + irq_dispose_mapping(irq);
> + tegra_msi_free(msi, hwirq);
> }
>
> static struct irq_chip tegra_msi_irq_chip = {
> --
> 2.0.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-03 22:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2014-09-03 22:51 ` Bjorn Helgaas
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).