hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iommu/msm: Make use of domain_alloc and domain_free 

Implement domain_alloc and domain_free iommu-ops as a
replacement for domain_init/domain_destroy.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2015-03-26 13:43:14 +01:00
parent b5cbb386ae
commit 3e116c3cd2
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
drivers/iommu/msm_iommu.c
View File

@ -52,8 +52,14 @@ DEFINE_SPINLOCK(msm_iommu_lock);
struct msm_priv { struct msm_priv {
unsigned long *pgtable; unsigned long *pgtable;
struct list_head list_attached; struct list_head list_attached;
struct iommu_domain domain;
}; };
static struct msm_priv *to_msm_priv(struct iommu_domain *dom)
{
return container_of(dom, struct msm_priv, domain);
}
static int __enable_clocks(struct msm_iommu_drvdata *drvdata) static int __enable_clocks(struct msm_iommu_drvdata *drvdata)
{ {
int ret; int ret;
@ -79,7 +85,7 @@ static void __disable_clocks(struct msm_iommu_drvdata *drvdata)
static int __flush_iotlb(struct iommu_domain *domain) static int __flush_iotlb(struct iommu_domain *domain)
{ {
struct msm_priv *priv = domain->priv; struct msm_priv *priv = to_msm_priv(domain);
struct msm_iommu_drvdata *iommu_drvdata; struct msm_iommu_drvdata *iommu_drvdata;
struct msm_iommu_ctx_drvdata *ctx_drvdata; struct msm_iommu_ctx_drvdata *ctx_drvdata;
int ret = 0; int ret = 0;
@ -209,10 +215,14 @@ static void __program_context(void __iomem *base, int ctx, phys_addr_t pgtable)
SET_M(base, ctx, 1); SET_M(base, ctx, 1);
} }
static int msm_iommu_domain_init(struct iommu_domain *domain) static struct iommu_domain *msm_iommu_domain_alloc(unsigned type)
{ {
struct msm_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL); struct msm_priv *priv;
if (type != IOMMU_DOMAIN_UNMANAGED)
return NULL;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
goto fail_nomem; goto fail_nomem;
@ -224,20 +234,19 @@ static int msm_iommu_domain_init(struct iommu_domain *domain)
goto fail_nomem; goto fail_nomem;
memset(priv->pgtable, 0, SZ_16K); memset(priv->pgtable, 0, SZ_16K);
domain->priv = priv;
domain->geometry.aperture_start = 0; priv->domain.geometry.aperture_start = 0;
domain->geometry.aperture_end = (1ULL << 32) - 1; priv->domain.geometry.aperture_end = (1ULL << 32) - 1;
domain->geometry.force_aperture = true; priv->domain.geometry.force_aperture = true;
return 0; return &priv->domain;
fail_nomem: fail_nomem:
kfree(priv); kfree(priv);
return -ENOMEM; return NULL;
} }
static void msm_iommu_domain_destroy(struct iommu_domain *domain) static void msm_iommu_domain_free(struct iommu_domain *domain)
{ {
struct msm_priv *priv; struct msm_priv *priv;
unsigned long flags; unsigned long flags;
@ -245,20 +254,17 @@ static void msm_iommu_domain_destroy(struct iommu_domain *domain)
int i; int i;
spin_lock_irqsave(&msm_iommu_lock, flags); spin_lock_irqsave(&msm_iommu_lock, flags);
priv = domain->priv; priv = to_msm_priv(domain);
domain->priv = NULL;
if (priv) { fl_table = priv->pgtable;
fl_table = priv->pgtable;
for (i = 0; i < NUM_FL_PTE; i++) for (i = 0; i < NUM_FL_PTE; i++)
if ((fl_table[i] & 0x03) == FL_TYPE_TABLE) if ((fl_table[i] & 0x03) == FL_TYPE_TABLE)
free_page((unsigned long) __va(((fl_table[i]) & free_page((unsigned long) __va(((fl_table[i]) &
FL_BASE_MASK))); FL_BASE_MASK)));
free_pages((unsigned long)priv->pgtable, get_order(SZ_16K)); free_pages((unsigned long)priv->pgtable, get_order(SZ_16K));
priv->pgtable = NULL; priv->pgtable = NULL;
}
kfree(priv); kfree(priv);
spin_unlock_irqrestore(&msm_iommu_lock, flags); spin_unlock_irqrestore(&msm_iommu_lock, flags);
@ -276,9 +282,9 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
spin_lock_irqsave(&msm_iommu_lock, flags); spin_lock_irqsave(&msm_iommu_lock, flags);
priv = domain->priv; priv = to_msm_priv(domain);
if (!priv || !dev) { if (!dev) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
@ -330,9 +336,9 @@ static void msm_iommu_detach_dev(struct iommu_domain *domain,
int ret; int ret;
spin_lock_irqsave(&msm_iommu_lock, flags); spin_lock_irqsave(&msm_iommu_lock, flags);
priv = domain->priv; priv = to_msm_priv(domain);
if (!priv || !dev) if (!dev)
goto fail; goto fail;
iommu_drvdata = dev_get_drvdata(dev->parent); iommu_drvdata = dev_get_drvdata(dev->parent);
@ -382,11 +388,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
goto fail; goto fail;
} }
priv = domain->priv; priv = to_msm_priv(domain);
if (!priv) {
ret = -EINVAL;
goto fail;
}
fl_table = priv->pgtable; fl_table = priv->pgtable;
@ -484,10 +486,7 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
spin_lock_irqsave(&msm_iommu_lock, flags); spin_lock_irqsave(&msm_iommu_lock, flags);
priv = domain->priv; priv = to_msm_priv(domain);
if (!priv)
goto fail;
fl_table = priv->pgtable; fl_table = priv->pgtable;
@ -566,7 +565,7 @@ static phys_addr_t msm_iommu_iova_to_phys(struct iommu_domain *domain,
spin_lock_irqsave(&msm_iommu_lock, flags); spin_lock_irqsave(&msm_iommu_lock, flags);
priv = domain->priv; priv = to_msm_priv(domain);
if (list_empty(&priv->list_attached)) if (list_empty(&priv->list_attached))
goto fail; goto fail;
@ -674,8 +673,8 @@ fail:
static const struct iommu_ops msm_iommu_ops = { static const struct iommu_ops msm_iommu_ops = {
.capable = msm_iommu_capable, .capable = msm_iommu_capable,
.domain_init = msm_iommu_domain_init, .domain_alloc = msm_iommu_domain_alloc,
.domain_destroy = msm_iommu_domain_destroy, .domain_free = msm_iommu_domain_free,
.attach_dev = msm_iommu_attach_dev, .attach_dev = msm_iommu_attach_dev,
.detach_dev = msm_iommu_detach_dev, .detach_dev = msm_iommu_detach_dev,
.map = msm_iommu_map, .map = msm_iommu_map,