linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
To: <bhelgaas@google.com>, <thierry.reding@gmail.com>,
	<petlozup@nvidia.com>, <rafael.j.wysocki@intel.com>,
	<lpieralisi@kernel.org>, <robh@kernel.org>,
	<jeffy.chen@rock-chips.com>
Cc: <krzysztof.kozlowski+dt@linaro.org>, <jonathanh@nvidia.com>,
	<dmitry.osipenko@collabora.com>, <viresh.kumar@linaro.org>,
	<gregkh@linuxfoundation.org>, <steven.price@arm.com>,
	<kw@linux.com>, <linux-pci@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-tegra@vger.kernel.org>, <linux-pm@vger.kernel.org>,
	<vidyas@nvidia.com>,
	Manikanta Maddireddy <mmaddireddy@nvidia.com>
Subject: [RFC,v14 2/5] of/irq: Adjust of_pci_irq parsing for multiple interrupts
Date: Wed, 8 Feb 2023 16:46:42 +0530	[thread overview]
Message-ID: <20230208111645.3863534-3-mmaddireddy@nvidia.com> (raw)
In-Reply-To: <20230208111645.3863534-1-mmaddireddy@nvidia.com>

From: Jeffy Chen <jeffy.chen@rock-chips.com>

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>
Signed-off-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
---

Changes in v14:
Address Rob's comment on using of_property_match_string().

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/pci/of.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 196834ed44fe..ff897c40ed71 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -429,9 +429,17 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *
 	 */
 	dn = pci_device_to_OF_node(pdev);
 	if (dn) {
-		rc = of_irq_parse_one(dn, 0, out_irq);
-		if (!rc)
-			return rc;
+		int index = 0;
+
+		index = of_property_match_string(dn, "interrupt-names", "pci");
+		if (index == -EINVAL)	/* Property doesn't exist */
+			index = 0;
+
+		if (index >= 0) {
+			rc = of_irq_parse_one(dn, index, out_irq);
+			if (!rc)
+				return rc;
+		}
 	}
 
 	/*
-- 
2.25.1


  parent reply	other threads:[~2023-02-08 11:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-08 11:16 [RFC,v14 0/5] Add DT based PCIe wake support in PCI core driver Manikanta Maddireddy
2023-02-08 11:16 ` [RFC,v14 1/5] dt-bindings: PCI: Add definition of PCIe WAKE# irq and PCI irq Manikanta Maddireddy
2023-02-08 13:53   ` Rob Herring
2023-02-08 15:54     ` Manikanta Maddireddy
2023-02-08 11:16 ` Manikanta Maddireddy [this message]
2023-02-08 11:44   ` [RFC,v14 2/5] of/irq: Adjust of_pci_irq parsing for multiple interrupts Thierry Reding
2023-02-08 12:20     ` Manikanta Maddireddy
2023-02-08 11:16 ` [RFC,v14 3/5] PCI / PM: Add support for the PCIe WAKE# signal for OF Manikanta Maddireddy
2023-02-08 11:50   ` Thierry Reding
2023-02-08 12:19     ` Manikanta Maddireddy
2023-02-08 11:16 ` [RFC,v14 4/5] arm64: tegra: Add PCIe port node with PCIe WAKE# for C1 controller Manikanta Maddireddy
2023-02-08 11:37   ` Thierry Reding
2023-02-08 12:13     ` Manikanta Maddireddy
2023-02-08 16:14       ` Thierry Reding
2023-02-09 10:53         ` Petlozu Pravareshwar
2023-02-09 11:12           ` Thierry Reding
2023-12-06 15:36   ` Manivannan Sadhasivam
2023-12-07  7:24     ` Manikanta Maddireddy
2023-12-07  7:59       ` Manivannan Sadhasivam
2023-12-07  8:53         ` Manikanta Maddireddy
2023-12-07  9:31           ` Manivannan Sadhasivam
2023-02-08 11:16 ` [RFC,v14 5/5] soc/tegra: pmc: Add Tegra234 PCIe wake event Manikanta Maddireddy
2023-02-08 11:38   ` Thierry Reding
2023-02-08 12:06     ` Manikanta Maddireddy
2023-12-06 14:44 ` [RFC,v14 0/5] Add DT based PCIe wake support in PCI core driver Krishna Chaitanya Chundru
2023-12-07  7:09   ` Manikanta Maddireddy

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=20230208111645.3863534-3-mmaddireddy@nvidia.com \
    --to=mmaddireddy@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.osipenko@collabora.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jeffy.chen@rock-chips.com \
    --cc=jonathanh@nvidia.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kw@linux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=lpieralisi@kernel.org \
    --cc=petlozup@nvidia.com \
    --cc=rafael.j.wysocki@intel.com \
    --cc=robh@kernel.org \
    --cc=steven.price@arm.com \
    --cc=thierry.reding@gmail.com \
    --cc=vidyas@nvidia.com \
    --cc=viresh.kumar@linaro.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).