12 files changed, 90 insertions, 29 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5435.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5435.bb
index 502200fa..e762246c 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5435.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5435.bb
@@ -31,7 +31,7 @@ DEPENDS_append_class-target = " clang-cross-x86_64"
 
 RDEPENDS_${PN} += "opencl-clang"
 
-LLVM_COMPAT_VERSION = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', '11.0.0', d)}"
+LLVM_COMPAT_VERSION = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', '11.1.0', d)}"
 EXTRA_OECMAKE = "-DIGC_PREFERRED_LLVM_VERSION=${LLVM_COMPAT_VERSION} -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 -DINSTALL_SPIRVDLL=0 -DIGC_BUILD__VC_ENABLED=OFF"
 
 # VectorCompiler doesn't build with LLVM11 as of this release.
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb
index 57b56d73..d0c852ab 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb
@@ -24,6 +24,7 @@ COMPATIBLE_HOST_libc-musl = "null"
 EXTRA_OECMAKE += "\
                   -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCMAKE_SKIP_RPATH=TRUE \
+                  -DPREFERRED_LLVM_VERSION="11.1.0" \
                   "
 
 do_install_append_class-native() {
diff --git a/lib/oeqa/runtime/cases/intel_vaapi_driver.py b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
index 85d2dd39..b78b2859 100644
--- a/lib/oeqa/runtime/cases/intel_vaapi_driver.py
+++ b/lib/oeqa/runtime/cases/intel_vaapi_driver.py
@@ -16,14 +16,14 @@ class VaapiDriverTest(OERuntimeTestCase):
         (status, output) = self.target.run('gst-inspect-1.0 vaapi')
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
-        (status, output) = self.target.run('export LIBVA_DRIVER_NAME=i965; '
-                                           'gst-launch-1.0 -ev videotestsrc num-buffers=60 ! '
-                                           'timeoverlay ! vaapih264enc ! mp4mux ! filesink location=/tmp/vtest_h264.mp4')
+        (status, output) = self.target.run('export GST_VAAPI_ALL_DRIVERS=1; '
+                                          'gst-launch-1.0 -ev videotestsrc num-buffers=60 ! '
+                                          'vaapih264enc ! mp4mux ! filesink location=/tmp/vtest_h264.mp4')
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
 
     @OETestDepends(['intel_vaapi_driver.VaapiDriverTest.test_gstreamer_can_encode_with_intel_vaapi_driver'])
     def test_gstreamer_can_decode_with_intel_vaapi_driver(self):
-        (status, output) = self.target.run('export LIBVA_DRIVER_NAME=i965; '
+        (status, output) = self.target.run('export GST_VAAPI_ALL_DRIVERS=1; '
                                            'gst-launch-1.0 filesrc location=/tmp/vtest_h264.mp4 ! '
                                            'qtdemux ! h264parse ! vaapih264dec ! vaapisink')
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py
index 6ce36a6f..52c1cdb4 100644
--- a/lib/oeqa/runtime/cases/microcode.py
+++ b/lib/oeqa/runtime/cases/microcode.py
@@ -16,20 +16,15 @@ class MicrocodeTest(OERuntimeTestCase):
 
     @OEHasPackage(["iucode-tool"])
     def test_microcode_update(self):
-        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -lS | grep rev')
-        if status:
-            self.skipTest("The iucode_tool detected no microcode for update.")
+        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -l --scan-system=2 | grep rev')
 
         selected_microcodes = output.splitlines()
         selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)")
-        self.assertTrue(selected_rev_list, msg="Could not find any rev from iucode_tool selected microcode.")
 
-        (status, output) = self.target.run('dmesg | grep microcode')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run("dmesg | grep 'microcode updated early'")
 
         updated_microcodes = output.splitlines()
-        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision=(\w*)")
-        self.assertTrue(updated_rev_list, msg="Could not find any updated revision from microcode dmesg.")
+        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision (\w*)")
 
         for ul in updated_rev_list:
             self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" %
diff --git a/lib/oeqa/runtime/cases/mkl_dnn.py b/lib/oeqa/runtime/cases/mkl_dnn.py
index c2d3180d..8d50df54 100644
--- a/lib/oeqa/runtime/cases/mkl_dnn.py
+++ b/lib/oeqa/runtime/cases/mkl_dnn.py
@@ -14,7 +14,7 @@ class MklDnn(OERuntimeTestCase):
     def tearDownClass(cls):
         cls.mkldnntest.tear_down()
         
-    @OEHasPackage(['onednn', 'libdnnl1'])
+    @OEHasPackage(['onednn', 'libdnnl2'])
     @OEHasPackage(['onednn-src', 'libdnnl-src'])
     @OEHasPackage(['onednn-dev', 'libdnnl-dev'])
     @OEHasPackage(['gcc'])
@@ -25,7 +25,7 @@ class MklDnn(OERuntimeTestCase):
         (status, output) = self.mkldnntest.test_mkldnn_can_compile_and_execute()
         self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
     
-    @OEHasPackage(['onednn', 'libdnnl1'])
+    @OEHasPackage(['onednn', 'libdnnl2'])
     @OEHasPackage(['onednn-test', 'libdnnl-test'])
     def test_mkldnn_benchdnn_package_available(self):
         (status, output) = self.mkldnntest.test_mkldnn_benchdnn_package_available()
diff --git a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
index 3f563722..869a4cbe 100644
--- a/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
+++ b/lib/oeqa/runtime/miutils/tests/mkl_dnn_test.py
@@ -49,9 +49,7 @@ class MkldnnTest(object):
         return self._run_mkldnn_benchdnn_test('./benchdnn --reorder --batch=inputs/reorder/test_reorder_bfloat16')
         
     def test_mkldnn_rnn_api(self):
-        # test_rnn_inference was not yet ready and was expected to fail
-        # while waiting it to be ready, use test_rnn_small for now
-        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_small')
+        return self._run_mkldnn_benchdnn_test('./benchdnn --rnn --batch=inputs/rnn/test_rnn_all')
         
     def test_mkldnn_shuffle_api(self):
         return self._run_mkldnn_benchdnn_test('./benchdnn --shuffle --batch=inputs/shuffle/test_shuffle_bfloat16')
\ No newline at end of file
diff --git a/recipes-core/microcode/intel-microcode_20201118.bb b/recipes-core/microcode/intel-microcode_20210216.bb
index b47c8157..69c8f08c 100644
--- a/recipes-core/microcode/intel-microcode_20201118.bb
+++ b/recipes-core/microcode/intel-microcode_20210216.bb
@@ -11,12 +11,12 @@ DESCRIPTION = "The microcode data file contains the latest microcode\
  if the file is placed in the /etc/firmware directory of the Linux system."
 
 LICENSE = "Intel-Microcode-License"
-LIC_FILES_CHKSUM = "file://license;md5=6b58767419df274d2409b294ddae17e6"
+LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721"
 
 SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \
            "
 
-SRCREV = "49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9"
+SRCREV = "4c5f3fdcc7f5d2b6c1bcc11001ed58923db481ab"
 
 DEPENDS = "iucode-tool-native"
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb
index abe6fb36..f99b1f19 100644
--- a/recipes-kernel/linux/linux-intel-dev.bb
+++ b/recipes-kernel/linux/linux-intel-dev.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.8.0"
-SRCREV_machine ?= "bcf876870b95592b52519ed4aafcf9d95999bc9c"
-SRCREV_meta ?= "2bcb4b9e8a85412849095463d4b891d9bbfbd1ad"
+LINUX_VERSION ?= "5.11-rc6"
+SRCREV_machine ?= "1048ba83fb1c00cd24172e23e8263972f6b5d9ac"
+SRCREV_meta ?= "3356fb62fb5eadec1f5c3c4248f1f8dbab968aa1"
 
 LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-intel-rt_5.10.bb b/recipes-kernel/linux/linux-intel-rt_5.10.bb
new file mode 100644
index 00000000..361b5dfc
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel-rt_5.10.bb
@@ -0,0 +1,35 @@
+require linux-intel.inc
+
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+    if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
+        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
+}
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+                   "
+
+KBRANCH = "5.10/preempt-rt"
+KMETA_BRANCH = "yocto-5.10"
+
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+
+LINUX_VERSION ?= "5.10.30"
+SRCREV_machine ?= "8b07bfbd844f73cbedc1f8eaa63e8b79295745d8"
+SRCREV_meta ?= "cd049697e9b2d3e9118110d476075ff8f87202cc"
+
+LINUX_KERNEL_TYPE = "preempt-rt"
+
+# Following commit is backported from mainline 5.12-rc to linux-intel 5.10 kernel
+# Commit: https://github.com/torvalds/linux/commit/26499e0518a77de29e7db2c53fb0d0e9e15be8fb
+# In which 'CONFIG_DRM_GMA3600' config option is dropped.
+# This causes warning during config audit. So suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
+
+# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
+# causes config warning too.
+KCONF_AUDIT_LEVEL_core2-32-intel-common = "0"
diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb
index 21fa7a60..2ec2a002 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.4.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.4.bb
@@ -18,9 +18,9 @@ KMETA_BRANCH = "yocto-5.4"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.4.70"
-SRCREV_machine ?= "6f0f7e5dd27c1798d0d58ccdf3cccebf79aef8a0"
-SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213"
+LINUX_VERSION ?= "5.4.115"
+SRCREV_machine ?= "00c7e2e1841e0ed3c1249c0e4bcacbd70435d62e"
+SRCREV_meta ?= "9e2546ab8d63f70ba458eb159d29ce6736ffd3e4"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
diff --git a/recipes-kernel/linux/linux-intel_5.10.bb b/recipes-kernel/linux/linux-intel_5.10.bb
new file mode 100644
index 00000000..dae4118a
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel_5.10.bb
@@ -0,0 +1,32 @@
+require linux-intel.inc
+
+KBRANCH = "5.10/yocto"
+KMETA_BRANCH = "yocto-5.10"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+                   "
+
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+
+LINUX_VERSION ?= "5.10.41"
+SRCREV_machine ?= "916ac934a98bc8206c1b5e1500c891dbcb43aac7"
+SRCREV_meta ?= "cd049697e9b2d3e9118110d476075ff8f87202cc"
+
+# For Crystalforest and Romley
+KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
+KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+
+# Following commit is backported from mainline 5.12-rc to linux-intel 5.10 kernel
+# Commit: https://github.com/torvalds/linux/commit/26499e0518a77de29e7db2c53fb0d0e9e15be8fb
+# In which 'CONFIG_DRM_GMA3600' config option is dropped.
+# This causes warning during config audit. So suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
+
+# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
+# causes config warning too.
+KCONF_AUDIT_LEVEL_core2-32-intel-common = "0"
diff --git a/recipes-kernel/linux/linux-intel_5.4.bb b/recipes-kernel/linux/linux-intel_5.4.bb
index ce53dc5e..910b0cfd 100644
--- a/recipes-kernel/linux/linux-intel_5.4.bb
+++ b/recipes-kernel/linux/linux-intel_5.4.bb
@@ -9,9 +9,9 @@ SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.4.81"
-SRCREV_machine ?= "b3d20595bdf59d0784cb8256445fff65df26c4ac"
-SRCREV_meta ?= "8930d401f840f6cdff4ac887f6f6832d8cd44112"
+LINUX_VERSION ?= "5.4.115"
+SRCREV_machine ?= "2521f747baec6ccd170456c0fe697c48844a080d"
+SRCREV_meta ?= "9e2546ab8d63f70ba458eb159d29ce6736ffd3e4"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"