Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6db719 authored by Nipun Gupta's avatar Nipun Gupta Committed by Joerg Roedel
Browse files

iommu/of: make of_pci_map_rid() available for other devices too 



iommu-map property is also used by devices with fsl-mc. This
patch moves the of_pci_map_rid to generic location, so that it
can be used by other busses too.

'of_pci_map_rid' is renamed here to 'of_map_rid' and there is no
functional change done in the API.

Signed-off-by: default avatarNipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c9d8d661

drivers/iommu/of_iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -132,9 +132,8 @@ 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_pci_map_rid(info->np, alias, "iommu-map",

			     "iommu-map-mask", &iommu_spec.np,

			     iommu_spec.args);

	err = of_map_rid(info->np, alias, "iommu-map", "iommu-map-mask",

			 &iommu_spec.np, iommu_spec.args);

	if (err)

		return err == -ENODEV ? NO_IOMMU : err;

drivers/of/base.c

+102 −0
Original line number Diff line number Diff line
@@ -2045,3 +2045,105 @@ int of_find_last_cache_level(unsigned int cpu) 


	return cache_level;

}



/**

 * of_map_rid - Translate a requester ID through a downstream mapping.

 * @np: root complex device node.

 * @rid: device requester 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

 * 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

 * a non-NULL device node pointer, only entries targeting that node will be

 * matched; if it points to a NULL value, it will receive the device node of

 * the first matching target phandle, with a reference held.

 *

 * Return: 0 on success or a standard error code on failure.

 */

int of_map_rid(struct device_node *np, u32 rid,

	       const char *map_name, const char *map_mask_name,

	       struct device_node **target, u32 *id_out)

{

	u32 map_mask, masked_rid;

	int map_len;

	const __be32 *map = NULL;



	if (!np || !map_name || (!target && !id_out))

		return -EINVAL;



	map = of_get_property(np, map_name, &map_len);

	if (!map) {

		if (target)

			return -ENODEV;

		/* Otherwise, no map implies no translation */

		*id_out = rid;

		return 0;

	}



	if (!map_len || map_len % (4 * sizeof(*map))) {

		pr_err("%pOF: Error: Bad %s length: %d\n", np,

			map_name, map_len);

		return -EINVAL;

	}



	/* The default is to select all bits. */

	map_mask = 0xffffffff;



	/*

	 * Can be overridden by "{iommu,msi}-map-mask" property.

	 * If of_property_read_u32() fails, the default is used.

	 */

	if (map_mask_name)

		of_property_read_u32(np, map_mask_name, &map_mask);



	masked_rid = map_mask & rid;

	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 phandle = be32_to_cpup(map + 1);

		u32 out_base = be32_to_cpup(map + 2);

		u32 rid_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",

				np, map_name, map_name,

				map_mask, rid_base);

			return -EFAULT;

		}



		if (masked_rid < rid_base || masked_rid >= rid_base + rid_len)

			continue;



		phandle_node = of_find_node_by_phandle(phandle);

		if (!phandle_node)

			return -ENODEV;



		if (target) {

			if (*target)

				of_node_put(phandle_node);

			else

				*target = phandle_node;



			if (*target != phandle_node)

				continue;

		}



		if (id_out)

			*id_out = masked_rid - rid_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);

		return 0;

	}



	pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",

		np, map_name, rid, target && *target ? *target : NULL);

	return -EFAULT;

}

EXPORT_SYMBOL_GPL(of_map_rid);

drivers/of/irq.c

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_pci.h>

#include <linux/string.h>

#include <linux/slab.h>
@@ -588,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_pci_map_rid(parent_dev->of_node, rid_in, "msi-map",

		if (!of_map_rid(parent_dev->of_node, rid_in, "msi-map",

				"msi-map-mask", np, &rid_out))

			break;

	return rid_out;

drivers/pci/of.c

+0 −101
Original line number Diff line number Diff line
@@ -355,107 +355,6 @@ int devm_of_pci_get_host_bridge_resources(struct device *dev, 
EXPORT_SYMBOL_GPL(devm_of_pci_get_host_bridge_resources);

#endif /* CONFIG_OF_ADDRESS */



/**

 * of_pci_map_rid - Translate a requester ID through a downstream mapping.

 * @np: root complex device node.

 * @rid: PCI requester 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 PCI requester 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

 * a non-NULL device node pointer, only entries targeting that node will be

 * matched; if it points to a NULL value, it will receive the device node of

 * the first matching target phandle, with a reference held.

 *

 * Return: 0 on success or a standard error code on failure.

 */

int of_pci_map_rid(struct device_node *np, u32 rid,

		   const char *map_name, const char *map_mask_name,

		   struct device_node **target, u32 *id_out)

{

	u32 map_mask, masked_rid;

	int map_len;

	const __be32 *map = NULL;



	if (!np || !map_name || (!target && !id_out))

		return -EINVAL;



	map = of_get_property(np, map_name, &map_len);

	if (!map) {

		if (target)

			return -ENODEV;

		/* Otherwise, no map implies no translation */

		*id_out = rid;

		return 0;

	}



	if (!map_len || map_len % (4 * sizeof(*map))) {

		pr_err("%pOF: Error: Bad %s length: %d\n", np,

			map_name, map_len);

		return -EINVAL;

	}



	/* The default is to select all bits. */

	map_mask = 0xffffffff;



	/*

	 * Can be overridden by "{iommu,msi}-map-mask" property.

	 * If of_property_read_u32() fails, the default is used.

	 */

	if (map_mask_name)

		of_property_read_u32(np, map_mask_name, &map_mask);



	masked_rid = map_mask & rid;

	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 phandle = be32_to_cpup(map + 1);

		u32 out_base = be32_to_cpup(map + 2);

		u32 rid_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",

				np, map_name, map_name,

				map_mask, rid_base);

			return -EFAULT;

		}



		if (masked_rid < rid_base || masked_rid >= rid_base + rid_len)

			continue;



		phandle_node = of_find_node_by_phandle(phandle);

		if (!phandle_node)

			return -ENODEV;



		if (target) {

			if (*target)

				of_node_put(phandle_node);

			else

				*target = phandle_node;



			if (*target != phandle_node)

				continue;

		}



		if (id_out)

			*id_out = masked_rid - rid_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);

		return 0;

	}



	pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",

		np, map_name, rid, target && *target ? *target : NULL);

	return -EFAULT;

}



#if IS_ENABLED(CONFIG_OF_IRQ)

/**

 * of_irq_parse_pci - Resolve the interrupt for a PCI device

include/linux/of.h

+11 −0
Original line number Diff line number Diff line
@@ -550,6 +550,10 @@ 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,

	       const char *map_name, const char *map_mask_name,

	       struct device_node **target, u32 *id_out);



#else /* CONFIG_OF */



static inline void of_core_init(void)
@@ -952,6 +956,13 @@ 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,

			     const char *map_name, const char *map_mask_name,

			     struct device_node **target, u32 *id_out)

{

	return -EINVAL;

}



#define of_match_ptr(_ptr)	NULL

#define of_match_node(_matches, _node)	NULL

#endif /* CONFIG_OF */