4.19.89: enable kvm

3 files changed, 34 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f42994d48c38..345e16799b43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = linux-raspberrypi4-aarch64
 	b2sums = b8833302687d1858b99ab2904082215d8158f5c11d45d654beb61b5ca9c1e33107c0f1c8963a52da75792337ad8c2bd0618e97d8f472d3e18d6c1d94c59e59f4
 	b2sums = 07e6a3aafee0a2c9b4bb010b28f3203671ed5fc9e82ebee3f9228d9233b3b09fd52ce4585e12f6a346edb8c19bf16733905723b0ce165b2aeed1573f0e72ad72
 	b2sums = 969479870f2fdcb92a9d3cb43bf4d329aa1ffe5b1b3862c0cbce43788230e5f3d308e766739257c265b4a83dc1c8e935f13f223fbd70a05f2776096a9db0d32b
-	b2sums = 1383ef743dfee478210ac7a0fd8f8a36f9df1d0bc3cb81052e829ea475fb85eda338de753e7a0b0a8737dcb13bd24083b045a67da037733ce558742d2b7ec0b5
+	b2sums = 1fc16420ee103fde3c989aa2458be48c43d13e18ab94dcb396948a914b1443107018fe6a7e0df56cd1b82265a348e72481129e6f1b99491c05ff2a219172e7e2
 	b2sums = f0cb39a8e448dc93cd830f1680303ecfcda6c729030ecf0bbf6dd8c57777a12ab33bbd991da4f735ba5869afb59d39f5cf5c7c725cc9ba6a78c235c2fd00251a
 	b2sums = 40e2e0ac9eec9f9c08593875ca5bb8a26f835e33ae42e3718b98e83d76bbbc51a68395215c707fe58269954127261f7f8d12ec47341d28c672de973f3c4e71e8
 	b2sums = 8edd95fb949c3282bc70043af19cd6afc5201c2889a4d4c2a0b65862d27ed7bbcfdcfb75cb2a91bae852f9a2294b5c947d71ce742458bf98f6937429130a64b0
diff --git a/PKGBUILD b/PKGBUILD
index b5f31c1586b0..5833df94dd5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,15 +24,13 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook')
-b2sums=(
-    'b8833302687d1858b99ab2904082215d8158f5c11d45d654beb61b5ca9c1e33107c0f1c8963a52da75792337ad8c2bd0618e97d8f472d3e18d6c1d94c59e59f4'
-    '07e6a3aafee0a2c9b4bb010b28f3203671ed5fc9e82ebee3f9228d9233b3b09fd52ce4585e12f6a346edb8c19bf16733905723b0ce165b2aeed1573f0e72ad72'
-    '969479870f2fdcb92a9d3cb43bf4d329aa1ffe5b1b3862c0cbce43788230e5f3d308e766739257c265b4a83dc1c8e935f13f223fbd70a05f2776096a9db0d32b'
-    '1383ef743dfee478210ac7a0fd8f8a36f9df1d0bc3cb81052e829ea475fb85eda338de753e7a0b0a8737dcb13bd24083b045a67da037733ce558742d2b7ec0b5'
-    'f0cb39a8e448dc93cd830f1680303ecfcda6c729030ecf0bbf6dd8c57777a12ab33bbd991da4f735ba5869afb59d39f5cf5c7c725cc9ba6a78c235c2fd00251a'
-    '40e2e0ac9eec9f9c08593875ca5bb8a26f835e33ae42e3718b98e83d76bbbc51a68395215c707fe58269954127261f7f8d12ec47341d28c672de973f3c4e71e8'
-    '8edd95fb949c3282bc70043af19cd6afc5201c2889a4d4c2a0b65862d27ed7bbcfdcfb75cb2a91bae852f9a2294b5c947d71ce742458bf98f6937429130a64b0'
-)
+b2sums=('b8833302687d1858b99ab2904082215d8158f5c11d45d654beb61b5ca9c1e33107c0f1c8963a52da75792337ad8c2bd0618e97d8f472d3e18d6c1d94c59e59f4'
+        '07e6a3aafee0a2c9b4bb010b28f3203671ed5fc9e82ebee3f9228d9233b3b09fd52ce4585e12f6a346edb8c19bf16733905723b0ce165b2aeed1573f0e72ad72'
+        '969479870f2fdcb92a9d3cb43bf4d329aa1ffe5b1b3862c0cbce43788230e5f3d308e766739257c265b4a83dc1c8e935f13f223fbd70a05f2776096a9db0d32b'
+        '1fc16420ee103fde3c989aa2458be48c43d13e18ab94dcb396948a914b1443107018fe6a7e0df56cd1b82265a348e72481129e6f1b99491c05ff2a219172e7e2'
+        'f0cb39a8e448dc93cd830f1680303ecfcda6c729030ecf0bbf6dd8c57777a12ab33bbd991da4f735ba5869afb59d39f5cf5c7c725cc9ba6a78c235c2fd00251a'
+        '40e2e0ac9eec9f9c08593875ca5bb8a26f835e33ae42e3718b98e83d76bbbc51a68395215c707fe58269954127261f7f8d12ec47341d28c672de973f3c4e71e8'
+        '8edd95fb949c3282bc70043af19cd6afc5201c2889a4d4c2a0b65862d27ed7bbcfdcfb75cb2a91bae852f9a2294b5c947d71ce742458bf98f6937429130a64b0')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/config b/config
index cea0cccb79a9..0c66cb069bec 100644
--- a/config
+++ b/config
@@ -4,10 +4,10 @@
 #
 
 #
-# Compiler: gcc (GCC) 9.2.0
+# Compiler: gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=90300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -333,6 +333,7 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
@@ -519,7 +520,27 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 #
 CONFIG_ARCH_SUPPORTS_ACPI=y
 # CONFIG_ACPI is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_INDIRECT_VECTORS=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST=m
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
 CONFIG_ARM64_CRYPTO=y
 # CONFIG_CRYPTO_SHA256_ARM64 is not set
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
@@ -676,6 +697,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_IOSCHED_BFQ is not set
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
@@ -719,6 +741,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y