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

Commit b70bb984 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Joerg Roedel
Browse files

iommu: provide of_xlate pointer unconditionally 



iommu drivers that support the standard DT bindings use a of_xlate
callback pointer, but that is only part of struct iommu_ops when
CONFIG_OF_IOMMU is enabled, leading to build errors in randconfig
builds when that is not provided:

drivers/iommu/mtk_iommu.c:497:2: error: unknown field 'of_xlate' specified in initializer
  .of_xlate = mtk_iommu_of_xlate,
  ^
drivers/iommu/mtk_iommu.c:497:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .of_xlate = mtk_iommu_of_xlate,
              ^~~~~~~~~~~~~~~~~~
drivers/iommu/mtk_iommu.c:497:14: note: (near initialization for 'mtk_iommu_ops.domain_get_attr')

We can work around it by adding more #ifdefs in each driver, but
it seems nicer to just allow setting the pointer even if it is
unused. This makes the driver code look nicer, and it gives better
compile-time coverage when test building on other architectures.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 0df4fabe ("iommu/mediatek: Add mt8173 IOMMU driver")
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 9735a227

include/linux/iommu.h

+0 −2
Original line number Diff line number Diff line
@@ -195,9 +195,7 @@ struct iommu_ops { 
	/* Get the number of windows per domain */

	u32 (*domain_get_windows)(struct iommu_domain *domain);



#ifdef CONFIG_OF_IOMMU

	int (*of_xlate)(struct device *dev, struct of_phandle_args *args);

#endif



	unsigned long pgsize_bitmap;

	void *priv;