Commit 09230cbc authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

swiotlb: move the SWIOTLB config symbol to lib/Kconfig 



This way we have one central definition of it, and user can select it as
needed.  The new option is not user visible, which is the behavior
it had in most architectures, with a few notable exceptions:

 - On x86_64 and mips/loongson3 it used to be user selectable, but
   defaulted to y.  It now is unconditional, which seems like the right
   thing for 64-bit architectures without guaranteed availablity of
   IOMMUs.
 - on powerpc the symbol is user selectable and defaults to n, but
   many boards select it.  This change assumes no working setup
   required a manual selection, but if that turned out to be wrong
   we'll have to add another select statement or two for the respective
   boards.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8d9b409b

arch/arm/Kconfig

+0 −3
Original line number Original line Diff line number Diff line
@@ -1772,9 +1772,6 @@ config SECCOMP 
	  and the task is only allowed to execute a few safe syscalls

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.

	  defined by each seccomp mode.





config SWIOTLB

	bool



config PARAVIRT

config PARAVIRT

	bool "Enable paravirtualization code"

	bool "Enable paravirtualization code"

	help

	help

arch/arm64/Kconfig

+1 −3
Original line number Original line Diff line number Diff line
@@ -143,6 +143,7 @@ config ARM64 
	select POWER_SUPPLY

	select POWER_SUPPLY

	select REFCOUNT_FULL

	select REFCOUNT_FULL

	select SPARSE_IRQ

	select SPARSE_IRQ

	select SWIOTLB

	select SYSCTL_EXCEPTION_TRACE

	select SYSCTL_EXCEPTION_TRACE

	select THREAD_INFO_IN_TASK

	select THREAD_INFO_IN_TASK

	help

	help
@@ -238,9 +239,6 @@ config HAVE_GENERIC_GUP 
config SMP

config SMP

	def_bool y

	def_bool y





config SWIOTLB

	def_bool y



config KERNEL_MODE_NEON

config KERNEL_MODE_NEON

	def_bool y

	def_bool y

arch/ia64/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -79,9 +79,6 @@ config MMU 
	bool

	bool

	default y

	default y





config SWIOTLB

       bool



config STACKTRACE_SUPPORT

config STACKTRACE_SUPPORT

	def_bool y

	def_bool y
@@ -138,7 +135,6 @@ config IA64_GENERIC 
	bool "generic"

	bool "generic"

	select NUMA

	select NUMA

	select ACPI_NUMA

	select ACPI_NUMA

	select DMA_DIRECT_OPS

	select SWIOTLB

	select SWIOTLB

	select PCI_MSI

	select PCI_MSI

	help

	help
@@ -159,7 +155,6 @@ config IA64_GENERIC 




config IA64_DIG

config IA64_DIG

	bool "DIG-compliant"

	bool "DIG-compliant"

	select DMA_DIRECT_OPS

	select SWIOTLB

	select SWIOTLB





config IA64_DIG_VTD

config IA64_DIG_VTD
@@ -175,7 +170,6 @@ config IA64_HP_ZX1 




config IA64_HP_ZX1_SWIOTLB

config IA64_HP_ZX1_SWIOTLB

	bool "HP-zx1/sx1000 with software I/O TLB"

	bool "HP-zx1/sx1000 with software I/O TLB"

	select DMA_DIRECT_OPS

	select SWIOTLB

	select SWIOTLB

	help

	help

	  Build a kernel that runs on HP zx1 and sx1000 systems even when they

	  Build a kernel that runs on HP zx1 and sx1000 systems even when they
@@ -199,7 +193,6 @@ config IA64_SGI_UV 
	bool "SGI-UV"

	bool "SGI-UV"

	select NUMA

	select NUMA

	select ACPI_NUMA

	select ACPI_NUMA

	select DMA_DIRECT_OPS

	select SWIOTLB

	select SWIOTLB

	help

	help

	  Selecting this option will optimize the kernel for use on UV based

	  Selecting this option will optimize the kernel for use on UV based
@@ -210,7 +203,6 @@ config IA64_SGI_UV 




config IA64_HP_SIM

config IA64_HP_SIM

	bool "Ski-simulator"

	bool "Ski-simulator"

	select DMA_DIRECT_OPS

	select SWIOTLB

	select SWIOTLB

	depends on !PM

	depends on !PM

arch/mips/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -911,6 +911,7 @@ config CAVIUM_OCTEON_SOC 
	select MIPS_NR_CPU_NR_MAP_1024

	select MIPS_NR_CPU_NR_MAP_1024

	select BUILTIN_DTB

	select BUILTIN_DTB

	select MTD_COMPLEX_MAPPINGS

	select MTD_COMPLEX_MAPPINGS

	select SWIOTLB

	select SYS_SUPPORTS_RELOCATABLE

	select SYS_SUPPORTS_RELOCATABLE

	help

	help

	  This option supports all of the Octeon reference boards from Cavium

	  This option supports all of the Octeon reference boards from Cavium
@@ -1366,6 +1367,7 @@ config CPU_LOONGSON3 
	select MIPS_PGD_C0_CONTEXT

	select MIPS_PGD_C0_CONTEXT

	select MIPS_L1_CACHE_SHIFT_6

	select MIPS_L1_CACHE_SHIFT_6

	select GPIOLIB

	select GPIOLIB

	select SWIOTLB

	help

	help

		The Loongson 3 processor implements the MIPS64R2 instruction

		The Loongson 3 processor implements the MIPS64R2 instruction

		set with many extensions.

		set with many extensions.

arch/mips/cavium-octeon/Kconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -67,10 +67,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY 
	help

	help

	  Lock the kernel's implementation of memcpy() into L2.

	  Lock the kernel's implementation of memcpy() into L2.





config SWIOTLB

	def_bool y

	select DMA_DIRECT_OPS



config OCTEON_ILM

config OCTEON_ILM

	tristate "Module to measure interrupt latency using Octeon CIU Timer"

	tristate "Module to measure interrupt latency using Octeon CIU Timer"

	help

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE