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

RT:update to 208

Browse Source
This commit is contained in:
zhangyu 2024-06-18 18:11:07 +08:00
parent b8810cc87c
commit 47d41dbb8e
4 changed files with 830 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1,22 +1,22 @@
From 0026e130f88770f45b00f52ba1374dd90b8be0f0 Mon Sep 17 00:00:00 2001 From b17c5ed418d6cdd498aaa2b4bb29df1d640ba8ad Mon Sep 17 00:00:00 2001
From: liyulei <liyulei@kylinos.cn> From: zhangyu <zhangyu4@kylinos.cn>
Date: Mon, 6 Feb 2023 18:04:41 +0800 Date: Tue, 18 Jun 2024 12:59:41 +0800
Subject: [PATCH 2/2] modify openeuler_defconfig for rt62 Subject: [PATCH 2/2] zhy2
--- ---
arch/arm64/configs/openeuler_defconfig | 5 +++-- arch/arm64/configs/openeuler_defconfig | 5 +++--
arch/arm64/kernel/fpsimd.c | 4 ++-- 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 +++++++++++++--- arch/x86/include/asm/preempt.h | 16 +++++++++++++---
include/linux/printk.h | 2 +- include/linux/printk.h | 2 +-
kernel/printk/printk.c | 2 +- kernel/printk/printk.c | 2 +-
6 files changed, 24 insertions(+), 12 deletions(-) 6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 30384eacad4f..b0ed4a9b3058 100644 index 05b50ca38..5baa109a4 100644
--- a/arch/arm64/configs/openeuler_defconfig --- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig
@@ -74,6 +74,7 @@ CONFIG_HIGH_RES_TIMERS=y @@ -87,6 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
@ -24,16 +24,16 @@ index 30384eacad4f..b0ed4a9b3058 100644
# #
# CPU/Task time and stats accounting # CPU/Task time and stats accounting
@@ -733,7 +734,7 @@ CONFIG_ACPI_MPAM=y @@ -772,7 +773,7 @@ CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PPTT=y CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y -CONFIG_VIRTUALIZATION=y
+# CONFIG_VIRTUALIZATION is not set +# CONFIG_VIRTUALIZATION is not set
CONFIG_KVM=y CONFIG_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_CVM_HOST=y
CONFIG_HAVE_KVM_IRQFD=y CONFIG_CVM_GUEST=y
@@ -1125,7 +1126,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y @@ -1174,7 +1175,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_GUP_BENCHMARK is not set # CONFIG_GUP_BENCHMARK is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_ARCH_HAS_PTE_SPECIAL=y
@ -43,10 +43,10 @@ index 30384eacad4f..b0ed4a9b3058 100644
CONFIG_MEMORY_RELIABLE=y CONFIG_MEMORY_RELIABLE=y
# CONFIG_CLEAR_FREELIST_PAGE is not set # CONFIG_CLEAR_FREELIST_PAGE is not set
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 84520f11667d..aa631771e0dc 100644 index 53753ae47..bcdd1bf20 100644
--- a/arch/arm64/kernel/fpsimd.c --- a/arch/arm64/kernel/fpsimd.c
+++ b/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) static void get_cpu_fpsimd_context(void)
{ {
@ -55,7 +55,7 @@ index 84520f11667d..aa631771e0dc 100644
__get_cpu_fpsimd_context(); __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) static void put_cpu_fpsimd_context(void)
{ {
__put_cpu_fpsimd_context(); __put_cpu_fpsimd_context();
@ -65,22 +65,23 @@ index 84520f11667d..aa631771e0dc 100644
static bool have_cpu_fpsimd_context(void) static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index 5ada612f1d75..685a49ca1fef 100644 index f3b810d0c..4494a5785 100644
--- a/arch/x86/configs/openeuler_defconfig --- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig
@@ -89,9 +89,10 @@ CONFIG_NO_HZ=y @@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
# end of Timers subsystem # end of Timers subsystem
-CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set # CONFIG_PREEMPT is not set
-
+CONFIG_PREEMPT_RT=y +CONFIG_PREEMPT_RT=y
# #
# CPU/Task time and stats accounting # CPU/Task time and stats accounting
@@ -206,7 +207,7 @@ CONFIG_HAVE_UID16=y #
@@ -217,7 +217,7 @@ CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y CONFIG_BPF=y
@ -89,7 +90,7 @@ index 5ada612f1d75..685a49ca1fef 100644
CONFIG_UID16=y CONFIG_UID16=y
CONFIG_MULTIUSER=y CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y CONFIG_SGETMASK_SYSCALL=y
@@ -735,7 +736,7 @@ CONFIG_KVM_COMPAT=y @@ -758,7 +758,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_NO_POLL=y CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_XFER_TO_GUEST_WORK=y
@ -99,7 +100,7 @@ index 5ada612f1d75..685a49ca1fef 100644
CONFIG_KVM_INTEL=m CONFIG_KVM_INTEL=m
CONFIG_X86_SGX_KVM=y CONFIG_X86_SGX_KVM=y
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h 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 --- a/arch/x86/include/asm/preempt.h
+++ b/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) @@ -134,10 +134,8 @@ static __always_inline bool should_resched(int preempt_offset)
@ -132,7 +133,7 @@ index a3b73de276c3..dda9ec24fdc1 100644
+ +
#endif /* __ASM_PREEMPT_H */ #endif /* __ASM_PREEMPT_H */
diff --git a/include/linux/printk.h b/include/linux/printk.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 --- a/include/linux/printk.h
+++ b/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, ...); @@ -241,7 +241,7 @@ __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
@ -145,18 +146,18 @@ index 9331b131ba25..23946f4828b2 100644
#else #else
static inline void zap_locks(void) { } static inline void zap_locks(void) { }
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e95b00f24c75..59bd804e662a 100644 index f068738c7..82d58ad08 100644
--- a/kernel/printk/printk.c --- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c +++ b/kernel/printk/printk.c
@@ -1813,7 +1813,7 @@ static void print_sync_until(struct console *con, u64 seq) @@ -1821,7 +1821,7 @@ static void print_sync_until(struct console *con, u64 seq)
console_atomic_unlock(flags); console_atomic_unlock(flags);
} }
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI) -#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT) +#if 0//(defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
void zap_locks(void) void zap_locks(void)
{ {
// if (raw_spin_is_locked(&logbuf_lock)) { // if (raw_spin_is_locked(&logbuf_lock)) {
-- --
2.36.1 2.41.0

7
kernel-rt.spec
View File

@ -10,9 +10,9 @@
%global upstream_version 5.10 %global upstream_version 5.10
%global upstream_sublevel 0 %global upstream_sublevel 0
%global devel_release 161 %global devel_release 208
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .60 %global pkg_release .61
%global rt_release .rt62 %global rt_release .rt62
%define with_debuginfo 1 %define with_debuginfo 1
@ -891,6 +891,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jun 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-208.0.0.61
- update kernel-rt version to 5.10.0-208.0.0
* Mon Nov 1 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.60 * 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 - 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 KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 161.0.0 %global hulkrelease 208.0.0
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-kernel-rt Name: raspberrypi-kernel-rt
Version: 5.10.0 Version: 5.10.0
Release: %{hulkrelease}.rt62.10 Release: %{hulkrelease}.rt62.11
Summary: Linux Kernel Summary: Linux Kernel
License: GPLv2 License: GPLv2
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -172,6 +172,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/lib/modules/%{KernelVer} /lib/modules/%{KernelVer}
%changelog %changelog
* Tue Jun 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-208.0.0.11
- - update preempt-RT to openEuler 5.10.0-208.0.0
* Mon Dec 30 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.10 * 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 - - update preempt-RT to openEuler 5.10.0-161.0.0