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: 8fea4a102ccd ("x86/64: enable IOMMU support")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 07edd53ff9cbd60dbbbad07500ed18d852418927..498cdff5812d86fa4bc4639d9ef7f07e47661e42 100644 (file)
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -2651,6 +2651,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INTEL_HID_EVENT is not set
 # CONFIG_INTEL_IDLE is not set
 # CONFIG_INTEL_IDMA64 is not set
+# CONFIG_INTEL_IDXD is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 # CONFIG_INTEL_IOATDMA 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_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_IONIC 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_FS is not set
 # CONFIG_VIRTIO_INPUT is not set
+# CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 1375ae6257f19066cf70aae2ba4d04037d0a96d7..2da2d2393ce9b0f4e8d4bf9df29510ac6ecb4729 100644 (file)
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -2745,6 +2745,8 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INTEL_HID_EVENT is not set
 # CONFIG_INTEL_IDLE 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_IOATDMA 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_IIO 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_IONIC 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_FS is not set
 # CONFIG_VIRTIO_INPUT is not set
+# CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set

diff --git a/target/linux/layerscape/armv8_64b/config-5.10 b/target/linux/layerscape/armv8_64b/config-5.10
index 6fc49fa79e438ab62c013b8e9f432a582ae10b20..c480b710061d75fcc0dfa22b0fc68d8641a093c0 100644 (file)
--- a/target/linux/layerscape/armv8_64b/config-5.10
+++ b/target/linux/layerscape/armv8_64b/config-5.10
@@ -798,7 +798,6 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
-# CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y

diff --git a/target/linux/mediatek/mt7623/config-5.15 b/target/linux/mediatek/mt7623/config-5.15
index aa4c4cbad1232345149d7de713ed7770f3609c73..5b0e11c6763c1954385f07535f751cc4a0f48f5e 100644 (file)
--- a/target/linux/mediatek/mt7623/config-5.15
+++ b/target/linux/mediatek/mt7623/config-5.15
@@ -275,9 +275,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set

diff --git a/target/linux/qoriq/config-5.10 b/target/linux/qoriq/config-5.10
index 2d49eeb9a1f2d3aa9abf76693991fd6a21b6a241..5bf31de3ea0606930d2128bdc7fc31c7d18cd3a1 100644 (file)
--- a/target/linux/qoriq/config-5.10
+++ b/target/linux/qoriq/config-5.10
@@ -177,7 +177,6 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IRQCHIP=y

diff --git a/target/linux/qoriq/config-5.15 b/target/linux/qoriq/config-5.15
index e607501dbc0b981896f1d27f0e9a8296658faf61..ef6442a1b1f48baa3022508dcdef35a9f76e4433 100644 (file)
--- a/target/linux/qoriq/config-5.15
+++ b/target/linux/qoriq/config-5.15
@@ -183,9 +183,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IRQCHIP=y

diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10
index 79dedb2041af6e21dab8c68dfb7c69e02c0bf98c..75a61b8b167abe950badece2c30c6478d5bfcb67 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.10
+++ b/target/linux/rockchip/armv8/config-5.10
@@ -284,7 +284,6 @@ CONFIG_INPUT_MATRIXKMAP=y
 # CONFIG_INPUT_RK805_PWRKEY is not set
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_IO_PGTABLE=y

diff --git a/target/linux/rockchip/armv8/config-5.15 b/target/linux/rockchip/armv8/config-5.15
index fa005294bca94a40f6b2d900ca36832397abef95..95ee62b5e9ed86a9b84f040b9bb8c4b96fa0ec6d 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.15
+++ b/target/linux/rockchip/armv8/config-5.15
@@ -278,8 +278,6 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_MATRIXKMAP=y
 CONFIG_IOMMU_API=y
 # 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_DMA=y
 CONFIG_IOMMU_IOVA=y

diff --git a/target/linux/tegra/config-5.10 b/target/linux/tegra/config-5.10
index 8d808595d9d151d296c3e35fceeb1912ce49f00c..9c80b5595b7075460ad3a30f8e1fb96275efe964 100644 (file)
--- a/target/linux/tegra/config-5.10
+++ b/target/linux/tegra/config-5.10
@@ -242,7 +242,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_IOVA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set

diff --git a/target/linux/tegra/config-5.15 b/target/linux/tegra/config-5.15
index 794fa8b7146a971af7b8994ea3a82b9f068c03f6..257ffda252ad3a0ecb100df28317def15438779e 100644 (file)
--- a/target/linux/tegra/config-5.15
+++ b/target/linux/tegra/config-5.15
@@ -248,9 +248,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INTERCONNECT=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_IOVA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set

diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10
index f91b3fe76f494dee194824db9dc73e50d678c7e2..3f84b00c0f92a08777d0a262aa1e4eaf68a9923f 100644 (file)
--- a/target/linux/x86/64/config-5.10
+++ b/target/linux/x86/64/config-5.10
@@ -242,7 +242,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INTEL_GTT=y
 CONFIG_INTEL_IDLE=y
-# CONFIG_INTEL_IDXD is not set
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
@@ -264,7 +263,6 @@ CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_IOVA=y

diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/64/config-5.15
index 7068b3b66cf9986af7df00ec68f086611d407881..040dceb961b037bcb20591349df929f2616db4be 100644 (file)
--- a/target/linux/x86/64/config-5.15
+++ b/target/linux/x86/64/config-5.15
@@ -257,7 +257,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INTEL_GTT=y
 CONFIG_INTEL_IDLE=y
-# CONFIG_INTEL_IDXD_COMPAT is not set
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
@@ -280,7 +279,7 @@ CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG 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_HELPER=y
 CONFIG_IOMMU_IOVA=y