[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <176382790748.498.16266737819766872891.tip-bot2@tip-bot2>
Date: Sat, 22 Nov 2025 16:11:47 -0000
From: "tip-bot2 for Lorenzo Pieralisi" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Lorenzo Pieralisi <lpieralisi@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>, Frank Li <Frank.Li@....com>,
Bjorn Helgaas <bhelgaas@...gle.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: irq/msi] PCI: iproc: Implement MSI controller node detection
with of_msi_xlate()
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: 4f32612f6a4e5a9b1344aebf856aa1a1581a426d
Gitweb: https://git.kernel.org/tip/4f32612f6a4e5a9b1344aebf856aa1a1581a426d
Author: Lorenzo Pieralisi <lpieralisi@...nel.org>
AuthorDate: Tue, 21 Oct 2025 14:41:02 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Sat, 22 Nov 2025 17:09:03 +01:00
PCI: iproc: Implement MSI controller node detection with of_msi_xlate()
The functionality implemented in the iproc driver in order to detect an
OF MSI controller node is now fully implemented in of_msi_xlate().
Replace the current msi-map/msi-parent parsing code with of_msi_xlate().
Since of_msi_xlate() is also a deviceID mapping API, pass in a fictitious
0 as deviceID - the driver only requires detecting the OF MSI controller
node not the deviceID mapping per-se (of_msi_xlate() return value is
ignored for the same reason).
Signed-off-by: Lorenzo Pieralisi <lpieralisi@...nel.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Frank Li <Frank.Li@....com>
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
Link: https://patch.msgid.link/20251021124103.198419-5-lpieralisi@kernel.org
---
drivers/pci/controller/pcie-iproc.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index 22134e9..ccf7199 100644
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -17,6 +17,7 @@
#include <linux/irqchip/arm-gic-v3.h>
#include <linux/platform_device.h>
#include <linux/of_address.h>
+#include <linux/of_irq.h>
#include <linux/of_pci.h>
#include <linux/of_platform.h>
#include <linux/phy/phy.h>
@@ -1337,29 +1338,16 @@ static int iproc_pcie_msi_steer(struct iproc_pcie *pcie,
static int iproc_pcie_msi_enable(struct iproc_pcie *pcie)
{
- struct device_node *msi_node;
+ struct device_node *msi_node = NULL;
int ret;
/*
* Either the "msi-parent" or the "msi-map" phandle needs to exist
* for us to obtain the MSI node.
*/
-
- msi_node = of_parse_phandle(pcie->dev->of_node, "msi-parent", 0);
- if (!msi_node) {
- const __be32 *msi_map = NULL;
- int len;
- u32 phandle;
-
- msi_map = of_get_property(pcie->dev->of_node, "msi-map", &len);
- if (!msi_map)
- return -ENODEV;
-
- phandle = be32_to_cpup(msi_map + 1);
- msi_node = of_find_node_by_phandle(phandle);
- if (!msi_node)
- return -ENODEV;
- }
+ of_msi_xlate(pcie->dev, &msi_node, 0);
+ if (!msi_node)
+ return -ENODEV;
/*
* Certain revisions of the iProc PCIe controller require additional
Powered by blists - more mailing lists