kernel: Move some IOMMU options to generic
This adds some missing IOMMU related options for x86/64 and moves some
of them to generic for all targets.
On x86 IOMMU_DEFAULT_DMA_LAZY is used by default, on all other platforms
IOMMU_DEFAULT_DMA_STRICT is the default. we just follow the default
kernel configuration here.
Fixes: 8fea4a102c ("x86/64: enable IOMMU support")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
			
			
This commit is contained in:
		| @@ -2651,6 +2651,7 @@ CONFIG_INPUT_MISC=y | |||||||
| # CONFIG_INTEL_HID_EVENT is not set | # CONFIG_INTEL_HID_EVENT is not set | ||||||
| # CONFIG_INTEL_IDLE is not set | # CONFIG_INTEL_IDLE is not set | ||||||
| # CONFIG_INTEL_IDMA64 is not set | # CONFIG_INTEL_IDMA64 is not set | ||||||
|  | # CONFIG_INTEL_IDXD is not set | ||||||
| # CONFIG_INTEL_INT0002_VGPIO is not set | # CONFIG_INTEL_INT0002_VGPIO is not set | ||||||
| # CONFIG_INTEL_IOATDMA is not set | # CONFIG_INTEL_IOATDMA is not set | ||||||
| # CONFIG_INTEL_ISH_HID is not set | # CONFIG_INTEL_ISH_HID is not set | ||||||
| @@ -2678,6 +2679,7 @@ CONFIG_INPUT_MISC=y | |||||||
| # CONFIG_INV_MPU6050_I2C is not set | # CONFIG_INV_MPU6050_I2C is not set | ||||||
| # CONFIG_INV_MPU6050_IIO is not set | # CONFIG_INV_MPU6050_IIO is not set | ||||||
| # CONFIG_INV_MPU6050_SPI is not set | # CONFIG_INV_MPU6050_SPI is not set | ||||||
|  | # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set | ||||||
| # CONFIG_IOMMU_SUPPORT is not set | # CONFIG_IOMMU_SUPPORT is not set | ||||||
| # CONFIG_IONIC is not set | # CONFIG_IONIC is not set | ||||||
| # CONFIG_IOSCHED_BFQ is not set | # CONFIG_IOSCHED_BFQ is not set | ||||||
| @@ -7009,6 +7011,7 @@ CONFIG_VHOST_MENU=y | |||||||
| # CONFIG_VIRTIO_CONSOLE is not set | # CONFIG_VIRTIO_CONSOLE is not set | ||||||
| # CONFIG_VIRTIO_FS is not set | # CONFIG_VIRTIO_FS is not set | ||||||
| # CONFIG_VIRTIO_INPUT is not set | # CONFIG_VIRTIO_INPUT is not set | ||||||
|  | # CONFIG_VIRTIO_IOMMU is not set | ||||||
| CONFIG_VIRTIO_MENU=y | CONFIG_VIRTIO_MENU=y | ||||||
| # CONFIG_VIRTIO_MMIO is not set | # CONFIG_VIRTIO_MMIO is not set | ||||||
| # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set | # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set | ||||||
|   | |||||||
| @@ -2745,6 +2745,8 @@ CONFIG_INPUT_MISC=y | |||||||
| # CONFIG_INTEL_HID_EVENT is not set | # CONFIG_INTEL_HID_EVENT is not set | ||||||
| # CONFIG_INTEL_IDLE is not set | # CONFIG_INTEL_IDLE is not set | ||||||
| # CONFIG_INTEL_IDMA64 is not set | # CONFIG_INTEL_IDMA64 is not set | ||||||
|  | # CONFIG_INTEL_IDXD is not set | ||||||
|  | # CONFIG_INTEL_IDXD_COMPAT is not set | ||||||
| # CONFIG_INTEL_INT0002_VGPIO is not set | # CONFIG_INTEL_INT0002_VGPIO is not set | ||||||
| # CONFIG_INTEL_IOATDMA is not set | # CONFIG_INTEL_IOATDMA is not set | ||||||
| # CONFIG_INTEL_ISH_HID is not set | # CONFIG_INTEL_ISH_HID is not set | ||||||
| @@ -2772,6 +2774,9 @@ CONFIG_INPUT_MISC=y | |||||||
| # CONFIG_INV_MPU6050_I2C is not set | # CONFIG_INV_MPU6050_I2C is not set | ||||||
| # CONFIG_INV_MPU6050_IIO is not set | # CONFIG_INV_MPU6050_IIO is not set | ||||||
| # CONFIG_INV_MPU6050_SPI is not set | # CONFIG_INV_MPU6050_SPI is not set | ||||||
|  | # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set | ||||||
|  | # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set | ||||||
|  | # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set | ||||||
| # CONFIG_IOMMU_SUPPORT is not set | # CONFIG_IOMMU_SUPPORT is not set | ||||||
| # CONFIG_IONIC is not set | # CONFIG_IONIC is not set | ||||||
| # CONFIG_IOSCHED_BFQ is not set | # CONFIG_IOSCHED_BFQ is not set | ||||||
| @@ -7341,6 +7346,7 @@ CONFIG_VHOST_MENU=y | |||||||
| # CONFIG_VIRTIO_CONSOLE is not set | # CONFIG_VIRTIO_CONSOLE is not set | ||||||
| # CONFIG_VIRTIO_FS is not set | # CONFIG_VIRTIO_FS is not set | ||||||
| # CONFIG_VIRTIO_INPUT is not set | # CONFIG_VIRTIO_INPUT is not set | ||||||
|  | # CONFIG_VIRTIO_IOMMU is not set | ||||||
| CONFIG_VIRTIO_MENU=y | CONFIG_VIRTIO_MENU=y | ||||||
| # CONFIG_VIRTIO_MMIO is not set | # CONFIG_VIRTIO_MMIO is not set | ||||||
| # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set | # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set | ||||||
|   | |||||||
| @@ -798,7 +798,6 @@ CONFIG_VIRTIO=y | |||||||
| CONFIG_VIRTIO_BALLOON=y | CONFIG_VIRTIO_BALLOON=y | ||||||
| CONFIG_VIRTIO_BLK=y | CONFIG_VIRTIO_BLK=y | ||||||
| CONFIG_VIRTIO_CONSOLE=y | CONFIG_VIRTIO_CONSOLE=y | ||||||
| # CONFIG_VIRTIO_IOMMU is not set |  | ||||||
| CONFIG_VIRTIO_MMIO=y | CONFIG_VIRTIO_MMIO=y | ||||||
| CONFIG_VIRTIO_NET=y | CONFIG_VIRTIO_NET=y | ||||||
| CONFIG_VIRTIO_PCI=y | CONFIG_VIRTIO_PCI=y | ||||||
|   | |||||||
| @@ -275,9 +275,7 @@ CONFIG_INPUT_KEYBOARD=y | |||||||
| CONFIG_INPUT_TOUCHSCREEN=y | CONFIG_INPUT_TOUCHSCREEN=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set |  | ||||||
| CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_IO_PGTABLE=y | CONFIG_IOMMU_IO_PGTABLE=y | ||||||
| CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y | CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y | ||||||
| # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set | # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set | ||||||
|   | |||||||
| @@ -177,7 +177,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||||||
| CONFIG_INPUT=y | CONFIG_INPUT=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_HELPER=y | CONFIG_IOMMU_HELPER=y | ||||||
| CONFIG_IOMMU_SUPPORT=y | CONFIG_IOMMU_SUPPORT=y | ||||||
| CONFIG_IRQCHIP=y | CONFIG_IRQCHIP=y | ||||||
|   | |||||||
| @@ -183,9 +183,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||||||
| CONFIG_INPUT=y | CONFIG_INPUT=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set |  | ||||||
| CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_HELPER=y | CONFIG_IOMMU_HELPER=y | ||||||
| CONFIG_IOMMU_SUPPORT=y | CONFIG_IOMMU_SUPPORT=y | ||||||
| CONFIG_IRQCHIP=y | CONFIG_IRQCHIP=y | ||||||
|   | |||||||
| @@ -284,7 +284,6 @@ CONFIG_INPUT_MATRIXKMAP=y | |||||||
| # CONFIG_INPUT_RK805_PWRKEY is not set | # CONFIG_INPUT_RK805_PWRKEY is not set | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_DMA=y | CONFIG_IOMMU_DMA=y | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
| CONFIG_IOMMU_IO_PGTABLE=y | CONFIG_IOMMU_IO_PGTABLE=y | ||||||
|   | |||||||
| @@ -278,8 +278,6 @@ CONFIG_INPUT_LEDS=y | |||||||
| CONFIG_INPUT_MATRIXKMAP=y | CONFIG_INPUT_MATRIXKMAP=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set |  | ||||||
| # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set |  | ||||||
| CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y | CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y | ||||||
| CONFIG_IOMMU_DMA=y | CONFIG_IOMMU_DMA=y | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
|   | |||||||
| @@ -242,7 +242,6 @@ CONFIG_INPUT=y | |||||||
| CONFIG_INPUT_KEYBOARD=y | CONFIG_INPUT_KEYBOARD=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
| # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set | # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set | ||||||
| # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set | # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set | ||||||
|   | |||||||
| @@ -248,9 +248,7 @@ CONFIG_INPUT_KEYBOARD=y | |||||||
| CONFIG_INTERCONNECT=y | CONFIG_INTERCONNECT=y | ||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set |  | ||||||
| CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | CONFIG_IOMMU_DEFAULT_DMA_STRICT=y | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
| # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set | # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set | ||||||
| # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set | # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set | ||||||
|   | |||||||
| @@ -242,7 +242,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 | |||||||
| CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y | CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y | ||||||
| CONFIG_INTEL_GTT=y | CONFIG_INTEL_GTT=y | ||||||
| CONFIG_INTEL_IDLE=y | CONFIG_INTEL_IDLE=y | ||||||
| # CONFIG_INTEL_IDXD is not set |  | ||||||
| CONFIG_INTEL_IOMMU=y | CONFIG_INTEL_IOMMU=y | ||||||
| # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | ||||||
| CONFIG_INTEL_IOMMU_FLOPPY_WA=y | CONFIG_INTEL_IOMMU_FLOPPY_WA=y | ||||||
| @@ -264,7 +263,6 @@ CONFIG_IOASID=y | |||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUG is not set | # CONFIG_IOMMU_DEBUG is not set | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set |  | ||||||
| CONFIG_IOMMU_DMA=y | CONFIG_IOMMU_DMA=y | ||||||
| CONFIG_IOMMU_HELPER=y | CONFIG_IOMMU_HELPER=y | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
|   | |||||||
| @@ -257,7 +257,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 | |||||||
| CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y | CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y | ||||||
| CONFIG_INTEL_GTT=y | CONFIG_INTEL_GTT=y | ||||||
| CONFIG_INTEL_IDLE=y | CONFIG_INTEL_IDLE=y | ||||||
| # CONFIG_INTEL_IDXD_COMPAT is not set |  | ||||||
| CONFIG_INTEL_IOMMU=y | CONFIG_INTEL_IOMMU=y | ||||||
| # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | ||||||
| CONFIG_INTEL_IOMMU_FLOPPY_WA=y | CONFIG_INTEL_IOMMU_FLOPPY_WA=y | ||||||
| @@ -280,7 +279,7 @@ CONFIG_IOASID=y | |||||||
| CONFIG_IOMMU_API=y | CONFIG_IOMMU_API=y | ||||||
| # CONFIG_IOMMU_DEBUG is not set | # CONFIG_IOMMU_DEBUG is not set | ||||||
| # CONFIG_IOMMU_DEBUGFS is not set | # CONFIG_IOMMU_DEBUGFS is not set | ||||||
| # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set | CONFIG_IOMMU_DEFAULT_DMA_LAZY=y | ||||||
| CONFIG_IOMMU_DMA=y | CONFIG_IOMMU_DMA=y | ||||||
| CONFIG_IOMMU_HELPER=y | CONFIG_IOMMU_HELPER=y | ||||||
| CONFIG_IOMMU_IOVA=y | CONFIG_IOMMU_IOVA=y | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens