From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01FAE2989B0; Tue, 14 Oct 2025 09:58:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760435936; cv=none; b=WpA2BPYwpHgJSdrkhcS4Z4wXcnLfVenZPERVm+/URJJ3iHRK4vA3YN7mi18+W6x9AdOKEjrR7B2ohSzC4gY5gMx+rMzN6BvWHVNPmsaCqPaJYhVdybjre/iEQbGacZ6giCuAHLYSQD70srG0um/94FkP/Yd4hiFWBDfWK/fOmwA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760435936; c=relaxed/simple; bh=Pz/+OnScQH57lMVcQRcBDaL0cFCYDLZVarTyxcsqluU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qCB5Uiy0bRNe3d7tg951NpN1BnpJWo37DB8tMpwjGDv82LHMfxtzlaBVWq4KBvAkTXlYWMq1euTC945GnDvA1ggHiyHAkGAHMEFXcGjr5FBQzzZWUcJQGrxmbKCMMIOw6Gd4D6rz2/XqtHNJUJSVaEveYrsM1q3sCjIr7F41Oks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=edoqiV/k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="edoqiV/k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 160DBC4CEFE; Tue, 14 Oct 2025 09:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760435935; bh=Pz/+OnScQH57lMVcQRcBDaL0cFCYDLZVarTyxcsqluU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=edoqiV/k6P/4eC65o+fGDDwFlqeSjogcWgXII7+/HSoXlyV+dVySXOkP951zajF1S xSqlCB8VMUB/7DJUfLTnq4l8LetnDf95Se05UWSLoVaKkMmZkXqit/GUwMQ4XYkVh7 KbDpR4boCDapn1e1kPWP93/TYt99EAoIeFdgeRLiW9AuZVBFPmJMS86Em077WVIQuk Em5p7L+9Atl1BdIhUa6Gx5uCvoeBXlOdDyCEXo/kZ2PjyIcBebc7LJLr4hvJwM+KWO jwVSIQzQkSffP3QBaV6ZbWTo2Wty8jOl6WIiPZKX9dgKtlblkGfOEH3yUc5epe7lNC xwVoE1jPGaQvA== From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, Lorenzo Pieralisi , Sascha Bischoff , Rob Herring , Marc Zyngier , Scott Branden , Thomas Gleixner , Bjorn Helgaas , Ray Jui , Frank Li , Manivannan Sadhasivam , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= Subject: [PATCH v2 1/4] of/irq: Add msi-parent check to of_msi_xlate() Date: Tue, 14 Oct 2025 11:58:42 +0200 Message-ID: <20251014095845.1310624-2-lpieralisi@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251014095845.1310624-1-lpieralisi@kernel.org> References: <20251014095845.1310624-1-lpieralisi@kernel.org> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In some legacy platforms the MSI controller for a PCI host bridge is identified by an msi-parent property whose phandle points at an MSI controller node with no #msi-cells property, that implicitly means For such platforms, mapping a device ID and retrieving the MSI controller node becomes simply a matter of checking whether in the device hierarchy there is an msi-parent property pointing at an MSI controller node with such characteristics. Add a helper function to of_msi_xlate() to check the msi-parent property in addition to msi-map and retrieve the MSI controller node (with a 1:1 ID deviceID-IN<->deviceID-OUT mapping) to provide support for deviceID mapping and MSI controller node retrieval for such platforms. Fixes: 57d72196dfc8 ("irqchip/gic-v5: Add GICv5 ITS support") Signed-off-by: Lorenzo Pieralisi Cc: Sascha Bischoff Cc: Rob Herring Cc: Marc Zyngier --- drivers/of/irq.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 65c3c23255b7..e67b2041e73b 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -671,6 +671,35 @@ void __init of_irq_init(const struct of_device_id *matches) } } +static int of_check_msi_parent(struct device_node *dev_node, struct device_node **msi_node) +{ + struct of_phandle_args msi_spec; + int ret; + + /* + * An msi-parent phandle with a missing or == 0 #msi-cells + * property identifies a 1:1 ID translation mapping. + * + * Set the msi controller node if the firmware matches this + * condition. + */ + ret = of_parse_phandle_with_optional_args(dev_node, "msi-parent", "#msi-cells", + 0, &msi_spec); + if (!ret) { + if ((*msi_node && *msi_node != msi_spec.np) || msi_spec.args_count != 0) + ret = -EINVAL; + + if (!ret) { + /* Return with a node reference held */ + *msi_node = msi_spec.np; + return 0; + } + of_node_put(msi_spec.np); + } + + return ret; +} + /** * of_msi_xlate - map a MSI ID and find relevant MSI controller node * @dev: device for which the mapping is to be done. @@ -678,7 +707,7 @@ void __init of_irq_init(const struct of_device_id *matches) * @id_in: Device ID. * * Walk up the device hierarchy looking for devices with a "msi-map" - * property. If found, apply the mapping to @id_in. + * or "msi-parent" property. If found, apply the mapping to @id_in. * If @msi_np points to a non-NULL device node pointer, only entries targeting * that node will be matched; if it points to a NULL value, it will receive the * device node of the first matching target phandle, with a reference held. @@ -692,12 +721,15 @@ u32 of_msi_xlate(struct device *dev, struct device_node **msi_np, u32 id_in) /* * Walk up the device parent links looking for one with a - * "msi-map" property. + * "msi-map" or an "msi-parent" property. */ - for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent) + for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent) { if (!of_map_id(parent_dev->of_node, id_in, "msi-map", "msi-map-mask", msi_np, &id_out)) break; + if (!of_check_msi_parent(parent_dev->of_node, msi_np)) + break; + } return id_out; } -- 2.50.1