From 5ee606c13d87fb454c6755b8bf55fa984428d87f Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Fri, 11 May 2018 13:19:13 +0200 Subject: atomc-3000: update kernel configs to match with 4.9 kernel Signed-off-by: Adrian Calianu --- bsp/atom-c3000/atom-c3000.cfg | 6 ++++++ features/printk/printk_y.cfg | 1 + features/vfio/vfio.cfg | 20 -------------------- features/vfio/vfio.scc | 4 ---- features/vfio/vfio_m.cfg | 20 ++++++++++++++++++++ features/vfio/vfio_m.scc | 4 ++++ 6 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 features/vfio/vfio.cfg delete mode 100644 features/vfio/vfio.scc create mode 100644 features/vfio/vfio_m.cfg create mode 100644 features/vfio/vfio_m.scc diff --git a/bsp/atom-c3000/atom-c3000.cfg b/bsp/atom-c3000/atom-c3000.cfg index eff35e6..43bd6b9 100644 --- a/bsp/atom-c3000/atom-c3000.cfg +++ b/bsp/atom-c3000/atom-c3000.cfg @@ -12,15 +12,21 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_ACPI_NUMA=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y +CONFIG_IOMMU_SUPPORT=y CONFIG_IOMMU_API=y CONFIG_IOMMU_IOVA=y CONFIG_AMD_IOMMU=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_DEFAULT_ON=n CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_INTEL_IOMMU_SVM=y CONFIG_MEMORY=y CONFIG_KVM_DEVICE_ASSIGNMENT=y CONFIG_AMD_IOMMU_STATS=y CONFIG_AMD_IOMMU_V2=y CONFIG_CRYPTO_RSA=y CONFIG_SERIAL_8250_MID=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MEMORY_FAILURE=y +CONFIG_COMPACTION=y diff --git a/features/printk/printk_y.cfg b/features/printk/printk_y.cfg index 0fcc9f0..1644716 100644 --- a/features/printk/printk_y.cfg +++ b/features/printk/printk_y.cfg @@ -1,4 +1,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_NMI=y +CONFIG_PRINTK_TIME=y CONFIG_EARLY_PRINTK=y CONFIG_X86_VERBOSE_BOOTUP=y diff --git a/features/vfio/vfio.cfg b/features/vfio/vfio.cfg deleted file mode 100644 index f42b937..0000000 --- a/features/vfio/vfio.cfg +++ /dev/null @@ -1,20 +0,0 @@ -CONFIG_HAVE_INTEL_TXT=y -CONFIG_PCI_PASID=y -CONFIG_VFIO_IOMMU_TYPE1=y -CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=y -# CONFIG_VFIO_NOIOMMU is not set -CONFIG_VFIO_PCI=m -# CONFIG_VFIO_PCI_VGA is not set -CONFIG_VFIO_PCI_MMAP=y -CONFIG_VFIO_PCI_INTX=y -CONFIG_VFIO_PCI_IGD=y -CONFIG_IOMMU_API=y -CONFIG_IOMMU_IOVA=y -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -CONFIG_INTEL_IOMMU_SVM=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_FLOPPY_WA=y -# CONFIG_INTEL_TXT is not set -# CONFIG_KVM_DEVICE_ASSIGNMENT is not set diff --git a/features/vfio/vfio.scc b/features/vfio/vfio.scc deleted file mode 100644 index c9369cb..0000000 --- a/features/vfio/vfio.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable VFIO" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware vfio.cfg diff --git a/features/vfio/vfio_m.cfg b/features/vfio/vfio_m.cfg new file mode 100644 index 0000000..f42b937 --- /dev/null +++ b/features/vfio/vfio_m.cfg @@ -0,0 +1,20 @@ +CONFIG_HAVE_INTEL_TXT=y +CONFIG_PCI_PASID=y +CONFIG_VFIO_IOMMU_TYPE1=y +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=y +# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_PCI=m +# CONFIG_VFIO_PCI_VGA is not set +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_IGD=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_IOVA=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +# CONFIG_INTEL_TXT is not set +# CONFIG_KVM_DEVICE_ASSIGNMENT is not set diff --git a/features/vfio/vfio_m.scc b/features/vfio/vfio_m.scc new file mode 100644 index 0000000..f971caf --- /dev/null +++ b/features/vfio/vfio_m.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable VFIO" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware vfio_m.cfg -- cgit v1.2.3-54-g00ecf