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 <[email protected]> Reviewed-by: Shile Zhang <[email protected]> Acked-by: Caspar Zhang <[email protected]>
alibaba · Jun 2, 2020 · 1369a5c · 1369a5c
1 parent 1607a48
commit 1369a5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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