Merge "Update kernel to v5.10.57"

kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Fix-compile-issues-when-using-kernel-5.10.57.patch

@@ -1,22 +1,23 @@
-From 7b589d8176fa503b7d817692312dd394c35925e3 Mon Sep 17 00:00:00 2001
-From: Vefa Bicakci <vefa.bicakci@windriver.com>
-Date: Tue, 1 Jun 2021 13:44:23 -0400
-Subject: [PATCH] Apply a dummy patch to let "build-pkgs --edit" work
+From ca7da3a87d1533596ed8eaad5770eadfdf3e0337 Mon Sep 17 00:00:00 2001
+From: Jiping Ma <jiping.ma2@windriver.com>
+Date: Mon, 23 Aug 2021 20:25:48 -0700
+Subject: [PATCH] Fix compile issues when using kernel 5.10.57.
 
-Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
+
+Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
 ---
- SPECS/mlnx-ofa_kernel.spec | 3 +++
+ mlnx-ofa_kernel.spec | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec
-index d4d3f1932db6..5a2982cfaa5f 100644
+diff --git a/mlnx-ofa_kernel.spec b/mlnx-ofa_kernel.spec
+index d4d3f19..d890dfb 100644
 --- a/SPECS/mlnx-ofa_kernel.spec
 +++ b/SPECS/mlnx-ofa_kernel.spec
 @@ -109,6 +109,7 @@ Url: http://www.mellanox.com/
  Group: System Environment/Base
  Source: %{_basename}-%{_version}.tgz
  Source100: modules-load.conf
-+Patch01: 0001-A-dummy-change-to-let-StarlingX-build-work.patch
++Patch01: 0001-implicit-declaration-of-function-__is_constexpr.patch
  BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED}
  Vendor: Mellanox Technologies
  Obsoletes: kernel-ib
@@ -30,5 +31,5 @@ index d4d3f1932db6..5a2982cfaa5f 100644
  %if 0%{?rhel} == 7
  source scl_source enable devtoolset-8 || :
 -- 
-2.29.2
+2.31.1
 

kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER

@@ -1,3 +1,3 @@
 Support-TiS-system.patch
 Introduce-devtoolset-8.patch
-Apply-a-dummy-patch-to-let-build-pkgs-edit-work.patch
+Fix-compile-issues-when-using-kernel-5.10.57.patch

kernel-modules/mlnx-ofa_kernel/centos/patches/0001-implicit-declaration-of-function-__is_constexpr.patch

@@ -0,0 +1,38 @@
+From 555ee6e9b3cb4ecb6c6a0a4806a960d564b9f983 Mon Sep 17 00:00:00 2001
+From: Jiping Ma <jiping.ma2@windriver.com>
+Date: Mon, 23 Aug 2021 20:11:33 -0700
+Subject: [PATCH] implicit declaration of function '__is_constexpr'
+
+We get a build error now when we use kernel version 5.10.57
+include/linux/minmax.h:23:4: error: implicit declaration of function '__is_constexpr';
+Because commit 1354ec840899e87259286cc844d4c161ea86fae7 in the yocto kernel changed
+the definition of GENMASK_INPUT_CHECK from __builtin_constant_p to __is_constexpr.
+so we need add __is_constexpr definition in const.h
+ 
+Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
+---
+ include/linux/const.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/linux/const.h b/include/linux/const.h
+index afe88a0..92daf28 100644
+--- a/source/include/linux/const.h
++++ b/source/include/linux/const.h
+@@ -7,6 +7,14 @@
+ 
+ #include_next <linux/const.h>
+ 
++/*
++ * This returns a constant expression while determining if an argument is
++ * a constant expression, most importantly without evaluating the argument.
++ * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>
++ */
++#define __is_constexpr(x) \
++        (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))
++
+ #ifndef UL
+ #define UL(x)           (_UL(x))
+ #endif
+-- 
+2.31.1
+

kernel-rt/centos/build_srpm.data

@@ -7,7 +7,7 @@ BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
 
 # The base branch is: v5.10/standard/preempt-rt/base
-TIS_BASE_SRCREV=bced2cdbd646996800d920c1604bffbb050a62ab
+TIS_BASE_SRCREV=9ad4f13ee44c39e890638d8a2157adcf830fc7bc
 
 PKG_BASE_SRCREV=4013790c6ef43fd9f936579b0cac50b8e0c4505a
 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT

kernel-rt/centos/kernel-rt.spec

@@ -90,7 +90,7 @@ Summary: The Linux kernel
 %define base_sublevel 10
 
 # Do we have a -stable update to apply?
-%define stable_update 30
+%define stable_update 57
 # Set rpm version accordingly
 %define stablerev %{stable_update}
 %define stable_base %{stable_update}
@@ -387,7 +387,7 @@ BuildRequires: util-linux
 
 %ifarch x86_64
 %define asmarch x86
-%define all_arch_configs kernel-%{version}-x86_64*.config
+%define all_arch_configs kernel-x86_64*.config
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -705,9 +705,8 @@ Source89: filter-modules.sh
 #Source46: kernel-ppc64le-debug-fedora.config
 #Source47: kernel-s390x-fedora.config
 #Source48: kernel-s390x-debug-fedora.config
-Source49: kernel-5.10.30-x86_64.config
-Source50: kernel-5.10.30-x86_64-debug.config
-#
+Source49: kernel-x86_64.config
+Source50: kernel-x86_64-debug.config
 
 
 Source51: generate_all_configs.sh
@@ -743,7 +742,7 @@ Source3000: ima_signing_key.pub
 
 # This file is intentionally left empty in the stock kernel. Its a nicety
 # added for those wanting to do custom rebuilds with altered config opts.
-Source1000: kernel-5.10.30-x86_64-rt.config.tis_extra
+Source1000: kernel-x86_64-rt.config.tis_extra
 
 # Here should be only the patches up to the upstream canonical Linus tree.
 
@@ -1564,7 +1563,7 @@ done
 %endif
 
 %if !%{debugbuildsenabled}
-rm -f kernel-%{version}-*debug.config
+rm -f kernel-*debug.config
 %endif
 
 # enable GCOV kernel config options if gcov is on
@@ -1580,7 +1579,7 @@ OPTS=""
 %if %{with_configchecks}
 	OPTS="$OPTS -w -n -c"
 %endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+./process_configs.sh $OPTS kernel
 
 # end of kernel config
 %endif
@@ -1651,7 +1650,7 @@ BuildKernel() {
     fi
 
     # Pick the right config file for the kernel we're building
-    Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config
+    Config=kernel-%{_target_cpu}${Flavour:+-${Flavour}}.config
     DevelDir=/usr/src/kernels/%{KVERREL}${Flav}
 
     # When the bootable image is just the ELF kernel, strip it.

kernel-rt/files/kernel-x86_64-debug.config

@@ -166,6 +166,7 @@ CONFIG_ATH_DEBUG=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_BCACHE is not set
 # CONFIG_BCMA_DEBUG is not set
 # CONFIG_BCMA_HOST_SOC is not set

kernel-rt/files/kernel-x86_64.config

@@ -167,6 +167,7 @@
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_BCACHE is not set
 # CONFIG_BCMA_DEBUG is not set
 # CONFIG_BCMA_HOST_SOC is not set

kernel-std/centos/build_srpm.data

@@ -7,7 +7,7 @@ BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
 
 # The base branch is: v5.10/standard/base
-TIS_BASE_SRCREV=1e798745fa8ef91ffe4fd38d443f9d44b59e3cb3
+TIS_BASE_SRCREV=1cd6e30b83d741562b55bf5b7763b1238a91150c
 
 PKG_BASE_SRCREV=4013790c6ef43fd9f936579b0cac50b8e0c4505a
 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT

kernel-std/centos/kernel.spec

@@ -93,7 +93,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 30
+%define stable_update 57
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -416,7 +416,7 @@ BuildRequires: util-linux
 
 %ifarch x86_64
 %define asmarch x86
-%define all_arch_configs kernel-%{version}-x86_64*.config
+%define all_arch_configs kernel-x86_64*.config
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -734,8 +734,8 @@ Source89: filter-modules.sh
 #Source46: kernel-ppc64le-debug-fedora.config
 #Source47: kernel-s390x-fedora.config
 #Source48: kernel-s390x-debug-fedora.config
-Source49: kernel-5.10.30-x86_64.config
-Source50: kernel-5.10.30-x86_64-debug.config
+Source49: kernel-x86_64.config
+Source50: kernel-x86_64-debug.config
 
 
 Source51: generate_all_configs.sh
@@ -771,7 +771,7 @@ Source3000: ima_signing_key.pub
 
 # This file is intentionally left empty in the stock kernel. Its a nicety
 # added for those wanting to do custom rebuilds with altered config opts.
-Source1000: kernel-5.10.30-x86_64.config.tis_extra
+Source1000: kernel-x86_64.config.tis_extra
 
 # Here should be only the patches up to the upstream canonical Linus tree.
 
@@ -1550,7 +1550,7 @@ done
 %endif
 
 %if !%{debugbuildsenabled}
-rm -f kernel-%{version}-*debug.config
+rm -f kernel-*debug.config
 %endif
 
 # enable GCOV kernel config options if gcov is on
@@ -1566,7 +1566,7 @@ OPTS=""
 %if %{with_configchecks}
 	OPTS="$OPTS -w -n -c"
 %endif
-./process_configs.sh $OPTS kernel %{rpmversion}
+./process_configs.sh $OPTS kernel
 
 # end of kernel config
 %endif
@@ -1637,7 +1637,7 @@ BuildKernel() {
     fi
 
     # Pick the right config file for the kernel we're building
-    Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config
+    Config=kernel-%{_target_cpu}${Flavour:+-${Flavour}}.config
     DevelDir=/usr/src/kernels/%{KVERREL}${Flav}
 
     # When the bootable image is just the ELF kernel, strip it.

kernel-std/files/kernel-x86_64-debug.config

@@ -462,6 +462,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set

kernel-std/files/kernel-x86_64.config

@@ -460,6 +460,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_SBS is not set