From 9621dcb027782b683e87445239cc6677fcc00aaf Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 24 Mar 2021 12:06:37 +0100 Subject: Upgrade to gatesgarth This is an initial commit, containing quick fixes and hacks to allow building the images. All these issues will be re-evaluated and fixed properly in their own commits. Signed-off-by: Adrian Dudau --- conf/machine/atom-c3000.conf | 2 +- conf/machine/xeon-d.conf | 2 +- recipes-kernel/linux/linux-intel-guest_4.14.bb | 1 - recipes-kernel/linux/linux-intel-guest_5.10.bb | 1 + recipes-kernel/linux/linux-intel-host_4.14.bb | 1 - recipes-kernel/linux/linux-intel-host_5.10.bb | 1 + recipes-kernel/linux/linux-intel.inc | 13 +++++-------- 7 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel-guest_4.14.bb create mode 100644 recipes-kernel/linux/linux-intel-guest_5.10.bb delete mode 100644 recipes-kernel/linux/linux-intel-host_4.14.bb create mode 100644 recipes-kernel/linux/linux-intel-host_5.10.bb diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf index 9ce89bd..d3fb5bb 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" diff --git a/conf/machine/xeon-d.conf b/conf/machine/xeon-d.conf index bfa6322..f3ee8c0 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" diff --git a/recipes-kernel/linux/linux-intel-guest_4.14.bb b/recipes-kernel/linux/linux-intel-guest_4.14.bb deleted file mode 100644 index 6be0508..0000000 --- a/recipes-kernel/linux/linux-intel-guest_4.14.bb +++ /dev/null @@ -1 +0,0 @@ -require linux-intel.inc 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..6be0508 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-guest_5.10.bb @@ -0,0 +1 @@ +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-host_5.10.bb b/recipes-kernel/linux/linux-intel-host_5.10.bb new file mode 100644 index 0000000..6be0508 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-host_5.10.bb @@ -0,0 +1 @@ +require linux-intel.inc diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index d0b951a..52e6e62 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -1,10 +1,10 @@ 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" +LINUX_VERSION = "5.10.8" + SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319" KENEABRANCH = "intel-4.14" 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" @@ -32,13 +32,10 @@ KERNEL_FEATURES_append = " features/ipmi/ipmi.scc" KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc" # IPv4 waiting for carrier on -KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" - -# Fixes for kernel -KERNEL_FEATURES_append = " patches/security/keys.scc" +#KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.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" +#KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc" -- cgit v1.2.3-54-g00ecf From 41e46c8765c815315001b93ba773e1d32e4446c3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 5 May 2021 09:37:55 +0200 Subject: layer.conf: LAYERSERIES_COMPAT: add gatesgarth Signed-off-by: Alexandru Avadanii Change-Id: Ia16227d04ed3597ef63bc90b166d145f30de1ff9 --- conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/layer.conf b/conf/layer.conf index 3f460a6..7d0af9b 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 = "gatesgarth" # change qemux86-64 arch from core2 to corei7 require conf/machine/qemux86-64-corei7.conf -- cgit v1.2.3-54-g00ecf From fcbab6e13ca080646a4c7f0fd72cccec931f1c9f Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 11 May 2021 19:32:22 +0200 Subject: linux-intel: remove upstreamed patch Change-Id: I1f78b8279f37b6e1f78d2d6c02ba1b96a435a643 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 52e6e62..fac803a 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -36,6 +36,3 @@ KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.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" -- cgit v1.2.3-54-g00ecf From 00ff2b6c1abde5c9c132121bdd0b96ef17113e1a Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 11 May 2021 19:34:04 +0200 Subject: linux-intel: disable audit on kernel configs During development, when change kernel config, we can change the default AUDIT values to get a report. Change-Id: I7bfc115d2106b40c8fe705dd0af0133b9eb519bf Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index fac803a..abcbc3f 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -9,6 +9,15 @@ SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319" KENEABRANCH = "intel-4.14" 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" +# KERNEL CONFIG 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 = "0" +KCONF_BSP_AUDIT_LEVEL = "0" +KMETA_AUDIT = "no" +KMETA_AUDIT_WERROR = "" + KERNEL_FEATURES_append_atom-c3000 = " bsp/atom-c3000/atom-c3000.scc" KERNEL_FEATURES_append = " features/apic/x2apic_y.scc" -- cgit v1.2.3-54-g00ecf From 1822df02380c5b4df5bb0313cc2639a7287fd75f Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 11 May 2021 19:38:02 +0200 Subject: linux-intel: bump kernel version to 5.10.32 This change helped us to properly select the patches from clearlinux and get the implementation for RPMB [1]. [1] https://github.com/intel/linux-intel-lts/commit/a990c931 Change-Id: Iec7c637ae66ee62951afc517c23462cdfb7c7ec7 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index abcbc3f..788a5a8 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -1,12 +1,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" + 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 = "5.10.8" +LINUX_VERSION = "5.10.32" +SRCREV_machine = "387c8111b7a756797d8b3078fd9d7d7b2580e01a" + +# Intel patches already included into 5.10.32 kernel +SRC_URI_remove = "file://objtool-fix-segfault-with-clang.patch" +SRC_URI_remove = "file://x86-entry-Emit-a-symbol-for-register-restoring-thunk.patch" -SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319" -KENEABRANCH = "intel-4.14" +SRCREV_metaenea = "7f87afa1b049ea17f60f2b8c8bcd0895a5eb6df8" +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" # KERNEL CONFIG CHECK LEVELS: -- cgit v1.2.3-54-g00ecf From 276c9070d020179daf067d10a7dd512acffa14ff Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 13 May 2021 13:29:39 +0200 Subject: fix kernel config check warnings for 5.10 kernel - meta-intel was bumped to latest gatesgarth so we can remove unnecessary patches - use latest enea-kernel-cache updated to 5.10 (fix MMC related config check warning) - re-enable config AUDIT by using default values - it can help us to check issues with config introduced by us ot by upstream - enable ipv4wait patch - was updated in enea-kernel-cache Change-Id: I05e21d8db64ed0cb5059a881c3a65fcc252701c9 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 788a5a8..b950e64 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -7,22 +7,18 @@ require recipes-kernel/linux/linux-common-config.inc LINUX_VERSION = "5.10.32" SRCREV_machine = "387c8111b7a756797d8b3078fd9d7d7b2580e01a" -# Intel patches already included into 5.10.32 kernel -SRC_URI_remove = "file://objtool-fix-segfault-with-clang.patch" -SRC_URI_remove = "file://x86-entry-Emit-a-symbol-for-register-restoring-thunk.patch" - -SRCREV_metaenea = "7f87afa1b049ea17f60f2b8c8bcd0895a5eb6df8" +SRCREV_metaenea = "bd0d0b951b62058b811e8a28ce03b08b6e58c496" 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" -# KERNEL CONFIG CHECK LEVELS: +# 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 = "0" -KCONF_BSP_AUDIT_LEVEL = "0" -KMETA_AUDIT = "no" -KMETA_AUDIT_WERROR = "" +# 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" @@ -47,7 +43,7 @@ KERNEL_FEATURES_append = " features/ipmi/ipmi.scc" KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc" # IPv4 waiting for carrier on -#KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" +KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" # Fixes for pci KERNEL_FEATURES_append = " patches/drivers/pci/quirks.scc" -- cgit v1.2.3-54-g00ecf From bf254268a23e4ca65a682a24d21c7248df753a34 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 20 May 2021 10:41:09 +0200 Subject: linux-intel updates for guest kernel - allow features(DCA) to be used for guest(x86-64) as well Change-Id: I585177ae534c763b893e40b842c91bd9c43e0d50 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index b950e64..280495e 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -33,7 +33,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" -- cgit v1.2.3-54-g00ecf From b36d884971dcaeaf8cddd8bea43c511addd22cc7 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 20 May 2021 19:36:50 +0200 Subject: linux-intel: get the latest enea-kernel-cache commit Change-Id: I243042ce3b39a433a34a53cf63c46a4319f2bed1 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 280495e..366d57d 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-common-config.inc LINUX_VERSION = "5.10.32" SRCREV_machine = "387c8111b7a756797d8b3078fd9d7d7b2580e01a" -SRCREV_metaenea = "bd0d0b951b62058b811e8a28ce03b08b6e58c496" +SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a" 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" -- cgit v1.2.3-54-g00ecf From 8d8a642311183302a51157c61dfbe97a3e1014aa Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 20 May 2021 10:37:35 +0200 Subject: linux-intel-guest: compatible with qemux86-64 machine Change-Id: Ib779867335a5b76165c79bb34b21a5a368bfefc6 Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel-guest_5.10.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-kernel/linux/linux-intel-guest_5.10.bb b/recipes-kernel/linux/linux-intel-guest_5.10.bb index 6be0508..1a18a37 100644 --- a/recipes-kernel/linux/linux-intel-guest_5.10.bb +++ b/recipes-kernel/linux/linux-intel-guest_5.10.bb @@ -1 +1,2 @@ +COMPATIBLE_MACHINE ?= "(qemux86-64)" require linux-intel.inc -- cgit v1.2.3-54-g00ecf From 1e612506f0f7d01239edf578e84c19803692c339 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 21 May 2021 12:41:18 +0200 Subject: conf/machine: Set SOTA_MACHINE for atom, xeon SOTA_MACHINE will later be used to determine whether we should include sota.conf.inc in distro configuration instead of bringing it in via conf/local.conf. Change-Id: I658c86f562743a50e5c078899e133e279b96027b Signed-off-by: Alexandru Avadanii --- conf/machine/atom-c3000.conf | 2 ++ conf/machine/xeon-d.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf index d3fb5bb..90b9794 100644 --- a/conf/machine/atom-c3000.conf +++ b/conf/machine/atom-c3000.conf @@ -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/xeon-d.conf b/conf/machine/xeon-d.conf index f3ee8c0..07e4bf8 100644 --- a/conf/machine/xeon-d.conf +++ b/conf/machine/xeon-d.conf @@ -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}" -- cgit v1.2.3-54-g00ecf From 5d08f177d5b6b5e06c36c016b6686b0b9a2c6c2b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 25 May 2021 11:40:01 +0200 Subject: qemux86-64 machine: Remove unused bootloader deps Upstream image_types_wic.bbclass adds build time dependencies for all possible bootloaders (grub-efi, systemd-boot, syslinux). Most of them (grub-efi, systemd-boot) copy (unused) artifacts to our deploy dir (e.g. systemd-bootx64.efi) and take up build time although we only use syslinux to generate a pcbios compatible wic file for the Enea Edge VNF image. Remove unused bootloaders, saving some build time, disk space and cleaning up the deploy dir. Note: Since the Enea Edge host image does not have rootfs.wic among its artifacts, there's no need to apply the same change for the other machines. Change-Id: Ib0d76f6ad2002e5bb6fceaa7f9f1a179c7d505e0 Signed-off-by: Alexandru Avadanii --- conf/machine/qemux86-64-corei7.conf | 3 +++ 1 file changed, 3 insertions(+) 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" -- cgit v1.2.3-54-g00ecf From 8955c6aa5b1ca96ef53bc6fb8b904cd4f6a2d2ca Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 26 May 2021 16:21:11 +0200 Subject: linux-intel: Allow BSPs to add patches (w/o AUFS) - allow BSP and scc files included in the BSP to add kernel source patches ("features"), not only kernel configuration fragments; - aufs patches in [1] are not yet rebased on top of [2], so until that happens upstream (aufs has been rebased and reworked on the master branch of yocto-kernel-cache for kernel 5.11) just remove the patches (we can't do that by patching kernel-meta with a patch file, as support is also broken upstream; handle it via a prepend); [1] http://git.yoctoproject.org/cgit.cgi/yocto-kernel-cache/log/\ features/aufs?h=yocto-5.10 [2] https://github.com/intel/linux-intel-lts/commit/26dc6581 Change-Id: I60b03451b3a812e21dd0a2d313e59ba19b249225 Signed-off-by: Alexandru Avadanii --- recipes-kernel/linux/linux-intel.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 366d57d..dbc9808 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -11,6 +11,20 @@ SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a" 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 -- cgit v1.2.3-54-g00ecf From cc42ee463328a183cec66c1e93587271375ac44c Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Mon, 14 Jun 2021 19:34:10 +0200 Subject: hardknott update take kernel version from meta-intel(5.10.35) Change-Id: If167bd8b4968f27f68f098ba6ec257bf3e28fc8a Signed-off-by: Adrian Calianu --- conf/layer.conf | 2 +- recipes-kernel/linux/linux-intel.inc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 7d0af9b..81f6cb4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,7 +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 = "gatesgarth" +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/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index dbc9808..f12b8a6 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,9 +4,6 @@ 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 = "5.10.32" -SRCREV_machine = "387c8111b7a756797d8b3078fd9d7d7b2580e01a" - SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a" 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" -- cgit v1.2.3-54-g00ecf From b01caf67f1bd2414622846ded6d38f931c13957e Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 15 Jun 2021 18:32:06 +0200 Subject: kmeta: update kmeta to latest enea-kernel-cache Resolved warning about coredump: [NOTE]: 'CONFIG_WANT_DEV_COREDUMP' last val (n) and .config val (y) do not match Change-Id: I2a64488b783e15f413ade0061e868706b7ffba4b Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-intel.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index f12b8a6..0180d0a 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,7 +4,7 @@ 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 -SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a" +SRCREV_metaenea = "163c9c49953f87ef13dd8007467acb38da21c84b" 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" -- cgit v1.2.3-54-g00ecf From 85219081802752ddf1016cfcc2b39217ec739869 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 18 Jun 2021 17:40:39 +0200 Subject: linux-intel: Enable ACPI Tiny Power Button support This will replace acpid in handling the power button press for both host and guest. Note that this bumps enea-kernel-cache to include 3 (unrelated) changes: - Fix kaudit warnings for guest kernel - features/ata/ata_piix_y: Add new fragment - features: Add acpi_tiny_pwrbtn_y fragment Depends-On: I4f564c0473b30d8f8df675aee571bc31f59a3d2d Change-Id: If684fc3e7d1b19839da888c3894de1f575e05182 Signed-off-by: Alexandru Avadanii --- recipes-kernel/linux/linux-intel.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 0180d0a..77638f6 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,7 +4,7 @@ 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 -SRCREV_metaenea = "163c9c49953f87ef13dd8007467acb38da21c84b" +SRCREV_metaenea = "18292f311c94bb5197fa82375d7586e7591f23a0" 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" @@ -53,6 +53,9 @@ 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" + # IPv4 waiting for carrier on KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" -- cgit v1.2.3-54-g00ecf From cda4fde8043776bb140397803b86778e13f4c5f1 Mon Sep 17 00:00:00 2001 From: Catalin Iova Date: Wed, 23 Jun 2021 13:15:19 +0200 Subject: recipes-kernel: Add IGC module support Change-Id: I5bbeee654a30048e49c2e3ffd949e752acf97e43 Signed-off-by: Catalin Iova --- recipes-kernel/linux/linux-intel.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 77638f6..48a1894 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,7 +4,7 @@ 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 -SRCREV_metaenea = "18292f311c94bb5197fa82375d7586e7591f23a0" +SRCREV_metaenea = "8dc3b0976651277b49123ab7cdf7ffe5bd250f8d" 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" -- cgit v1.2.3-54-g00ecf From 1a86d672f02f0fa29ac4113fc3d1b676460350c6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 6 Jul 2021 17:25:26 +0200 Subject: linux-intel: Allow using "63" as alias for "last" Previous Enea Edge releases hardcode the kernel args in a way that cannot currently be changed on upgrade. Due to upstream changes in the kernel, specifying a non-existent CPU, e.g. greater than the number of the last CPU is no longer supported and leads to nohz_full, isolcpus, rcu_nocbs no longer being honored. Until we have a proper mechanism in place that will allow specifying kernel arguments per-boot-entry; we alias "63" to "last", so that expressions like "1-63" are equivalent to "1-last". This will ensure backwards compatibility with kernel 4.14 arguments. Note: This relies on the assumption that we don't support boards with more than 64 cores and should be removed as soon as per-boot-entry kernel args are supported. Change-Id: I21d99315192ea4dc224f11314557e0a5ed1b34b6 Signed-off-by: Alexandru Avadanii --- recipes-kernel/linux/linux-intel.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 48a1894..685984c 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,7 +4,7 @@ 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 -SRCREV_metaenea = "8dc3b0976651277b49123ab7cdf7ffe5bd250f8d" +SRCREV_metaenea = "f86788bac0c8aaa0903aa2ef3b98ec0327a56d5b" 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" @@ -56,6 +56,9 @@ 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" -- cgit v1.2.3-54-g00ecf From 3273f76dc7be0487d804046dc3bcb6f775faa09d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 7 Jul 2021 16:11:18 +0200 Subject: linux-intel: Bump enea-kernel-cache for "last" fix Change-Id: Icfb8c0c3cb2cec669ccf4df7aa053f6ed3fcd54f Signed-off-by: Alexandru Avadanii --- recipes-kernel/linux/linux-intel.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 685984c..c29d9f9 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -4,7 +4,7 @@ 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 -SRCREV_metaenea = "f86788bac0c8aaa0903aa2ef3b98ec0327a56d5b" +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" -- cgit v1.2.3-54-g00ecf