Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iommu/ipmmu-vmsa: Replace local utlb code with fwspec ids

Browse Source 
Now when both 32-bit and 64-bit code inside the driver is using
fwspec it is possible to replace the utlb handling with fwspec ids
that get populated from ->of_xlate().

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Magnus Damm 2017-07-17 22:05:41 +09:00 committed by Joerg Roedel
parent 3c49ed322b
commit 7b2d59611f
1 changed files with 19 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
drivers/iommu/ipmmu-vmsa.c
View File

@ -19,6 +19,7 @@
#include <linux/iommu.h> #include <linux/iommu.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -59,8 +60,6 @@ struct ipmmu_vmsa_domain {
struct ipmmu_vmsa_iommu_priv { struct ipmmu_vmsa_iommu_priv {
struct ipmmu_vmsa_device *mmu; struct ipmmu_vmsa_device *mmu;
unsigned int *utlbs;
unsigned int num_utlbs;
struct device *dev; struct device *dev;
struct list_head list; struct list_head list;
}; };
@ -550,13 +549,14 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
struct device *dev) struct device *dev)
{ {
struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev); struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
struct iommu_fwspec *fwspec = dev->iommu_fwspec;
struct ipmmu_vmsa_device *mmu = priv->mmu; struct ipmmu_vmsa_device *mmu = priv->mmu;
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain); struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
unsigned long flags; unsigned long flags;
unsigned int i; unsigned int i;
int ret = 0; int ret = 0;
if (!mmu) { if (!priv || !priv->mmu) {
dev_err(dev, "Cannot attach to IPMMU\n"); dev_err(dev, "Cannot attach to IPMMU\n");
return -ENXIO; return -ENXIO;
} }
@ -583,8 +583,8 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < priv->num_utlbs; ++i) for (i = 0; i < fwspec->num_ids; ++i)
ipmmu_utlb_enable(domain, priv->utlbs[i]); ipmmu_utlb_enable(domain, fwspec->ids[i]);
return 0; return 0;
} }
@ -592,12 +592,12 @@ static int ipmmu_attach_device(struct iommu_domain *io_domain,
static void ipmmu_detach_device(struct iommu_domain *io_domain, static void ipmmu_detach_device(struct iommu_domain *io_domain,
struct device *dev) struct device *dev)
{ {
struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev); struct iommu_fwspec *fwspec = dev->iommu_fwspec;
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain); struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
unsigned int i; unsigned int i;
for (i = 0; i < priv->num_utlbs; ++i) for (i = 0; i < fwspec->num_ids; ++i)
ipmmu_utlb_disable(domain, priv->utlbs[i]); ipmmu_utlb_disable(domain, fwspec->ids[i]);
/* /*
* TODO: Optimize by disabling the context when no device is attached. * TODO: Optimize by disabling the context when no device is attached.
@ -633,102 +633,36 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
return domain->iop->iova_to_phys(domain->iop, iova); return domain->iop->iova_to_phys(domain->iop, iova);
} }
static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev, static int ipmmu_init_platform_device(struct device *dev,
unsigned int *utlbs, unsigned int num_utlbs) struct of_phandle_args *args)
{
unsigned int i;
for (i = 0; i < num_utlbs; ++i) {
struct of_phandle_args args;
int ret;
ret = of_parse_phandle_with_args(dev->of_node, "iommus",
"#iommu-cells", i, &args);
if (ret < 0)
return ret;
of_node_put(args.np);
if (args.np != mmu->dev->of_node || args.args_count != 1)
return -EINVAL;
utlbs[i] = args.args[0];
}
return 0;
}
static int ipmmu_init_platform_device(struct device *dev)
{ {
struct platform_device *ipmmu_pdev;
struct ipmmu_vmsa_iommu_priv *priv; struct ipmmu_vmsa_iommu_priv *priv;
struct ipmmu_vmsa_device *mmu;
unsigned int *utlbs;
unsigned int i;
int num_utlbs;
int ret = -ENODEV;
/* Find the master corresponding to the device. */ ipmmu_pdev = of_find_device_by_node(args->np);
if (!ipmmu_pdev)
num_utlbs = of_count_phandle_with_args(dev->of_node, "iommus",
"#iommu-cells");
if (num_utlbs < 0)
return -ENODEV; return -ENODEV;
utlbs = kcalloc(num_utlbs, sizeof(*utlbs), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!utlbs) if (!priv)
return -ENOMEM; return -ENOMEM;
spin_lock(&ipmmu_devices_lock); priv->mmu = platform_get_drvdata(ipmmu_pdev);
list_for_each_entry(mmu, &ipmmu_devices, list) {
ret = ipmmu_find_utlbs(mmu, dev, utlbs, num_utlbs);
if (!ret) {
/*
* TODO Take a reference to the MMU to protect
* against device removal.
*/
break;
}
}
spin_unlock(&ipmmu_devices_lock);
if (ret < 0)
goto error;
for (i = 0; i < num_utlbs; ++i) {
if (utlbs[i] >= mmu->num_utlbs) {
ret = -EINVAL;
goto error;
}
}
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
ret = -ENOMEM;
goto error;
}
priv->mmu = mmu;
priv->utlbs = utlbs;
priv->num_utlbs = num_utlbs;
priv->dev = dev; priv->dev = dev;
dev->iommu_fwspec->iommu_priv = priv; dev->iommu_fwspec->iommu_priv = priv;
return 0; return 0;
error:
kfree(utlbs);
return ret;
} }
static int ipmmu_of_xlate(struct device *dev, static int ipmmu_of_xlate(struct device *dev,
struct of_phandle_args *spec) struct of_phandle_args *spec)
{ {
iommu_fwspec_add_ids(dev, spec->args, 1);
/* Initialize once - xlate() will call multiple times */ /* Initialize once - xlate() will call multiple times */
if (to_priv(dev)) if (to_priv(dev))
return 0; return 0;
return ipmmu_init_platform_device(dev); return ipmmu_init_platform_device(dev, spec);
} }
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)