> -----Original Message-----
> From: Bjorn Helgaas <helgaas@xxxxxxxxxx>
> Sent: Tuesday, July 21, 2020 8:29 PM
> To: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; Will Deacon <will@xxxxxxxxxx>;
> Hanjun Guo <guohanjun@xxxxxxxxxx>; Bjorn Helgaas
> <bhelgaas@xxxxxxxxxx>; Sudeep Holla <sudeep.holla@xxxxxxx>; Catalin
> Marinas <catalin.marinas@xxxxxxx>; Robin Murphy <robin.murphy@xxxxxxx>;
> Rafael J. Wysocki <rjw@xxxxxxxxxxxxx>; iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx;
> linux-acpi@xxxxxxxxxxxxxxx; devicetree@xxxxxxxxxxxxxxx; linux-
> pci@xxxxxxxxxxxxxxx; Rob Herring <robh+dt@xxxxxxxxxx>; Joerg Roedel
> <joro@xxxxxxxxxx>; Marc Zyngier <maz@xxxxxxxxxx>; Makarand Pawagi
> <makarand.pawagi@xxxxxxx>; Diana Madalina Craciun (OSS)
> <diana.craciun@xxxxxxxxxxx>; Laurentiu Tudor <laurentiu.tudor@xxxxxxx>
> Subject: [EXT] Re: [PATCH v2 03/12] ACPI/IORT: Make iort_msi_map_rid() PCI
> agnostic
>
> Caution: EXT Email
>
> On Fri, Jun 19, 2020 at 09:20:04AM +0100, Lorenzo Pieralisi wrote:
> > There is nothing PCI specific in iort_msi_map_rid().
> >
> > Rename the function using a bus protocol agnostic name,
> > iort_msi_map_id(), and convert current callers to it.
> >
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> > Cc: Will Deacon <will@xxxxxxxxxx>
> > Cc: Hanjun Guo <guohanjun@xxxxxxxxxx>
> > Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> > Cc: Sudeep Holla <sudeep.holla@xxxxxxx>
> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
> > Cc: Robin Murphy <robin.murphy@xxxxxxx>
> > Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
>
> Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>
> Sorry I missed this!
[Makarand Pawagi]
Thanks Bjorn, Hi Rafael can you also finalize your review?
>
> > ---
> > drivers/acpi/arm64/iort.c | 12 ++++++------
> > drivers/pci/msi.c | 2 +-
> > include/linux/acpi_iort.h | 6 +++---
> > 3 files changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> > index 902e2aaca946..53f9ef515089 100644
> > --- a/drivers/acpi/arm64/iort.c
> > +++ b/drivers/acpi/arm64/iort.c
> > @@ -568,22 +568,22 @@ static struct acpi_iort_node
> > *iort_find_dev_node(struct device *dev) }
> >
> > /**
> > - * iort_msi_map_rid() - Map a MSI requester ID for a device
> > + * iort_msi_map_id() - Map a MSI input ID for a device
> > * @dev: The device for which the mapping is to be done.
> > - * @req_id: The device requester ID.
> > + * @input_id: The device input ID.
> > *
> > - * Returns: mapped MSI RID on success, input requester ID otherwise
> > + * Returns: mapped MSI ID on success, input ID otherwise
> > */
> > -u32 iort_msi_map_rid(struct device *dev, u32 req_id)
> > +u32 iort_msi_map_id(struct device *dev, u32 input_id)
> > {
> > struct acpi_iort_node *node;
> > u32 dev_id;
> >
> > node = iort_find_dev_node(dev);
> > if (!node)
> > - return req_id;
> > + return input_id;
> >
> > - iort_node_map_id(node, req_id, &dev_id, IORT_MSI_TYPE);
> > + iort_node_map_id(node, input_id, &dev_id, IORT_MSI_TYPE);
> > return dev_id;
> > }
> >
> > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index
> > 74a91f52ecc0..77f48b95e277 100644
> > --- a/drivers/pci/msi.c
> > +++ b/drivers/pci/msi.c
> > @@ -1536,7 +1536,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain
> > *domain, struct pci_dev *pdev)
> >
> > of_node = irq_domain_get_of_node(domain);
> > rid = of_node ? of_msi_map_rid(&pdev->dev, of_node, rid) :
> > - iort_msi_map_rid(&pdev->dev, rid);
> > + iort_msi_map_id(&pdev->dev, rid);
> >
> > return rid;
> > }
> > diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h
> > index 08ec6bd2297f..e51425e083da 100644
> > --- a/include/linux/acpi_iort.h
> > +++ b/include/linux/acpi_iort.h
> > @@ -28,7 +28,7 @@ void iort_deregister_domain_token(int trans_id);
> > 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);
> > +u32 iort_msi_map_id(struct device *dev, u32 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); @@
> > -39,8 +39,8 @@ const struct iommu_ops *iort_iommu_configure(struct
> > device *dev); int iort_iommu_msi_get_resv_regions(struct device *dev,
> > struct list_head *head); #else 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 u32 iort_msi_map_id(struct device *dev, u32 id) {
> > +return id; }
> > static inline struct irq_domain *iort_get_device_domain(
> > struct device *dev, u32 id, enum irq_domain_bus_token bus_token)
> > { return NULL; }
> > --
> > 2.26.1
> >
