From bb92ec6dfc37249ca08f26b80aa1bc5407edddd3 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Sat, 9 Jul 2022 01:05:05 +0800 Subject: [PATCH] kernel: 5.18: refresh patches (#9714) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- .../generic/hack-5.18/204-module_strip.patch | 22 +++++------ .../hack-5.18/221-module_exports.patch | 4 +- .../linux/generic/hack-5.18/251-kconfig.patch | 12 +++--- .../generic/hack-5.18/253-ksmbd-config.patch | 4 +- .../260-crypto_test_dependencies.patch | 2 +- .../661-use_fq_codel_by_default.patch | 2 +- .../780-usb-net-MeigLink_modem_support.patch | 2 +- .../800-GPIO-add-named-gpio-exports.patch | 2 +- .../hack-5.18/904-debloat_dma_buf.patch | 10 ++--- .../hack-5.18/920-device_tree_cmdline.patch | 2 +- ...k-events-support-multiple-registrant.patch | 20 +++++----- ...-linux-kernel-to-support-shortcut-fe.patch | 28 +++++++------- .../203-kallsyms_uncompressed.patch | 2 +- ...ernel-XZ-compression-option-on-PPC_8.patch | 2 +- ...support-for-minor-aligned-partitions.patch | 8 ++-- ...mtd-cfi_cmdset_0002-no-erase_suspend.patch | 2 +- ...et_0002-add-buffer-write-cmd-timeout.patch | 2 +- .../494-mtd-ubi-add-EOF-marker-support.patch | 2 +- .../530-jffs2_make_lzma_available.patch | 2 +- ...-netfilter_optional_tcp_window_check.patch | 8 ++-- ...ng-with-source-address-failed-policy.patch | 16 ++++---- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 8 ++-- ..._eth_soc-add-support-for-coherent-DM.patch | 38 +++++++++---------- ..._eth_soc-add-support-for-Wireless-Et.patch | 2 +- ..._eth_soc-implement-flow-offloading-t.patch | 2 +- ..._eth_soc-allocate-struct-mtk_ppe-sep.patch | 6 +-- ..._eth_soc-rework-hardware-flow-table-.patch | 6 +-- ...net-mtk_eth_soc-enable-threaded-NAPI.patch | 6 +-- ...detach-callback-to-struct-phy_driver.patch | 4 +- ...net-phy-at803x-fix-at8033-sgmii-mode.patch | 2 +- ...-net-dsa-mt7530-Support-EEE-features.patch | 4 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- .../810-pci_disable_common_quirks.patch | 8 ++-- .../811-pci_disable_usb_common_quirks.patch | 2 +- .../pending-5.18/834-ledtrig-libata.patch | 8 ++-- .../pending-5.18/920-mangle_bootargs.patch | 2 +- 36 files changed, 127 insertions(+), 127 deletions(-) diff --git a/target/linux/generic/hack-5.18/204-module_strip.patch b/target/linux/generic/hack-5.18/204-module_strip.patch index a6c99b259..72c6eb7cb 100644 --- a/target/linux/generic/hack-5.18/204-module_strip.patch +++ b/target/linux/generic/hack-5.18/204-module_strip.patch @@ -56,8 +56,8 @@ Signed-off-by: Felix Fietkau -#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware) +#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware) - #define _MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, #ns) - #define MODULE_IMPORT_NS(ns) _MODULE_IMPORT_NS(ns) + #define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, __stringify(ns)) + --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -20,6 +20,16 @@ @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -2369,6 +2369,13 @@ config UNUSED_KSYMS_WHITELIST +@@ -2383,6 +2383,13 @@ config UNUSED_KSYMS_WHITELIST one per line. The path can be absolute, or relative to the kernel source tree. @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3269,9 +3269,11 @@ static int setup_load_info(struct load_i +@@ -3273,9 +3273,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3292,6 +3294,7 @@ static int check_modinfo(struct module * +@@ -3296,6 +3298,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -2055,7 +2055,9 @@ static void read_symbols(const char *mod +@@ -2056,7 +2056,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_symbol(mod, &info, sym, symname); @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau } for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { -@@ -2234,8 +2236,10 @@ static void add_header(struct buffer *b, +@@ -2235,8 +2237,10 @@ static void add_header(struct buffer *b, buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "BUILD_LTO_INFO;\n"); buf_printf(b, "\n"); @@ -148,7 +148,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); -@@ -2252,8 +2256,10 @@ static void add_header(struct buffer *b, +@@ -2253,8 +2257,10 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -159,7 +159,7 @@ Signed-off-by: Felix Fietkau } /* Cannot check for assembler */ -@@ -2266,8 +2272,10 @@ static void add_retpoline(struct buffer +@@ -2267,8 +2273,10 @@ static void add_retpoline(struct buffer static void add_staging_flag(struct buffer *b, const char *name) { @@ -170,7 +170,7 @@ Signed-off-by: Felix Fietkau } /** -@@ -2347,11 +2355,13 @@ static void add_depends(struct buffer *b +@@ -2348,11 +2356,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau } static void write_buf(struct buffer *b, const char *fname) -@@ -2600,7 +2610,9 @@ int main(int argc, char **argv) +@@ -2601,7 +2611,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-5.18/221-module_exports.patch b/target/linux/generic/hack-5.18/221-module_exports.patch index 2cbb25ead..43a917858 100644 --- a/target/linux/generic/hack-5.18/221-module_exports.patch +++ b/target/linux/generic/hack-5.18/221-module_exports.patch @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau *(.modinfo) \ --- a/include/linux/export.h +++ b/include/linux/export.h -@@ -82,6 +82,12 @@ struct kernel_symbol { +@@ -84,6 +84,12 @@ struct kernel_symbol { #else @@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau /* * For every exported symbol, do the following: * -@@ -99,7 +105,7 @@ struct kernel_symbol { +@@ -101,7 +107,7 @@ struct kernel_symbol { extern const char __kstrtab_##sym[]; \ extern const char __kstrtabns_##sym[]; \ __CRC_SYMBOL(sym, sec); \ diff --git a/target/linux/generic/hack-5.18/251-kconfig.patch b/target/linux/generic/hack-5.18/251-kconfig.patch index 3d24a7d1c..b53207ef1 100644 --- a/target/linux/generic/hack-5.18/251-kconfig.patch +++ b/target/linux/generic/hack-5.18/251-kconfig.patch @@ -16,7 +16,7 @@ Signed-off-by: John Crispin --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -33,7 +33,7 @@ config CRYPTO_FIPS +@@ -34,7 +34,7 @@ config CRYPTO_FIPS this is. config CRYPTO_ALGAPI @@ -25,7 +25,7 @@ Signed-off-by: John Crispin select CRYPTO_ALGAPI2 help This option provides the API for cryptographic algorithms. -@@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2 +@@ -43,7 +43,7 @@ config CRYPTO_ALGAPI2 tristate config CRYPTO_AEAD @@ -34,7 +34,7 @@ Signed-off-by: John Crispin select CRYPTO_AEAD2 select CRYPTO_ALGAPI -@@ -53,7 +53,7 @@ config CRYPTO_AEAD2 +@@ -54,7 +54,7 @@ config CRYPTO_AEAD2 select CRYPTO_RNG2 config CRYPTO_SKCIPHER @@ -43,7 +43,7 @@ Signed-off-by: John Crispin select CRYPTO_SKCIPHER2 select CRYPTO_ALGAPI -@@ -63,7 +63,7 @@ config CRYPTO_SKCIPHER2 +@@ -64,7 +64,7 @@ config CRYPTO_SKCIPHER2 select CRYPTO_RNG2 config CRYPTO_HASH @@ -52,7 +52,7 @@ Signed-off-by: John Crispin select CRYPTO_HASH2 select CRYPTO_ALGAPI -@@ -72,7 +72,7 @@ config CRYPTO_HASH2 +@@ -73,7 +73,7 @@ config CRYPTO_HASH2 select CRYPTO_ALGAPI2 config CRYPTO_RNG @@ -92,7 +92,7 @@ Signed-off-by: John Crispin bool --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -446,16 +446,16 @@ config BCH_CONST_T +@@ -449,16 +449,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH diff --git a/target/linux/generic/hack-5.18/253-ksmbd-config.patch b/target/linux/generic/hack-5.18/253-ksmbd-config.patch index 8fb87a34b..4ec57c069 100644 --- a/target/linux/generic/hack-5.18/253-ksmbd-config.patch +++ b/target/linux/generic/hack-5.18/253-ksmbd-config.patch @@ -1,6 +1,6 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -2401,7 +2401,7 @@ config PADATA +@@ -2415,7 +2415,7 @@ config PADATA bool config ASN1 @@ -11,7 +11,7 @@ that can be interpreted by the ASN.1 stream decoder and used to --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -617,7 +617,7 @@ config LIBFDT +@@ -620,7 +620,7 @@ config LIBFDT bool config OID_REGISTRY diff --git a/target/linux/generic/hack-5.18/260-crypto_test_dependencies.patch b/target/linux/generic/hack-5.18/260-crypto_test_dependencies.patch index c73a1f1f6..64daa8274 100644 --- a/target/linux/generic/hack-5.18/260-crypto_test_dependencies.patch +++ b/target/linux/generic/hack-5.18/260-crypto_test_dependencies.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -120,13 +120,13 @@ config CRYPTO_MANAGER +@@ -121,13 +121,13 @@ config CRYPTO_MANAGER cbc(aes). config CRYPTO_MANAGER2 diff --git a/target/linux/generic/hack-5.18/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.18/661-use_fq_codel_by_default.patch index 734a94725..9424cae98 100644 --- a/target/linux/generic/hack-5.18/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.18/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -618,12 +618,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -604,12 +604,13 @@ extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops; diff --git a/target/linux/generic/hack-5.18/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.18/780-usb-net-MeigLink_modem_support.patch index 9040b2dbd..a92246e38 100644 --- a/target/linux/generic/hack-5.18/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.18/780-usb-net-MeigLink_modem_support.patch @@ -19,7 +19,7 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1129,6 +1131,11 @@ static const struct usb_device_id option +@@ -1133,6 +1135,11 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/hack-5.18/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.18/800-GPIO-add-named-gpio-exports.patch index 19f9f0a4f..f0be8f438 100644 --- a/target/linux/generic/hack-5.18/800-GPIO-add-named-gpio-exports.patch +++ b/target/linux/generic/hack-5.18/800-GPIO-add-named-gpio-exports.patch @@ -15,7 +15,7 @@ Signed-off-by: John Crispin #include "gpiolib.h" #include "gpiolib-of.h" -@@ -1053,3 +1055,72 @@ void of_gpio_dev_init(struct gpio_chip * +@@ -1058,3 +1060,72 @@ void of_gpio_dev_init(struct gpio_chip * else gc->of_node = gdev->dev.of_node; } diff --git a/target/linux/generic/hack-5.18/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.18/904-debloat_dma_buf.patch index 152796b31..e2803e15a 100644 --- a/target/linux/generic/hack-5.18/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.18/904-debloat_dma_buf.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig -@@ -187,7 +187,7 @@ config SOC_BUS +@@ -198,7 +198,7 @@ config SOC_BUS source "drivers/base/regmap/Kconfig" config DMA_SHARED_BUFFER @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau dmabuf_selftests-y := \ selftest.o \ -@@ -15,4 +17,6 @@ +@@ -15,4 +17,6 @@ dmabuf_selftests-y := \ st-dma-fence-unwrap.o \ st-dma-resv.o @@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau +dma-shared-buffer-objs := $(dma-buf-objs-y) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -1506,4 +1506,5 @@ static void __exit dma_buf_deinit(void) +@@ -1459,4 +1459,5 @@ static void __exit dma_buf_deinit(void) kern_unmount(dma_buf_mnt); dma_buf_uninit_sysfs_statistics(); } @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4175,6 +4175,7 @@ int wake_up_state(struct task_struct *p, +@@ -4287,6 +4287,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau * Perform scheduler related setup for a newly forked process p. --- a/fs/d_path.c +++ b/fs/d_path.c -@@ -316,6 +316,7 @@ char *dynamic_dname(struct dentry *dentr +@@ -314,6 +314,7 @@ char *dynamic_dname(struct dentry *dentr buffer += buflen - sz; return memcpy(buffer, temp, sz); } diff --git a/target/linux/generic/hack-5.18/920-device_tree_cmdline.patch b/target/linux/generic/hack-5.18/920-device_tree_cmdline.patch index 6661dd49d..40c77b18b 100644 --- a/target/linux/generic/hack-5.18/920-device_tree_cmdline.patch +++ b/target/linux/generic/hack-5.18/920-device_tree_cmdline.patch @@ -1,6 +1,6 @@ --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1162,6 +1162,9 @@ int __init early_init_dt_scan_chosen(cha +@@ -1165,6 +1165,9 @@ int __init early_init_dt_scan_chosen(cha p = of_get_flat_dt_prop(node, "bootargs", &l); if (p != NULL && l > 0) strlcpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); diff --git a/target/linux/generic/hack-5.18/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.18/952-add-net-conntrack-events-support-multiple-registrant.patch index b7683f893..8a538d2dd 100644 --- a/target/linux/generic/hack-5.18/952-add-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.18/952-add-net-conntrack-events-support-multiple-registrant.patch @@ -93,7 +93,7 @@ Signed-off-by: Zhi Chen #if defined(CONFIG_NF_CONNTRACK_LABELS) --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -151,6 +151,14 @@ config NF_CONNTRACK_EVENTS +@@ -162,6 +162,14 @@ config NF_CONNTRACK_EVENTS If unsure, say `N'. @@ -110,7 +110,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2878,6 +2878,10 @@ int nf_conntrack_init_net(struct net *ne +@@ -2815,6 +2815,10 @@ int nf_conntrack_init_net(struct net *ne nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); @@ -133,7 +133,7 @@ Signed-off-by: Zhi Chen #include #include #include -@@ -167,6 +170,35 @@ static int __nf_conntrack_eventmask_repo +@@ -168,6 +171,35 @@ static int __nf_conntrack_eventmask_repo return ret; } @@ -169,7 +169,7 @@ Signed-off-by: Zhi Chen int nf_conntrack_eventmask_report(unsigned int events, struct nf_conn *ct, u32 portid, int report) { -@@ -203,10 +235,52 @@ int nf_conntrack_eventmask_report(unsign +@@ -204,10 +236,52 @@ int nf_conntrack_eventmask_report(unsign return ret; } @@ -222,7 +222,7 @@ Signed-off-by: Zhi Chen void nf_ct_deliver_cached_events(struct nf_conn *ct) { struct nf_conntrack_ecache *e; -@@ -232,6 +306,7 @@ void nf_ct_deliver_cached_events(struct +@@ -233,6 +307,7 @@ void nf_ct_deliver_cached_events(struct */ __nf_conntrack_eventmask_report(e, events, e->missed, &item); } @@ -230,7 +230,7 @@ Signed-off-by: Zhi Chen EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events); void nf_ct_expect_event_report(enum ip_conntrack_expect_events event, -@@ -264,20 +339,43 @@ out_unlock: +@@ -265,20 +340,43 @@ out_unlock: rcu_read_unlock(); } @@ -276,7 +276,7 @@ Signed-off-by: Zhi Chen void nf_conntrack_unregister_notifier(struct net *net) { mutex_lock(&nf_ct_ecache_mutex); -@@ -285,6 +383,7 @@ void nf_conntrack_unregister_notifier(st +@@ -286,6 +384,7 @@ void nf_conntrack_unregister_notifier(st mutex_unlock(&nf_ct_ecache_mutex); /* synchronize_rcu() is called after netns pre_exit */ } @@ -286,7 +286,7 @@ Signed-off-by: Zhi Chen void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state) --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const +@@ -712,12 +712,19 @@ static size_t ctnetlink_nlmsg_size(const } static int @@ -306,7 +306,7 @@ Signed-off-by: Zhi Chen struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3761,11 +3768,17 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3772,11 +3779,17 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS @@ -324,7 +324,7 @@ Signed-off-by: Zhi Chen static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { [IPCTNL_MSG_CT_NEW] = { -@@ -3864,8 +3877,12 @@ static int __net_init ctnetlink_net_init +@@ -3875,8 +3888,12 @@ static int __net_init ctnetlink_net_init static void ctnetlink_net_pre_exit(struct net *net) { #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/hack-5.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 67496067e..7c2b0c8d8 100644 --- a/target/linux/generic/hack-5.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -1,6 +1,6 @@ --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -70,6 +70,9 @@ void brioctl_set(int (*hook)(struct net +@@ -69,6 +69,9 @@ void brioctl_set(int (*hook)(struct net int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd, struct ifreq *ifr, void __user *uarg); @@ -12,9 +12,9 @@ struct list_head *br_ip_list); --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -877,6 +877,10 @@ struct sk_buff { - #endif +@@ -1022,6 +1022,10 @@ struct sk_buff { __u8 slow_gro:1; + __u8 csum_not_inet:1; +#ifdef CONFIG_SHORTCUT_FE + __u8 fast_forwarded:1; @@ -49,7 +49,7 @@ const struct nf_ct_event_notifier *nb); --- a/net/Kconfig +++ b/net/Kconfig -@@ -456,6 +456,9 @@ config FAILOVER +@@ -460,6 +460,9 @@ config FAILOVER migration of VMs with direct attached VFs by failing over to the paravirtual datapath when the VF is unplugged. @@ -61,8 +61,8 @@ default y --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -777,6 +777,28 @@ void br_port_flags_change(struct net_bri - br_offload_port_state(p); +@@ -774,6 +774,28 @@ void br_port_flags_change(struct net_bri + br_recalculate_neigh_suppress_enabled(br); } +void br_dev_update_stats(struct net_device *dev, @@ -92,7 +92,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3584,9 +3584,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3532,9 +3532,17 @@ static int xmit_one(struct sk_buff *skb, { unsigned int len; int rc; @@ -109,9 +109,9 @@ + } +#endif - #ifdef CONFIG_ETHERNET_PACKET_MANGLE - if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb))) -@@ -5213,6 +5221,11 @@ void netdev_rx_handler_unregister(struct + len = skb->len; + PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies); +@@ -5161,6 +5169,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -123,7 +123,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5261,6 +5274,10 @@ static int __netif_receive_skb_core(stru +@@ -5209,6 +5222,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -134,7 +134,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -5298,6 +5315,15 @@ another_round: +@@ -5246,6 +5263,15 @@ another_round: goto out; } @@ -178,7 +178,7 @@ rcu_read_unlock(); if (likely(ret >= 0 && missed == 0)) -@@ -345,6 +356,11 @@ int nf_conntrack_register_notifier(struc +@@ -346,6 +357,11 @@ int nf_conntrack_register_notifier(struc { return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); } @@ -190,7 +190,7 @@ #else int nf_conntrack_register_notifier(struct net *net, const struct nf_ct_event_notifier *new) -@@ -375,6 +391,11 @@ int nf_conntrack_unregister_notifier(str +@@ -376,6 +392,11 @@ int nf_conntrack_unregister_notifier(str { return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); } diff --git a/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch index 3cb25ea20..77bef1795 100644 --- a/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-5.18/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -1446,6 +1446,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1460,6 +1460,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-5.18/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch b/target/linux/generic/pending-5.18/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch index 3d24a92e5..cb9f29528 100644 --- a/target/linux/generic/pending-5.18/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch +++ b/target/linux/generic/pending-5.18/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch @@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -223,7 +223,7 @@ config PPC +@@ -222,7 +222,7 @@ config PPC select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZMA if DEFAULT_UIMAGE select HAVE_KERNEL_LZO if DEFAULT_UIMAGE diff --git a/target/linux/generic/pending-5.18/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.18/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch index 088c351da..5c3794e1a 100644 --- a/target/linux/generic/pending-5.18/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch +++ b/target/linux/generic/pending-5.18/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch @@ -338,7 +338,7 @@ Reported-by: Dan Carpenter default y --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -1043,6 +1043,8 @@ static u8 spi_nor_convert_3to4_erase(u8 +@@ -1052,6 +1052,8 @@ static u8 spi_nor_convert_3to4_erase(u8 static bool spi_nor_has_uniform_erase(const struct spi_nor *nor) { @@ -347,7 +347,7 @@ Reported-by: Dan Carpenter return !!nor->params->erase_map.uniform_erase_type; } -@@ -2160,6 +2162,7 @@ static int spi_nor_select_erase(struct s +@@ -2169,6 +2171,7 @@ static int spi_nor_select_erase(struct s { struct spi_nor_erase_map *map = &nor->params->erase_map; const struct spi_nor_erase_type *erase = NULL; @@ -355,7 +355,7 @@ Reported-by: Dan Carpenter struct mtd_info *mtd = &nor->mtd; u32 wanted_size = nor->info->sector_size; int i; -@@ -2192,8 +2195,9 @@ static int spi_nor_select_erase(struct s +@@ -2201,8 +2204,9 @@ static int spi_nor_select_erase(struct s */ for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { if (map->erase_type[i].size) { @@ -367,7 +367,7 @@ Reported-by: Dan Carpenter } } -@@ -2201,6 +2205,8 @@ static int spi_nor_select_erase(struct s +@@ -2210,6 +2214,8 @@ static int spi_nor_select_erase(struct s return -EINVAL; mtd->erasesize = erase->size; diff --git a/target/linux/generic/pending-5.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/target/linux/generic/pending-5.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch index cb7768a5e..0be74a597 100644 --- a/target/linux/generic/pending-5.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch +++ b/target/linux/generic/pending-5.18/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -914,7 +914,7 @@ static int get_chip(struct map_info *map +@@ -907,7 +907,7 @@ static int get_chip(struct map_info *map return 0; case FL_ERASING: diff --git a/target/linux/generic/pending-5.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/pending-5.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch index bedd53ccb..ca56de827 100644 --- a/target/linux/generic/pending-5.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch +++ b/target/linux/generic/pending-5.18/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch @@ -7,7 +7,7 @@ Signed-off-by: George Kashperko 1 file changed, 1 insertion(+) --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -2058,6 +2058,7 @@ static int __xipram do_write_buffer(stru +@@ -2051,6 +2051,7 @@ static int __xipram do_write_buffer(stru /* Write Buffer Load */ map_write(map, CMD(0x25), cmd_adr); diff --git a/target/linux/generic/pending-5.18/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-5.18/494-mtd-ubi-add-EOF-marker-support.patch index fc4814622..413431755 100644 --- a/target/linux/generic/pending-5.18/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/pending-5.18/494-mtd-ubi-add-EOF-marker-support.patch @@ -50,7 +50,7 @@ Signed-off-by: Gabor Juhos break; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -780,6 +780,7 @@ struct ubi_attach_info { +@@ -778,6 +778,7 @@ struct ubi_attach_info { int mean_ec; uint64_t ec_sum; int ec_count; diff --git a/target/linux/generic/pending-5.18/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.18/530-jffs2_make_lzma_available.patch index 8da0d582c..64091cce6 100644 --- a/target/linux/generic/pending-5.18/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.18/530-jffs2_make_lzma_available.patch @@ -1087,7 +1087,7 @@ Signed-off-by: Alexandros C. Couloumbis #define JFFS2_NODE_ACCURATE 0x2000 --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -343,6 +343,12 @@ config ZSTD_DECOMPRESS +@@ -346,6 +346,12 @@ config ZSTD_DECOMPRESS source "lib/xz/Kconfig" diff --git a/target/linux/generic/pending-5.18/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.18/613-netfilter_optional_tcp_window_check.patch index a462af6b6..067fc3fb1 100644 --- a/target/linux/generic/pending-5.18/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-5.18/613-netfilter_optional_tcp_window_check.patch @@ -9,7 +9,7 @@ Signed-off-by: Christian 'Ansuel' Marangi --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -465,6 +465,9 @@ static bool tcp_in_window(struct nf_conn +@@ -491,6 +491,9 @@ static bool tcp_in_window(struct nf_conn s32 receiver_offset; bool res, in_recv_win; @@ -19,7 +19,7 @@ Signed-off-by: Christian 'Ansuel' Marangi /* * Get the required data from the packet. */ -@@ -1160,7 +1163,7 @@ int nf_conntrack_tcp_packet(struct nf_co +@@ -1174,7 +1177,7 @@ int nf_conntrack_tcp_packet(struct nf_co IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeout = timeouts[TCP_CONNTRACK_UNACK]; @@ -28,7 +28,7 @@ Signed-off-by: Christian 'Ansuel' Marangi timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; else -@@ -1476,6 +1479,9 @@ void nf_conntrack_tcp_init_net(struct ne +@@ -1490,6 +1493,9 @@ void nf_conntrack_tcp_init_net(struct ne */ tn->tcp_be_liberal = 0; @@ -80,4 +80,4 @@ Signed-off-by: Christian 'Ansuel' Marangi + u8 tcp_no_window_check; u8 tcp_max_retrans; u8 tcp_ignore_invalid_rst; - #if IS_ENABLED(CONFIG_NF_FLOW_TABLE) \ No newline at end of file + #if IS_ENABLED(CONFIG_NF_FLOW_TABLE) diff --git a/target/linux/generic/pending-5.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 5b37da6bc..cc261ab98 100644 --- a/target/linux/generic/pending-5.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-5.18/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski /* * Allocate a dst for local (unicast / anycast) address. */ -@@ -5021,7 +5051,8 @@ static int rtm_to_fib6_config(struct sk_ +@@ -5028,7 +5058,8 @@ static int rtm_to_fib6_config(struct sk_ if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE || rtm->rtm_type == RTN_PROHIBIT || @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -6274,6 +6305,8 @@ static int ip6_route_dev_notify(struct n +@@ -6281,6 +6312,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -6285,6 +6318,7 @@ static int ip6_route_dev_notify(struct n +@@ -6292,6 +6325,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -6476,6 +6510,8 @@ static int __net_init ip6_route_net_init +@@ -6483,6 +6517,8 @@ static int __net_init ip6_route_net_init #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.fib6_has_custom_rules = false; @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, sizeof(*net->ipv6.ip6_prohibit_entry), GFP_KERNEL); -@@ -6486,11 +6522,21 @@ static int __net_init ip6_route_net_init +@@ -6493,11 +6529,21 @@ static int __net_init ip6_route_net_init ip6_template_metrics, true); INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); -@@ -6517,6 +6563,8 @@ out: +@@ -6524,6 +6570,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -6536,6 +6584,7 @@ static void __net_exit ip6_route_net_exi +@@ -6543,6 +6591,7 @@ static void __net_exit ip6_route_net_exi kfree(net->ipv6.ip6_null_entry); #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski kfree(net->ipv6.ip6_blk_hole_entry); #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); -@@ -6613,6 +6662,9 @@ void __init ip6_route_init_special_entri +@@ -6620,6 +6669,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/target/linux/generic/pending-5.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 6b14bf2d9..d97cf4c9e 100644 --- a/target/linux/generic/pending-5.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u8 inner_protocol_type:1; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -7491,6 +7491,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7497,6 +7497,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -81,7 +81,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7542,6 +7584,7 @@ static int __netdev_upper_dev_link(struc +@@ -7548,6 +7590,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -89,7 +89,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7633,6 +7676,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7639,6 +7682,7 @@ static void __netdev_upper_dev_unlink(st changeupper_info.master = netdev_master_upper_dev_get(dev) == upper_dev; @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_PRECHANGEUPPER, &changeupper_info.info); -@@ -8691,6 +8735,7 @@ int dev_set_mac_address(struct net_devic +@@ -8697,6 +8741,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-5.18/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/generic/pending-5.18/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index 44c070860..d73ea4a25 100644 --- a/target/linux/generic/pending-5.18/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/generic/pending-5.18/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -786,7 +787,7 @@ static int mtk_init_fq_dma(struct mtk_et +@@ -797,7 +798,7 @@ static int mtk_init_fq_dma(struct mtk_et dma_addr_t dma_addr; int i; @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau cnt * sizeof(struct mtk_tx_dma), ð->phy_scratch_ring, GFP_ATOMIC); -@@ -798,10 +799,10 @@ static int mtk_init_fq_dma(struct mtk_et +@@ -809,10 +810,10 @@ static int mtk_init_fq_dma(struct mtk_et if (unlikely(!eth->scratch_head)) return -ENOMEM; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; phy_ring_tail = eth->phy_scratch_ring + -@@ -855,26 +856,26 @@ static void mtk_tx_unmap(struct mtk_eth +@@ -866,26 +867,26 @@ static void mtk_tx_unmap(struct mtk_eth { if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) { if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) { @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau dma_unmap_addr(tx_buf, dma_addr1), dma_unmap_len(tx_buf, dma_len1), DMA_TO_DEVICE); -@@ -952,9 +953,9 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -963,9 +964,9 @@ static int mtk_tx_map(struct sk_buff *sk if (skb_vlan_tag_present(skb)) txd4 |= TX_DMA_INS_VLAN | skb_vlan_tag_get(skb); @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; WRITE_ONCE(itxd->txd1, mapped_addr); -@@ -993,10 +994,10 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -1004,10 +1005,10 @@ static int mtk_tx_map(struct sk_buff *sk frag_map_size = min(frag_size, MTK_TX_DMA_BUF_LEN); @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau goto err_dma; if (i == nr_frags - 1 && -@@ -1274,18 +1275,18 @@ static int mtk_poll_rx(struct napi_struc +@@ -1288,18 +1289,18 @@ static int mtk_poll_rx(struct napi_struc netdev->stats.rx_dropped++; goto release_desc; } @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau ring->buf_size, DMA_FROM_DEVICE); /* receive data */ -@@ -1558,7 +1559,7 @@ static int mtk_tx_alloc(struct mtk_eth * +@@ -1572,7 +1573,7 @@ static int mtk_tx_alloc(struct mtk_eth * if (!ring->buf) goto no_tx_mem; @@ -129,7 +129,7 @@ Signed-off-by: Felix Fietkau &ring->phys, GFP_ATOMIC); if (!ring->dma) goto no_tx_mem; -@@ -1576,7 +1577,7 @@ static int mtk_tx_alloc(struct mtk_eth * +@@ -1590,7 +1591,7 @@ static int mtk_tx_alloc(struct mtk_eth * * descriptors in ring->dma_pdma. */ if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) { @@ -138,7 +138,7 @@ Signed-off-by: Felix Fietkau &ring->phys_pdma, GFP_ATOMIC); if (!ring->dma_pdma) -@@ -1635,7 +1636,7 @@ static void mtk_tx_clean(struct mtk_eth +@@ -1649,7 +1650,7 @@ static void mtk_tx_clean(struct mtk_eth } if (ring->dma) { @@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau MTK_DMA_SIZE * sizeof(*ring->dma), ring->dma, ring->phys); -@@ -1643,7 +1644,7 @@ static void mtk_tx_clean(struct mtk_eth +@@ -1657,7 +1658,7 @@ static void mtk_tx_clean(struct mtk_eth } if (ring->dma_pdma) { @@ -156,7 +156,7 @@ Signed-off-by: Felix Fietkau MTK_DMA_SIZE * sizeof(*ring->dma_pdma), ring->dma_pdma, ring->phys_pdma); -@@ -1688,18 +1689,18 @@ static int mtk_rx_alloc(struct mtk_eth * +@@ -1705,18 +1706,18 @@ static int mtk_rx_alloc(struct mtk_eth * return -ENOMEM; } @@ -178,7 +178,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; ring->dma[i].rxd1 = (unsigned int)dma_addr; -@@ -1735,7 +1736,7 @@ static void mtk_rx_clean(struct mtk_eth +@@ -1752,7 +1753,7 @@ static void mtk_rx_clean(struct mtk_eth continue; if (!ring->dma[i].rxd1) continue; @@ -187,7 +187,7 @@ Signed-off-by: Felix Fietkau ring->dma[i].rxd1, ring->buf_size, DMA_FROM_DEVICE); -@@ -1746,7 +1747,7 @@ static void mtk_rx_clean(struct mtk_eth +@@ -1763,7 +1764,7 @@ static void mtk_rx_clean(struct mtk_eth } if (ring->dma) { @@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau ring->dma_size * sizeof(*ring->dma), ring->dma, ring->phys); -@@ -2099,7 +2100,7 @@ static void mtk_dma_free(struct mtk_eth +@@ -2119,7 +2120,7 @@ static void mtk_dma_free(struct mtk_eth if (eth->netdev[i]) netdev_reset_queue(eth->netdev[i]); if (eth->scratch_ring) { @@ -205,7 +205,7 @@ Signed-off-by: Felix Fietkau MTK_DMA_SIZE * sizeof(struct mtk_tx_dma), eth->scratch_ring, eth->phy_scratch_ring); -@@ -2448,6 +2449,8 @@ static void mtk_dim_tx(struct work_struc +@@ -2468,6 +2469,8 @@ static void mtk_dim_tx(struct work_struc static int mtk_hw_init(struct mtk_eth *eth) { @@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau int i, val, ret; if (test_and_set_bit(MTK_HW_INIT, ð->state)) -@@ -2460,6 +2463,10 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2480,6 +2483,10 @@ static int mtk_hw_init(struct mtk_eth *e if (ret) goto err_disable_pm; @@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3040,6 +3047,35 @@ free_netdev: +@@ -3060,6 +3067,35 @@ free_netdev: return err; } @@ -261,7 +261,7 @@ Signed-off-by: Felix Fietkau static int mtk_probe(struct platform_device *pdev) { struct device_node *mac_np; -@@ -3053,6 +3089,7 @@ static int mtk_probe(struct platform_dev +@@ -3073,6 +3109,7 @@ static int mtk_probe(struct platform_dev eth->soc = of_device_get_match_data(&pdev->dev); eth->dev = &pdev->dev; @@ -269,7 +269,7 @@ Signed-off-by: Felix Fietkau eth->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(eth->base)) return PTR_ERR(eth->base); -@@ -3101,6 +3138,16 @@ static int mtk_probe(struct platform_dev +@@ -3121,6 +3158,16 @@ static int mtk_probe(struct platform_dev } } diff --git a/target/linux/generic/pending-5.18/701-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch b/target/linux/generic/pending-5.18/701-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch index 714c30781..10beda900 100644 --- a/target/linux/generic/pending-5.18/701-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch +++ b/target/linux/generic/pending-5.18/701-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau static int mtk_msg_level = -1; module_param_named(msg_level, mtk_msg_level, int, 0); -@@ -3170,6 +3171,22 @@ static int mtk_probe(struct platform_dev +@@ -3190,6 +3191,22 @@ static int mtk_probe(struct platform_dev } } diff --git a/target/linux/generic/pending-5.18/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch b/target/linux/generic/pending-5.18/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch index 011f7d816..a5039026b 100644 --- a/target/linux/generic/pending-5.18/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch +++ b/target/linux/generic/pending-5.18/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch @@ -256,7 +256,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -701,6 +701,10 @@ int dev_fill_forward_path(const struct n +@@ -703,6 +703,10 @@ int dev_fill_forward_path(const struct n if (WARN_ON_ONCE(last_dev == ctx.dev)) return -1; } diff --git a/target/linux/generic/pending-5.18/701-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch b/target/linux/generic/pending-5.18/701-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch index fc2a787a3..9efd4b768 100644 --- a/target/linux/generic/pending-5.18/701-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch +++ b/target/linux/generic/pending-5.18/701-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2269,7 +2269,7 @@ static int mtk_open(struct net_device *d +@@ -2289,7 +2289,7 @@ static int mtk_open(struct net_device *d if (err) return err; @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau gdm_config = MTK_GDMA_TO_PPE; mtk_gdm_config(eth, gdm_config); -@@ -2343,7 +2343,7 @@ static int mtk_stop(struct net_device *d +@@ -2363,7 +2363,7 @@ static int mtk_stop(struct net_device *d mtk_dma_free(eth); if (eth->soc->offload_version) @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau return 0; } -@@ -3262,10 +3262,11 @@ static int mtk_probe(struct platform_dev +@@ -3282,10 +3282,11 @@ static int mtk_probe(struct platform_dev } if (eth->soc->offload_version) { diff --git a/target/linux/generic/pending-5.18/701-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch b/target/linux/generic/pending-5.18/701-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch index f4fe0f031..e4efe0d4a 100644 --- a/target/linux/generic/pending-5.18/701-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch +++ b/target/linux/generic/pending-5.18/701-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau #include #include "mtk_eth_soc.h" -@@ -1239,7 +1240,7 @@ static int mtk_poll_rx(struct napi_struc +@@ -1250,7 +1251,7 @@ static int mtk_poll_rx(struct napi_struc struct net_device *netdev; unsigned int pktlen; dma_addr_t dma_addr; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau int mac; ring = mtk_get_rx_ring(eth); -@@ -1315,6 +1316,11 @@ static int mtk_poll_rx(struct napi_struc +@@ -1329,6 +1330,11 @@ static int mtk_poll_rx(struct napi_struc skb_set_hash(skb, hash, PKT_HASH_TYPE_L4); } @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX && (trxd.rxd2 & RX_DMA_VTAG)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), -@@ -3262,7 +3268,7 @@ static int mtk_probe(struct platform_dev +@@ -3282,7 +3288,7 @@ static int mtk_probe(struct platform_dev } if (eth->soc->offload_version) { diff --git a/target/linux/generic/pending-5.18/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-5.18/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch index f812ddf8f..61d5df19f 100644 --- a/target/linux/generic/pending-5.18/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch +++ b/target/linux/generic/pending-5.18/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2144,8 +2144,8 @@ static irqreturn_t mtk_handle_irq_rx(int +@@ -2164,8 +2164,8 @@ static irqreturn_t mtk_handle_irq_rx(int eth->rx_events++; if (likely(napi_schedule_prep(ð->rx_napi))) { @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau } return IRQ_HANDLED; -@@ -2157,8 +2157,8 @@ static irqreturn_t mtk_handle_irq_tx(int +@@ -2177,8 +2177,8 @@ static irqreturn_t mtk_handle_irq_tx(int eth->tx_events++; if (likely(napi_schedule_prep(ð->tx_napi))) { @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau } return IRQ_HANDLED; -@@ -3297,6 +3297,8 @@ static int mtk_probe(struct platform_dev +@@ -3317,6 +3317,8 @@ static int mtk_probe(struct platform_dev * for NAPI to work */ init_dummy_netdev(ð->dummy_dev); diff --git a/target/linux/generic/pending-5.18/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-5.18/703-phy-add-detach-callback-to-struct-phy_driver.patch index 24a0d40cb..2d1d9ffaf 100644 --- a/target/linux/generic/pending-5.18/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-5.18/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1715,6 +1715,9 @@ void phy_detach(struct phy_device *phyde +@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde struct module *ndev_owner = NULL; struct mii_bus *bus; @@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos sysfs_remove_link(&dev->dev.kobj, "phydev"); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -818,6 +818,12 @@ struct phy_driver { +@@ -824,6 +824,12 @@ struct phy_driver { /** @handle_interrupt: Override default interrupt handling */ irqreturn_t (*handle_interrupt)(struct phy_device *phydev); diff --git a/target/linux/generic/pending-5.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-5.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch index 0859cb355..8fc90aeb9 100644 --- a/target/linux/generic/pending-5.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch +++ b/target/linux/generic/pending-5.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch @@ -21,7 +21,7 @@ Signed-off-by: Roman Yeryomin #define AT803X_DEBUG_ADDR 0x1D #define AT803X_DEBUG_DATA 0x1E -@@ -935,6 +936,27 @@ static int at803x_smarteee_config(struct +@@ -946,6 +947,27 @@ static int at803x_smarteee_config(struct struct at803x_priv *priv = phydev->priv; u16 mask = 0, val = 0; int ret; diff --git a/target/linux/generic/pending-5.18/761-net-dsa-mt7530-Support-EEE-features.patch b/target/linux/generic/pending-5.18/761-net-dsa-mt7530-Support-EEE-features.patch index 5b2f43ecc..2a5009793 100644 --- a/target/linux/generic/pending-5.18/761-net-dsa-mt7530-Support-EEE-features.patch +++ b/target/linux/generic/pending-5.18/761-net-dsa-mt7530-Support-EEE-features.patch @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit Signed-off-by: RenĂ© van Dorst --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2839,9 +2839,13 @@ static void mt753x_phylink_mac_link_up(s +@@ -2833,9 +2833,13 @@ static void mt753x_phylink_mac_link_up(s switch (speed) { case SPEED_1000: mcr |= PMCR_FORCE_SPEED_1000; @@ -23,7 +23,7 @@ Signed-off-by: RenĂ© van Dorst break; } if (duplex == DUPLEX_FULL) { -@@ -3118,6 +3122,54 @@ static int mt753x_set_mac_eee(struct dsa +@@ -3112,6 +3116,54 @@ static int mt753x_set_mac_eee(struct dsa return 0; } diff --git a/target/linux/generic/pending-5.18/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.18/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 3b72ad018..923356482 100644 --- a/target/linux/generic/pending-5.18/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.18/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6872,6 +6872,7 @@ static int mv88e6xxx_register_switch(str +@@ -6873,6 +6873,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/generic/pending-5.18/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-5.18/810-pci_disable_common_quirks.patch index 7edbd94f7..3f444e44f 100644 --- a/target/linux/generic/pending-5.18/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-5.18/810-pci_disable_common_quirks.patch @@ -25,7 +25,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -206,6 +206,7 @@ static void quirk_mmio_always_on(struct +@@ -207,6 +207,7 @@ static void quirk_mmio_always_on(struct DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos /* * The Mellanox Tavor device gives false positive parity errors. Disable * parity error reporting. -@@ -3363,6 +3364,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3364,6 +3365,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3388,6 +3391,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3389,6 +3392,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3426,6 +3431,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3427,6 +3432,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); diff --git a/target/linux/generic/pending-5.18/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.18/811-pci_disable_usb_common_quirks.patch index 9b0ce7100..67406bac8 100644 --- a/target/linux/generic/pending-5.18/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-5.18/811-pci_disable_usb_common_quirks.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -495,7 +495,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/pending-5.18/834-ledtrig-libata.patch b/target/linux/generic/pending-5.18/834-ledtrig-libata.patch index e557913e2..6a2d0e3ee 100644 --- a/target/linux/generic/pending-5.18/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.18/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4590,6 +4603,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4595,6 +4608,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -5357,6 +5373,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5362,6 +5378,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5392,6 +5411,12 @@ static void ata_host_release(struct kref +@@ -5397,6 +5416,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -5794,7 +5819,23 @@ int ata_host_register(struct ata_host *h +@@ -5799,7 +5824,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } diff --git a/target/linux/generic/pending-5.18/920-mangle_bootargs.patch b/target/linux/generic/pending-5.18/920-mangle_bootargs.patch index 28c6620f5..05e389fae 100644 --- a/target/linux/generic/pending-5.18/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.18/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1806,6 +1806,15 @@ config EMBEDDED +@@ -1820,6 +1820,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration.