iommu: rockchip: Free domain on .domain_free
IOMMU domain resource life is well-defined, managed by .domain_alloc and .domain_free. Therefore, domain-specific resources shouldn't be tied to the device life, but instead to its domain. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Reviewed-by: Robin Murphy <robin.murphy@arm.com> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Родитель
4f5cafb5cb
Коммит
42bb97b80f
|
@ -979,13 +979,13 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
|
||||||
if (!dma_dev)
|
if (!dma_dev)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
rk_domain = devm_kzalloc(dma_dev, sizeof(*rk_domain), GFP_KERNEL);
|
rk_domain = kzalloc(sizeof(*rk_domain), GFP_KERNEL);
|
||||||
if (!rk_domain)
|
if (!rk_domain)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (type == IOMMU_DOMAIN_DMA &&
|
if (type == IOMMU_DOMAIN_DMA &&
|
||||||
iommu_get_dma_cookie(&rk_domain->domain))
|
iommu_get_dma_cookie(&rk_domain->domain))
|
||||||
return NULL;
|
goto err_free_domain;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* rk32xx iommus use a 2 level pagetable.
|
* rk32xx iommus use a 2 level pagetable.
|
||||||
|
@ -1020,6 +1020,8 @@ err_free_dt:
|
||||||
err_put_cookie:
|
err_put_cookie:
|
||||||
if (type == IOMMU_DOMAIN_DMA)
|
if (type == IOMMU_DOMAIN_DMA)
|
||||||
iommu_put_dma_cookie(&rk_domain->domain);
|
iommu_put_dma_cookie(&rk_domain->domain);
|
||||||
|
err_free_domain:
|
||||||
|
kfree(rk_domain);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -1048,6 +1050,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
|
||||||
|
|
||||||
if (domain->type == IOMMU_DOMAIN_DMA)
|
if (domain->type == IOMMU_DOMAIN_DMA)
|
||||||
iommu_put_dma_cookie(&rk_domain->domain);
|
iommu_put_dma_cookie(&rk_domain->domain);
|
||||||
|
kfree(rk_domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rk_iommu_add_device(struct device *dev)
|
static int rk_iommu_add_device(struct device *dev)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче