Merge branch 'feature_CPDX-3405'

Change-Id: I0a2ba49c597f6c686815f2ce357a78c53bb1537b

8 files changed, 46 insertions, 15 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 3f460a6..81f6cb4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,6 +10,7 @@ BBFILE_COLLECTIONS += "nfv-access-bsp-x86"
 BBFILE_PATTERN_nfv-access-bsp-x86 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_nfv-access-bsp-x86 = "6"
 LAYERDEPENDS_nfv-access-bsp-x86 = "intel"
+LAYERSERIES_COMPAT_nfv-access-bsp-x86 = "hardknott"
 
 # change qemux86-64 arch from core2 to corei7
 require conf/machine/qemux86-64-corei7.conf
diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf
index 9ce89bd..90b9794 100644
--- a/conf/machine/atom-c3000.conf
+++ b/conf/machine/atom-c3000.conf
@@ -11,7 +11,7 @@
 # Soft set linux-yocto as preferred kernel like x86-base.inc
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host"
 PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host"
-PREFERRED_VERSION_linux-intel-host ?= "4.14%"
+PREFERRED_VERSION_linux-intel-host ?= "5.10%"
 
 MACHINE_FEATURES += "pcbios efi"
 
@@ -45,3 +45,5 @@ XSERVER ?= "${XSERVER_X86_BASE} \
 
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+
+SOTA_MACHINE ?= "${MACHINE}"
diff --git a/conf/machine/qemux86-64-corei7.conf b/conf/machine/qemux86-64-corei7.conf
index 8f4bc1f..4f6e807 100644
--- a/conf/machine/qemux86-64-corei7.conf
+++ b/conf/machine/qemux86-64-corei7.conf
@@ -32,3 +32,6 @@ BASE_LIB_tune-corei7-64-x32 = "libx32"
 TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32"
 PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32"
 QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false"
+
+# wic image type builds all possible bootloaders (systemd-boot, grub-efi), remove unused ones
+WKS_FILE_DEPENDS_BOOTLOADERS_remove_qemux86-64 = "grub-efi systemd-boot"
diff --git a/conf/machine/xeon-d.conf b/conf/machine/xeon-d.conf
index bfa6322..07e4bf8 100644
--- a/conf/machine/xeon-d.conf
+++ b/conf/machine/xeon-d.conf
@@ -9,7 +9,7 @@
 # Soft set linux-yocto as preferred kernel like x86-base.inc
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host"
 PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host"
-PREFERRED_VERSION_linux-intel ?= "4.14%"
+PREFERRED_VERSION_linux-intel ?= "5.10%"
 
 MACHINE_FEATURES += "pcbios efi"
 
@@ -44,3 +44,5 @@ XSERVER ?= "${XSERVER_X86_BASE} \
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
+
+SOTA_MACHINE ?= "${MACHINE}"
diff --git a/recipes-kernel/linux/linux-intel-guest_5.10.bb b/recipes-kernel/linux/linux-intel-guest_5.10.bb
new file mode 100644
index 0000000..1a18a37
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel-guest_5.10.bb
@@ -0,0 +1,2 @@
+COMPATIBLE_MACHINE ?= "(qemux86-64)"
+require linux-intel.inc
diff --git a/recipes-kernel/linux/linux-intel-host_4.14.bb b/recipes-kernel/linux/linux-intel-host_4.14.bb
deleted file mode 100644
index 6be0508..0000000
--- a/recipes-kernel/linux/linux-intel-host_4.14.bb
+++ /dev/null
@@ -1 +0,0 @@
-require linux-intel.inc
diff --git a/recipes-kernel/linux/linux-intel-guest_4.14.bb b/recipes-kernel/linux/linux-intel-host_5.10.bb
index 6be0508..6be0508 100644
--- a/recipes-kernel/linux/linux-intel-guest_4.14.bb
+++ b/recipes-kernel/linux/linux-intel-host_5.10.bb
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index d0b951a..c29d9f9 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -1,14 +1,36 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
-require common/recipes-kernel/linux/linux-intel_4.14.bb
+
+require recipes-kernel/linux/linux-intel_5.10.bb
 require recipes-kernel/linux/linux-deploy-kconfig.inc
 require recipes-kernel/linux/linux-common-config.inc
 
-LINUX_VERSION = "4.14.123"
-SRCREV_machine = "6aab3d561d738f3ceb9230a828b3f0b1ed5e98a3"
-SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319"
-KENEABRANCH = "intel-4.14"
+SRCREV_metaenea = "347e8b9d3feaddfdc37505b5d4eccfb216307e64"
+KENEABRANCH = "intel-5.10"
 SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta"
 
+# Upstream BSPs include aufs support (by patching the kernel source + enabling it in kernel config).
+# However, our current kernel version contains a backported commit that conflicts with aufs patches.
+# Until aufs patches are rebased in yocto-kernel-cache, disable aufs kernel source patching, since
+# we don't enable it via kernel config anyway.
+do_kernel_metadata_prepend() {
+    ## ENEA_start ##
+    # kernel-meta patching via patch files added to SRC_URI is currently broken, handle it here
+    sed -i -E 's/^(include features.aufs.*)$/# \1/g' ${WORKDIR}/kernel-meta/ktypes/standard/standard.scc
+    ## ENEA_end ##
+}
+
+# Allow BSPs to supply patches without explicitly adding the scc files to SRC_URI/KERNEL_FEATURES
+KMETA_EXTERNAL_BSPS = "t"
+
+# KERNEL CONFIG DEFAULT CHECK LEVELS:
+#   0: no reporting
+#   1: report options that are specified, but not in the final config
+#   2: report options that are not hardware related, but set by a BSP
+# KCONF_AUDIT_LEVEL="1"
+# KCONF_BSP_AUDIT_LEVEL="2"
+# KMETA_AUDIT="yes"
+# KMETA_AUDIT_WERROR=""
+
 KERNEL_FEATURES_append_atom-c3000 = " bsp/atom-c3000/atom-c3000.scc"
 
 KERNEL_FEATURES_append = " features/apic/x2apic_y.scc"
@@ -22,7 +44,7 @@ KERNEL_FEATURES_append = " features/blkdev/net_blk_dev.scc"
 KERNEL_FEATURES_append = " features/blkdev/ramdisk_blk_dev.scc"
 
 # Intel 10G ports(SoC)
-KERNEL_FEATURES_append_corei7-64-intel-common = " features/dca/dca_y.scc"
+KERNEL_FEATURES_append_x86-64 = " features/dca/dca_y.scc"
 
 # NMVe SSD
 KERNEL_FEATURES_append = " features/nvme/nvme.scc"
@@ -31,14 +53,14 @@ KERNEL_FEATURES_append = " features/nvme/nvme.scc"
 KERNEL_FEATURES_append = " features/ipmi/ipmi.scc"
 KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc"
 
+# ACPI Tiny power button
+KERNEL_FEATURES_append = " features/acpi/acpi_tiny_pwrbtn_y.scc"
+
+# CPULIST: Allow using "63" as an alias for "last" in nohz_full, isolcpus etc.
+KERNEL_FEATURES_append = " features/cpulist_abbrev/cpulist_abbrev_enea.scc"
+
 # IPv4 waiting for carrier on
 KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc"
 
-# Fixes for kernel
-KERNEL_FEATURES_append = " patches/security/keys.scc"
-
 # Fixes for pci
 KERNEL_FEATURES_append = " patches/drivers/pci/quirks.scc"
-
-# Fixes for ACPI PCCT (upstream in kernel v4.18-rc1 or newer)
-KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc"