tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

PCI/MSI: Make the pci_msi_map_rid_ctlr_node() interface firmware agnostic

To support booting with OF and ACPI seamlessly, GIC ITS parent code
requires the PCI/MSI irqdomain layer to implement a function to retrieve
an MSI controller fwnode and map an RID in a firmware agnostic way
(ie pci_msi_map_rid_ctlr_node()).

Convert pci_msi_map_rid_ctlr_node() to an OF agnostic interface
(fwnode_handle based) and update the GIC ITS MSI parent code to reflect
the pci_msi_map_rid_ctlr_node() change.

Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260115-gicv5-host-acpi-v3-2-c13a9a150388@kernel.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Lorenzo Pieralisi and committed by
Rafael J. Wysocki a08df2fb 0323897a

+22 -10
+4 -4
drivers/irqchip/irq-gic-its-msi-parent.c
··· 104 104 static int its_v5_pci_msi_prepare(struct irq_domain *domain, struct device *dev, 105 105 int nvec, msi_alloc_info_t *info) 106 106 { 107 - struct device_node *msi_node = NULL; 107 + struct fwnode_handle *msi_node = NULL; 108 108 struct msi_domain_info *msi_info; 109 109 struct pci_dev *pdev; 110 110 phys_addr_t pa; ··· 116 116 117 117 pdev = to_pci_dev(dev); 118 118 119 - rid = pci_msi_map_rid_ctlr_node(pdev, &msi_node); 119 + rid = pci_msi_map_rid_ctlr_node(domain->parent, pdev, &msi_node); 120 120 if (!msi_node) 121 121 return -ENODEV; 122 122 123 - ret = its_translate_frame_address(msi_node, &pa); 123 + ret = its_translate_frame_address(to_of_node(msi_node), &pa); 124 124 if (ret) 125 125 return -ENODEV; 126 126 127 - of_node_put(msi_node); 127 + fwnode_handle_put(msi_node); 128 128 129 129 /* ITS specific DeviceID */ 130 130 info->scratchpad[0].ul = rid;
+16 -5
drivers/pci/msi/irqdomain.c
··· 376 376 } 377 377 378 378 /** 379 - * pci_msi_map_rid_ctlr_node - Get the MSI controller node and MSI requester id (RID) 379 + * pci_msi_map_rid_ctlr_node - Get the MSI controller fwnode_handle and MSI requester id (RID) 380 + * @domain: The interrupt domain 380 381 * @pdev: The PCI device 381 - * @node: Pointer to store the MSI controller device node 382 + * @node: Pointer to store the MSI controller fwnode_handle 382 383 * 383 - * Use the firmware data to find the MSI controller node for @pdev. 384 + * Use the firmware data to find the MSI controller fwnode_handle for @pdev. 384 385 * If found map the RID and initialize @node with it. @node value must 385 386 * be set to NULL on entry. 386 387 * 387 388 * Returns: The RID. 388 389 */ 389 - u32 pci_msi_map_rid_ctlr_node(struct pci_dev *pdev, struct device_node **node) 390 + u32 pci_msi_map_rid_ctlr_node(struct irq_domain *domain, struct pci_dev *pdev, 391 + struct fwnode_handle **node) 390 392 { 391 393 u32 rid = pci_dev_id(pdev); 392 394 393 395 pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); 394 396 395 - return of_msi_xlate(&pdev->dev, node, rid); 397 + /* Check whether the domain fwnode is an OF node */ 398 + if (irq_domain_get_of_node(domain)) { 399 + struct device_node *msi_ctlr_node = NULL; 400 + 401 + rid = of_msi_xlate(&pdev->dev, &msi_ctlr_node, rid); 402 + if (msi_ctlr_node) 403 + *node = of_fwnode_handle(msi_ctlr_node); 404 + } 405 + 406 + return rid; 396 407 } 397 408 398 409 /**
+2 -1
include/linux/msi.h
··· 702 702 void pci_msi_mask_irq(struct irq_data *data); 703 703 void pci_msi_unmask_irq(struct irq_data *data); 704 704 u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev); 705 - u32 pci_msi_map_rid_ctlr_node(struct pci_dev *pdev, struct device_node **node); 705 + u32 pci_msi_map_rid_ctlr_node(struct irq_domain *domain, struct pci_dev *pdev, 706 + struct fwnode_handle **node); 706 707 struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev); 707 708 void pci_msix_prepare_desc(struct irq_domain *domain, msi_alloc_info_t *arg, 708 709 struct msi_desc *desc);