Commit bd3c2e66 authored Jan 02, 2019 by Sakari Ailus Committed by Joerg Roedel Jan 11, 2019

iommu/iova: Allow compiling the library without IOMMU support

Drivers such as the Intel IPU3 ImgU driver use the IOVA library to manage
the device's own virtual address space while not implementing the IOMMU
API. Currently the IOVA library is only compiled if the IOMMU support is
enabled, resulting into a failure during linking due to missing symbols.

Fix this by defining IOVA library Kconfig bits independently of IOMMU
support configuration, and descending to the iommu directory
unconditionally during the build.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent bfeffd15

drivers/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ obj-y += tty/
		obj-y += char/

		# iommu/ comes before gpu as gpu are using iommu controllers
		obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
		obj-y += iommu/

		# gpu/ comes after char for AGP vs DRM startup and after iommu
		obj-y += gpu/

drivers/iommu/Kconfig

+4 −3

Original line number	Diff line number	Diff line
		# The IOVA library may also be used by non-IOMMU_API users
		config IOMMU_IOVA
		tristate

		# IOMMU_API always gets selected by whoever wants it.
		config IOMMU_API
		bool
		@@ -81,9 +85,6 @@ config IOMMU_DEFAULT_PASSTHROUGH

		If unsure, say N here.

		config IOMMU_IOVA
		tristate

		config OF_IOMMU
		def_bool y
		depends on OF && IOMMU_API

Admin message