Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back

Browse Source 
This domain type is not yet handled in the
iommu_ops->domain_free() call-back. Fix that.

Fixes: 0bb6e243d7fb ('iommu/amd: Support IOMMU_DOMAIN_DMA type allocation')
Cc: stable@vger.kernel.org # v4.2+
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2016-07-07 15:57:04 +02:00
parent d26592a93d
commit cda7005ba2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/iommu/amd_iommu.c
View File

@ -2863,9 +2863,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
static void amd_iommu_domain_free(struct iommu_domain *dom)
{
struct protection_domain *domain;
if (!dom)
return;
struct dma_ops_domain *dma_dom;
domain = to_pdomain(dom);
@ -2874,13 +2872,24 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
BUG_ON(domain->dev_cnt != 0);
if (domain->mode != PAGE_MODE_NONE)
free_pagetable(domain);
if (!dom)
return;
if (domain->flags & PD_IOMMUV2_MASK)
free_gcr3_table(domain);
switch (dom->type) {
case IOMMU_DOMAIN_DMA:
dma_dom = domain->priv;
dma_ops_domain_free(dma_dom);
break;
default:
if (domain->mode != PAGE_MODE_NONE)
free_pagetable(domain);
protection_domain_free(domain);
if (domain->flags & PD_IOMMUV2_MASK)
free_gcr3_table(domain);
protection_domain_free(domain);
break;
}
}
static void amd_iommu_detach_device(struct iommu_domain *dom,