Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1221782 > unrolled thread
| Started by | David Daney <ddaney.cavm@gmail.com> |
|---|---|
| First post | 2015-09-10 01:00 +0200 |
| Last post | 2015-09-17 22:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v3] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages. David Daney <ddaney.cavm@gmail.com> - 2015-09-10 01:00 +0200
Re: [PATCH v3] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages. Rob Herring <robh@kernel.org> - 2015-09-17 22:00 +0200
| From | David Daney <ddaney.cavm@gmail.com> |
|---|---|
| Date | 2015-09-10 01:00 +0200 |
| Subject | [PATCH v3] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages. |
| Message-ID | <q6Wvn-8wd-7@gated-at.bofh.it> |
From: David Daney <david.daney@cavium.com>
It is perfectly legitimate for a PCI device to have an
PCI_INTERRUPT_PIN value of zero. This happens if the device doesn't
use interrupts, or on PCIe devices, where only MSI/MSI-X are
supported.
Silence the annoying "of_irq_parse_pci() failed with rc=-19" error
messages by moving the printing code into of_irq_parse_pci(), and only
emitting the message for cases where PCI_INTERRUPT_PIN == 0 is not the
cause for an early exit.
Signed-off-by: David Daney <david.daney@cavium.com>
---
Changes in v3: Also print the message for failures in
of_irq_parse_raw() (also suggested by Frank Rowand).
Changes in v2: Move the print function in to of_irq_parse_pci() at a
common error exit point (as suggested by Frank Rowand).
drivers/of/of_pci_irq.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
index 1710d9d..2306313 100644
--- a/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@ -38,8 +38,8 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
*/
rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
if (rc != 0)
- return rc;
- /* No pin, exit */
+ goto err;
+ /* No pin, exit with no error message. */
if (pin == 0)
return -ENODEV;
@@ -53,8 +53,10 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
ppnode = pci_bus_to_OF_node(pdev->bus);
/* No node for host bridge ? give up */
- if (ppnode == NULL)
- return -EINVAL;
+ if (ppnode == NULL) {
+ rc = -EINVAL;
+ goto err;
+ }
} else {
/* We found a P2P bridge, check if it has a node */
ppnode = pci_device_to_OF_node(ppdev);
@@ -86,7 +88,13 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
out_irq->args[0] = pin;
laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
laddr[1] = laddr[2] = cpu_to_be32(0);
- return of_irq_parse_raw(laddr, out_irq);
+ rc = of_irq_parse_raw(laddr, out_irq);
+ if (rc)
+ goto err;
+ return 0;
+err:
+ dev_err(&pdev->dev, "of_irq_parse_pci() failed with rc=%d\n", rc);
+ return rc;
}
EXPORT_SYMBOL_GPL(of_irq_parse_pci);
@@ -105,10 +113,8 @@ int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
int ret;
ret = of_irq_parse_pci(dev, &oirq);
- if (ret) {
- dev_err(&dev->dev, "of_irq_parse_pci() failed with rc=%d\n", ret);
+ if (ret)
return 0; /* Proper return code 0 == NO_IRQ */
- }
return irq_create_of_mapping(&oirq);
}
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2015-09-17 22:00 +0200 |
| Subject | Re: [PATCH v3] of_pci_irq: Silence bogus "of_irq_parse_pci() failed ..." messages. |
| Message-ID | <q9NvA-5kj-3@gated-at.bofh.it> |
| In reply to | #1221782 |
On 09/09/2015 05:57 PM, David Daney wrote:
> From: David Daney <david.daney@cavium.com>
>
> It is perfectly legitimate for a PCI device to have an
> PCI_INTERRUPT_PIN value of zero. This happens if the device doesn't
> use interrupts, or on PCIe devices, where only MSI/MSI-X are
> supported.
>
> Silence the annoying "of_irq_parse_pci() failed with rc=-19" error
> messages by moving the printing code into of_irq_parse_pci(), and only
> emitting the message for cases where PCI_INTERRUPT_PIN == 0 is not the
> cause for an early exit.
>
> Signed-off-by: David Daney <david.daney@cavium.com>
Applied, thanks.
Rob
> ---
>
> Changes in v3: Also print the message for failures in
> of_irq_parse_raw() (also suggested by Frank Rowand).
>
> Changes in v2: Move the print function in to of_irq_parse_pci() at a
> common error exit point (as suggested by Frank Rowand).
>
>
> drivers/of/of_pci_irq.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
> index 1710d9d..2306313 100644
> --- a/drivers/of/of_pci_irq.c
> +++ b/drivers/of/of_pci_irq.c
> @@ -38,8 +38,8 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> */
> rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);
> if (rc != 0)
> - return rc;
> - /* No pin, exit */
> + goto err;
> + /* No pin, exit with no error message. */
> if (pin == 0)
> return -ENODEV;
>
> @@ -53,8 +53,10 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> ppnode = pci_bus_to_OF_node(pdev->bus);
>
> /* No node for host bridge ? give up */
> - if (ppnode == NULL)
> - return -EINVAL;
> + if (ppnode == NULL) {
> + rc = -EINVAL;
> + goto err;
> + }
> } else {
> /* We found a P2P bridge, check if it has a node */
> ppnode = pci_device_to_OF_node(ppdev);
> @@ -86,7 +88,13 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
> out_irq->args[0] = pin;
> laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
> laddr[1] = laddr[2] = cpu_to_be32(0);
> - return of_irq_parse_raw(laddr, out_irq);
> + rc = of_irq_parse_raw(laddr, out_irq);
> + if (rc)
> + goto err;
> + return 0;
> +err:
> + dev_err(&pdev->dev, "of_irq_parse_pci() failed with rc=%d\n", rc);
> + return rc;
> }
> EXPORT_SYMBOL_GPL(of_irq_parse_pci);
>
> @@ -105,10 +113,8 @@ int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
> int ret;
>
> ret = of_irq_parse_pci(dev, &oirq);
> - if (ret) {
> - dev_err(&dev->dev, "of_irq_parse_pci() failed with rc=%d\n", ret);
> + if (ret)
> return 0; /* Proper return code 0 == NO_IRQ */
> - }
>
> return irq_create_of_mapping(&oirq);
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web