Skip to content

Revert TTY serial driver to upstream to allow PREEMPT_RT patching for kernel-rt upgrade #13867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: 3.0-dev
Choose a base branch
from
Open

Revert TTY serial driver to upstream to allow PREEMPT_RT patching for kernel-rt upgrade #13867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afa05f4
Kernel-rt upgrade to 6.6.85.1 version
CBL-Mariner-Bot Apr 5, 2025
a1731f2
Remove failing hunk from PREEMPT_RT patch
Apr 24, 2025
820c99d
Revert drivers/tty/serial/8250/8250_port.c to upstream before applyin…
Apr 25, 2025
7f4982b
Update config and fix missing patch cmd in spec
Apr 26, 2025
6ce43bd
Added missing ifdef
May 1, 2025
a71ab41
Update patch to include missing ifdef
May 5, 2025
43212f5
Set kernel-rt release to 1
May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion SPECS-EXTENDED/kernel-rt/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.6.77.1 Kernel Configuration
# Linux/x86_64 6.6.85.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -7373,6 +7373,13 @@ CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y
CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
# end of Random number generation

Expand Down
4 changes: 2 additions & 2 deletions SPECS-EXTENDED/kernel-rt/kernel-rt.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "23d30e3d061d14ef091b301fba88fd559981b533e94fa5ae374e16fa023abc32",
"config": "96d8e41cf334f308715713d6e20656f8e1b8ac1475ceeb209f9e217b01447eed",
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-6.6.77.1.tar.gz": "2d9cce0c5a39c6be7fe272da6811acd4aa5fa386d9cd8f055b0b8110684c3028"
"kernel-6.6.85.1.tar.gz": "4dab471d68ce07dd31e925788c128ff1c7d9a6d2c7e0a073bd8e6701514cfee6"
}
}
12 changes: 9 additions & 3 deletions SPECS-EXTENDED/kernel-rt/kernel-rt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global security_hardening none
%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
%global rt_version rt50
%global rt_version rt53
%define uname_r %{version}-%{rt_version}-%{release}
%define mariner_version 3
%define version_upstream %(echo %{version} | rev | cut -d'.' -f2- | rev)
Expand All @@ -23,7 +23,7 @@

Summary: Realtime Linux Kernel
Name: kernel-rt
Version: 6.6.77.1
Version: 6.6.85.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Expand All @@ -37,10 +37,11 @@ Source3: cbl-mariner-ca-20211013.pem
Source4: cpupower
Source5: cpupower.service

Patch0: revert-to-upstream-8250_port.c.patch
# When updating, make sure to grab the matching patch from
# https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/
# Also, remember to bump the global rt_version macro above ^
Patch0: patch-%{version_upstream}-%{rt_version}.patch
Patch1: patch-%{version_upstream}-%{rt_version}.patch

BuildRequires: audit-devel
BuildRequires: bash
Expand Down Expand Up @@ -161,6 +162,7 @@ manipulation of eBPF programs and maps.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{mariner_version}-%{version}
%patch 0 -p1
%patch 1 -p1

make mrproper

Expand Down Expand Up @@ -414,6 +416,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Sat May 22 2025 Harshit Gupta <[email protected]> - 6.6.85.1-1
- Auto-upgrade to 6.6.85.1
- Add revert-to-upstream-8250_port.c.patch

* Mon Feb 24 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.77.1-1
- Auto-upgrade to 6.6.77.1

Expand Down
Loading
Loading