android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "iommu: qcom-iommu-util: Fix out-of-sync data structure"

Browse Source
This commit is contained in:
qctecmdr 2021-11-08 17:26:55 -08:00 committed by Gerrit - the friendly Code Review server
commit 604ad7045d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/iommu/qcom-dma-iommu-generic.c
View File

@ -256,23 +256,24 @@ void *qcom_dma_common_contiguous_remap(struct page *page, size_t size,
}
/*
* Unmaps a range previously mapped by dma_common_*_remap
* Unmaps a range previously mapped by dma_common_contiguous_remap or
* dma_common_pages_remap. Note that dma_common_contiguous_remap does
* not insert an rb_tree entry since there is no pages array to save.
*/
void qcom_dma_common_free_remap(void *cpu_addr, size_t size)
{
struct qcom_iommu_dma_area *area;
vunmap(cpu_addr);
/* qcom_dma_common_contiguous_remap doesn't save the pages array */
area = qcom_find_vm_area(cpu_addr);
if (!area)
return;
if (area) {
mutex_lock(&rbtree_lock);
rb_erase(&area->node, root);
mutex_unlock(&rbtree_lock);
kfree(area);
}
mutex_lock(&rbtree_lock);
rb_erase(&area->node, root);
mutex_unlock(&rbtree_lock);
kfree(area);
vunmap(cpu_addr);
}
static struct gen_pool *atomic_pool __ro_after_init;