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

Commit 53c92d79 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: of: enforce const-ness of struct iommu_ops 



As a set of driver-provided callbacks and static data, there is no
compelling reason for struct iommu_ops to be mutable in core code, so
enforce const-ness throughout.

Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 3c3e8943

arch/arm/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static inline unsigned long dma_max_pfn(struct device *dev) 


#define arch_setup_dma_ops arch_setup_dma_ops

extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			       struct iommu_ops *iommu, bool coherent);

			       const struct iommu_ops *iommu, bool coherent);



#define arch_teardown_dma_ops arch_teardown_dma_ops

extern void arch_teardown_dma_ops(struct device *dev);

arch/arm/mm/dma-mapping.c

+3 −3
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ static struct dma_map_ops *arm_get_iommu_dma_map_ops(bool coherent) 
}



static bool arm_setup_iommu_dma_ops(struct device *dev, u64 dma_base, u64 size,

				    struct iommu_ops *iommu)

				    const struct iommu_ops *iommu)

{

	struct dma_iommu_mapping *mapping;
@@ -2253,7 +2253,7 @@ static void arm_teardown_iommu_dma_ops(struct device *dev) 
#else



static bool arm_setup_iommu_dma_ops(struct device *dev, u64 dma_base, u64 size,

				    struct iommu_ops *iommu)

				    const struct iommu_ops *iommu)

{

	return false;

}
@@ -2270,7 +2270,7 @@ static struct dma_map_ops *arm_get_dma_map_ops(bool coherent) 
}



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			struct iommu_ops *iommu, bool coherent)

			const struct iommu_ops *iommu, bool coherent)

{

	struct dma_map_ops *dma_ops;

arch/arm64/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 
}



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			struct iommu_ops *iommu, bool coherent);

			const struct iommu_ops *iommu, bool coherent);

#define arch_setup_dma_ops	arch_setup_dma_ops



#ifdef CONFIG_IOMMU_DMA

arch/arm64/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -979,13 +979,13 @@ void arch_teardown_dma_ops(struct device *dev) 
#else



static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

				  struct iommu_ops *iommu)

				  const struct iommu_ops *iommu)

{ }



#endif  /* CONFIG_IOMMU_DMA */



void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			struct iommu_ops *iommu, bool coherent)

			const struct iommu_ops *iommu, bool coherent)

{

	if (!dev->archdata.dma_ops)

		dev->archdata.dma_ops = &swiotlb_dma_ops;

drivers/iommu/of_iommu.c

+7 −7
Original line number Diff line number Diff line
@@ -98,12 +98,12 @@ EXPORT_SYMBOL_GPL(of_get_dma_window); 
struct of_iommu_node {

	struct list_head list;

	struct device_node *np;

	struct iommu_ops *ops;

	const struct iommu_ops *ops;

};

static LIST_HEAD(of_iommu_list);

static DEFINE_SPINLOCK(of_iommu_lock);



void of_iommu_set_ops(struct device_node *np, struct iommu_ops *ops)

void of_iommu_set_ops(struct device_node *np, const struct iommu_ops *ops)

{

	struct of_iommu_node *iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
@@ -119,10 +119,10 @@ void of_iommu_set_ops(struct device_node *np, struct iommu_ops *ops) 
	spin_unlock(&of_iommu_lock);

}



struct iommu_ops *of_iommu_get_ops(struct device_node *np)

const struct iommu_ops *of_iommu_get_ops(struct device_node *np)

{

	struct of_iommu_node *node;

	struct iommu_ops *ops = NULL;

	const struct iommu_ops *ops = NULL;



	spin_lock(&of_iommu_lock);

	list_for_each_entry(node, &of_iommu_list, list)
@@ -134,12 +134,12 @@ struct iommu_ops *of_iommu_get_ops(struct device_node *np) 
	return ops;

}



struct iommu_ops *of_iommu_configure(struct device *dev,

const struct iommu_ops *of_iommu_configure(struct device *dev,

					   struct device_node *master_np)

{

	struct of_phandle_args iommu_spec;

	struct device_node *np;

	struct iommu_ops *ops = NULL;

	const struct iommu_ops *ops = NULL;

	int idx = 0;



	/*