diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-24 13:33:37 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-24 13:49:47 +0200 |
| commit | f08f7e88c99e8f17781945ddfbb0859f64c3a414 (patch) | |
| tree | cfd2360381351e73b7a392b462f29572d52468ab /target/linux/x86 | |
| parent | 579703f38c14b9441e2a28529c9883b311410f3e (diff) | |
| download | upstream-f08f7e88c99e8f17781945ddfbb0859f64c3a414.tar.gz upstream-f08f7e88c99e8f17781945ddfbb0859f64c3a414.tar.bz2 upstream-f08f7e88c99e8f17781945ddfbb0859f64c3a414.zip | |
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>
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/64/config-5.10 | 2 | ||||
| -rw-r--r-- | target/linux/x86/64/config-5.15 | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10 index f91b3fe76f..3f84b00c0f 100644 --- 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 7068b3b66c..040dceb961 100644 --- 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 |