of/iommu: Make of_map_rid() PCI agnostic

There is nothing PCI specific (other than the RID - requester ID)
in the of_map_rid() implementation, so the same function can be
reused for input/output IDs mapping for other busses just as well.

Rename the RID instances/names to a generic "id" tag.

No functionality change intended.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Joerg Roedel <jroedel@suse.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200619082013.13661-7-lorenzo.pieralisi@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 20738aacac89e29f23c28370b75cfce30374fabd..01631624473727ec27b6cc450cd261a5ac6c610a 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -129,7 +129,7 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
        struct of_phandle_args iommu_spec = { .args_count = 1 };
        int err;
 
-       err = of_map_rid(info->np, alias, "iommu-map", "iommu-map-mask",
+       err = of_map_id(info->np, alias, "iommu-map", "iommu-map-mask",
                         &iommu_spec.np, iommu_spec.args);
        if (err)
                return err == -ENODEV ? NO_IOMMU : err;
@@ -145,7 +145,7 @@ static int of_fsl_mc_iommu_init(struct fsl_mc_device *mc_dev,
        struct of_phandle_args iommu_spec = { .args_count = 1 };
        int err;
 
-       err = of_map_rid(master_np, mc_dev->icid, "iommu-map",
+       err = of_map_id(master_np, mc_dev->icid, "iommu-map",
                         "iommu-map-mask", &iommu_spec.np,
                         iommu_spec.args);
        if (err)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index ae03b1218b06e5f5da9111fecf09cd30ca3d8691..ea44fea998139a9dd89747d82f8b8cf64243731a 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2201,15 +2201,15 @@ int of_find_last_cache_level(unsigned int cpu)
 }
 
 /**
- * of_map_rid - Translate a requester ID through a downstream mapping.
+ * of_map_id - Translate an ID through a downstream mapping.
  * @np: root complex device node.
- * @rid: device requester ID to map.
+ * @id: device ID to map.
  * @map_name: property name of the map to use.
  * @map_mask_name: optional property name of the mask to use.
  * @target: optional pointer to a target device node.
  * @id_out: optional pointer to receive the translated ID.
  *
- * Given a device requester ID, look up the appropriate implementation-defined
+ * Given a device ID, look up the appropriate implementation-defined
  * platform ID and/or the target device which receives transactions on that
  * ID, as per the "iommu-map" and "msi-map" bindings. Either of @target or
  * @id_out may be NULL if only the other is required. If @target points to
@@ -2219,11 +2219,11 @@ int of_find_last_cache_level(unsigned int cpu)
  *
  * Return: 0 on success or a standard error code on failure.
  */
-int of_map_rid(struct device_node *np, u32 rid,
+int of_map_id(struct device_node *np, u32 id,
               const char *map_name, const char *map_mask_name,
               struct device_node **target, u32 *id_out)
 {
-       u32 map_mask, masked_rid;
+       u32 map_mask, masked_id;
        int map_len;
        const __be32 *map = NULL;
 
@@ -2235,7 +2235,7 @@ int of_map_rid(struct device_node *np, u32 rid,
                if (target)
                        return -ENODEV;
                /* Otherwise, no map implies no translation */
-               *id_out = rid;
+               *id_out = id;
                return 0;
        }
 
@@ -2255,22 +2255,22 @@ int of_map_rid(struct device_node *np, u32 rid,
        if (map_mask_name)
                of_property_read_u32(np, map_mask_name, &map_mask);
 
-       masked_rid = map_mask & rid;
+       masked_id = map_mask & id;
        for ( ; map_len > 0; map_len -= 4 * sizeof(*map), map += 4) {
                struct device_node *phandle_node;
-               u32 rid_base = be32_to_cpup(map + 0);
+               u32 id_base = be32_to_cpup(map + 0);
                u32 phandle = be32_to_cpup(map + 1);
                u32 out_base = be32_to_cpup(map + 2);
-               u32 rid_len = be32_to_cpup(map + 3);
+               u32 id_len = be32_to_cpup(map + 3);
 
-               if (rid_base & ~map_mask) {
-                       pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores rid-base (0x%x)\n",
+               if (id_base & ~map_mask) {
+                       pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores id-base (0x%x)\n",
                                np, map_name, map_name,
-                               map_mask, rid_base);
+                               map_mask, id_base);
                        return -EFAULT;
                }
 
-               if (masked_rid < rid_base || masked_rid >= rid_base + rid_len)
+               if (masked_id < id_base || masked_id >= id_base + id_len)
                        continue;
 
                phandle_node = of_find_node_by_phandle(phandle);
@@ -2288,20 +2288,20 @@ int of_map_rid(struct device_node *np, u32 rid,
                }
 
                if (id_out)
-                       *id_out = masked_rid - rid_base + out_base;
+                       *id_out = masked_id - id_base + out_base;
 
-               pr_debug("%pOF: %s, using mask %08x, rid-base: %08x, out-base: %08x, length: %08x, rid: %08x -> %08x\n",
-                       np, map_name, map_mask, rid_base, out_base,
-                       rid_len, rid, masked_rid - rid_base + out_base);
+               pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, length: %08x, id: %08x -> %08x\n",
+                       np, map_name, map_mask, id_base, out_base,
+                       id_len, id, masked_id - id_base + out_base);
                return 0;
        }
 
-       pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
-               rid, target && *target ? *target : NULL);
+       pr_info("%pOF: no %s translation for id 0x%x on %pOF\n", np, map_name,
+               id, target && *target ? *target : NULL);
 
        /* Bypasses translation */
        if (id_out)
-               *id_out = rid;
+               *id_out = id;
        return 0;
 }
-EXPORT_SYMBOL_GPL(of_map_rid);
+EXPORT_SYMBOL_GPL(of_map_id);

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index a296eaf52a5b23c377349b59688ffa62ec66db4d..d632bc5b3a2de8d2c7466f224e3007c1731d6062 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -587,7 +587,7 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,
         * "msi-map" property.
         */
        for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent)
-               if (!of_map_rid(parent_dev->of_node, rid_in, "msi-map",
+               if (!of_map_id(parent_dev->of_node, rid_in, "msi-map",
                                "msi-map-mask", np, &rid_out))
                        break;
        return rid_out;

diff --git a/include/linux/of.h b/include/linux/of.h
index c669c0a4732f12efe608021238eb575281457167..60abe3f636addb1d422d6161b50b9a8e756b3342 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -554,7 +554,7 @@ bool of_console_check(struct device_node *dn, char *name, int index);
 
 extern int of_cpu_node_to_id(struct device_node *np);
 
-int of_map_rid(struct device_node *np, u32 rid,
+int of_map_id(struct device_node *np, u32 id,
               const char *map_name, const char *map_mask_name,
               struct device_node **target, u32 *id_out);
 
@@ -978,7 +978,7 @@ static inline int of_cpu_node_to_id(struct device_node *np)
        return -ENODEV;
 }
 
-static inline int of_map_rid(struct device_node *np, u32 rid,
+static inline int of_map_id(struct device_node *np, u32 id,
                             const char *map_name, const char *map_mask_name,
                             struct device_node **target, u32 *id_out)
 {