packages/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kernel-RT update to 5.10.0-177.0.0.61 && rpi-rt to 5.10.0-177.0.0.11

Browse Source
This commit is contained in:
zhangyu 2023-12-14 13:46:52 +08:00
parent 4bc0ca8bb7
commit f28f174921
4 changed files with 1017 additions and 917 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1860
0001-apply-preempt-RT-patch.patch
View File

File diff suppressed because it is too large Load Diff

60
0001-modify-openeuler_defconfig-for-rt62.patch
View File

@ -1,52 +1,53 @@
From 0026e130f88770f45b00f52ba1374dd90b8be0f0 Mon Sep 17 00:00:00 2001
From: liyulei <liyulei@kylinos.cn>
Date: Mon, 6 Feb 2023 18:04:41 +0800
Subject: [PATCH 2/2] modify openeuler_defconfig for rt62
From 744a4eb5a8241919999033f304b48cf801918fd4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Thu, 14 Dec 2023 11:38:19 +0800
Subject: [PATCH] modify-openeuler_defconfig-for-rt62.patch
---
arch/arm64/configs/openeuler_defconfig | 5 +++--
arch/arm64/configs/openeuler_defconfig | 6 +++---
arch/arm64/kernel/fpsimd.c | 4 ++--
arch/x86/configs/openeuler_defconfig | 7 ++++---
arch/x86/configs/openeuler_defconfig | 8 ++++----
arch/x86/include/asm/preempt.h | 16 +++++++++++++---
include/linux/printk.h | 2 +-
kernel/printk/printk.c | 2 +-
6 files changed, 24 insertions(+), 12 deletions(-)
6 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 30384eacad4f..b0ed4a9b3058 100644
index 12e4828c9..7edb9923f 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -74,6 +74,7 @@ CONFIG_HIGH_RES_TIMERS=y
@@ -87,7 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
-
+CONFIG_PREEMPT_RT=y
#
# CPU/Task time and stats accounting
@@ -733,7 +734,7 @@ CONFIG_ACPI_MPAM=y
#
@@ -760,7 +760,7 @@ CONFIG_ACPI_MPAM=y
CONFIG_ACPI_PPTT=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
+# CONFIG_VIRTUALIZATION is not set
+#CONFIG_VIRTUALIZATION=y
CONFIG_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y
@@ -1125,7 +1126,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -1156,7 +1156,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_GUP_BENCHMARK is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_PIN_MEMORY=y
+# CONFIG_PIN_MEMORY is not set
+#CONFIG_PIN_MEMORY is not set
CONFIG_PID_RESERVE=y
CONFIG_MEMORY_RELIABLE=y
# CONFIG_CLEAR_FREELIST_PAGE is not set
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 84520f11667d..aa631771e0dc 100644
index 131b2dda3..992c11f2c 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -180,7 +180,7 @@ static void __get_cpu_fpsimd_context(void)
@@ -234,7 +234,7 @@ static void __get_cpu_fpsimd_context(void)
*/
static void get_cpu_fpsimd_context(void)
{
@ -55,7 +56,7 @@ index 84520f11667d..aa631771e0dc 100644
__get_cpu_fpsimd_context();
}
@@ -201,7 +201,7 @@ static void __put_cpu_fpsimd_context(void)
@@ -255,7 +255,7 @@ static void __put_cpu_fpsimd_context(void)
static void put_cpu_fpsimd_context(void)
{
__put_cpu_fpsimd_context();
@ -65,22 +66,23 @@ index 84520f11667d..aa631771e0dc 100644
static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index 5ada612f1d75..685a49ca1fef 100644
index 3db754e79..14cf52af1 100644
--- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig
@@ -89,9 +89,10 @@ CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
# end of Timers subsystem
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
-
+CONFIG_PREEMPT_RT=y
#
# CPU/Task time and stats accounting
@@ -206,7 +207,7 @@ CONFIG_HAVE_UID16=y
#
@@ -212,7 +212,7 @@ CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y
@ -89,7 +91,7 @@ index 5ada612f1d75..685a49ca1fef 100644
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
@@ -735,7 +736,7 @@ CONFIG_KVM_COMPAT=y
@@ -748,7 +748,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
@ -99,7 +101,7 @@ index 5ada612f1d75..685a49ca1fef 100644
CONFIG_KVM_INTEL=m
CONFIG_X86_SGX_KVM=y
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
index a3b73de276c3..dda9ec24fdc1 100644
index a3b73de27..dda9ec24f 100644
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
@@ -134,10 +134,8 @@ static __always_inline bool should_resched(int preempt_offset)
@ -132,7 +134,7 @@ index a3b73de276c3..dda9ec24fdc1 100644
+
#endif /* __ASM_PREEMPT_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 9331b131ba25..23946f4828b2 100644
index 26c70fd11..c82c971e8 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -241,7 +241,7 @@ __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
@ -145,18 +147,18 @@ index 9331b131ba25..23946f4828b2 100644
#else
static inline void zap_locks(void) { }
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e95b00f24c75..59bd804e662a 100644
index 45239dcfb..0f9b88d38 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1813,7 +1813,7 @@ static void print_sync_until(struct console *con, u64 seq)
@@ -1826,7 +1826,7 @@ static void print_sync_until(struct console *con, u64 seq)
console_atomic_unlock(flags);
}
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
void zap_locks(void)
{
// if (raw_spin_is_locked(&logbuf_lock)) {
--
2.36.1
2.33.0

7
kernel-rt.spec
View File

@ -10,9 +10,9 @@
%global upstream_version 5.10
%global upstream_sublevel 0
%global devel_release 161
%global devel_release 177
%global maintenance_release .0.0
%global pkg_release .60
%global pkg_release .61
%global rt_release .rt62
%define with_debuginfo 1
@ -891,6 +891,9 @@ fi
%endif
%changelog
* Fri Dec 14 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-177.0.0.61
- update kernel-rt version to 5.10.0-177.0.0
* Mon Nov 1 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.60
- update kernel-rt version to 5.10.0-161.0.0

7
raspberrypi-kernel-rt.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 161.0.0
%global hulkrelease 177.0.0
%global debug_package %{nil}
Name: raspberrypi-kernel-rt
Version: 5.10.0
Release: %{hulkrelease}.rt62.10
Release: %{hulkrelease}.rt62.11
Summary: Linux Kernel
License: GPLv2
URL: http://www.kernel.org/
@ -172,6 +172,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/lib/modules/%{KernelVer}
%changelog
* Fri Dec 12 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-177.0.0.11
- - update preempt-RT to openEuler 5.10.0-177.0.0
* Mon Dec 30 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.10
- - update preempt-RT to openEuler 5.10.0-161.0.0