From c83233b0525e73c1e0d4525686388c3eee027267 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 21 Jan 2021 20:51:19 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.91 (#6225) --- include/kernel-version.mk | 4 ++-- package/boot/uboot-envtools/Makefile | 2 +- package/boot/uboot-envtools/files/ath79 | 17 ++++++++++++++ package/boot/uboot-envtools/files/ipq40xx | 12 +++++++++- package/boot/uboot-envtools/files/ipq806x | 1 + package/boot/uboot-envtools/files/ramips | 3 ++- package/kernel/linux/modules/other.mk | 11 ++++------ .../generic/hack-5.4/204-module_strip.patch | 4 ++-- .../generic/hack-5.4/221-module_exports.patch | 2 +- .../hack-5.4/249-udp-tunnel-selection.patch | 11 ++++++++++ .../hack-5.4/904-debloat_dma_buf.patch | 2 +- .../hack-5.4/999-thermal-tristate.patch | 11 ---------- .../530-jffs2_make_lzma_available.patch | 2 +- ...-netfilter_optional_tcp_window_check.patch | 4 ++-- target/linux/ipq806x/config-5.4 | 1 + .../900-arm-add-cmdline-override.patch | 22 +++++++++---------- .../patches-5.4/997-device_tree_cmdline.patch | 4 ++-- ...5-usb-dwc3-add-otg-properties-update.patch | 4 ++-- ...-usb-role-switch-class-support-for-d.patch | 2 +- ...karound-for-host-mode-VBUS-glitch-wh.patch | 4 ++-- .../0303-mtd-spinand-disable-on-die-ECC.patch | 4 ++-- ...agate-resolved-link-config-via-mac_l.patch | 4 ++-- ...e-resolved-link-config-via-mac_link_.patch | 2 +- ...reservation-in-bootmem_init-for-cert.patch | 6 ++--- ...013-owrt-hack-fix-mt7688-cache-issue.patch | 4 ++-- .../ramips/patches-5.4/998-thermal-bool.patch | 11 ---------- target/linux/x86/config-5.4 | 22 +++++++++---------- target/linux/x86/generic/config-5.4 | 1 + 28 files changed, 97 insertions(+), 80 deletions(-) create mode 100644 target/linux/generic/hack-5.4/249-udp-tunnel-selection.patch delete mode 100644 target/linux/generic/hack-5.4/999-thermal-tristate.patch delete mode 100644 target/linux/ramips/patches-5.4/998-thermal-bool.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f25334b5b..43e48b8f4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.14 = .195 LINUX_VERSION-4.19 = .138 -LINUX_VERSION-5.4 = .86 +LINUX_VERSION-5.4 = .91 LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 -LINUX_KERNEL_HASH-5.4.86 = eb36b5fc6ef7b953acba0a3e62d872e0330c4d34b38d58f5714493a4fe3b0e8b +LINUX_KERNEL_HASH-5.4.91 = 0e0161bb034b9ba59e58a20985e49ecfb38104586602f53f37b382f508fc5c17 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 4a86376f7..398f37de1 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot PKG_VERSION:=2020.04 -PKG_RELEASE:=6 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 2c6a730fb..4b8476681 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -24,9 +24,12 @@ arduino,yun|\ buffalo,bhr-4grv2|\ devolo,magic-2-wifi|\ engenius,eap300-v2|\ +engenius,eap350-v1|\ +engenius,eap600|\ engenius,ecb1200|\ engenius,ecb1750|\ engenius,ecb350-v1|\ +engenius,ecb600|\ engenius,enh202-v1|\ engenius,ens202ext-v1|\ engenius,enstationac-v1|\ @@ -45,6 +48,13 @@ netgear,wnr2200-16m|\ netgear,wnr612-v2|\ ocedo,koala|\ ocedo,raccoon|\ +openmesh,mr600-v1|\ +openmesh,mr600-v2|\ +openmesh,mr900-v1|\ +openmesh,mr900-v2|\ +openmesh,mr1750-v1|\ +openmesh,mr1750-v2|\ +openmesh,om5p|\ openmesh,om5p-ac-v2|\ samsung,wam250|\ ubnt,nanostation-m|\ @@ -82,6 +92,13 @@ netgear,wndr4300tn|\ netgear,wndr4300sw) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" ;; +openmesh,om2p-v2|\ +openmesh,om2p-v4|\ +openmesh,om2p-hs-v1|\ +openmesh,om2p-hs-v2|\ +openmesh,om2p-hs-v3|\ +openmesh,om2p-hs-v4|\ +openmesh,om2p-lc|\ plasmacloud,pa300|\ plasmacloud,pa300e) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000" diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx index 27aab6b28..b24cbf979 100644 --- a/package/boot/uboot-envtools/files/ipq40xx +++ b/package/boot/uboot-envtools/files/ipq40xx @@ -32,13 +32,23 @@ ubootenv_mtdinfo () { case "$board" in alfa-network,ap120c-ac |\ +devolo,magic-2-wifi-next |\ edgecore,ecw5211 |\ +glinet,gl-ap1300 |\ glinet,gl-b1300 |\ luma,wrtq-329acn |\ openmesh,a42 |\ -openmesh,a62) +openmesh,a62 |\ +plasmacloud,pa1200 |\ +plasmacloud,pa2200) ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x10000" "0x10000" ;; +aruba,ap-303) + ubootenv_add_uci_config "/dev/mtd13" "0x0" "0x10000" "0x10000" + ;; +aruba,ap-365) + ubootenv_add_uci_config "/dev/mtd8" "0x0" "0x10000" "0x10000" + ;; buffalo,wtr-m2133hp) ubootenv_add_uci_config "/dev/mtd8" "0x0" "0x40000" "0x20000" ;; diff --git a/package/boot/uboot-envtools/files/ipq806x b/package/boot/uboot-envtools/files/ipq806x index 6aae089ac..96a4ee645 100644 --- a/package/boot/uboot-envtools/files/ipq806x +++ b/package/boot/uboot-envtools/files/ipq806x @@ -45,6 +45,7 @@ qcom,ipq8064-ap148 |\ qcom,ipq8064-db149) ubootenv_add_uci_config $(ubootenv_mtdinfo) ;; +ubnt,unifi-ac-hd |\ zyxel,nbg6817) ubootenv_add_uci_config "/dev/mtdblock9" "0x0" "0x10000" "0x10000" ;; diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index bfb8b4023..cb2e3da28 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -17,7 +17,8 @@ alfa-network,ac1200rm|\ alfa-network,awusfree1|\ alfa-network,quad-e4g|\ alfa-network,r36m-e4g|\ -alfa-network,tube-e4g) +alfa-network,tube-e4g|\ +engenius,esr600h) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x1000" ;; allnet,all0256n-4m|\ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 6eb940483..e17305fe1 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1087,11 +1087,11 @@ $(eval $(call KernelPackage,random-tpm)) define KernelPackage/thermal SUBMENU:=$(OTHER_MENU) - TITLE:=Generic Thermal sysfs driver + TITLE:=Thermal driver DEPENDS:=+kmod-hwmon-core HIDDEN:=1 KCONFIG:= \ - CONFIG_THERMAL \ + CONFIG_THERMAL=y \ CONFIG_THERMAL_OF=y \ CONFIG_CPU_THERMAL=y \ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y \ @@ -1103,14 +1103,11 @@ define KernelPackage/thermal CONFIG_THERMAL_GOV_USER_SPACE=n \ CONFIG_THERMAL_HWMON=y \ CONFIG_THERMAL_EMULATION=n - FILES:=$(LINUX_DIR)/drivers/thermal/thermal_sys.ko - AUTOLOAD:=$(call AutoProbe,thermal_sys) endef define KernelPackage/thermal/description - Generic Thermal Sysfs driver offers a generic mechanism for thermal - management. Usually it's made up of one or more thermal zone and cooling - device. + Thermal driver offers a generic mechanism for thermal management. + Usually it's made up of one or more thermal zone and cooling device. endef $(eval $(call KernelPackage,thermal)) diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch index f311b176f..2b4435f93 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3127,9 +3127,11 @@ static int setup_load_info(struct load_i +@@ -3125,9 +3125,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3150,6 +3152,7 @@ static int check_modinfo(struct module * +@@ -3148,6 +3150,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.4/221-module_exports.patch b/target/linux/generic/hack-5.4/221-module_exports.patch index f651cd902..4f805cf7e 100644 --- a/target/linux/generic/hack-5.4/221-module_exports.patch +++ b/target/linux/generic/hack-5.4/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -885,6 +895,8 @@ +@@ -888,6 +898,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/hack-5.4/249-udp-tunnel-selection.patch b/target/linux/generic/hack-5.4/249-udp-tunnel-selection.patch new file mode 100644 index 000000000..2c74298df --- /dev/null +++ b/target/linux/generic/hack-5.4/249-udp-tunnel-selection.patch @@ -0,0 +1,11 @@ +--- a/net/ipv4/Kconfig ++++ b/net/ipv4/Kconfig +@@ -315,7 +315,7 @@ config NET_IPVTI + on top. + + config NET_UDP_TUNNEL +- tristate ++ tristate "IP: UDP tunneling support" + select NET_IP_TUNNEL + default n + diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index a5713a67e..7c67478fc 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau selftest.o \ --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -1300,4 +1300,5 @@ static void __exit dma_buf_deinit(void) +@@ -1313,4 +1313,5 @@ static void __exit dma_buf_deinit(void) dma_buf_uninit_debugfs(); kern_unmount(dma_buf_mnt); } diff --git a/target/linux/generic/hack-5.4/999-thermal-tristate.patch b/target/linux/generic/hack-5.4/999-thermal-tristate.patch deleted file mode 100644 index 8a207c8ea..000000000 --- a/target/linux/generic/hack-5.4/999-thermal-tristate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -4,7 +4,7 @@ - # - - menuconfig THERMAL -- bool "Generic Thermal sysfs driver" -+ tristate "Generic Thermal sysfs driver" - help - Generic Thermal Sysfs driver offers a generic mechanism for - thermal management. Usually it's made up of one or more thermal diff --git a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch index eb0e51d57..f49768855 100644 --- a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch @@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis +} --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c -@@ -377,14 +377,41 @@ static int __init init_jffs2_fs(void) +@@ -380,14 +380,41 @@ static int __init init_jffs2_fs(void) BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); diff --git a/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch index 711ffcd83..288133772 100644 --- a/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau static bool enable_hooks __read_mostly; MODULE_PARM_DESC(enable_hooks, "Always enable conntrack hooks"); module_param(enable_hooks, bool, 0000); -@@ -646,6 +649,7 @@ enum nf_ct_sysctl_index { +@@ -649,6 +652,7 @@ enum nf_ct_sysctl_index { NF_SYSCTL_CT_PROTO_TIMEOUT_GRE_STREAM, #endif @@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau __NF_SYSCTL_CT_LAST_SYSCTL, }; -@@ -972,6 +976,13 @@ static struct ctl_table nf_ct_sysctl_tab +@@ -975,6 +979,13 @@ static struct ctl_table nf_ct_sysctl_tab .proc_handler = proc_dointvec_jiffies, }, #endif diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4 index 568c5df39..ab547061c 100644 --- a/target/linux/ipq806x/config-5.4 +++ b/target/linux/ipq806x/config-5.4 @@ -78,6 +78,7 @@ CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_QCOM=y CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE_OVERRIDE=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_QCOM=y CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch index 60b160ae6..49cd68b68 100644 --- a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch @@ -1,20 +1,20 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1838,6 +1838,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL - Only command line ATAG will be processed, the rest of the ATAGs - sent by bootloader will be ignored. +@@ -1840,6 +1840,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL -+config CMDLINE_OVERRIDE -+ bool "Use alternative cmdline from device tree" -+ help -+ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can -+ be used, this is not a good option for kernels that are shared across -+ devices. This setting enables using "chosen/cmdline-override" as the -+ cmdline if it exists in the device tree. -+ endchoice ++config CMDLINE_OVERRIDE ++ bool "Use alternative cmdline from device tree" ++ help ++ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can ++ be used, this is not a good option for kernels that are shared across ++ devices. This setting enables using "chosen/cmdline-override" as the ++ cmdline if it exists in the device tree. ++ config CMDLINE + string "Default kernel command string" + default "" --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns diff --git a/target/linux/ipq806x/patches-5.4/997-device_tree_cmdline.patch b/target/linux/ipq806x/patches-5.4/997-device_tree_cmdline.patch index 3cc032fdd..b6b1b0476 100644 --- a/target/linux/ipq806x/patches-5.4/997-device_tree_cmdline.patch +++ b/target/linux/ipq806x/patches-5.4/997-device_tree_cmdline.patch @@ -8,5 +8,5 @@ + if (p != NULL && l > 0) + strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); - /* - * CONFIG_CMDLINE is meant to be a default in case nothing else + /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different + * device tree option of chosen/bootargs-override. This is diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch index 95f8af1ee..22d8f2bac 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch @@ -36,7 +36,7 @@ Signed-off-by: Peter Chen dwc->sysdev_is_parent = device_property_read_bool(dev, --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -954,6 +954,7 @@ struct dwc3_scratchpad_array { +@@ -955,6 +955,7 @@ struct dwc3_scratchpad_array { * @nr_scratch: number of scratch buffers * @u1u2: only used on revisions <1.83a for workaround * @maximum_speed: maximum speed requested (mainly for testing purposes) @@ -44,7 +44,7 @@ Signed-off-by: Peter Chen * @revision: revision register contents * @version_type: VERSIONTYPE register contents, a sub release of a revision * @dr_mode: requested mode of operation -@@ -1110,6 +1111,7 @@ struct dwc3 { +@@ -1111,6 +1112,7 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch index b8f0c6a2c..4e6f12869 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch @@ -23,7 +23,7 @@ Signed-off-by: Li Jun #include #include -@@ -1095,6 +1096,7 @@ struct dwc3 { +@@ -1096,6 +1097,7 @@ struct dwc3 { void __iomem *regs; size_t regs_size; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch index a8d23623b..82e2a25e2 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch @@ -44,7 +44,7 @@ Reviewed-by: Peter Chen --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -1047,6 +1047,8 @@ struct dwc3_scratchpad_array { +@@ -1048,6 +1048,8 @@ struct dwc3_scratchpad_array { * 3 - Reserved * @dis_metastability_quirk: set to disable metastability quirk. * @dis_split_quirk: set to disable split boundary. @@ -53,7 +53,7 @@ Reviewed-by: Peter Chen * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. */ -@@ -1242,6 +1244,8 @@ struct dwc3 { +@@ -1243,6 +1245,8 @@ struct dwc3 { unsigned dis_split_quirk:1; diff --git a/target/linux/mediatek/patches-5.4/0303-mtd-spinand-disable-on-die-ECC.patch b/target/linux/mediatek/patches-5.4/0303-mtd-spinand-disable-on-die-ECC.patch index 56b9585d7..5c18ea0f7 100644 --- a/target/linux/mediatek/patches-5.4/0303-mtd-spinand-disable-on-die-ECC.patch +++ b/target/linux/mediatek/patches-5.4/0303-mtd-spinand-disable-on-die-ECC.patch @@ -11,7 +11,7 @@ Signed-off-by: Xiangsheng Hou --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -495,7 +495,7 @@ static int spinand_mtd_read(struct mtd_i +@@ -491,7 +491,7 @@ static int spinand_mtd_read(struct mtd_i int ret = 0; if (ops->mode != MTD_OPS_RAW && spinand->eccinfo.ooblayout) @@ -20,7 +20,7 @@ Signed-off-by: Xiangsheng Hou mutex_lock(&spinand->lock); -@@ -543,7 +543,7 @@ static int spinand_mtd_write(struct mtd_ +@@ -539,7 +539,7 @@ static int spinand_mtd_write(struct mtd_ int ret = 0; if (ops->mode != MTD_OPS_RAW && mtd->ooblayout) diff --git a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch index 96fa3be1e..fc987e8e9 100644 --- a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch +++ b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch @@ -83,7 +83,7 @@ Signed-off-by: David S. Miller /* Queue modes */ #define MVPP2_QDIST_SINGLE_MODE 0 -@@ -3467,8 +3470,9 @@ static void mvpp2_start_dev(struct mvpp2 +@@ -3468,8 +3471,9 @@ static void mvpp2_start_dev(struct mvpp2 .interface = port->phy_interface, }; mvpp2_mac_config(&port->phylink_config, MLO_AN_INBAND, &state); @@ -95,7 +95,7 @@ Signed-off-by: David S. Miller } netif_tx_start_all_queues(port->dev); -@@ -5126,8 +5130,11 @@ static void mvpp2_mac_config(struct phyl +@@ -5139,8 +5143,11 @@ static void mvpp2_mac_config(struct phyl mvpp2_port_enable(port); } diff --git a/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch b/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch index e693a17d2..7a34dbad6 100644 --- a/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch +++ b/target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch @@ -51,7 +51,7 @@ Signed-off-by: David S. Miller struct ethtool_eee *p = &priv->dev->ports[port].eee; --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c -@@ -1518,7 +1518,9 @@ static void gswip_phylink_mac_link_down( +@@ -1508,7 +1508,9 @@ static void gswip_phylink_mac_link_down( static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface, diff --git a/target/linux/ramips/patches-5.4/0003-MIPS-Fix-memory-reservation-in-bootmem_init-for-cert.patch b/target/linux/ramips/patches-5.4/0003-MIPS-Fix-memory-reservation-in-bootmem_init-for-cert.patch index fa923f182..63429f49b 100644 --- a/target/linux/ramips/patches-5.4/0003-MIPS-Fix-memory-reservation-in-bootmem_init-for-cert.patch +++ b/target/linux/ramips/patches-5.4/0003-MIPS-Fix-memory-reservation-in-bootmem_init-for-cert.patch @@ -16,7 +16,7 @@ Signed-off-by: Tobias Wolf --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -285,6 +285,8 @@ static unsigned long __init init_initrd( +@@ -287,6 +287,8 @@ static unsigned long __init init_initrd( * Initialize the bootmem allocator. It also setup initrd related data * if needed. */ @@ -25,7 +25,7 @@ Signed-off-by: Tobias Wolf #if defined(CONFIG_SGI_IP27) || (defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_NUMA)) static void __init bootmem_init(void) -@@ -323,7 +325,7 @@ static void __init bootmem_init(void) +@@ -325,7 +327,7 @@ static void __init bootmem_init(void) /* * Reserve any memory between the start of RAM and PHYS_OFFSET */ @@ -34,7 +34,7 @@ Signed-off-by: Tobias Wolf memblock_reserve(PHYS_OFFSET, ramstart - PHYS_OFFSET); if (PFN_UP(ramstart) > ARCH_PFN_OFFSET) { -@@ -384,8 +386,6 @@ static void __init bootmem_init(void) +@@ -386,8 +388,6 @@ static void __init bootmem_init(void) #endif /* CONFIG_SGI_IP27 */ diff --git a/target/linux/ramips/patches-5.4/0013-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-5.4/0013-owrt-hack-fix-mt7688-cache-issue.patch index 6b1cc1515..bedea1450 100644 --- a/target/linux/ramips/patches-5.4/0013-owrt-hack-fix-mt7688-cache-issue.patch +++ b/target/linux/ramips/patches-5.4/0013-owrt-hack-fix-mt7688-cache-issue.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -652,8 +652,6 @@ static void __init arch_mem_init(char ** +@@ -723,8 +723,6 @@ static void __init arch_mem_init(char ** memblock_reserve(crashk_res.start, crashk_res.end - crashk_res.start + 1); #endif @@ -19,7 +19,7 @@ Signed-off-by: John Crispin /* * In order to reduce the possibility of kernel panic when failed to * get IO TLB memory under CONFIG_SWIOTLB, it is better to allocate -@@ -770,6 +768,7 @@ void __init setup_arch(char **cmdline_p) +@@ -841,6 +839,7 @@ void __init setup_arch(char **cmdline_p) cpu_cache_init(); paging_init(); diff --git a/target/linux/ramips/patches-5.4/998-thermal-bool.patch b/target/linux/ramips/patches-5.4/998-thermal-bool.patch deleted file mode 100644 index ba05101d7..000000000 --- a/target/linux/ramips/patches-5.4/998-thermal-bool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -4,7 +4,7 @@ - # - - menuconfig THERMAL -- tristate "Generic Thermal sysfs driver" -+ bool "Generic Thermal sysfs driver" - help - Generic Thermal Sysfs driver offers a generic mechanism for - thermal management. Usually it's made up of one or more thermal diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index 9428d314c..10810b0b8 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -115,6 +115,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y @@ -153,6 +154,11 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_DMI_SYSFS=y CONFIG_DNOTIFY=y # CONFIG_DPTF_POWER is not set +# CONFIG_DRM_I915_DEBUG_MMIO is not set +# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +CONFIG_DRM_I915_FORCE_PROBE="" +CONFIG_DRM_I915_SPIN_REQUEST=5 +CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 CONFIG_DUMMY_CONSOLE=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set @@ -160,6 +166,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y # CONFIG_EDD is not set CONFIG_EFI_EARLYCON=y +# CONFIG_EFI_RCI2_TABLE is not set # CONFIG_EISA is not set # CONFIG_EUROTECH_WDT is not set CONFIG_EXT4_FS=y @@ -207,6 +214,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_VDSO_32=y # CONFIG_GEOS is not set CONFIG_GLOB=y +# CONFIG_HALTPOLL_CPUIDLE is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -294,6 +302,7 @@ CONFIG_HW_RANDOM_VIA=y CONFIG_HZ=250 CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y +# CONFIG_I2C_AMD_MP2 is not set CONFIG_I8253_LOCK=y # CONFIG_I8K is not set # CONFIG_IB700_WDT is not set @@ -306,6 +315,7 @@ CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y # CONFIG_INTEL_IPS is not set +# CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_PCH_THERMAL is not set # CONFIG_INTEL_PMC_IPC is not set @@ -511,6 +521,7 @@ CONFIG_USER_STACKTRACE_SUPPORT=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_VGA_CONSOLE=y # CONFIG_VIA_WDT is not set +# CONFIG_VIRTIO_PMEM is not set # CONFIG_VMWARE_VMCI is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y @@ -589,14 +600,3 @@ CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_X86=y CONFIG_ZLIB_INFLATE=y -# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set -# CONFIG_HALTPOLL_CPUIDLE is not set -# CONFIG_EFI_RCI2_TABLE is not set -# CONFIG_INTEL_MEI_HDCP is not set -# CONFIG_I2C_AMD_MP2 is not set -CONFIG_DRM_I915_FORCE_PROBE="" -CONFIG_DRM_I915_SPIN_REQUEST=5 -CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 -# CONFIG_DRM_I915_DEBUG_MMIO is not set -# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set -# CONFIG_VIRTIO_PMEM is not set diff --git a/target/linux/x86/generic/config-5.4 b/target/linux/x86/generic/config-5.4 index ada81ce04..edccf8751 100644 --- a/target/linux/x86/generic/config-5.4 +++ b/target/linux/x86/generic/config-5.4 @@ -119,6 +119,7 @@ CONFIG_EFIVAR_FS=m # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set +# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set CONFIG_EFI_ESRT=y # CONFIG_EFI_FAKE_MEMMAP is not set # CONFIG_EFI_PGT_DUMP is not set