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

iommu/io-pgtable: Make selftest gubbins consistently __init 



The selftests run as an initcall, but the annotation of the various
callbacks and data seems to be somewhat arbitrary. Add it consistently
for everything related to the selftests.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent db22a9de

drivers/iommu/io-pgtable-arm-v7s.c

+8 −7
Original line number Diff line number Diff line
@@ -846,27 +846,28 @@ struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns = { 


#ifdef CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST



static struct io_pgtable_cfg *cfg_cookie;

static struct io_pgtable_cfg *cfg_cookie __initdata;



static void dummy_tlb_flush_all(void *cookie)

static void __init dummy_tlb_flush_all(void *cookie)

{

	WARN_ON(cookie != cfg_cookie);

}



static void dummy_tlb_flush(unsigned long iova, size_t size, size_t granule,

			    void *cookie)

static void __init dummy_tlb_flush(unsigned long iova, size_t size,

				   size_t granule, void *cookie)

{

	WARN_ON(cookie != cfg_cookie);

	WARN_ON(!(size & cfg_cookie->pgsize_bitmap));

}



static void dummy_tlb_add_page(struct iommu_iotlb_gather *gather,

			       unsigned long iova, size_t granule, void *cookie)

static void __init dummy_tlb_add_page(struct iommu_iotlb_gather *gather,

				      unsigned long iova, size_t granule,

				      void *cookie)

{

	dummy_tlb_flush(iova, granule, granule, cookie);

}



static const struct iommu_flush_ops dummy_tlb_ops = {

static const struct iommu_flush_ops dummy_tlb_ops __initconst = {

	.tlb_flush_all	= dummy_tlb_flush_all,

	.tlb_flush_walk	= dummy_tlb_flush,

	.tlb_flush_leaf	= dummy_tlb_flush,

drivers/iommu/io-pgtable-arm.c

+7 −6
Original line number Diff line number Diff line
@@ -1097,22 +1097,23 @@ struct io_pgtable_init_fns io_pgtable_arm_mali_lpae_init_fns = { 


#ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST



static struct io_pgtable_cfg *cfg_cookie;

static struct io_pgtable_cfg *cfg_cookie __initdata;



static void dummy_tlb_flush_all(void *cookie)

static void __init dummy_tlb_flush_all(void *cookie)

{

	WARN_ON(cookie != cfg_cookie);

}



static void dummy_tlb_flush(unsigned long iova, size_t size, size_t granule,

			    void *cookie)

static void __init dummy_tlb_flush(unsigned long iova, size_t size,

				   size_t granule, void *cookie)

{

	WARN_ON(cookie != cfg_cookie);

	WARN_ON(!(size & cfg_cookie->pgsize_bitmap));

}



static void dummy_tlb_add_page(struct iommu_iotlb_gather *gather,

			       unsigned long iova, size_t granule, void *cookie)

static void __init dummy_tlb_add_page(struct iommu_iotlb_gather *gather,

				      unsigned long iova, size_t granule,

				      void *cookie)

{

	dummy_tlb_flush(iova, granule, granule, cookie);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE