From: dann frazier <dann.frazier@canonical.com>
Date: Thu, 21 Sep 2017 17:16:23 +0000 (-0600)
Subject: UBUNTU: [Config] Disable CONFIG_IPMMU_VMSA on arm64
X-Git-Tag: Ubuntu-4.13.0-12.13~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=30d949729174e0d26cdccfa9d904bb7999c9befd;p=mirror_ubuntu-artful-kernel.git

UBUNTU: [Config] Disable CONFIG_IPMMU_VMSA on arm64

BugLink: https://bugs.launchpad.net/bugs/1718734

This driver is currently causing boot failures on several arm64
servers. Let's disable it for now until a proper fix can be
backported from upstream.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 8c4ef8a731f4..2f56c4203945 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2401,13 +2401,15 @@ CONFIG_TEGRA_IOMMU_GART                         policy<{'armhf-generic': 'y'}>
 CONFIG_TEGRA_IOMMU_SMMU                         policy<{'armhf-generic': 'y'}>
 CONFIG_EXYNOS_IOMMU                             policy<{'armhf': 'y'}>
 CONFIG_EXYNOS_IOMMU_DEBUG                       policy<{'armhf': 'n'}>
-CONFIG_IPMMU_VMSA                               policy<{'arm64': 'y', 'armhf': 'y'}>
+CONFIG_IPMMU_VMSA                               policy<{'arm64': 'n', 'armhf': 'y'}>
 CONFIG_SPAPR_TCE_IOMMU                          policy<{'ppc64el': 'y'}>
 CONFIG_ARM_SMMU                                 policy<{'arm64': 'y', 'armhf': 'n'}>
 CONFIG_ARM_SMMU_V3                              policy<{'arm64': 'y'}>
 CONFIG_S390_CCW_IOMMU                           policy<{'s390x': 'y'}>
 CONFIG_MTK_IOMMU                                policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_MTK_IOMMU_V1                             policy<{'armhf': 'n'}>
+#
+CONFIG_IPMMU_VMSA				note<LP:1718734>
 
 # Menu: Device Drivers >> IOMMU Hardware Support >> Generic IOMMU Pagetable Support
 CONFIG_IOMMU_IO_PGTABLE_LPAE                    policy<{'arm64': 'y', 'armhf': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index c2cdb8444567..6578741d22db 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -186,6 +186,7 @@ CONFIG_INPUT=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IPACK_BUS=m
 CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMMU_VMSA is not set
 CONFIG_IPX=m
 # CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_IRQ_BYPASS_MANAGER=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 2f8eb84f9e94..e9bba2b31788 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -166,6 +166,7 @@ CONFIG_INPUT=y
 CONFIG_IOMMU_IOVA=m
 CONFIG_IPACK_BUS=m
 CONFIG_IPMI_HANDLER=m
+CONFIG_IPMMU_VMSA=y
 CONFIG_IPX=m
 # CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_IRQ_BYPASS_MANAGER=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 554a3580a099..561b93858f51 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4163,7 +4163,6 @@ CONFIG_IPMI_POWEROFF=m
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMMU_VMSA=y
 CONFIG_IPPP_FILTER=y
 CONFIG_IPQ_GCC_4019=m
 CONFIG_IPQ_GCC_806X=m