From: Mete Durlu <mdurlu(a)redhat.com>
redhat/configs: Add SMC_LO config option on s390
Upstream Status: RHEL only
This introduces a kind of Emulated-ISM device named loopback-ism for
SMCv2.1. The loopback-ism device is currently exclusive for SMC usage,
and aims to provide an SMC shortcut for sockets within the same kernel,
leading to improved intra-OS traffic performance. Configuration of this
feature is managed through the config SMC_LO.
Signed-off-by: Mete Durlu <mdurlu(a)redhat.com>
diff --git a/redhat/configs/common/generic/s390x/CONFIG_SMC_LO b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/s390x/CONFIG_SMC_LO
@@ -0,0 +1 @@
+# CONFIG_SMC_LO is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3874
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870
kernel-automotive is a separate package with its own dist-git and not a
variant of the stock kernel like kernel-debug, kernel-rt, etc. are. In order
to support building this as a separate package we need to add automotive
specific make targets that behave similarly to their analogous stock kernel
targets.
This adds a flag (AUTOMOTIVE_BUILD) that can be included when calling the
standard make targets to repurpose them to build kernel-automotive rather than
the stock kernel.
This adds one make target specific to kernel-automotive as a convenience:
- dist-automotive-configs
Regarding the automotive scratch build targets: the autosd and rhivos distros
based on cs10 do not exist today. I have gone ahead and included targets for
those as if they did exist rather than trying to force kernel-ark to support
cs9 based automotive distros (which is not the target of these changes). These
changes will eventually be taken to cs10 to support building automotive from
the same branch as the stock kernel.
In summary, these scratch build targets are not for use yet:
- cbs: autosd10s-packages-main-el10s
- brew: rhivos-2-newest-test-pesign
Currently there is not a suitable scratch build target in brew or cbs now that
Rust is enabled. I'm relying on CKI's c10s build container for now.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/scripts/rh-dist-git.sh | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/1005-dist-dump-variables.bats | 2 +-
redhat/Makefile | 144 ++++++++++++++-----
redhat/Makefile.automotive | 15 ++
redhat/Makefile.variables | 7 +-
redhat/automotive-centpkg-sig.conf | 32 ++++
redhat/kernel.spec.template | 58 ++++++-
.gitlab-ci.yml | 13 +-
Makefile.rhelver | 10 +
57 files changed, 390 insertions(+), 157 deletions(-)
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in drivers/soc
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: ARCH_R9A09G056 [=y]
Type : bool
Defined at drivers/soc/renesas/Kconfig:396
Prompt: ARM64 Platform support for RZ/V2N
Depends on: SOC_RENESAS [=y] && ARM64 [=y]
Location:
-> Device Drivers
-> SOC (System On Chip) specific Drivers
-> Renesas SoC driver support (SOC_RENESAS [=y])
-> ARM64 Platform support for RZ/V2N (ARCH_R9A09G056 [=y])
Selects: SYS_R9A09G056 [=y]
Commit: 31d358e611b7 (soc: renesas: Add config option for RZ/V2N (R9A09G056) SoC)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_ARCH_R9A09G056 b/redhat/configs/pending-rhel/generic/CONFIG_ARCH_R9A09G056
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_ARCH_R9A09G056
+++ /dev/null
@@ -1,16 +0,0 @@
-# Symbol: ARCH_R9A09G056 [=y]
-# Type : bool
-# Defined at drivers/soc/renesas/Kconfig:396
-# Prompt: ARM64 Platform support for RZ/V2N
-# Depends on: SOC_RENESAS [=y] && ARM64 [=y]
-# Location:
-# -> Device Drivers
-# -> SOC (System On Chip) specific Drivers
-# -> Renesas SoC driver support (SOC_RENESAS [=y])
-# -> ARM64 Platform support for RZ/V2N (ARCH_R9A09G056 [=y])
-# Selects: SYS_R9A09G056 [=y]
-#
-#
-#
-# Commit: 31d358e611b7 (soc: renesas: Add config option for RZ/V2N (R9A09G056) SoC)
-CONFIG_ARCH_R9A09G056=y
diff --git a/redhat/configs/rhel/generic/CONFIG_ARCH_R9A09G056 b/redhat/configs/rhel/generic/CONFIG_ARCH_R9A09G056
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_ARCH_R9A09G056
@@ -0,0 +1 @@
+CONFIG_ARCH_R9A09G056=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3921
From: Francesco Poli (wintermute) <invernomuto(a)paranoici.org>
cpupower: split unitdir from libdir in Makefile
Improve the installation procedure for the systemd service unit
'cpupower.service', to be more flexible. Some distros install libraries
to /usr/lib64/, but systemd service units have to be installed to
/usr/lib/systemd/system: as a consequence, the installation procedure
should not assume that systemd service units can be installed to
${libdir}/systemd/system ...
Define a dedicated variable ("unitdir") in the Makefile.
Link: https://lore.kernel.org/linux-pm/260b6d79-ab61-43b7-a0eb-813e257bc028@leemh…
Fixes: 9c70b779ad91 ("cpupower: add a systemd service to run cpupower")
Signed-off-by: Francesco Poli (wintermute) <invernomuto(a)paranoici.org>
Tested-by: Thorsten Leemhuis <linux(a)leemhuis.info>
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index blahblah..blahblah 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -73,6 +73,7 @@ sbindir ?= /usr/sbin
mandir ?= /usr/man
libdir ?= /usr/lib
libexecdir ?= /usr/libexec
+unitdir ?= /usr/lib/systemd/system
includedir ?= /usr/include
localedir ?= /usr/share/locale
docdir ?= /usr/share/doc/packages/cpupower
@@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower
$(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}'
$(INSTALL) -d $(DESTDIR)${libexecdir}
$(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower'
- $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system
- sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
- $(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
+ $(INSTALL) -d $(DESTDIR)${unitdir}
+ sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service'
+ $(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service'
install-man:
$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
@@ -348,7 +349,7 @@ uninstall:
- rm -f $(DESTDIR)${bindir}/utils/cpupower
- rm -f $(DESTDIR)${confdir}cpupower-service.conf
- rm -f $(DESTDIR)${libexecdir}/cpupower
- - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service
+ - rm -f $(DESTDIR)${unitdir}/cpupower.service
- rm -f $(DESTDIR)${mandir}/man1/cpupower.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3898
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870
kernel-automotive is a separate package with its own dist-git and not a
variant of the stock kernel like kernel-debug, kernel-rt, etc. are. In order
to support building this as a separate package we need to add automotive
specific make targets that behave similarly to their analogous stock kernel
targets.
This adds the following make targets specific to kernel-automotive:
- dist-automotive-configs
- dist-srpm-automotive
- dist-brew-automotive
- dist-cbs-automotive
- dist-git-automotive
- dist-git-automotive-test
Regarding the automotive scratch build targets: the autosd and rhivos distros
based on cs10 do not exist today. I have gone ahead and included targets for
those as if they did exist rather than trying to force kernel-ark to support
cs9 based automotive distros (which is not the target of these changes). These
changes will eventually be taken to cs10 to support building automotive from
the same branch as the stock kernel.
In summary, these scratch build targets are not for use yet:
- cbs: autosd10s-packages-main-el10s
- brew: rhivos-2-newest-test-pesign
To test the cbs scratch build, use: autosd9s-packages-main-el9s
Currently there is not a suitable scratch build target in brew
(rhivos-1-newest-test-pesign has been requested but does not exist yet).
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/scripts/rh-dist-git.sh | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 11 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 11 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 11 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 11 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 11 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 11 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 11 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 11 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 7 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 7 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 7 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 7 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.el7 | 7 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 7 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 7 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 7 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 11 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 2 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 11 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 11 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 2 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 11 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 11 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 2 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 11 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 11 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 2 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 11 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 2 +-
redhat/self-test/1005-dist-dump-variables.bats | 2 +-
redhat/Makefile | 165 ++++++++++++++-----
redhat/Makefile.variables | 11 +-
redhat/automotive-centpkg-sig.conf | 32 +++
redhat/kernel.spec.template | 58 +++++-
.gitlab-ci.yml | 13 +-
Makefile.rhelver | 10 +
56 files changed, 439 insertions(+), 134 deletions(-)
From: Jeremy Cline on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3862
JIRA: https://issues.redhat.com/browse/RHEL-82437
There is RHEL/Fedora specific functionality on x86 and other arches which
enables extra kernel lockdowns
when booted by secureboot. Let's do the same for arm now that secureboot is
working.
This is a rebase of the patch set from Mark that's been submitted for [RHEL
10](https://gitlab.com/redhat/centos-stream/src/kernel/centos-
stream-10/-/merge_requests/609) and [RHEL 9](https://gitlab.com/redhat/centos-
stream/src/kernel/centos-stream-9/-/merge_requests/5192), but which I don't
see in ARK. In particular, I'm interested in getting this into Fedora since,
although we do not currently sign aarch64 for SecureBoot, we're working on
getting the infrastructure ready for that. In the mean time, carrying this
patch is useful for folks who build and sign their own aarch64 kernels.
I hope I'm not stepping on Mark's toes here, I figured the easiest place to
ask about plans for it in Fedora/ARK was in a PR to add it.
Signed-off-by: Mark Salter <msalter(a)redhat.com>
Signed-off-by: Jeremy Cline <jeremycline(a)linux.microsoft.com>
---
arch/arm64/kernel/setup.c | 27 ++++++++++
drivers/firmware/efi/libstub/fdt.c | 5 +
drivers/firmware/efi/libstub/secureboot.c | 14 +++-
redhat/configs/common/generic/arm/aarch64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT | 1 +
4 files changed, 43 insertions(+), 4 deletions(-)