Commit bac05772 authored by Vasant Hegde's avatar Vasant Hegde Committed by Joerg Roedel

iommu/amd: Refactor protection domain allocation code

To replace if-else with switch-case statement due to increasing number of
domain types.

No functional changes intended.
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20230921092147.5930-5-vasant.hegde@amd.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ba7d263b
...@@ -2078,24 +2078,8 @@ static struct protection_domain *protection_domain_alloc(unsigned int type) ...@@ -2078,24 +2078,8 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
struct io_pgtable_ops *pgtbl_ops; struct io_pgtable_ops *pgtbl_ops;
struct protection_domain *domain; struct protection_domain *domain;
int pgtable; int pgtable;
int mode = DEFAULT_PGTABLE_LEVEL;
int ret; int ret;
/*
* Force IOMMU v1 page table when iommu=pt and
* when allocating domain for pass-through devices.
*/
if (type == IOMMU_DOMAIN_IDENTITY) {
pgtable = AMD_IOMMU_V1;
mode = PAGE_MODE_NONE;
} else if (type == IOMMU_DOMAIN_UNMANAGED) {
pgtable = AMD_IOMMU_V1;
} else if (type == IOMMU_DOMAIN_DMA || type == IOMMU_DOMAIN_DMA_FQ) {
pgtable = amd_iommu_pgtable;
} else {
return NULL;
}
domain = kzalloc(sizeof(*domain), GFP_KERNEL); domain = kzalloc(sizeof(*domain), GFP_KERNEL);
if (!domain) if (!domain)
return NULL; return NULL;
...@@ -2106,27 +2090,42 @@ static struct protection_domain *protection_domain_alloc(unsigned int type) ...@@ -2106,27 +2090,42 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
spin_lock_init(&domain->lock); spin_lock_init(&domain->lock);
INIT_LIST_HEAD(&domain->dev_list); INIT_LIST_HEAD(&domain->dev_list);
domain->nid = NUMA_NO_NODE;
switch (type) {
/* No need to allocate io pgtable ops in passthrough mode */
case IOMMU_DOMAIN_IDENTITY:
return domain;
case IOMMU_DOMAIN_DMA:
case IOMMU_DOMAIN_DMA_FQ:
pgtable = amd_iommu_pgtable;
break;
/*
* Force IOMMU v1 page table when allocating
* domain for pass-through devices.
*/
case IOMMU_DOMAIN_UNMANAGED:
pgtable = AMD_IOMMU_V1;
break;
default:
goto out_err;
}
switch (pgtable) { switch (pgtable) {
case AMD_IOMMU_V1: case AMD_IOMMU_V1:
ret = protection_domain_init_v1(domain, mode); ret = protection_domain_init_v1(domain, DEFAULT_PGTABLE_LEVEL);
break; break;
case AMD_IOMMU_V2: case AMD_IOMMU_V2:
ret = protection_domain_init_v2(domain); ret = protection_domain_init_v2(domain);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
break;
} }
if (ret) if (ret)
goto out_err; goto out_err;
/* No need to allocate io pgtable ops in passthrough mode */
if (type == IOMMU_DOMAIN_IDENTITY)
return domain;
domain->nid = NUMA_NO_NODE;
pgtbl_ops = alloc_io_pgtable_ops(pgtable, &domain->iop.pgtbl_cfg, domain); pgtbl_ops = alloc_io_pgtable_ops(pgtable, &domain->iop.pgtbl_cfg, domain);
if (!pgtbl_ops) { if (!pgtbl_ops) {
domain_id_free(domain->id); domain_id_free(domain->id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment