From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2654
Compiling for clang is getting trickier to do because the configs are
different than gcc in some cases. Mimic the kgcov framework to setup
clang to be easier to update their configs.
This framework is designed to blindly merge.py with any configs fed to
it. This is unlike the build_configs framework where it uses
priority.rhel|fedora rules to merge things.
This leads to strange cases where clang debug configs need different
settings than clang non-debug configs. For non-lto clang, due to clang
bugs it is easy to disable the debug features and get away with this.
But once resolved we will have to reinvestigate. For lto clang, I just
hack out the debug and kgcov config files due to clashing Kconfig depend
rules.
I don't expect this to be a long term solution. Perhaps when our config
rework is fully realized this just melts away. TBD.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/configs/common/clang/debug/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/debug/CONFIG_KMSAN | 1 +
redhat/configs/common/clang/generic/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/generic/CONFIG_KMSAN | 1 +
redhat/configs/common/clang_lto/debug/README | 0
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/README | 0
redhat/configs/priority.fedora | 4 -
redhat/configs/priority.rhel | 4 -
redhat/configs/priority.snip | 9 +
redhat/kernel.spec.template | 78 ++++++---
14 files changed, 70 insertions(+), 33 deletions(-)
From: Javier Martinez Canillas <javierm(a)redhat.com>
fedora: Switch TI_SCI_CLK and TI_SCI_PM_DOMAINS symbols to built-in
These two are currently built as a module, but this prevents the K3 AM6xx
boards to boot. For example, an AM625 BeaglePlay hangs on boot after this:
## Flattened Device Tree blob at ffb0e8e0
Booting using the fdt blob at 0xffb0e8e0
Working FDT set to ffb0e8e0
Loading Ramdisk to 8bcb0000, end 8ffff195 ... OK
Loading Device Tree to 000000008bc9c000, end 000000008bcaf4a7 ... OK
Working FDT set to 8bc9c000
Starting kernel ...
I/TC: Secondary CPU 1 initializing
I/TC: Secondary CPU 1 switching to normal world boot
I/TC: Secondary CPU 2 initializing
I/TC: Secondary CPU 2 switching to normal world boot
I/TC: Secondary CPU 3 initializing
I/TC: Secondary CPU 3 switching to normal world boot
With these two symbols built-in the board continues with the boot process.
Reported-by: Enric Balletbo i Serra <eballetbo(a)redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
@@ -1 +1 @@
-CONFIG_TI_SCI_CLK=m
+CONFIG_TI_SCI_CLK=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
@@ -1 +1 @@
-CONFIG_TI_SCI_PM_DOMAINS=m
+CONFIG_TI_SCI_PM_DOMAINS=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2727
From: Steve Best <sbest(a)redhat.com>
redhat/configs: NXP BBNSM Power Key Driver
Description:
Turn on NXP BBNSM Power Key Driver
Tested: make dist-configs
Signed-off-by: Steve Best <sbest(a)redhat.com>
diff --git a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
@@ -1 +1 @@
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2725
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 106602712
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/105827
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
aarch64 - Filesystem - NFS Connectathon
ppc64le - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,9 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then disable selftests
+%if %{with_bpftool} == 0
+%define with_selftests 0
%endif
%ifnarch noarch
@@ -2716,12 +2714,14 @@ if [ -f $DevelDir/vmlinux.h ]; then
RPM_VMLINUX_H=$DevelDir/vmlinux.h
fi
+%if %{with_bpftool}
%global bpftool_make \
%{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1
-%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make}
popd
+%else
+echo "bpftools disabled ... disabling selftests"
%endif
%if %{with_selftests}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720