diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2015-06-05 08:34:57 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-11 07:14:55 +0200 |
| commit | 8aca92d82d9f259e0b6b0c81e5eb9baaf471e6ad (patch) | |
| tree | 2bbb9f59ef5e0a195bd983ecf64ec949fb7fd3f7 | |
| parent | powerpc/iommu: Put IOMMU group explicitly (diff) | |
| download | linux-8aca92d82d9f259e0b6b0c81e5eb9baaf471e6ad.tar.xz linux-8aca92d82d9f259e0b6b0c81e5eb9baaf471e6ad.zip | |
powerpc/iommu: Always release iommu_table in iommu_free_table()
At the moment iommu_free_table() only releases memory if
the table was initialized for the platform code use, i.e. it had
it_map initialized (which purpose is to track DMA memory space use).
With dynamic DMA windows, we will need to be able to release
iommu_table even if it was used for VFIO in which case it_map is NULL
so does the patch.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/kernel/iommu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 3d47eb3e15dd..73eb39a7a9e1 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -713,9 +713,11 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name) unsigned long bitmap_sz; unsigned int order; - if (!tbl || !tbl->it_map) { - printk(KERN_ERR "%s: expected TCE map for %s\n", __func__, - node_name); + if (!tbl) + return; + + if (!tbl->it_map) { + kfree(tbl); return; } |