From: John Audia <graysky@archlinux.us>
Date: Fri, 11 Mar 2022 12:15:14 +0000 (-0500)
Subject: kernel: bump 5.10 to 5.10.105
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=048f0b170296c6fc2e2076bbe7c07b4c840d31f6;p=openwrt%2Fstaging%2Fldir.git

kernel: bump 5.10 to 5.10.105

Updated default config with new sym (CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y).

Manually rebased:
    generic/hack-5.10/220-arm-gc_sections.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <graysky@archlinux.us>
---

diff --git a/include/kernel-5.10 b/include/kernel-5.10
index 201f2b0ae0..2c11b30fc2 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .104
-LINUX_KERNEL_HASH-5.10.104 = 394a9267ea8e24d0f0cfaad3439bf43abe7bcf6479dc9548e485b48a0ac562f1
+LINUX_VERSION-5.10 = .105
+LINUX_KERNEL_HASH-5.10.105 = 3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
diff --git a/target/linux/bcm27xx/patches-5.10/950-0157-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/target/linux/bcm27xx/patches-5.10/950-0157-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
index 5d2cd9691a..bc439f5c5d 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0157-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0157-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  #include <linux/personality.h>
  #include <linux/preempt.h>
  #include <linux/printk.h>
-@@ -137,6 +138,10 @@ static int c_show(struct seq_file *m, vo
+@@ -140,6 +141,10 @@ static int c_show(struct seq_file *m, vo
  {
  	int i, j;
  	bool compat = personality(current->personality) == PER_LINUX32;
@@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  
  	for_each_online_cpu(i) {
  		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-@@ -197,6 +202,26 @@ static int c_show(struct seq_file *m, vo
+@@ -200,6 +205,26 @@ static int c_show(struct seq_file *m, vo
  		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
  	}
  
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 3622901a87..578b8be764 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -3382,6 +3382,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_MIGRATION is not set
+CONFIG_HARDEN_BRANCH_HISTORY=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_MII=y
 # CONFIG_MIKROTIK is not set
 # CONFIG_MIKROTIK_RB532 is not set
diff --git a/target/linux/generic/hack-5.10/220-arm-gc_sections.patch b/target/linux/generic/hack-5.10/220-arm-gc_sections.patch
index d4f4efc505..5b36c5ebae 100644
--- a/target/linux/generic/hack-5.10/220-arm-gc_sections.patch
+++ b/target/linux/generic/hack-5.10/220-arm-gc_sections.patch
@@ -72,7 +72,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  
 --- a/arch/arm/include/asm/vmlinux.lds.h
 +++ b/arch/arm/include/asm/vmlinux.lds.h
-@@ -29,13 +29,13 @@
+@@ -42,13 +42,13 @@
  #define PROC_INFO							\
  		. = ALIGN(4);						\
  		__proc_info_begin = .;					\
@@ -88,7 +88,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  		__idmap_text_end = .;					\
  
  #define ARM_DISCARD							\
-@@ -96,12 +96,12 @@
+@@ -109,12 +109,12 @@
  	. = ALIGN(8);							\
  	.ARM.unwind_idx : {						\
  		__start_unwind_idx = .;					\
@@ -103,20 +103,21 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  		__stop_unwind_tab = .;					\
  	}
  
-@@ -112,14 +112,14 @@
- #define ARM_VECTORS							\
- 	__vectors_start = .;						\
- 	.vectors 0xffff0000 : AT(__vectors_start) {			\
--		*(.vectors)						\
-+		KEEP(*(.vectors))					\
- 	}								\
- 	. = __vectors_start + SIZEOF(.vectors);				\
- 	__vectors_end = .;						\
+@@ -126,7 +126,7 @@
+ 	__vectors_lma = .;						\
+ 	OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) {		\
+ 		.vectors {						\
+-			*(.vectors)					\
++			KEEP(*(.vectors))				\
+ 		}							\
+ 		.vectors.bhb.loop8 {					\
+ 			*(.vectors.bhb.loop8)				\
+@@ -144,7 +144,7 @@
  									\
- 	__stubs_start = .;						\
- 	.stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) {		\
+ 	__stubs_lma = .;						\
+ 	.stubs ADDR(.vectors) + 0x1000 : AT(__stubs_lma) {		\
 -		*(.stubs)						\
 +		KEEP(*(.stubs))						\
  	}								\
- 	. = __stubs_start + SIZEOF(.stubs);				\
- 	__stubs_end = .;						\
+ 	ARM_LMA(__stubs, .stubs);					\
+ 	. = __stubs_lma + SIZEOF(.stubs);				\