Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cda7005b authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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



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

Fixes: 0bb6e243 ('iommu/amd: Support IOMMU_DOMAIN_DMA type allocation')
Cc: stable@vger.kernel.org # v4.2+
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d26592a9

drivers/iommu/amd_iommu.c

+17 −8
Original line number Diff line number Diff line
@@ -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,6 +2872,15 @@ static void amd_iommu_domain_free(struct iommu_domain *dom) 


	BUG_ON(domain->dev_cnt != 0);



	if (!dom)

		return;



	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);
@@ -2881,6 +2888,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom) 
			free_gcr3_table(domain);



		protection_domain_free(domain);

		break;

	}

}



static void amd_iommu_detach_device(struct iommu_domain *dom,