From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Mon, 24 Feb 2020 13:53:57 +0000 (+0000)
Subject: kernel: x86_64: drop CALGARY IOMMU
X-Git-Tag: v21.02.0-rc1~3729
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ffd249366f96a6a94fac18909109a6c98a458de7;p=openwrt%2Fstaging%2Fchunkeey.git

kernel: x86_64: drop CALGARY IOMMU

The calgary IOMMU was only used on high-end IBM systems in the early
x86_64 age.  This is an unlikely OpenWrt target and in fact upstream
are looking to drop the driver entirely with the bonus that we no
longer see:

[ 0.000000] Calgary: detecting Calgary via BIOS EBDA area
[ 0.000000] Calgary: Unable to locate Rio Grande table in EBDA - bailing!

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---

diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19
index ddbd818dfc..3d18d216f4 100644
--- a/target/linux/x86/64/config-4.19
+++ b/target/linux/x86/64/config-4.19
@@ -75,8 +75,8 @@ CONFIG_NVME_MULTIPATH=y
 CONFIG_BLK_MQ_VIRTIO=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 CONFIG_BTT=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+# CONFIG_CALGARY_IOMMU=y
+# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_CONNECTOR=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 CONFIG_CPU_RMAP=y