From 1369a5c7f33df0ee8d6549d01561a28dfd926ee8 Mon Sep 17 00:00:00 2001 From: Artie Ding Date: Tue, 2 Jun 2020 11:57:44 +0800 Subject: [PATCH] configs: enable AMD IOMMU configs fix #27365977 It enables AMD_IOMMU for AMD platforms which support X2APIC. Because AMD IOMMU driver initializes OMMU protection domains as direct map, IOMMU_DEFAULT_PASSTHROUGH is needed. Signed-off-by: Artie Ding Reviewed-by: Shile Zhang Acked-by: Caspar Zhang --- configs/config-4.19.y-x86_64 | 9 +++++---- configs/config-4.19.y-x86_64-debug | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/config-4.19.y-x86_64 b/configs/config-4.19.y-x86_64 index 063fb3e86680..3adb96768025 100644 --- a/configs/config-4.19.y-x86_64 +++ b/configs/config-4.19.y-x86_64 @@ -579,8 +579,8 @@ CONFIG_PCI_QUIRKS=y CONFIG_PCI_ATS=y CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_IOV=y -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y CONFIG_PCI_LABEL=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y @@ -3337,9 +3337,10 @@ CONFIG_IOMMU_SUPPORT=y # Generic IOMMU Pagetable Support # # CONFIG_IOMMU_DEBUGFS is not set -# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y CONFIG_IOMMU_IOVA=y -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_SVM is not set diff --git a/configs/config-4.19.y-x86_64-debug b/configs/config-4.19.y-x86_64-debug index 05b4c2b150bb..9a8dc20bf522 100644 --- a/configs/config-4.19.y-x86_64-debug +++ b/configs/config-4.19.y-x86_64-debug @@ -584,8 +584,8 @@ CONFIG_PCI_QUIRKS=y CONFIG_PCI_ATS=y CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_IOV=y -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y CONFIG_PCI_LABEL=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y @@ -3340,9 +3340,10 @@ CONFIG_IOMMU_SUPPORT=y # Generic IOMMU Pagetable Support # # CONFIG_IOMMU_DEBUGFS is not set -# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y CONFIG_IOMMU_IOVA=y -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_SVM is not set -- GitLab