From ae29c123c988dae5c59e33f0294cd7dc3aad401f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 11 Apr 2022 03:36:16 +0800 Subject: [PATCH] kernel: bump to 4.9.309, 4.14.275, 4.19.237 Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++++++------ .../patches-4.14/905-BCM53573-minor-hacks.patch | 2 +- .../025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 2 +- ...4.15-net-qrtr-Move-constants-to-header-file.patch | 2 +- ...-qrtr-Add-control-packet-definition-to-uapi.patch | 2 +- target/linux/generic/config-4.14 | 3 ++- target/linux/generic/config-4.19 | 3 ++- target/linux/generic/config-4.9 | 3 ++- .../linux/generic/hack-4.14/902-debloat_proc.patch | 2 +- .../linux/generic/hack-4.19/902-debloat_proc.patch | 2 +- ...lement-arch_counter_get_cntpct-to-read-the-.patch | 8 ++++---- ...ce-drivers-arch_timer-Workaround-for-Allwin.patch | 6 +++--- 12 files changed, 25 insertions(+), 22 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6ad8666132..a39695b629 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .308 -LINUX_VERSION-4.14 = .273 -LINUX_VERSION-4.19 = .236 +LINUX_VERSION-4.9 = .309 +LINUX_VERSION-4.14 = .275 +LINUX_VERSION-4.19 = .237 -LINUX_KERNEL_HASH-4.9.308 = 7be8aa7cfdbe696d1bf1e9943a1d2bd6cd8f5b6009113dfccfe6aa30f21f2e87 -LINUX_KERNEL_HASH-4.14.273 = 1bfd1b320a7167cf6cf0a8a1e9f7f1e5932b997c9041507c5aaff80b8dacbc2d -LINUX_KERNEL_HASH-4.19.236 = 002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0 +LINUX_KERNEL_HASH-4.9.309 = e86a55a89e1e28756b890b2b78f8b582d05cecb3509ff5c353e9534866468614 +LINUX_KERNEL_HASH-4.14.275 = 100a9960fb2d8e079c9feeef640715a7fb749ed728a57e427f9e2443212e58f9 +LINUX_KERNEL_HASH-4.19.237 = bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch index 4762505708..a0a893a31f 100644 --- a/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch +++ b/target/linux/bcm53xx/patches-4.14/905-BCM53573-minor-hacks.patch @@ -61,7 +61,7 @@ Signed-off-by: Rafał Miłecki #include #include #include -@@ -845,6 +846,16 @@ static void arch_timer_of_configure_rate +@@ -860,6 +861,16 @@ static void arch_timer_of_configure_rate if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) arch_timer_rate = rate; diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 1bb30ab6ca..82afb03d29 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -55,7 +55,7 @@ Cc: Kir Kolyshkin rwlock_t sk_callback_lock; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2791,6 +2791,7 @@ void sock_init_data(struct socket *sock, +@@ -2788,6 +2788,7 @@ void sock_init_data(struct socket *sock, sk->sk_max_pacing_rate = ~0U; sk->sk_pacing_rate = ~0U; diff --git a/target/linux/generic/backport-4.9/610-v4.15-net-qrtr-Move-constants-to-header-file.patch b/target/linux/generic/backport-4.9/610-v4.15-net-qrtr-Move-constants-to-header-file.patch index e684f8c4e4..894fcf73fd 100644 --- a/target/linux/generic/backport-4.9/610-v4.15-net-qrtr-Move-constants-to-header-file.patch +++ b/target/linux/generic/backport-4.9/610-v4.15-net-qrtr-Move-constants-to-header-file.patch @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h -@@ -5,6 +5,9 @@ +@@ -4,6 +4,9 @@ #include #include diff --git a/target/linux/generic/backport-4.9/611-v4.15-net-qrtr-Add-control-packet-definition-to-uapi.patch b/target/linux/generic/backport-4.9/611-v4.15-net-qrtr-Add-control-packet-definition-to-uapi.patch index 8b2448a777..ebbb3912d0 100644 --- a/target/linux/generic/backport-4.9/611-v4.15-net-qrtr-Add-control-packet-definition-to-uapi.patch +++ b/target/linux/generic/backport-4.9/611-v4.15-net-qrtr-Add-control-packet-definition-to-uapi.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h -@@ -14,4 +14,36 @@ struct sockaddr_qrtr { +@@ -13,4 +13,36 @@ struct sockaddr_qrtr { __u32 sq_port; }; diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index ba50b0051a..9cd682e11c 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -1656,7 +1656,7 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_HAMACHI is not set # CONFIG_HAMRADIO is not set # CONFIG_HAPPYMEAL is not set -# CONFIG_HARDEN_BRANCH_HISTORY is not set +CONFIG_HARDEN_BRANCH_HISTORY=y # CONFIG_HARDENED_USERCOPY is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set # CONFIG_HARDLOCKUP_DETECTOR is not set @@ -2752,6 +2752,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set # CONFIG_MKISS is not set +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set # CONFIG_MLX5_CORE is not set diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index eef43c9f67..658bcb09db 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -1737,7 +1737,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512 # CONFIG_HAMACHI is not set # CONFIG_HAMRADIO is not set # CONFIG_HAPPYMEAL is not set -# CONFIG_HARDEN_BRANCH_HISTORY is not set +CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_FALLBACK is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set @@ -2880,6 +2880,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_MKISS is not set # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index e3935582c0..8eae9b4e7b 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -1465,7 +1465,7 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_HAMACHI is not set # CONFIG_HAMRADIO is not set # CONFIG_HAPPYMEAL is not set -# CONFIG_HARDEN_BRANCH_HISTORY is not set +CONFIG_HARDEN_BRANCH_HISTORY=y # CONFIG_HARDENED_USERCOPY is not set # CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_HAVE_AOUT is not set @@ -2478,6 +2478,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_W6692 is not set +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_MKISS is not set # CONFIG_MLX4_CORE is not set # CONFIG_MLX4_EN is not set diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index e6b761d3c0..a517b6fa6a 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3430,6 +3430,8 @@ static __net_initdata struct pernet_oper +@@ -3427,6 +3427,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index 52096144b2..dfe023bee3 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3532,6 +3532,8 @@ static __net_initdata struct pernet_oper +@@ -3529,6 +3529,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/sunxi/patches-4.14/031-arm64-Implement-arch_counter_get_cntpct-to-read-the-.patch b/target/linux/sunxi/patches-4.14/031-arm64-Implement-arch_counter_get_cntpct-to-read-the-.patch index 60f0cb6c9b..937d3e591e 100644 --- a/target/linux/sunxi/patches-4.14/031-arm64-Implement-arch_counter_get_cntpct-to-read-the-.patch +++ b/target/linux/sunxi/patches-4.14/031-arm64-Implement-arch_counter_get_cntpct-to-read-the-.patch @@ -84,7 +84,7 @@ Signed-off-by: Christoffer Dall static u64 notrace arm64_858921_read_cntvct_el0(void) { u64 old, new; -@@ -346,6 +365,7 @@ static const struct arch_timer_erratum_w +@@ -353,6 +372,7 @@ static const struct arch_timer_erratum_w .desc = "Freescale erratum a005858", .read_cntp_tval_el0 = fsl_a008585_read_cntp_tval_el0, .read_cntv_tval_el0 = fsl_a008585_read_cntv_tval_el0, @@ -92,7 +92,7 @@ Signed-off-by: Christoffer Dall .read_cntvct_el0 = fsl_a008585_read_cntvct_el0, .set_next_event_phys = erratum_set_next_event_tval_phys, .set_next_event_virt = erratum_set_next_event_tval_virt, -@@ -358,6 +378,7 @@ static const struct arch_timer_erratum_w +@@ -365,6 +385,7 @@ static const struct arch_timer_erratum_w .desc = "HiSilicon erratum 161010101", .read_cntp_tval_el0 = hisi_161010101_read_cntp_tval_el0, .read_cntv_tval_el0 = hisi_161010101_read_cntv_tval_el0, @@ -100,7 +100,7 @@ Signed-off-by: Christoffer Dall .read_cntvct_el0 = hisi_161010101_read_cntvct_el0, .set_next_event_phys = erratum_set_next_event_tval_phys, .set_next_event_virt = erratum_set_next_event_tval_virt, -@@ -368,6 +389,7 @@ static const struct arch_timer_erratum_w +@@ -375,6 +396,7 @@ static const struct arch_timer_erratum_w .desc = "HiSilicon erratum 161010101", .read_cntp_tval_el0 = hisi_161010101_read_cntp_tval_el0, .read_cntv_tval_el0 = hisi_161010101_read_cntv_tval_el0, @@ -108,7 +108,7 @@ Signed-off-by: Christoffer Dall .read_cntvct_el0 = hisi_161010101_read_cntvct_el0, .set_next_event_phys = erratum_set_next_event_tval_phys, .set_next_event_virt = erratum_set_next_event_tval_virt, -@@ -378,6 +400,7 @@ static const struct arch_timer_erratum_w +@@ -385,6 +407,7 @@ static const struct arch_timer_erratum_w .match_type = ate_match_local_cap_id, .id = (void *)ARM64_WORKAROUND_858921, .desc = "ARM erratum 858921", diff --git a/target/linux/sunxi/patches-4.14/100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch b/target/linux/sunxi/patches-4.14/100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch index 6da300312f..79e94c6fd2 100644 --- a/target/linux/sunxi/patches-4.14/100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch +++ b/target/linux/sunxi/patches-4.14/100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch @@ -173,7 +173,7 @@ Signed-off-by: Daniel Lezcano select TIMER_OF if OF --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c -@@ -317,6 +317,48 @@ static u64 notrace arm64_858921_read_cnt +@@ -324,6 +324,48 @@ static u64 notrace arm64_1188873_read_cn } #endif @@ -222,8 +222,8 @@ Signed-off-by: Daniel Lezcano #ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, timer_unstable_counter_workaround); -@@ -404,6 +446,19 @@ static const struct arch_timer_erratum_w - .read_cntvct_el0 = arm64_858921_read_cntvct_el0, +@@ -419,6 +461,19 @@ static const struct arch_timer_erratum_w + .read_cntvct_el0 = arm64_1188873_read_cntvct_el0, }, #endif +#ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1