On Thu, May 21, 2020 at 01:59:58PM +0100, Lorenzo Pieralisi wrote:
> iort_get_device_domain() is PCI specific but it need not be,
> since it can be used to retrieve IRQ domain nexus of any kind
> by adding an irq_domain_bus_token input to it.
> 
> Make it PCI agnostic by also renaming the requestor ID input
> to a more generic ID name.
> 
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
> Cc: Will Deacon <w...@kernel.org>
> Cc: Hanjun Guo <guohan...@huawei.com>
> Cc: Bjorn Helgaas <bhelg...@google.com>
> Cc: Sudeep Holla <sudeep.ho...@arm.com>
> Cc: Catalin Marinas <catalin.mari...@arm.com>
> Cc: Robin Murphy <robin.mur...@arm.com>
> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
> Cc: Marc Zyngier <m...@kernel.org>

Acked-by: Bjorn Helgaas <bhelg...@google.com>   # pci/msi.c

> ---
>  drivers/acpi/arm64/iort.c | 14 +++++++-------
>  drivers/pci/msi.c         |  3 ++-
>  include/linux/acpi_iort.h |  7 ++++---
>  3 files changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index 7cfd77b5e6e8..8f2a961c1364 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -567,7 +567,6 @@ static struct acpi_iort_node *iort_find_dev_node(struct 
> device *dev)
>               node = iort_get_iort_node(dev->fwnode);
>               if (node)
>                       return node;
> -
>               /*
>                * if not, then it should be a platform device defined in
>                * DSDT/SSDT (with Named Component node in IORT)
> @@ -658,13 +657,13 @@ static int __maybe_unused iort_find_its_base(u32 
> its_id, phys_addr_t *base)
>  /**
>   * iort_dev_find_its_id() - Find the ITS identifier for a device
>   * @dev: The device.
> - * @req_id: Device's requester ID
> + * @id: Device's ID
>   * @idx: Index of the ITS identifier list.
>   * @its_id: ITS identifier.
>   *
>   * Returns: 0 on success, appropriate error value otherwise
>   */
> -static int iort_dev_find_its_id(struct device *dev, u32 req_id,
> +static int iort_dev_find_its_id(struct device *dev, u32 id,
>                               unsigned int idx, int *its_id)
>  {
>       struct acpi_iort_its_group *its;
> @@ -674,7 +673,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 
> req_id,
>       if (!node)
>               return -ENXIO;
>  
> -     node = iort_node_map_id(node, req_id, NULL, IORT_MSI_TYPE);
> +     node = iort_node_map_id(node, id, NULL, IORT_MSI_TYPE);
>       if (!node)
>               return -ENXIO;
>  
> @@ -697,19 +696,20 @@ static int iort_dev_find_its_id(struct device *dev, u32 
> req_id,
>   *
>   * Returns: the MSI domain for this device, NULL otherwise
>   */
> -struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)
> +struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
> +                                       enum irq_domain_bus_token bus_token)
>  {
>       struct fwnode_handle *handle;
>       int its_id;
>  
> -     if (iort_dev_find_its_id(dev, req_id, 0, &its_id))
> +     if (iort_dev_find_its_id(dev, id, 0, &its_id))
>               return NULL;
>  
>       handle = iort_find_domain_token(its_id);
>       if (!handle)
>               return NULL;
>  
> -     return irq_find_matching_fwnode(handle, DOMAIN_BUS_PCI_MSI);
> +     return irq_find_matching_fwnode(handle, bus_token);
>  }
>  
>  static void iort_set_device_domain(struct device *dev,
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 6b43a5455c7a..74a91f52ecc0 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -1558,7 +1558,8 @@ struct irq_domain *pci_msi_get_device_domain(struct 
> pci_dev *pdev)
>       pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
>       dom = of_msi_map_get_device_domain(&pdev->dev, rid);
>       if (!dom)
> -             dom = iort_get_device_domain(&pdev->dev, rid);
> +             dom = iort_get_device_domain(&pdev->dev, rid,
> +                                          DOMAIN_BUS_PCI_MSI);
>       return dom;
>  }
>  #endif /* CONFIG_PCI_MSI_IRQ_DOMAIN */
> diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h
> index 8e7e2ec37f1b..08ec6bd2297f 100644
> --- a/include/linux/acpi_iort.h
> +++ b/include/linux/acpi_iort.h
> @@ -29,7 +29,8 @@ struct fwnode_handle *iort_find_domain_token(int trans_id);
>  #ifdef CONFIG_ACPI_IORT
>  void acpi_iort_init(void);
>  u32 iort_msi_map_rid(struct device *dev, u32 req_id);
> -struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id);
> +struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
> +                                       enum irq_domain_bus_token bus_token);
>  void acpi_configure_pmsi_domain(struct device *dev);
>  int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id);
>  /* IOMMU interface */
> @@ -40,8 +41,8 @@ int iort_iommu_msi_get_resv_regions(struct device *dev, 
> struct list_head *head);
>  static inline void acpi_iort_init(void) { }
>  static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id)
>  { return req_id; }
> -static inline struct irq_domain *iort_get_device_domain(struct device *dev,
> -                                                     u32 req_id)
> +static inline struct irq_domain *iort_get_device_domain(
> +     struct device *dev, u32 id, enum irq_domain_bus_token bus_token)
>  { return NULL; }
>  static inline void acpi_configure_pmsi_domain(struct device *dev) { }
>  /* IOMMU interface */
> -- 
> 2.26.1
> 
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to