Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752215AbdLZCiJ (ORCPT ); Mon, 25 Dec 2017 21:38:09 -0500 Received: from regular1.263xmail.com ([211.150.99.135]:43311 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbdLZCiD (ORCPT ); Mon, 25 Dec 2017 21:38:03 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org, bhelgaas@google.com Cc: linux-pm@vger.kernel.org, tony@atomide.com, shawn.lin@rock-chips.com, briannorris@chromium.org, rjw@rjwysocki.net, dianders@chromium.org, Jeffy Chen , Frank Rowand , devicetree@vger.kernel.org, Rob Herring Subject: [RFC PATCH v12 2/5] of/irq: Adjust of_pci_irq parsing for multiple interrupts Date: Tue, 26 Dec 2017 10:36:43 +0800 Message-Id: <20171226023646.17722-3-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171226023646.17722-1-jeffy.chen@rock-chips.com> References: <20171226023646.17722-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1521 Lines: 62 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 --- Changes in v13: None Changes in v12: None 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