[Eoan raspi2][SRU][PATCH] UBUNTU: raspi2: [Config] CONFIG_KVM='y'

[Connor Kuehl]

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

CONFIG_KVM is a desired feature for linux-raspi2.

Signed-off-by: Connor Kuehl <connor.kuehl at canonical.com>
---
 debian.raspi2/config/annotations          |  1 +
 debian.raspi2/config/config.common.ubuntu | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
index c22a50d878b9..6c481de85421 100644
--- a/debian.raspi2/config/annotations
+++ b/debian.raspi2/config/annotations
@@ -10162,6 +10162,7 @@ CONFIG_PM                                       policy<{'amd64': 'y', 'arm64': '
 CONFIG_PM_TRACE_RTC                             policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_APM_EMULATION                            policy<{'armhf': 'n'}>
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_KVM                                      policy<{'arm64': 'y', 'armhf': 'y'}>note<LP:1783961>
 CONFIG_KVM_GUEST                                policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_SFI                                      policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_INTEL_IDLE                               policy<{'amd64': 'y', 'i386': 'y'}>
diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 80ab0f39dc46..12531a377ca0 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -384,6 +384,7 @@ CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
 CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_832075=y
+# CONFIG_ARM64_ERRATUM_834220 is not set
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_858921=y
@@ -2591,6 +2592,15 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_HAVE_NET_DSA=y
@@ -3336,6 +3346,7 @@ CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IRQCHIP=y
 CONFIG_IRQSOFF_TRACER=y
+CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
@@ -3539,7 +3550,13 @@ CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 # CONFIG_KSZ884X_PCI is not set
 CONFIG_KUSER_HELPERS=y
-# CONFIG_KVM is not set
+CONFIG_KVM=y
+CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_INDIRECT_VECTORS=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_VFIO=y
 CONFIG_KXCJK1013=m
 CONFIG_KXSD9=m
 CONFIG_KXSD9_I2C=m
@@ -5277,6 +5294,7 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 CONFIG_PREEMPTIRQ_TRACEPOINTS=y
 # CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTER=m
-- 
2.17.1