Skip to content

Commit 2cd2602

Browse files
harshitgupta1337Harshit Gupta
andauthored
Revert TTY serial driver to upstream to allow PREEMPT_RT patching for kernel-rt upgrade (#13867)
Co-authored-by: Harshit Gupta <guptaharshit@microsoft.com>
1 parent c0c6316 commit 2cd2602

6 files changed

Lines changed: 8020 additions & 18668 deletions

File tree

SPECS-EXTENDED/kernel-rt/config

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.6.77.1 Kernel Configuration
3+
# Linux/x86_64 6.6.85.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
66
CONFIG_CC_IS_GCC=y
@@ -7373,6 +7373,13 @@ CONFIG_CRYPTO_DRBG_HASH=y
73737373
CONFIG_CRYPTO_DRBG_CTR=y
73747374
CONFIG_CRYPTO_DRBG=y
73757375
CONFIG_CRYPTO_JITTERENTROPY=y
7376+
CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
7377+
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
7378+
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
7379+
# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
7380+
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
7381+
CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
7382+
CONFIG_CRYPTO_JITTERENTROPY_OSR=3
73767383
# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
73777384
# end of Random number generation
73787385

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
4-
"config": "23d30e3d061d14ef091b301fba88fd559981b533e94fa5ae374e16fa023abc32",
4+
"config": "96d8e41cf334f308715713d6e20656f8e1b8ac1475ceeb209f9e217b01447eed",
55
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
66
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
77
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
8-
"kernel-6.6.77.1.tar.gz": "2d9cce0c5a39c6be7fe272da6811acd4aa5fa386d9cd8f055b0b8110684c3028"
8+
"kernel-6.6.85.1.tar.gz": "4dab471d68ce07dd31e925788c128ff1c7d9a6d2c7e0a073bd8e6701514cfee6"
99
}
1010
}

SPECS-EXTENDED/kernel-rt/kernel-rt.spec

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%global security_hardening none
22
%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
3-
%global rt_version rt50
3+
%global rt_version rt53
44
%define uname_r %{version}-%{rt_version}-%{release}
55
%define mariner_version 3
66
%define version_upstream %(echo %{version} | rev | cut -d'.' -f2- | rev)
@@ -23,7 +23,7 @@
2323

2424
Summary: Realtime Linux Kernel
2525
Name: kernel-rt
26-
Version: 6.6.77.1
26+
Version: 6.6.85.1
2727
Release: 1%{?dist}
2828
License: GPLv2
2929
Vendor: Microsoft Corporation
@@ -37,10 +37,11 @@ Source3: cbl-mariner-ca-20211013.pem
3737
Source4: cpupower
3838
Source5: cpupower.service
3939

40+
Patch0: reapply-serial-8250-adjust-fifo-mode-timeout.patch
4041
# When updating, make sure to grab the matching patch from
4142
# https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/
4243
# Also, remember to bump the global rt_version macro above ^
43-
Patch0: patch-%{version_upstream}-%{rt_version}.patch
44+
Patch1: patch-%{version_upstream}-%{rt_version}.patch
4445

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

165167
make mrproper
166168

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

416418
%changelog
419+
* Sat May 22 2025 Harshit Gupta <guptaharshit@microsoft.com> - 6.6.85.1-1
420+
- Auto-upgrade to 6.6.85.1
421+
- Add reapply-serial-8250-adjust-fifo-mode-timeout.patch
422+
417423
* Mon Feb 24 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.77.1-1
418424
- Auto-upgrade to 6.6.77.1
419425

0 commit comments

Comments
 (0)