diff --git a/include/kernel-5.10 b/include/kernel-5.10 index e52f4b1c4..f5dff37bd 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .142 -LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268 +LINUX_VERSION-5.10 = .143 +LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91 diff --git a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch index 5362baf65..c995c9040 100644 --- a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch @@ -43,7 +43,7 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1892,6 +1892,7 @@ struct xhci_hcd { +@@ -1895,6 +1895,7 @@ struct xhci_hcd { struct xhci_hub usb2_rhub; struct xhci_hub usb3_rhub; /* support xHCI 1.0 spec USB2 hardware LPM */ diff --git a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch index cb6a7be84..68b831036 100644 --- a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch +++ b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch @@ -13,9 +13,9 @@ Signed-off-by: John Crispin --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -931,6 +931,17 @@ config LEDS_ACER_A500 - - source "drivers/leds/blink/Kconfig" +@@ -929,6 +929,17 @@ config LEDS_ACER_A500 + This option enables support for the Power Button LED of + Acer Iconia Tab A500. +config LEDS_RESET + tristate "LED support for reset-controller API" diff --git a/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch b/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch index e99d067c4..317bef220 100644 --- a/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch +++ b/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch @@ -21,7 +21,7 @@ Signed-off-by: David Bauer --- a/drivers/mtd/spi-nor/macronix.c +++ b/drivers/mtd/spi-nor/macronix.c -@@ -51,7 +51,8 @@ static const struct flash_info macronix_ +@@ -50,7 +50,8 @@ static const struct flash_info macronix_ { "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) }, { "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) }, { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch index 38a65b183..13b6fd329 100644 --- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3150,6 +3150,7 @@ int spi_nor_scan(struct spi_nor *nor, co struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; struct device_node *np = spi_nor_get_flash_node(nor); @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma int ret; int i; -@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3204,7 +3205,12 @@ int spi_nor_scan(struct spi_nor *nor, co if (ret) return ret; diff --git a/target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch b/target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch index e5b06e14a..ad5257fab 100644 --- a/target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch +++ b/target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru +@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru parse_redboot_of(master); @@ -19,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru +@@ -109,10 +115,6 @@ static int parse_redboot_partitions(stru goto nogood; } } @@ -30,7 +30,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru +@@ -185,6 +187,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch index cd335fbbc..88cf2b9a8 100644 --- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch @@ -682,7 +682,7 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh) --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf +@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf /* Fast path for timestamp-only option */ if (length == TCPOLEN_TSTAMP_ALIGNED @@ -706,7 +706,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4116,14 +4116,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -4127,14 +4127,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch index 4ed13deb5..3129fac3a 100644 --- a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch @@ -42,7 +42,7 @@ menu "SPI GPIO expanders" --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -121,6 +121,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061. +@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061. obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o diff --git a/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch b/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch index 4cf6bb08d..4f4344b40 100644 --- a/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch +++ b/target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch @@ -27,7 +27,7 @@ depends on MFD_SYSCON --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -73,6 +73,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o +@@ -72,6 +72,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o @@ -35,7 +35,7 @@ obj-$(CONFIG_GPIO_LOGICVC) += gpio-logicvc.o obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o -@@ -122,6 +123,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio +@@ -121,6 +122,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o obj-$(CONFIG_GPIO_RB4XX) += gpio-rb4xx.o diff --git a/target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index b76f06d92..b70f28e5a 100644 --- a/target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -317,6 +317,9 @@ config BCM63XX +@@ -319,6 +319,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU diff --git a/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch b/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch index f37220168..8517bd7bb 100644 --- a/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch +++ b/target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch @@ -34,7 +34,7 @@ Signed-off-by: Chuck Lever source "fs/cifs/Kconfig" --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c -@@ -422,7 +422,9 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = { +@@ -430,7 +430,9 @@ static const struct nfs4_ssc_client_ops */ void nfs42_ssc_register_ops(void) { @@ -44,7 +44,7 @@ Signed-off-by: Chuck Lever } /** -@@ -433,7 +435,9 @@ void nfs42_ssc_register_ops(void) +@@ -441,7 +443,9 @@ void nfs42_ssc_register_ops(void) */ void nfs42_ssc_unregister_ops(void) { @@ -56,7 +56,7 @@ Signed-off-by: Chuck Lever --- a/fs/nfs/super.c +++ b/fs/nfs/super.c -@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = { +@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = }; EXPORT_SYMBOL_GPL(nfs_sops); @@ -112,7 +112,7 @@ Signed-off-by: Chuck Lever --- a/fs/nfs_common/Makefile +++ b/fs/nfs_common/Makefile -@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o +@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl nfs_acl-objs := nfsacl.o obj-$(CONFIG_GRACE_PERIOD) += grace.o diff --git a/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch b/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch index 37cf10fd2..84c68e142 100644 --- a/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch +++ b/target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch @@ -32,7 +32,7 @@ Signed-off-by: Trond Myklebust source "fs/ceph/Kconfig" --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c -@@ -422,9 +422,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = { +@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops */ void nfs42_ssc_register_ops(void) { @@ -42,7 +42,7 @@ Signed-off-by: Trond Myklebust } /** -@@ -435,9 +433,7 @@ void nfs42_ssc_register_ops(void) +@@ -443,9 +441,7 @@ void nfs42_ssc_register_ops(void) */ void nfs42_ssc_unregister_ops(void) { diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index f9bb0e2cc..352c6094d 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7919,11 +7923,10 @@ static int nf_tables_commit(struct net * +@@ -7921,11 +7925,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso } else { nft_clear(net, trans->ctx.table); } -@@ -8137,11 +8140,9 @@ static int __nf_tables_abort(struct net +@@ -8139,11 +8142,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { diff --git a/target/linux/generic/backport-5.10/610-v5.18-netfilter-flowtable-move-dst_check-to-packet-path.patch b/target/linux/generic/backport-5.10/610-v5.18-netfilter-flowtable-move-dst_check-to-packet-path.patch index 99e40b937..060214277 100644 --- a/target/linux/generic/backport-5.10/610-v5.18-netfilter-flowtable-move-dst_check-to-packet-path.patch +++ b/target/linux/generic/backport-5.10/610-v5.18-netfilter-flowtable-move-dst_check-to-packet-path.patch @@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c -@@ -433,33 +433,12 @@ nf_flow_table_iterate(struct nf_flowtabl +@@ -429,33 +429,12 @@ nf_flow_table_iterate(struct nf_flowtabl return err; } diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index 0b082c029..566154c86 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3247,9 +3247,11 @@ static int setup_load_info(struct load_i +@@ -3251,9 +3251,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; -@@ -3270,6 +3272,7 @@ static int check_modinfo(struct module * +@@ -3274,6 +3276,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.10/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-5.10/640-bridge-only-accept-EAP-locally.patch index d8e5f2fc9..3572c19fc 100644 --- a/target/linux/generic/hack-5.10/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-5.10/640-bridge-only-accept-EAP-locally.patch @@ -12,7 +12,7 @@ Signed-off-by: Etienne Champetier --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -107,10 +107,14 @@ int br_handle_frame_finish(struct net *n +@@ -114,10 +114,14 @@ int br_handle_frame_finish(struct net *n } } diff --git a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch index de8aa0eca..21e558702 100644 --- a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.10/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 -@@ -625,12 +625,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -611,12 +611,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; @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau EXPORT_SYMBOL(default_qdisc_ops); static void qdisc_maybe_clear_missed(struct Qdisc *q, -@@ -1062,12 +1062,12 @@ static void attach_one_default_qdisc(str +@@ -1077,12 +1077,12 @@ static void attach_one_default_qdisc(str void *_unused) { struct Qdisc *qdisc; diff --git a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch index b35686205..45a558bfe 100644 --- a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch @@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen #if defined(CONFIG_NF_CONNTRACK_LABELS) --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS +@@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS If unsure, say `N'. diff --git a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 887732de8..858bc0c78 100644 --- a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -80,7 +80,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, +@@ -3650,9 +3650,17 @@ static int xmit_one(struct sk_buff *skb, { unsigned int len; int rc; @@ -99,7 +99,7 @@ #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb))) -@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct +@@ -5204,6 +5212,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -111,7 +111,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru +@@ -5252,6 +5265,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -122,7 +122,7 @@ net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_receive_skb(skb); -@@ -5299,6 +5316,15 @@ another_round: +@@ -5291,6 +5308,15 @@ another_round: goto out; } diff --git a/target/linux/generic/hack-5.10/993-export-dev-set-dev-symbol.patch b/target/linux/generic/hack-5.10/993-export-dev-set-dev-symbol.patch index 9a3f6a8f0..c261eeeac 100644 --- a/target/linux/generic/hack-5.10/993-export-dev-set-dev-symbol.patch +++ b/target/linux/generic/hack-5.10/993-export-dev-set-dev-symbol.patch @@ -1,6 +1,6 @@ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6900,6 +6900,7 @@ +@@ -6903,6 +6903,7 @@ int dev_set_threaded(struct net_device * return err; } diff --git a/target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch b/target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch index 377958b77..1d2b3d85f 100644 --- a/target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch +++ b/target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch @@ -1,6 +1,6 @@ --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c -@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) +@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_contro { struct mhi_event *mhi_event = mhi_cntrl->mhi_event; struct device *dev = &mhi_cntrl->mhi_dev->dev; @@ -19,7 +19,7 @@ "bhi", mhi_cntrl); if (ret) return ret; -@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) +@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_contro ret = request_irq(mhi_cntrl->irq[mhi_event->irq], mhi_irq_handler, diff --git a/target/linux/generic/hack-5.10/995-add-support-for-forced-PM-resume.patch b/target/linux/generic/hack-5.10/995-add-support-for-forced-PM-resume.patch index 35fe5821c..8fb2cb1b1 100644 --- a/target/linux/generic/hack-5.10/995-add-support-for-forced-PM-resume.patch +++ b/target/linux/generic/hack-5.10/995-add-support-for-forced-PM-resume.patch @@ -1,6 +1,6 @@ --- a/drivers/bus/mhi/core/pm.c +++ b/drivers/bus/mhi/core/pm.c -@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) +@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller } EXPORT_SYMBOL_GPL(mhi_pm_suspend); @@ -9,7 +9,7 @@ { struct mhi_chan *itr, *tmp; struct device *dev = &mhi_cntrl->mhi_dev->dev; -@@ -783,6 +783,13 @@ +@@ -783,6 +783,13 @@ int mhi_pm_resume(struct mhi_controller if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) return -EIO; @@ -23,7 +23,7 @@ /* Notify clients about exiting LPM */ list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) { -@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller *mhi_cntrl) +@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller return 0; } @@ -45,7 +45,7 @@ int ret; --- a/drivers/net/wireless/ath/ath11k/mhi.c +++ b/drivers/net/wireless/ath/ath11k/mhi.c -@@ -415,6 +415,11 @@ +@@ -415,6 +415,11 @@ static int ath11k_mhi_set_state(struct a case ATH11K_MHI_SUSPEND: break; case ATH11K_MHI_RESUME: @@ -59,11 +59,10 @@ ret = mhi_force_rddm_mode(ab_pci->mhi_ctrl); --- a/include/linux/mhi.h +++ b/include/linux/mhi.h -@@ -646,6 +646,19 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl); - */ +@@ -647,6 +647,19 @@ int mhi_pm_suspend(struct mhi_controller int mhi_pm_resume(struct mhi_controller *mhi_cntrl); -+/** + /** + * mhi_pm_resume_force - Force resume MHI from suspended state + * @mhi_cntrl: MHI controller + * @@ -76,6 +75,7 @@ + */ +int mhi_pm_resume_force(struct mhi_controller *mhi_cntrl); + - /** ++/** * mhi_download_rddm_img - Download ramdump image from device for * debugging purpose. + * @mhi_cntrl: MHI controller diff --git a/target/linux/generic/hack-5.10/996-fs-ntfs3-Add-NTFS3-in-fs-Kconfig-and-fs-Makefile.patch b/target/linux/generic/hack-5.10/996-fs-ntfs3-Add-NTFS3-in-fs-Kconfig-and-fs-Makefile.patch index 9b115962b..8a38e2be5 100644 --- a/target/linux/generic/hack-5.10/996-fs-ntfs3-Add-NTFS3-in-fs-Kconfig-and-fs-Makefile.patch +++ b/target/linux/generic/hack-5.10/996-fs-ntfs3-Add-NTFS3-in-fs-Kconfig-and-fs-Makefile.patch @@ -11,8 +11,6 @@ Signed-off-by: Konstantin Komarov fs/Makefile | 1 + 2 files changed, 2 insertions(+) -diff --git a/fs/Kconfig b/fs/Kconfig -index da524c4d7b7e..0bbad356ab57 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -145,6 +145,7 @@ menu "DOS/FAT/EXFAT/NT Filesystems" @@ -23,8 +21,6 @@ index da524c4d7b7e..0bbad356ab57 100644 endmenu endif # BLOCK -diff --git a/fs/Makefile b/fs/Makefile -index 999d1a23f036..4f5242cdaee2 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -100,6 +100,7 @@ obj-$(CONFIG_SYSV_FS) += sysv/ @@ -35,6 +31,3 @@ index 999d1a23f036..4f5242cdaee2 100644 obj-$(CONFIG_UFS_FS) += ufs/ obj-$(CONFIG_EFS_FS) += efs/ obj-$(CONFIG_JFFS2_FS) += jffs2/ --- -2.30.1 - diff --git a/target/linux/generic/pending-5.10/201-extra_optimization.patch b/target/linux/generic/pending-5.10/201-extra_optimization.patch index cb1de8076..e7f46d244 100644 --- a/target/linux/generic/pending-5.10/201-extra_optimization.patch +++ b/target/linux/generic/pending-5.10/201-extra_optimization.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -735,11 +735,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni +@@ -744,11 +744,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE diff --git a/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch index 7692f484a..3ea5f4abb 100644 --- a/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ b/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -305,6 +305,7 @@ static int parse_redboot_partitions(stru +@@ -306,6 +306,7 @@ static int parse_redboot_partitions(stru static const struct of_device_id mtd_parser_redboot_of_match_table[] = { { .compatible = "redboot-fis" }, diff --git a/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch index 4eaecfd9a..3979954ea 100644 --- a/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch +++ b/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau endif # MTD_SPI_NOR --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2801,6 +2801,21 @@ static void spi_nor_info_init_params(str +@@ -2795,6 +2795,21 @@ static void spi_nor_info_init_params(str */ erase_mask = 0; i = 0; @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau if (info->flags & SECT_4K_PMC) { erase_mask |= BIT(i); spi_nor_set_erase_type(&map->erase_type[i], 4096u, -@@ -2812,6 +2827,7 @@ static void spi_nor_info_init_params(str +@@ -2806,6 +2821,7 @@ static void spi_nor_info_init_params(str SPINOR_OP_BE_4K); i++; } diff --git a/target/linux/generic/pending-5.10/479-mtd-spi-nor-add-xtx-xt25f128b.patch b/target/linux/generic/pending-5.10/479-mtd-spi-nor-add-xtx-xt25f128b.patch index 394f9a18d..9f18f7a79 100644 --- a/target/linux/generic/pending-5.10/479-mtd-spi-nor-add-xtx-xt25f128b.patch +++ b/target/linux/generic/pending-5.10/479-mtd-spi-nor-add-xtx-xt25f128b.patch @@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau +}; --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2037,6 +2037,7 @@ static const struct spi_nor_manufacturer +@@ -2035,6 +2035,7 @@ static const struct spi_nor_manufacturer &spi_nor_winbond, &spi_nor_xilinx, &spi_nor_xmc, diff --git a/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch b/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch index f44391ef8..fdd68d065 100644 --- a/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch +++ b/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch @@ -144,7 +144,7 @@ Signed-off-by: Rajkumar Ayyasamy .cmd_rcgr = 0x75070, .freq_tbl = ftbl_pcie_rchng_clk_src, .hid_width = 5, -@@ -4435,6 +4523,114 @@ static struct clk_branch gcc_pcie0_axi_s +@@ -4435,6 +4523,114 @@ static const struct alpha_pll_config nss .alpha_en_mask = BIT(24), }; diff --git a/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch b/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch index 7f32ac333..b45580f7a 100644 --- a/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch +++ b/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch @@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -4524,10 +4524,10 @@ static struct clk_branch gcc_pcie0_axi_s +@@ -4524,10 +4524,10 @@ static const struct alpha_pll_config nss }; static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = { diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 8a04c568e..5e6113b64 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -109,7 +109,7 @@ __be16 vlan_proto, u16 vlan_id) --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2764,6 +2764,10 @@ enum netdev_cmd { +@@ -2778,6 +2778,10 @@ enum netdev_cmd { NETDEV_CVLAN_FILTER_DROP_INFO, NETDEV_SVLAN_FILTER_PUSH_INFO, NETDEV_SVLAN_FILTER_DROP_INFO, @@ -508,7 +508,7 @@ #endif --- a/net/core/neighbour.c +++ b/net/core/neighbour.c -@@ -1209,7 +1209,21 @@ static void neigh_update_hhs(struct neig +@@ -1224,7 +1224,21 @@ static void neigh_update_hhs(struct neig } } @@ -530,7 +530,7 @@ /* Generic update routine. -- lladdr is new lladdr or NULL, if it is not supplied. -@@ -1240,6 +1254,7 @@ static int __neigh_update(struct neighbo +@@ -1255,6 +1269,7 @@ static int __neigh_update(struct neighbo int notify = 0; struct net_device *dev; int update_isrouter = 0; @@ -538,7 +538,7 @@ trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid); -@@ -1254,6 +1269,8 @@ static int __neigh_update(struct neighbo +@@ -1269,6 +1284,8 @@ static int __neigh_update(struct neighbo new = old; goto out; } @@ -547,7 +547,7 @@ if (!(flags & NEIGH_UPDATE_F_ADMIN) && (old & (NUD_NOARP | NUD_PERMANENT))) goto out; -@@ -1291,6 +1308,11 @@ static int __neigh_update(struct neighbo +@@ -1306,6 +1323,11 @@ static int __neigh_update(struct neighbo - compare new & old - if they are different, check override flag */ @@ -559,7 +559,7 @@ if ((old & NUD_VALID) && !memcmp(lladdr, neigh->ha, dev->addr_len)) lladdr = neigh->ha; -@@ -1413,8 +1435,11 @@ out: +@@ -1428,8 +1450,11 @@ out: if (((new ^ old) & NUD_PERMANENT) || ext_learn_change) neigh_update_gc_list(neigh); @@ -639,7 +639,7 @@ #endif --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -7270,3 +7270,35 @@ void addrconf_cleanup(void) +@@ -7269,3 +7269,35 @@ void addrconf_cleanup(void) destroy_workqueue(addrconf_wq); } diff --git a/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch b/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch index 653cf0ff9..29c2dd7c2 100644 --- a/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch +++ b/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch @@ -466,7 +466,7 @@ #endif /* !(__LINUX_IF_PPPOX_H) */ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1628,6 +1628,24 @@ enum netdev_priv_flags { +@@ -1642,6 +1642,24 @@ enum netdev_priv_flags { IFF_NO_IP_ALIGN = 1<<31, }; @@ -491,7 +491,7 @@ #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN #define IFF_EBRIDGE IFF_EBRIDGE #define IFF_BONDING IFF_BONDING -@@ -2008,6 +2026,7 @@ struct net_device { +@@ -2022,6 +2040,7 @@ struct net_device { unsigned int flags; unsigned int priv_flags; diff --git a/target/linux/ipq807x/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch b/target/linux/ipq807x/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch index 971b32841..4d6afb93f 100644 --- a/target/linux/ipq807x/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch +++ b/target/linux/ipq807x/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch @@ -11,11 +11,9 @@ Signed-off-by: Simon Casey net/bridge/br_fdb.c | 25 +++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) -diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index 3d3509ab7..6261e545f 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -196,4 +196,8 @@ typedef struct net_bridge_port *br_get_dst_hook_t( +@@ -197,4 +197,8 @@ typedef struct net_bridge_port *br_get_d extern br_get_dst_hook_t __rcu *br_get_dst_hook; /* QCA NSS ECM support - End */ @@ -24,11 +22,9 @@ index 3d3509ab7..6261e545f 100644 +/* QCA NSS bridge-mgr support - End */ + #endif -diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c -index 26ff431b8..56a695fe4 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c -@@ -66,6 +66,15 @@ void br_fdb_update_unregister_notify(struct notifier_block *nb) +@@ -66,6 +66,15 @@ void br_fdb_update_unregister_notify(str EXPORT_SYMBOL_GPL(br_fdb_update_unregister_notify); /* QCA NSS ECM support - End */ @@ -44,7 +40,7 @@ index 26ff431b8..56a695fe4 100644 int __init br_fdb_init(void) { br_fdb_cache = kmem_cache_create("bridge_fdb_cache", -@@ -371,7 +380,7 @@ void br_fdb_cleanup(struct work_struct *work) +@@ -371,7 +380,7 @@ void br_fdb_cleanup(struct work_struct * unsigned long delay = hold_time(br); unsigned long work_delay = delay; unsigned long now = jiffies; @@ -53,7 +49,7 @@ index 26ff431b8..56a695fe4 100644 /* this part is tricky, in order to avoid blocking learning and * consequently forwarding, we rely on rcu to delete objects with -@@ -399,12 +408,13 @@ void br_fdb_cleanup(struct work_struct *work) +@@ -399,12 +408,13 @@ void br_fdb_cleanup(struct work_struct * } else { spin_lock_bh(&br->hash_lock); if (!hlist_unhashed(&f->fdb_node)) { @@ -69,7 +65,7 @@ index 26ff431b8..56a695fe4 100644 /* QCA NSS ECM support - End */ } spin_unlock_bh(&br->hash_lock); -@@ -615,6 +625,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, +@@ -615,6 +625,7 @@ void br_fdb_update(struct net_bridge *br const unsigned char *addr, u16 vid, unsigned long flags) { struct net_bridge_fdb_entry *fdb; @@ -77,7 +73,7 @@ index 26ff431b8..56a695fe4 100644 /* some users want to always flood. */ if (hold_time(br) == 0) -@@ -640,6 +651,12 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, +@@ -640,6 +651,12 @@ void br_fdb_update(struct net_bridge *br if (unlikely(source != fdb->dst && !test_bit(BR_FDB_STICKY, &fdb->flags))) { br_switchdev_fdb_notify(br, fdb, RTM_DELNEIGH); @@ -90,7 +86,7 @@ index 26ff431b8..56a695fe4 100644 fdb->dst = source; fdb_modified = true; /* Take over HW learned entry */ -@@ -651,7 +668,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, +@@ -651,7 +668,7 @@ void br_fdb_update(struct net_bridge *br /* QCA NSS ECM support - Start */ atomic_notifier_call_chain( &br_fdb_update_notifier_list, @@ -99,6 +95,3 @@ index 26ff431b8..56a695fe4 100644 /* QCA NSS ECM support - End */ } --- -2.25.1 - diff --git a/target/linux/ipq807x/patches-5.10/991-clk-qcom-add-support-for-hw-controlled-RCG.patch b/target/linux/ipq807x/patches-5.10/991-clk-qcom-add-support-for-hw-controlled-RCG.patch index 147dcf25b..b7f615608 100644 --- a/target/linux/ipq807x/patches-5.10/991-clk-qcom-add-support-for-hw-controlled-RCG.patch +++ b/target/linux/ipq807x/patches-5.10/991-clk-qcom-add-support-for-hw-controlled-RCG.patch @@ -133,4 +133,4 @@ Change-Id: Ifb4175b02d89542baa1b758107c2ce86f7bf8599 + update_config(rcg, true); clk_rcg2_clear_force_enable(hw); - \ No newline at end of file + diff --git a/target/linux/ipq807x/patches-5.10/998-regulator-add-Qualcomm-CPR-regulators.patch b/target/linux/ipq807x/patches-5.10/998-regulator-add-Qualcomm-CPR-regulators.patch index 247baba53..7b5669bf2 100644 --- a/target/linux/ipq807x/patches-5.10/998-regulator-add-Qualcomm-CPR-regulators.patch +++ b/target/linux/ipq807x/patches-5.10/998-regulator-add-Qualcomm-CPR-regulators.patch @@ -1,6 +1,3 @@ -diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h -new file mode 100644 -index 000000000000..db43446163a9 --- /dev/null +++ b/include/soc/qcom/socinfo.h @@ -0,0 +1,463 @@ diff --git a/target/linux/ipq807x/patches-5.10/999-5.10-qca-nss-ssdk-delete-fdb-entry-using-netdev.patch b/target/linux/ipq807x/patches-5.10/999-5.10-qca-nss-ssdk-delete-fdb-entry-using-netdev.patch index 041d3a460..15ce2ce4a 100644 --- a/target/linux/ipq807x/patches-5.10/999-5.10-qca-nss-ssdk-delete-fdb-entry-using-netdev.patch +++ b/target/linux/ipq807x/patches-5.10/999-5.10-qca-nss-ssdk-delete-fdb-entry-using-netdev.patch @@ -1,6 +1,6 @@ --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -240,4 +240,7 @@ extern br_get_dst_hook_t __rcu *br_get_d +@@ -201,4 +201,7 @@ extern br_get_dst_hook_t __rcu *br_get_d extern struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br); /* QCA NSS bridge-mgr support - End */ @@ -10,7 +10,7 @@ #endif --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c -@@ -1246,6 +1246,19 @@ static int __br_fdb_delete(struct net_br +@@ -1181,6 +1181,19 @@ static int __br_fdb_delete(struct net_br return err; } diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 0fa8ff572..33d27a181 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2735,6 +2735,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2716,6 +2716,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mediatek/patches-5.10/510-net-mediatek-add-flow-offload-for-mt7623.patch b/target/linux/mediatek/patches-5.10/510-net-mediatek-add-flow-offload-for-mt7623.patch index e370d6847..7f45a715e 100644 --- a/target/linux/mediatek/patches-5.10/510-net-mediatek-add-flow-offload-for-mt7623.patch +++ b/target/linux/mediatek/patches-5.10/510-net-mediatek-add-flow-offload-for-mt7623.patch @@ -14,7 +14,7 @@ Signed-off-by: Frank Wunderlich --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -3375,6 +3375,7 @@ static const struct mtk_soc_data mt7623_ +@@ -3395,6 +3395,7 @@ static const struct mtk_soc_data mt7623_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7623_CLKS_BITMAP, .required_pctl = true, diff --git a/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 898e60230..8f56bdbf9 100644 --- a/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. diff --git a/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch index a88717113..34842c6ff 100644 --- a/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch +++ b/target/linux/ramips/patches-5.10/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch @@ -55,7 +55,7 @@ Signed-off-by: David Bauer +}; --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2021,6 +2021,7 @@ int spi_nor_sr2_bit7_quad_enable(struct +@@ -2019,6 +2019,7 @@ int spi_nor_sr2_bit7_quad_enable(struct static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_atmel, diff --git a/target/linux/ramips/patches-5.10/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch b/target/linux/ramips/patches-5.10/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch index 3eee03494..d0686a705 100644 --- a/target/linux/ramips/patches-5.10/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch +++ b/target/linux/ramips/patches-5.10/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch @@ -44,4 +44,4 @@ Signed-off-by: Weijie Gao +obj-$(CONFIG_MTD_NAND_MT7621) += mt7621_nand.o obj-$(CONFIG_MTD_NAND_MTK) += mtk_ecc.o mtk_nand.o obj-$(CONFIG_MTD_NAND_MXIC) += mxic_nand.o - obj-$(CONFIG_MTD_NAND_TEGRA) += tegra_nand.o \ No newline at end of file + obj-$(CONFIG_MTD_NAND_TEGRA) += tegra_nand.o diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch b/target/linux/ramips/patches-5.10/710-at803x.patch index d15dd9296..6a025d580 100644 --- a/target/linux/ramips/patches-5.10/710-at803x.patch +++ b/target/linux/ramips/patches-5.10/710-at803x.patch @@ -40,9 +40,9 @@ Signed-off-by: René van Dorst +#define PSSR_SPEED_1000 BIT(15) +#define PSSR_SPEED_100 BIT(14) - #define AT803X_DEBUG_REG_0 0x00 - #define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15) -@@ -532,12 +543,75 @@ static int at803x_parse_dt(struct phy_de + #define AT803X_DEBUG_ANALOG_TEST_CTRL 0x00 + #define QCA8327_DEBUG_MANU_CTRL_EN BIT(2) +@@ -629,12 +640,75 @@ static int at803x_parse_dt(struct phy_de return 0; } @@ -118,7 +118,7 @@ Signed-off-by: René van Dorst priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; -@@ -744,6 +818,10 @@ static int at803x_read_status(struct phy +@@ -841,6 +915,10 @@ static int at803x_read_status(struct phy { int ss, err, old_link = phydev->link; @@ -129,7 +129,7 @@ Signed-off-by: René van Dorst /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); if (err) -@@ -844,6 +922,12 @@ static int at803x_config_aneg(struct phy +@@ -941,6 +1019,12 @@ static int at803x_config_aneg(struct phy { int ret; @@ -142,7 +142,7 @@ Signed-off-by: René van Dorst ret = at803x_config_mdix(phydev, phydev->mdix_ctrl); if (ret < 0) return ret; -@@ -1145,6 +1229,7 @@ static struct phy_driver at803x_driver[] +@@ -1353,6 +1437,7 @@ static struct phy_driver at803x_driver[] /* Qualcomm Atheros AR8031/AR8033 */ PHY_ID_MATCH_EXACT(ATH8031_PHY_ID), .name = "Qualcomm Atheros AR8031/AR8033", diff --git a/target/linux/ramips/patches-5.10/720-Revert-net-phy-simplify-phy_link_change-arguments.patch b/target/linux/ramips/patches-5.10/720-Revert-net-phy-simplify-phy_link_change-arguments.patch index a73d5e7b1..6e8b48829 100644 --- a/target/linux/ramips/patches-5.10/720-Revert-net-phy-simplify-phy_link_change-arguments.patch +++ b/target/linux/ramips/patches-5.10/720-Revert-net-phy-simplify-phy_link_change-arguments.patch @@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c phy_led_trigger_change_speed(phydev); } -@@ -567,7 +567,7 @@ int phy_start_cable_test(struct phy_devi +@@ -572,7 +572,7 @@ int phy_start_cable_test(struct phy_devi goto out; /* Mark the carrier down until the test is complete */ @@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c netif_testing_on(dev); err = phydev->drv->cable_test_start(phydev); -@@ -638,7 +638,7 @@ int phy_start_cable_test_tdr(struct phy_ +@@ -643,7 +643,7 @@ int phy_start_cable_test_tdr(struct phy_ goto out; /* Mark the carrier down until the test is complete */ @@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c netif_testing_on(dev); err = phydev->drv->cable_test_tdr_start(phydev, config); -@@ -709,7 +709,7 @@ static int phy_check_link_status(struct +@@ -714,7 +714,7 @@ static int phy_check_link_status(struct phy_link_up(phydev); } else if (!phydev->link && phydev->state != PHY_NOLINK) { phydev->state = PHY_NOLINK; @@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c } return 0; -@@ -1191,7 +1191,7 @@ void phy_state_machine(struct work_struc +@@ -1226,7 +1226,7 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; diff --git a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index 52d40215f..c17333692 100644 --- a/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-5.10/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -62,7 +62,7 @@ Cc: linux-gpio@vger.kernel.org depends on PLAT_SPEAR --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos +@@ -119,6 +119,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o diff --git a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch index 40d484dad..1e9d5a288 100644 --- a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -5301,6 +5302,22 @@ static void rtl_tally_reset(struct r8152 +@@ -6780,6 +6781,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -5342,6 +5359,8 @@ static void r8152b_init(struct r8152 *tp +@@ -6821,6 +6838,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -5487,6 +5506,8 @@ static void r8153_init(struct r8152 *tp) +@@ -6961,6 +6980,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -5573,6 +5594,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7043,6 +7064,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ @@ -71,4 +71,4 @@ Signed-off-by: David Bauer + r8152_led_configuration(tp); } - static int rtl8152_pre_reset(struct usb_interface *intf) + static void r8153c_init(struct r8152 *tp) diff --git a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index 3ead34ca9..c2caa814b 100644 --- a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -13,7 +13,7 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -75,6 +75,19 @@ &emmc_phy { +@@ -68,6 +68,19 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch b/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch index 404f64ab9..23d461fad 100644 --- a/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch +++ b/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi +@@ -37,6 +37,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb diff --git a/target/linux/rockchip/patches-5.10/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.10/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch index d76563efc..674657593 100644 --- a/target/linux/rockchip/patches-5.10/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.10/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -101,6 +101,19 @@ +@@ -96,6 +96,19 @@ max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; diff --git a/target/linux/rockchip/patches-5.10/108-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-5.10/108-nanopi-r4s-sd-signalling.patch index a04c14b70..f4f77835c 100644 --- a/target/linux/rockchip/patches-5.10/108-nanopi-r4s-sd-signalling.patch +++ b/target/linux/rockchip/patches-5.10/108-nanopi-r4s-sd-signalling.patch @@ -12,7 +12,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -121,6 +121,11 @@ +@@ -145,6 +145,11 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch index 28c337554..01059d8d4 100644 --- a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch +++ b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch @@ -1,7 +1,7 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-ev - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb +@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1 + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb diff --git a/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch index 078efd4da..4cb7e34e7 100644 --- a/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.10/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -7,7 +7,7 @@ +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts @@ -0,0 +1,51 @@ diff --git a/target/linux/rockchip/patches-5.10/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-5.10/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch index dffaf4395..e057053ab 100644 --- a/target/linux/rockchip/patches-5.10/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch +++ b/target/linux/rockchip/patches-5.10/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch @@ -33,21 +33,16 @@ to status_led in accordance with the board schematics. 2 files changed, 397 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 479906f3a..5f6ffb496 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -3,6 +3,7 @@ - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb +@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts -new file mode 100644 -index 000000000..1eb7fd5f7 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3.dts @@ -0,0 +1,396 @@ @@ -447,6 +442,3 @@ index 000000000..1eb7fd5f7 + realtek,led-data = <0x87>; + }; +}; --- -2.34.1 - diff --git a/target/linux/rockchip/patches-5.10/600-net-phy-Add-driver-for-Motorcomm-YT85xx-PHYs.patch b/target/linux/rockchip/patches-5.10/600-net-phy-Add-driver-for-Motorcomm-YT85xx-PHYs.patch index 9ded06653..1a557178a 100644 --- a/target/linux/rockchip/patches-5.10/600-net-phy-Add-driver-for-Motorcomm-YT85xx-PHYs.patch +++ b/target/linux/rockchip/patches-5.10/600-net-phy-Add-driver-for-Motorcomm-YT85xx-PHYs.patch @@ -15,7 +15,7 @@ Signed-off-by: hmz007 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -297,6 +297,11 @@ config MICROSEMI_PHY +@@ -302,6 +302,11 @@ config MICROSEMI_PHY help Currently supports VSC8514, VSC8530, VSC8531, VSC8540 and VSC8541 PHYs @@ -29,7 +29,7 @@ Signed-off-by: hmz007 help --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -82,6 +82,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o +@@ -83,6 +83,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o obj-$(CONFIG_MICROCHIP_PHY) += microchip.o obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o obj-$(CONFIG_MICROSEMI_PHY) += mscc/ diff --git a/target/linux/x86/patches-5.10/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch b/target/linux/x86/patches-5.10/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch index 51265c0a0..2e8d74ef1 100644 --- a/target/linux/x86/patches-5.10/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch +++ b/target/linux/x86/patches-5.10/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch @@ -1,7 +1,6 @@ -diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2020-09-03 23:21:36.695693427 -0400 -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h 2020-09-03 23:29:22.457340229 -0400 -@@ -1592,6 +1592,7 @@ +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +@@ -1592,6 +1592,7 @@ struct bnx2x { uint num_ethernet_queues; uint num_cnic_queues; int disable_tpa; @@ -9,10 +8,9 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/ u32 rx_mode; #define BNX2X_RX_MODE_NONE 0 -diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 2020-09-03 23:21:36.699693373 -0400 -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c 2020-09-03 23:29:22.457340229 -0400 -@@ -151,6 +151,7 @@ +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +@@ -151,6 +151,7 @@ typedef int (*read_sfp_module_eeprom_fun #define SFP_EEPROM_CON_TYPE_ADDR 0x2 #define SFP_EEPROM_CON_TYPE_VAL_UNKNOWN 0x0 @@ -20,7 +18,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe #define SFP_EEPROM_CON_TYPE_VAL_LC 0x7 #define SFP_EEPROM_CON_TYPE_VAL_COPPER 0x21 #define SFP_EEPROM_CON_TYPE_VAL_RJ45 0x22 -@@ -4206,6 +4207,16 @@ +@@ -4210,6 +4211,16 @@ static void bnx2x_warpcore_set_sgmii_spe 0x1000); DP(NETIF_MSG_LINK, "set SGMII AUTONEG\n"); } else { @@ -37,7 +35,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, MDIO_WC_REG_COMBO_IEEE0_MIICTRL, &val16); val16 &= 0xcebf; -@@ -4216,6 +4227,7 @@ +@@ -4220,6 +4231,7 @@ static void bnx2x_warpcore_set_sgmii_spe val16 |= 0x2000; break; case SPEED_1000: @@ -45,7 +43,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe val16 |= 0x0040; break; default: -@@ -8169,6 +8181,7 @@ +@@ -8172,6 +8184,7 @@ static int bnx2x_get_edc_mode(struct bnx break; } case SFP_EEPROM_CON_TYPE_VAL_UNKNOWN: @@ -53,7 +51,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe case SFP_EEPROM_CON_TYPE_VAL_LC: case SFP_EEPROM_CON_TYPE_VAL_RJ45: check_limiting_mode = 1; -@@ -8179,7 +8192,8 @@ +@@ -8182,7 +8195,8 @@ static int bnx2x_get_edc_mode(struct bnx (val[SFP_EEPROM_1G_COMP_CODE_ADDR] != 0)) { DP(NETIF_MSG_LINK, "1G SFP module detected\n"); phy->media_type = ETH_PHY_SFP_1G_FIBER; @@ -63,7 +61,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe u8 gport = params->port; phy->req_line_speed = SPEED_1000; if (!CHIP_IS_E1x(bp)) { -@@ -9238,6 +9252,7 @@ +@@ -9236,6 +9250,7 @@ static void bnx2x_8727_config_speed(stru u16 tmp1, val; /* Set option 1G speed */ if ((phy->req_line_speed == SPEED_1000) || @@ -71,7 +69,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe (phy->media_type == ETH_PHY_SFP_1G_FIBER)) { DP(NETIF_MSG_LINK, "Setting 1G force\n"); bnx2x_cl45_write(bp, phy, -@@ -9247,6 +9262,22 @@ +@@ -9245,6 +9260,22 @@ static void bnx2x_8727_config_speed(stru bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1); DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1); @@ -94,7 +92,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe /* Power down the XAUI until link is up in case of dual-media * and 1G */ -@@ -9268,7 +9299,7 @@ +@@ -9266,7 +9297,7 @@ static void bnx2x_8727_config_speed(stru DP(NETIF_MSG_LINK, "Setting 1G clause37\n"); bnx2x_cl45_write(bp, phy, @@ -103,7 +101,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300); } else { -@@ -9276,9 +9307,12 @@ +@@ -9274,9 +9305,12 @@ static void bnx2x_8727_config_speed(stru * registers although it is default */ bnx2x_cl45_write(bp, phy, @@ -117,7 +115,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x0100); bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0x2040); -@@ -9569,6 +9603,11 @@ +@@ -9565,6 +9599,11 @@ static u8 bnx2x_8727_read_status(struct vars->line_speed = SPEED_10000; DP(NETIF_MSG_LINK, "port %x: External link up in 10G\n", params->port); @@ -129,7 +127,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe } else if ((link_status & (1<<0)) && (!(link_status & (1<<13)))) { link_up = 1; vars->line_speed = SPEED_1000; -@@ -9600,7 +9639,8 @@ +@@ -9596,7 +9635,8 @@ static u8 bnx2x_8727_read_status(struct } if ((DUAL_MEDIA(params)) && @@ -139,7 +137,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_PCS_GP, &val1); -@@ -11730,6 +11770,7 @@ +@@ -11720,6 +11760,7 @@ static const struct bnx2x_phy phy_warpco SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full | SUPPORTED_1000baseKX_Full | @@ -147,7 +145,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe SUPPORTED_10000baseT_Full | SUPPORTED_10000baseKR_Full | SUPPORTED_20000baseKR2_Full | -@@ -11916,6 +11957,7 @@ +@@ -11906,6 +11947,7 @@ static const struct bnx2x_phy phy_8727 = .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff}, .mdio_ctrl = 0, .supported = (SUPPORTED_10000baseT_Full | @@ -155,7 +153,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe SUPPORTED_1000baseT_Full | SUPPORTED_FIBRE | SUPPORTED_Pause | -@@ -12263,6 +12305,7 @@ +@@ -12253,6 +12295,7 @@ static int bnx2x_populate_int_phy(struct break; case PORT_HW_CFG_NET_SERDES_IF_SFI: phy->supported &= (SUPPORTED_1000baseT_Full | @@ -163,7 +161,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE | SUPPORTED_Pause | -@@ -13947,7 +13990,8 @@ +@@ -13937,7 +13980,8 @@ void bnx2x_period_func(struct link_param & PORT_HW_CFG_NET_SERDES_IF_MASK) == PORT_HW_CFG_NET_SERDES_IF_SFI) { if (bnx2x_is_sfp_module_plugged(phy, params)) { @@ -173,10 +171,9 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethe } else if (vars->link_status & LINK_STATUS_SFP_TX_FAULT) { /* Clean trail, interrupt corrects the leds */ -diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2020-09-03 23:21:36.699693373 -0400 -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 2020-09-03 23:29:22.461340175 -0400 -@@ -105,6 +105,10 @@ +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +@@ -113,6 +113,10 @@ static int disable_tpa; module_param(disable_tpa, int, 0444); MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature"); @@ -187,7 +184,7 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethe static int int_mode; module_param(int_mode, int, 0444); MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X " -@@ -12455,6 +12459,8 @@ +@@ -12389,6 +12393,8 @@ static int bnx2x_init_bp(struct bnx2x *b if (BP_NOMCP(bp) && (func == 0)) dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n"); @@ -196,10 +193,9 @@ diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethe bp->disable_tpa = disable_tpa; bp->disable_tpa |= !!IS_MF_STORAGE_ONLY(bp); /* Reduce memory usage in kdump environment by disabling TPA */ -diff -Naur a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h 2020-09-03 23:21:36.699693373 -0400 -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h 2020-09-03 23:22:22.975062197 -0400 -@@ -7169,7 +7169,8 @@ +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h +@@ -7169,7 +7169,8 @@ Theotherbitsarereservedandshouldbezero*/ #define MDIO_PMA_REG_8727_PCS_GP 0xc842 #define MDIO_PMA_REG_8727_OPT_CFG_REG 0xc8e4