diff --git a/patches/006-kernel-update-to-4.4.205.patch b/patches/006-kernel-update-to-4.4.205.patch deleted file mode 100644 index 380f044d6d..0000000000 --- a/patches/006-kernel-update-to-4.4.205.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ab0ce1a07f7b231b609b0516e408cc17813844b1 Mon Sep 17 00:00:00 2001 -From: Sven Roederer -Date: Tue, 17 Dec 2019 12:39:39 +0100 -Subject: [PATCH] [17.01] kernel: update to 4.4.205 - -update patches for kernel 4.4.205 -* mtd_fix_cfi_cmdset_0002_status_check: seems to be implemented upstream by 9ce51a5b414a42887505a6504a2f0273b89906a5 -* debloat_proc: was changed upstream in a6d17aa291cad1d36331ba17cbcacd045381a3f1 -x86: add TSX config-options -* this options were added in 4.4.202, set defaults as for 4.9.x - -Compile tested: ar71xx-generic, ar71xx-mikrotik, mpc85xx-generic, ramips-mt7620, - ramips-mt7621, x86-generic (all buildbot-targets) - -Signed-off-by: Sven Roederer ---- - include/kernel-version.mk | 4 ++-- - ...mtd_fix_cfi_cmdset_0002_status_check.patch | 22 ------------------- - .../patches-4.4/902-debloat_proc.patch | 4 ++-- - target/linux/x86/config-4.4 | 3 +++ - 4 files changed, 7 insertions(+), 26 deletions(-) - delete mode 100644 target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch - -diff --git a/include/kernel-version.mk b/include/kernel-version.mk -index e68e01012b..13bea7bc18 100644 ---- a/include/kernel-version.mk -+++ b/include/kernel-version.mk -@@ -3,10 +3,10 @@ - LINUX_RELEASE?=1 - - LINUX_VERSION-3.18 = .43 --LINUX_VERSION-4.4 = .194 -+LINUX_VERSION-4.4 = .205 - - LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c --LINUX_KERNEL_HASH-4.4.194 = 7f63e893f1a178c25646a302ae7425423a3f1b72fc5d6895a2716e4bb6b8744f -+LINUX_KERNEL_HASH-4.4.205 = fa1f8fe9c12e18e5cda18cf759b77ae9e778e1e9006d837426c955b75bd4eaa6 - - ifdef KERNEL_PATCHVER - LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) -diff --git a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch -deleted file mode 100644 -index 040d83d4cb..0000000000 ---- a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch -+++ /dev/null -@@ -1,22 +0,0 @@ ----- a/drivers/mtd/chips/cfi_cmdset_0002.c --+++ b/drivers/mtd/chips/cfi_cmdset_0002.c --@@ -1633,8 +1633,8 @@ static int __xipram do_write_oneword(str -- break; -- } -- --- if (chip_ready(map, adr)) --- break; --+ if (chip_good(map, adr, datum)) --+ goto enable_xip; -- -- /* Latency issues. Drop the lock, wait a while and retry */ -- UDELAY(map, chip, adr, 1); --@@ -1650,6 +1650,8 @@ static int __xipram do_write_oneword(str -- -- ret = -EIO; -- } --+ --+ enable_xip: -- xip_enable(map, chip, adr); -- op_done: -- if (mode == FL_OTP_WRITE) -diff --git a/target/linux/generic/patches-4.4/902-debloat_proc.patch b/target/linux/generic/patches-4.4/902-debloat_proc.patch -index 7005280d6e..f98c31720b 100644 ---- a/target/linux/generic/patches-4.4/902-debloat_proc.patch -+++ b/target/linux/generic/patches-4.4/902-debloat_proc.patch -@@ -138,10 +138,10 @@ - #endif - #ifdef CONFIG_PROC_FS - - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); --- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops); -+- proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); - + if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) { - + proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); --+ proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops); -++ proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); - + proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); - + } - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); -diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4 -index a4a83be24c..f96a91b722 100644 ---- a/target/linux/x86/config-4.4 -+++ b/target/linux/x86/config-4.4 -@@ -422,6 +422,9 @@ CONFIG_X86_GENERIC=y - # CONFIG_X86_GX_SUSPMOD is not set - # CONFIG_X86_INTEL_MPX is not set - # CONFIG_X86_INTEL_PSTATE is not set -+CONFIG_X86_INTEL_TSX_MODE_OFF=y -+# CONFIG_X86_INTEL_TSX_MODE_ON is not set -+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set - CONFIG_X86_INTEL_USERCOPY=y - CONFIG_X86_INTERNODE_CACHE_SHIFT=6 - CONFIG_X86_INVD_BUG=y --- -2.20.1 - diff --git a/patches/007-linux-4.4.205-fix-brcm2708.patch b/patches/007-linux-4.4.205-fix-brcm2708.patch deleted file mode 100644 index ec0391f183..0000000000 --- a/patches/007-linux-4.4.205-fix-brcm2708.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/target/linux/brcm2708/patches-4.4/0079-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.4/0079-Improve-__copy_to_user-and-__copy_from_user-performa.patch -index 3de1e63d07..1ecb9aeb72 100644 ---- a/target/linux/brcm2708/patches-4.4/0079-Improve-__copy_to_user-and-__copy_from_user-performa.patch -+++ b/target/linux/brcm2708/patches-4.4/0079-Improve-__copy_to_user-and-__copy_from_user-performa.patch -@@ -252,13 +252,18 @@ See: https://github.com/raspberrypi/linux/issues/1082 - +.endm - --- a/arch/arm/lib/copy_from_user.S - +++ b/arch/arm/lib/copy_from_user.S --@@ -89,11 +89,13 @@ -+@@ -89,16 +89,18 @@ - - .text - - -ENTRY(arm_copy_from_user) - +ENTRY(__copy_from_user_std) - +WEAK(arm_copy_from_user) -+ #ifdef CONFIG_CPU_SPECTRE -+ get_thread_info r3 -+ ldr r3, [r3, #TI_ADDR_LIMIT] -+ uaccess_mask_range_ptr r1, r2, r3, ip -+ #endif - - #include "copy_template.S" - -diff --git a/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch b/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch -index 97eb130dc1..0dfe754793 100644 ---- a/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch -+++ b/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch -@@ -103,30 +103,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze - vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN); - fmxr(FPEXC, fpexc); - } --@@ -608,6 +615,7 @@ int vfp_restore_user_hwstate(struct user -- struct vfp_hard_struct *hwstate = &thread->vfpstate.hard; -- unsigned long fpexc; -- int err = 0; --+ u32 fpsid = fmrx(FPSID); -- -- /* Disable VFP to avoid corrupting the new thread state. */ -- vfp_flush_hwstate(thread); --@@ -631,8 +639,12 @@ int vfp_restore_user_hwstate(struct user -- /* Ensure the VFP is enabled. */ -- fpexc |= FPEXC_EN; -- --- /* Ensure FPINST2 is invalid and the exception flag is cleared. */ --- fpexc &= ~(FPEXC_EX | FPEXC_FP2V); --+ /* Mask FPXEC_EX and FPEXC_FP2V if not required by VFP arch */ --+ if ((fpsid & FPSID_ARCH_MASK) != (1 << FPSID_ARCH_BIT)) { --+ /* Ensure FPINST2 is invalid and the exception flag is cleared. */ --+ fpexc &= ~(FPEXC_EX | FPEXC_FP2V); --+ } --+ -- hwstate->fpexc = fpexc; -- -- __get_user_error(hwstate->fpinst, &ufp_exc->fpinst, err); --@@ -702,7 +714,8 @@ void kernel_neon_begin(void) -+@@ -702,7 +709,8 @@ void kernel_neon_begin(void) - cpu = get_cpu(); - - fpexc = fmrx(FPEXC) | FPEXC_EN; - -diff --git a/target/linux/brcm2708/bcm2710/config-4.4 b/target/linux/brcm2708/bcm2710/config-4.4 -index 5f2b76a30e..c73ed3caff 100644 ---- a/target/linux/brcm2708/bcm2710/config-4.4 -+++ b/target/linux/brcm2708/bcm2710/config-4.4 -@@ -165,6 +165,7 @@ CONFIG_GPIO_BCM_VIRT=y - CONFIG_GPIO_DEVRES=y - CONFIG_GPIO_SYSFS=y - CONFIG_HANDLE_DOMAIN_IRQ=y -+CONFIG_HARDEN_BRANCH_PREDICTOR=y - CONFIG_HARDIRQS_SW_RESEND=y - CONFIG_HAS_DMA=y - CONFIG_HAS_IOMEM=y diff --git a/patches/series b/patches/series index dd4fb43c74..e24b16d35e 100644 --- a/patches/series +++ b/patches/series @@ -4,8 +4,6 @@ 003-netifd-update-to-git-HEAD-version.patch 004-openwrt-release_use_configured_revision.patch 005-hostapd_nolegacy_by_default.patch -006-kernel-update-to-4.4.205.patch -007-linux-4.4.205-fix-brcm2708.patch 300-use_olsrd0903.patch 201-revert_olsr-status_for_olsr0903.patch 600-imagebuilder-custom-postinst-script.patch