Unverified Commit 930f0c02 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3699 [OLK-6.6] Enable CONFIG_IOMMUFD and CONFIG_VFIO_DEVICE_CDEV in x86/arm64 defconfig 

Merge Pull Request from: @x56Jason 
 
## Description
IOMMUFD & VFIO_DEVICE_CDEV are prerequisites for advanced IOMMU/VFIO features such as SVM/vSVM,
need to enable them in OLK-6.6.

## Issue
#I8SMQA

## Test
- Build and boot
- Use qemu with old VFIO interface to passthrough device and boot VM, VM can boot successfully and passthrough device works well

## Known Issue
N/A

## Default Kernel Config Change
+CONFIG_VFIO_DEVICE_CDEV=y
+CONFIG_IOMMUFD=m
+CONFIG_INTERVAL_TREE_SPAN_ITER=y
 
 
Link:https://gitee.com/openeuler/kernel/pulls/3699

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 8a399161 71c53852

arch/arm64/configs/openeuler_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -6324,6 +6324,7 @@ CONFIG_UIO_PCI_GENERIC=m 
# CONFIG_UIO_PRUSS is not set

# CONFIG_UIO_MF624 is not set

CONFIG_VFIO=m

CONFIG_VFIO_DEVICE_CDEV=y

CONFIG_VFIO_GROUP=y

CONFIG_VFIO_CONTAINER=y

CONFIG_VFIO_IOMMU_TYPE1=m
@@ -6510,7 +6511,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y 
CONFIG_OF_IOMMU=y

CONFIG_IOMMU_DMA=y

CONFIG_IOMMU_SVA=y

# CONFIG_IOMMUFD is not set

CONFIG_IOMMUFD=m

CONFIG_ARM_SMMU=y

# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set

CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
@@ -7672,6 +7673,7 @@ CONFIG_TEXTSEARCH_BM=m 
CONFIG_TEXTSEARCH_FSM=m

CONFIG_BTREE=y

CONFIG_INTERVAL_TREE=y

CONFIG_INTERVAL_TREE_SPAN_ITER=y

CONFIG_XARRAY_MULTI=y

CONFIG_ASSOCIATIVE_ARRAY=y

CONFIG_HAS_IOMEM=y

arch/x86/configs/openeuler_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -7029,6 +7029,7 @@ CONFIG_UIO_PCI_GENERIC=m 
# CONFIG_UIO_MF624 is not set

CONFIG_UIO_HV_GENERIC=m

CONFIG_VFIO=m

CONFIG_VFIO_DEVICE_CDEV=y

CONFIG_VFIO_GROUP=y

CONFIG_VFIO_CONTAINER=y

CONFIG_VFIO_IOMMU_TYPE1=m
@@ -7277,7 +7278,7 @@ CONFIG_INTEL_IOMMU_SVM=y 
CONFIG_INTEL_IOMMU_FLOPPY_WA=y

# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set

CONFIG_INTEL_IOMMU_PERF_EVENTS=y

# CONFIG_IOMMUFD is not set

CONFIG_IOMMUFD=m

CONFIG_IRQ_REMAP=y

CONFIG_HYPERV_IOMMU=y

# CONFIG_VIRTIO_IOMMU is not set
@@ -8860,6 +8861,7 @@ CONFIG_TEXTSEARCH_BM=m 
CONFIG_TEXTSEARCH_FSM=m

CONFIG_BTREE=y

CONFIG_INTERVAL_TREE=y

CONFIG_INTERVAL_TREE_SPAN_ITER=y

CONFIG_XARRAY_MULTI=y

CONFIG_ASSOCIATIVE_ARRAY=y

CONFIG_HAS_IOMEM=y