openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/ipmmu-vmsa: Use fwspec iommu_priv on ARM64 

Convert from archdata to iommu_priv via iommu_fwspec on ARM64 but
let 32-bit ARM keep on using archdata for now.

Once the 32-bit ARM code and the IPMMU driver is able to move over
to CONFIG_IOMMU_DMA=y then coverting to fwspec via ->of_xlate() will
be easy.

For now fwspec ids and num_ids are not used to allow code sharing between
32-bit and 64-bit ARM code inside the driver.

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-05-17 19:07:20 +09:00 committed by Joerg Roedel
parent 3ae4729202
commit 0fbc8b04c3
1 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ struct ipmmu_vmsa_domain {
spinlock_t lock; /* Protects mappings */ spinlock_t lock; /* Protects mappings */
}; };
struct ipmmu_vmsa_archdata { struct ipmmu_vmsa_iommu_priv {
struct ipmmu_vmsa_device *mmu; struct ipmmu_vmsa_device *mmu;
unsigned int *utlbs; unsigned int *utlbs;
unsigned int num_utlbs; unsigned int num_utlbs;
@ -72,6 +72,24 @@ static struct ipmmu_vmsa_domain *to_vmsa_domain(struct iommu_domain *dom)
return container_of(dom, struct ipmmu_vmsa_domain, io_domain); return container_of(dom, struct ipmmu_vmsa_domain, io_domain);
} }
static struct ipmmu_vmsa_iommu_priv *to_priv(struct device *dev)
{
#if defined(CONFIG_ARM)
return dev->archdata.iommu;
#else
return dev->iommu_fwspec->iommu_priv;
#endif
}
static void set_priv(struct device *dev, struct ipmmu_vmsa_iommu_priv *p)
{
#if defined(CONFIG_ARM)
dev->archdata.iommu = p;
#else
dev->iommu_fwspec->iommu_priv = p;
#endif
}
#define TLB_LOOP_TIMEOUT 100 /* 100us */ #define TLB_LOOP_TIMEOUT 100 /* 100us */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -543,8 +561,8 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
static int ipmmu_attach_device(struct iommu_domain *io_domain, static int ipmmu_attach_device(struct iommu_domain *io_domain,
struct device *dev) struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata = dev->archdata.iommu; struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
struct ipmmu_vmsa_device *mmu = archdata->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;
@ -577,8 +595,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 < archdata->num_utlbs; ++i) for (i = 0; i < priv->num_utlbs; ++i)
ipmmu_utlb_enable(domain, archdata->utlbs[i]); ipmmu_utlb_enable(domain, priv->utlbs[i]);
return 0; return 0;
} }
@ -586,12 +604,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_archdata *archdata = dev->archdata.iommu; struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
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 < archdata->num_utlbs; ++i) for (i = 0; i < priv->num_utlbs; ++i)
ipmmu_utlb_disable(domain, archdata->utlbs[i]); ipmmu_utlb_disable(domain, priv->utlbs[i]);
/* /*
* TODO: Optimize by disabling the context when no device is attached. * TODO: Optimize by disabling the context when no device is attached.
@ -654,7 +672,7 @@ static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
static int ipmmu_init_platform_device(struct device *dev) static int ipmmu_init_platform_device(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata; struct ipmmu_vmsa_iommu_priv *priv;
struct ipmmu_vmsa_device *mmu; struct ipmmu_vmsa_device *mmu;
unsigned int *utlbs; unsigned int *utlbs;
unsigned int i; unsigned int i;
@ -697,17 +715,17 @@ static int ipmmu_init_platform_device(struct device *dev)
} }
} }
archdata = kzalloc(sizeof(*archdata), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!archdata) { if (!priv) {
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
archdata->mmu = mmu; priv->mmu = mmu;
archdata->utlbs = utlbs; priv->utlbs = utlbs;
archdata->num_utlbs = num_utlbs; priv->num_utlbs = num_utlbs;
archdata->dev = dev; priv->dev = dev;
dev->archdata.iommu = archdata; set_priv(dev, priv);
return 0; return 0;
error: error:
@ -727,12 +745,11 @@ static struct iommu_domain *ipmmu_domain_alloc(unsigned type)
static int ipmmu_add_device(struct device *dev) static int ipmmu_add_device(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata;
struct ipmmu_vmsa_device *mmu = NULL; struct ipmmu_vmsa_device *mmu = NULL;
struct iommu_group *group; struct iommu_group *group;
int ret; int ret;
if (dev->archdata.iommu) { if (to_priv(dev)) {
dev_warn(dev, "IOMMU driver already assigned to device %s\n", dev_warn(dev, "IOMMU driver already assigned to device %s\n",
dev_name(dev)); dev_name(dev));
return -EINVAL; return -EINVAL;
@ -768,8 +785,7 @@ static int ipmmu_add_device(struct device *dev)
* - Make the mapping size configurable ? We currently use a 2GB mapping * - Make the mapping size configurable ? We currently use a 2GB mapping
* at a 1GB offset to ensure that NULL VAs will fault. * at a 1GB offset to ensure that NULL VAs will fault.
*/ */
archdata = dev->archdata.iommu; mmu = to_priv(dev)->mmu;
mmu = archdata->mmu;
if (!mmu->mapping) { if (!mmu->mapping) {
struct dma_iommu_mapping *mapping; struct dma_iommu_mapping *mapping;
@ -800,24 +816,24 @@ static int ipmmu_add_device(struct device *dev)
if (!IS_ERR_OR_NULL(group)) if (!IS_ERR_OR_NULL(group))
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
kfree(archdata->utlbs); kfree(to_priv(dev)->utlbs);
kfree(archdata); kfree(to_priv(dev));
dev->archdata.iommu = NULL; set_priv(dev, NULL);
return ret; return ret;
} }
static void ipmmu_remove_device(struct device *dev) static void ipmmu_remove_device(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata = dev->archdata.iommu; struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
arm_iommu_detach_device(dev); arm_iommu_detach_device(dev);
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
kfree(archdata->utlbs); kfree(priv->utlbs);
kfree(archdata); kfree(priv);
dev->archdata.iommu = NULL; set_priv(dev, NULL);
} }
static const struct iommu_ops ipmmu_ops = { static const struct iommu_ops ipmmu_ops = {
@ -874,11 +890,14 @@ static void ipmmu_domain_free_dma(struct iommu_domain *io_domain)
static int ipmmu_add_device_dma(struct device *dev) static int ipmmu_add_device_dma(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata = dev->archdata.iommu; struct iommu_fwspec *fwspec = dev->iommu_fwspec;
struct iommu_group *group; struct iommu_group *group;
/* The device has been verified in xlate() */ /*
if (!archdata) * Only let through devices that have been verified in xlate()
* We may get called with dev->iommu_fwspec set to NULL.
*/
if (!fwspec || !fwspec->iommu_priv)
return -ENODEV; return -ENODEV;
group = iommu_group_get_for_dev(dev); group = iommu_group_get_for_dev(dev);
@ -886,17 +905,17 @@ static int ipmmu_add_device_dma(struct device *dev)
return PTR_ERR(group); return PTR_ERR(group);
spin_lock(&ipmmu_slave_devices_lock); spin_lock(&ipmmu_slave_devices_lock);
list_add(&archdata->list, &ipmmu_slave_devices); list_add(&to_priv(dev)->list, &ipmmu_slave_devices);
spin_unlock(&ipmmu_slave_devices_lock); spin_unlock(&ipmmu_slave_devices_lock);
return 0; return 0;
} }
static void ipmmu_remove_device_dma(struct device *dev) static void ipmmu_remove_device_dma(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata = dev->archdata.iommu; struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
spin_lock(&ipmmu_slave_devices_lock); spin_lock(&ipmmu_slave_devices_lock);
list_del(&archdata->list); list_del(&priv->list);
spin_unlock(&ipmmu_slave_devices_lock); spin_unlock(&ipmmu_slave_devices_lock);
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
@ -904,16 +923,16 @@ static void ipmmu_remove_device_dma(struct device *dev)
static struct device *ipmmu_find_sibling_device(struct device *dev) static struct device *ipmmu_find_sibling_device(struct device *dev)
{ {
struct ipmmu_vmsa_archdata *archdata = dev->archdata.iommu; struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev);
struct ipmmu_vmsa_archdata *sibling_archdata = NULL; struct ipmmu_vmsa_iommu_priv *sibling_priv = NULL;
bool found = false; bool found = false;
spin_lock(&ipmmu_slave_devices_lock); spin_lock(&ipmmu_slave_devices_lock);
list_for_each_entry(sibling_archdata, &ipmmu_slave_devices, list) { list_for_each_entry(sibling_priv, &ipmmu_slave_devices, list) {
if (archdata == sibling_archdata) if (priv == sibling_priv)
continue; continue;
if (sibling_archdata->mmu == archdata->mmu) { if (sibling_priv->mmu == priv->mmu) {
found = true; found = true;
break; break;
} }
@ -921,7 +940,7 @@ static struct device *ipmmu_find_sibling_device(struct device *dev)
spin_unlock(&ipmmu_slave_devices_lock); spin_unlock(&ipmmu_slave_devices_lock);
return found ? sibling_archdata->dev : NULL; return found ? sibling_priv->dev : NULL;
} }
static struct iommu_group *ipmmu_find_group_dma(struct device *dev) static struct iommu_group *ipmmu_find_group_dma(struct device *dev)