lkml.org 
[lkml]   [2017]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v11 2/5] of/irq: Adjust of_pci_irq parsing for multiple interrupts
    Date
    Currently we are considering the first irq as the PCI interrupt pin,
    but a PCI device may have multiple interrupts(e.g. PCIe WAKE# pin).

    Only parse the PCI interrupt pin when the irq is unnamed or named as
    "pci".

    Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
    ---

    Changes in v11:
    Address Brian's comments.

    Changes in v10: None
    Changes in v9: None
    Changes in v8: None
    Changes in v7: None
    Changes in v6: None
    Changes in v5: None
    Changes in v3: None
    Changes in v2: None

    drivers/of/of_pci_irq.c | 22 +++++++++++++++++++---
    1 file changed, 19 insertions(+), 3 deletions(-)

    diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
    index 3a05568f65df..d39565d5477b 100644
    --- a/drivers/of/of_pci_irq.c
    +++ b/drivers/of/of_pci_irq.c
    @@ -27,9 +27,25 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq
    */
    dn = pci_device_to_OF_node(pdev);
    if (dn) {
    - rc = of_irq_parse_one(dn, 0, out_irq);
    - if (!rc)
    - return rc;
    + struct property *prop;
    + const char *name;
    + int index = 0;
    +
    + of_property_for_each_string(dn, "interrupt-names", prop, name) {
    + if (!strcmp(name, "pci"))
    + break;
    + index++;
    + }
    +
    + /*
    + * Only parse from DT if we have no "interrupt-names",
    + * or if we found an interrupt named "pci".
    + */
    + if (index == 0 || name) {
    + rc = of_irq_parse_one(dn, index, out_irq);
    + if (!rc)
    + return rc;
    + }
    }

    /* Ok, we don't, time to have fun. Let's start by building up an
    --
    2.11.0

    \
     
     \ /
      Last update: 2017-12-25 12:50    [W:4.710 / U:1.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site