diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2020-10-16 01:41:17 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2020-10-16 16:56:43 +0200 |
commit | 340384a9c14521a4b391b00d69fc6887f1812467 (patch) | |
tree | 9e984105e90f5493f3cfccfccb008587fe0f9dd4 | |
parent | 1505444161c50807f8f8608afa4d767f6972ff53 (diff) |
linux: update to 4.19.151
-rw-r--r-- | mk/linux-ver.mk | 4 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 1 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch | 66 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/arc.patch (renamed from target/linux/patches/4.19.149/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/darwin-dtc.patch (renamed from target/linux/patches/4.19.149/darwin-dtc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/darwin-file2alias.patch (renamed from target/linux/patches/4.19.149/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/fec-coldfire.patch (renamed from target/linux/patches/4.19.149/fec-coldfire.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/or1k-more-ram.patch (renamed from target/linux/patches/4.19.149/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/relocs.patch (renamed from target/linux/patches/4.19.149/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.151/startup.patch (renamed from target/linux/patches/4.19.149/startup.patch) | 0 |
10 files changed, 68 insertions, 3 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 19adfde2a..37e5ce766 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -22,10 +22,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.149 +KERNEL_FILE_VER:= 4.19.151 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d9cdcb9a66942a56b91c8d4b273d15a3c5b8e59fad44b79e03362cfffaa62a00 +KERNEL_HASH:= c7b134c6d45f77df0909c225300e64379d7f9d69abd9ad73ff6a289aa2b6a36e endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) KERNEL_FILE_VER:= 4.14.200 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index c20fb0dde..6419c52bf 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -24,7 +24,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_FRV default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_CPU_ARM_ARM11MPCORE default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_CPU_ARM_CORTEX_A53 default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB -default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_ARC default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_CSKY default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_RISCV32 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_RISCV64 diff --git a/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch b/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch new file mode 100644 index 000000000..1215bb6d0 --- /dev/null +++ b/target/linux/patches/4.19.151/0001-Revert-ARC-entry-fix-potential-EFA-clobber-when-TIF_.patch @@ -0,0 +1,66 @@ +From af5e43cd88d4b7d59260de6bdacbf715e2a7ff5d Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbx@openadk.org> +Date: Fri, 16 Oct 2020 01:17:24 +0200 +Subject: [PATCH] Revert "ARC: entry: fix potential EFA clobber when + TIF_SYSCALL_TRACE" + +This reverts commit 01b636cbc4c39c7073c02c2f1dfbe8c36c11938f. + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +--- + arch/arc/kernel/entry.S | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S +index 705a68208423..85d9ea4a0acc 100644 +--- a/arch/arc/kernel/entry.S ++++ b/arch/arc/kernel/entry.S +@@ -156,6 +156,7 @@ END(EV_Extension) + tracesys: + ; save EFA in case tracer wants the PC of traced task + ; using ERET won't work since next-PC has already committed ++ lr r12, [efa] + GET_CURR_TASK_FIELD_PTR TASK_THREAD, r11 + st r12, [r11, THREAD_FAULT_ADDR] ; thread.fault_address + +@@ -198,9 +199,15 @@ tracesys_exit: + ; Breakpoint TRAP + ; --------------------------------------------- + trap_with_param: +- mov r0, r12 ; EFA in case ptracer/gdb wants stop_pc ++ ++ ; stop_pc info by gdb needs this info ++ lr r0, [efa] + mov r1, sp + ++ ; Now that we have read EFA, it is safe to do "fake" rtie ++ ; and get out of CPU exception mode ++ FAKE_RET_FROM_EXCPN ++ + ; Save callee regs in case gdb wants to have a look + ; SP will grow up by size of CALLEE Reg-File + ; NOTE: clobbers r12 +@@ -227,10 +234,6 @@ ENTRY(EV_Trap) + + EXCEPTION_PROLOGUE + +- lr r12, [efa] +- +- FAKE_RET_FROM_EXCPN +- + ;============ TRAP 1 :breakpoints + ; Check ECR for trap with arg (PROLOGUE ensures r9 has ECR) + bmsk.f 0, r9, 7 +@@ -238,6 +241,9 @@ ENTRY(EV_Trap) + + ;============ TRAP (no param): syscall top level + ++ ; First return from Exception to pure K mode (Exception/IRQs renabled) ++ FAKE_RET_FROM_EXCPN ++ + ; If syscall tracing ongoing, invoke pre-post-hooks + GET_CURR_THR_INFO_FLAGS r10 + btst r10, TIF_SYSCALL_TRACE +-- +2.11.0 + diff --git a/target/linux/patches/4.19.149/arc.patch b/target/linux/patches/4.19.151/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/4.19.149/arc.patch +++ b/target/linux/patches/4.19.151/arc.patch diff --git a/target/linux/patches/4.19.149/darwin-dtc.patch b/target/linux/patches/4.19.151/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/4.19.149/darwin-dtc.patch +++ b/target/linux/patches/4.19.151/darwin-dtc.patch diff --git a/target/linux/patches/4.19.149/darwin-file2alias.patch b/target/linux/patches/4.19.151/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/4.19.149/darwin-file2alias.patch +++ b/target/linux/patches/4.19.151/darwin-file2alias.patch diff --git a/target/linux/patches/4.19.149/fec-coldfire.patch b/target/linux/patches/4.19.151/fec-coldfire.patch index 09d8ad047..09d8ad047 100644 --- a/target/linux/patches/4.19.149/fec-coldfire.patch +++ b/target/linux/patches/4.19.151/fec-coldfire.patch diff --git a/target/linux/patches/4.19.149/or1k-more-ram.patch b/target/linux/patches/4.19.151/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.19.149/or1k-more-ram.patch +++ b/target/linux/patches/4.19.151/or1k-more-ram.patch diff --git a/target/linux/patches/4.19.149/relocs.patch b/target/linux/patches/4.19.151/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/4.19.149/relocs.patch +++ b/target/linux/patches/4.19.151/relocs.patch diff --git a/target/linux/patches/4.19.149/startup.patch b/target/linux/patches/4.19.151/startup.patch index dd27de856..dd27de856 100644 --- a/target/linux/patches/4.19.149/startup.patch +++ b/target/linux/patches/4.19.151/startup.patch |