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

Commit f5b83190 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/io-pgtable: Remove flush_pgtable callback 



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

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 857c88ca

drivers/iommu/io-pgtable-arm.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -884,16 +884,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)

drivers/iommu/io-pgtable.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,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.

 *

 *

 * Note that these can all be called in atomic context and must therefore

 * Note that these can all be called in atomic context and must therefore

 * not block.

 * not block.
@@ -30,7 +29,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);

};

};





/**

/**