evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iommu/io-pgtable: Remove flush_pgtable callback

Browse source 
With the users fully converted to DMA API operations, it's dead, Jim.

Change-Id: Ia9b6679902a3ef1ae9ac6abf6eb4b0b492952fe4
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
[pdaly@codeaurora.org Resolve minor conflicts]
This commit is contained in:
Robin Murphy 2015-07-29 19:46:12 +01:00 • committed by David Keitel
parent 65affae5ca
commit 0192e7b4b8
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/iommu/io-pgtable-arm.c
View file

@ -1165,16 +1165,10 @@ static void dummy_tlb_sync(void *cookie)
WARN_ON(cookie != cfg_cookie); WARN_ON(cookie != cfg_cookie);
} }
static void dummy_flush_pgtable(void *ptr, size_t size, void *cookie)
{
WARN_ON(cookie != cfg_cookie);
}
static struct iommu_gather_ops dummy_tlb_ops __initdata = { static struct iommu_gather_ops dummy_tlb_ops __initdata = {
.tlb_flush_all = dummy_tlb_flush_all, .tlb_flush_all = dummy_tlb_flush_all,
.tlb_add_flush = dummy_tlb_add_flush, .tlb_add_flush = dummy_tlb_add_flush,
.tlb_sync = dummy_tlb_sync, .tlb_sync = dummy_tlb_sync,
.flush_pgtable = dummy_flush_pgtable,
}; };
static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops) static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)

2
drivers/iommu/io-pgtable.h
View file

@ -22,7 +22,6 @@ enum io_pgtable_fmt {
* @tlb_sync: Ensure any queued TLB invalidation has taken effect, and * @tlb_sync: Ensure any queued TLB invalidation has taken effect, and
* any corresponding page table updates are visible to the * any corresponding page table updates are visible to the
* IOMMU. * IOMMU.
* @flush_pgtable: Ensure page table updates are visible to the IOMMU.
* @alloc_pages_exact: Allocate page table memory (optional, defaults to * @alloc_pages_exact: Allocate page table memory (optional, defaults to
* alloc_pages_exact) * alloc_pages_exact)
* @free_pages_exact: Free page table memory (optional, defaults to * @free_pages_exact: Free page table memory (optional, defaults to
@ -36,7 +35,6 @@ struct iommu_gather_ops {
void (*tlb_add_flush)(unsigned long iova, size_t size, bool leaf, void (*tlb_add_flush)(unsigned long iova, size_t size, bool leaf,
void *cookie); void *cookie);
void (*tlb_sync)(void *cookie); void (*tlb_sync)(void *cookie);
void (*flush_pgtable)(void *ptr, size_t size, void *cookie);
void *(*alloc_pages_exact)(void *cookie, size_t size, gfp_t gfp_mask); void *(*alloc_pages_exact)(void *cookie, size_t size, gfp_t gfp_mask);
void (*free_pages_exact)(void *cookie, void *virt, size_t size); void (*free_pages_exact)(void *cookie, void *virt, size_t size);
}; };