of/irq: Make of_msi_map_rid() PCI bus agnostic

There is nothing PCI bus specific in the of_msi_map_rid()
implementation other than the requester ID tag for the input
ID space. Rename requester ID to a more generic ID so that
the translation code can be used by all busses that require
input/output ID translations.

No functional change intended.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200619082013.13661-11-lorenzo.pieralisi@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 1005e4f349ef6cd5f35a565f96d0ec74f3cc8410..25d17b8a1a1aafb17b7440c61fcd8d3cf8403a27 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -576,43 +576,43 @@ err:
        }
 }
 
-static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,
-                           u32 rid_in)
+static u32 __of_msi_map_id(struct device *dev, struct device_node **np,
+                           u32 id_in)
 {
        struct device *parent_dev;
-       u32 rid_out = rid_in;
+       u32 id_out = id_in;
 
        /*
         * Walk up the device parent links looking for one with a
         * "msi-map" property.
         */
        for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent)
-               if (!of_map_id(parent_dev->of_node, rid_in, "msi-map",
-                               "msi-map-mask", np, &rid_out))
+               if (!of_map_id(parent_dev->of_node, id_in, "msi-map",
+                               "msi-map-mask", np, &id_out))
                        break;
-       return rid_out;
+       return id_out;
 }
 
 /**
- * of_msi_map_rid - Map a MSI requester ID for a device.
+ * of_msi_map_id - Map a MSI ID for a device.
  * @dev: device for which the mapping is to be done.
  * @msi_np: device node of the expected msi controller.
- * @rid_in: unmapped MSI requester ID for the device.
+ * @id_in: unmapped MSI ID for the device.
  *
  * Walk up the device hierarchy looking for devices with a "msi-map"
- * property.  If found, apply the mapping to @rid_in.
+ * property.  If found, apply the mapping to @id_in.
  *
- * Returns the mapped MSI requester ID.
+ * Returns the mapped MSI ID.
  */
-u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in)
+u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in)
 {
-       return __of_msi_map_rid(dev, &msi_np, rid_in);
+       return __of_msi_map_id(dev, &msi_np, id_in);
 }
 
 /**
  * of_msi_map_get_device_domain - Use msi-map to find the relevant MSI domain
  * @dev: device for which the mapping is to be done.
- * @rid: Requester ID for the device.
+ * @id: Device ID.
  * @bus_token: Bus token
  *
  * Walk up the device hierarchy looking for devices with a "msi-map"
@@ -625,7 +625,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id,
 {
        struct device_node *np = NULL;
 
-       __of_msi_map_rid(dev, &np, id);
+       __of_msi_map_id(dev, &np, id);
        return irq_find_matching_host(np, bus_token);
 }
 

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index b4bfe0b03b2ddeee16c01ff9a877795cf7ccb7eb..19aeadb22f11721a983c7a33109dca433c3876e4 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1535,7 +1535,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)
        pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
 
        of_node = irq_domain_get_of_node(domain);
-       rid = of_node ? of_msi_map_rid(&pdev->dev, of_node, rid) :
+       rid = of_node ? of_msi_map_id(&pdev->dev, of_node, rid) :
                        iort_msi_map_id(&pdev->dev, rid);
 
        return rid;

diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 7142a37227584768d54bb44c032996fb444ddbc8..e8b78139f78c5a949f23782ecc7ea30252e6731b 100644 (file)
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -55,7 +55,7 @@ extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
                                                        u32 id,
                                                        u32 bus_token);
 extern void of_msi_configure(struct device *dev, struct device_node *np);
-u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
+u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in);
 #else
 static inline int of_irq_count(struct device_node *dev)
 {
@@ -93,10 +93,10 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev
 static inline void of_msi_configure(struct device *dev, struct device_node *np)
 {
 }
-static inline u32 of_msi_map_rid(struct device *dev,
-                                struct device_node *msi_np, u32 rid_in)
+static inline u32 of_msi_map_id(struct device *dev,
+                                struct device_node *msi_np, u32 id_in)
 {
-       return rid_in;
+       return id_in;
 }
 #endif