lakitu-kernel: Enable IOMMU and IRQ_REMAP configurations.
IRQ_REMAP configuration needs to be enabled inorder to use APIC ids >
256. When more than 256 cpus are used, APIC id is going to be > 256.
To enable IRQ_REMAP, IOMMU_SUPPORT needs to be enabled.
BUG=b/227518000
TEST=presubmit, validation, k8s, manually booting M2 ultra-mem.
RELEASE_NOTE=Enable IOMMU_SUPPORT and IRQ_REMAP kernel configurations.
Signed-off-by: Meena Shanmugam <meenashanmugam@google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/35667
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
cos-patch: bug
Change-Id: I7d9ca81e92c4a8828d7408cb9525c52cc8b2a528
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/35728
Reviewed-by: Dexter Rivera <riverade@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index bf99ba2..3f37704 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -2791,7 +2791,24 @@
CONFIG_MAILBOX=y
CONFIG_PCC=y
# CONFIG_ALTERA_MBOX is not set
-# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+# CONFIG_AMD_IOMMU is not set
+CONFIG_DMAR_TABLE=y
+# CONFIG_INTEL_IOMMU is not set
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+# CONFIG_VIRTIO_IOMMU is not set
#
# Remoteproc drivers
