From 0a2b5b6076a7672df9e279f8f1c18790aef028b7 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:37:11 +0800 Subject: [PATCH] kernel: bump to 5.4.241, 6.1.25 --- include/kernel-5.4 | 4 +-- include/kernel-6.1 | 4 +-- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- ...support-for-performing-fake-doorbell.patch | 6 ++-- ...e6xxx-Add-support-for-port-mirroring.patch | 4 +-- ...x-fix-broken-if-statement-because-of.patch | 2 +- ...the-dst-buffer-to-of_get_mac_address.patch | 8 ++--- ...dd-netdev_sw_irq_coalesce_default_on.patch | 2 +- .../661-use_fq_codel_by_default.patch | 2 +- ...-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- .../hack-5.4/904-debloat_dma_buf.patch | 2 +- .../721-net-add-packet-mangeling.patch | 2 +- .../790-SFP-GE-T-ignore-TX_FAULT.patch | 6 ++-- ...-linux-kernel-to-support-shortcut-fe.patch | 8 ++--- ...mtd-device-named-ubi-or-data-on-boot.patch | 4 +-- ...760-net-dsa-mv88e6xxx-fix-vlan-setup.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- ...mtd-device-named-ubi-or-data-on-boot.patch | 4 +-- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 8 ++--- .../999-03b-qca-nss-ecm-support.patch | 6 ++-- ...99-07b-qca-nss-clients-qdisc-support.patch | 2 +- ...-add-driver-for-Rockchip-USB-3.0-PHY.patch | 1 - ...-rk3328-add-usb3phy-nodes-for-rk3328.patch | 7 ++-- ...m64-dts-rockchip-rk3328-add-dfi-node.patch | 2 +- ...anopi-r2s-add-rk3328-dmc-relate-node.patch | 8 ++--- .../patches-6.1/992-enable-intel-guc.patch | 1 - ...to-enable-disable-tcp_collapse-logic.patch | 33 ++++++------------- .../999-Add-xtsproxy-Crypto-API-module.patch | 24 ++++---------- 28 files changed, 66 insertions(+), 92 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index cdfa8125d..e281ed586 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .240 -LINUX_KERNEL_HASH-5.4.240 = dc88f041ce97520f19ea4ff8687d0f8b692d4c4a62be38e6d8aa9d0e71060e46 +LINUX_VERSION-5.4 = .241 +LINUX_KERNEL_HASH-5.4.241 = ffc0e0ad6f47f8b7b05148d815cbab27f44fa433f3a8ed0e372d4b8647bcea7c diff --git a/include/kernel-6.1 b/include/kernel-6.1 index 5eb20c389..b636e7b36 100644 --- a/include/kernel-6.1 +++ b/include/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .24 -LINUX_KERNEL_HASH-6.1.24 = aae6a7e38e33589011f5a5c0d7e087c8a26e3daf8d434432ee975ead90546504 +LINUX_VERSION-6.1 = .25 +LINUX_KERNEL_HASH-6.1.25 = cb72436ceb15086ae3df65e590592030692a9237a37d64105478eb5a72493091 diff --git a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch index 0da57d3dd..1ab1de3f4 100644 --- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch @@ -23,7 +23,7 @@ produce a noisy warning. xhci->quirks |= XHCI_RESET_ON_RESUME; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us +@@ -431,10 +431,14 @@ static int xhci_try_enable_msi(struct us free_irq(hcd->irq, hcd); hcd->irq = 0; diff --git a/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index dcdf48149..a988d2775 100644 --- a/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -40,7 +40,7 @@ it on BCM4708 family. /* called during probe() after chip reset completes */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -158,6 +158,49 @@ int xhci_start(struct xhci_hcd *xhci) +@@ -159,6 +159,49 @@ int xhci_start(struct xhci_hcd *xhci) return ret; } @@ -90,7 +90,7 @@ it on BCM4708 family. /* * Reset a halted HC. * -@@ -608,10 +651,20 @@ static int xhci_init(struct usb_hcd *hcd +@@ -612,10 +655,20 @@ static int xhci_init(struct usb_hcd *hcd static int xhci_run_finished(struct xhci_hcd *xhci) { @@ -114,7 +114,7 @@ it on BCM4708 family. xhci->shared_hcd->state = HC_STATE_RUNNING; xhci->cmd_ring_state = CMD_RING_STATE_RUNNING; -@@ -621,6 +674,10 @@ static int xhci_run_finished(struct xhci +@@ -625,6 +678,10 @@ static int xhci_run_finished(struct xhci xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_run for USB3 roothub"); return 0; diff --git a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch index a45a22e48..6f5e5e595 100644 --- a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch +++ b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4928,6 +4928,80 @@ static int mv88e6xxx_port_mdb_del(struct +@@ -4933,6 +4933,80 @@ static int mv88e6xxx_port_mdb_del(struct return err; } @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port, bool unicast, bool multicast) { -@@ -4982,6 +5056,8 @@ static const struct dsa_switch_ops mv88e +@@ -4987,6 +5061,8 @@ static const struct dsa_switch_ops mv88e .port_mdb_prepare = mv88e6xxx_port_mdb_prepare, .port_mdb_add = mv88e6xxx_port_mdb_add, .port_mdb_del = mv88e6xxx_port_mdb_del, diff --git a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch index 837126a33..24a6bf59d 100644 --- a/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch +++ b/target/linux/generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -4995,7 +4995,7 @@ static void mv88e6xxx_port_mirror_del(st +@@ -5000,7 +5000,7 @@ static void mv88e6xxx_port_mirror_del(st if (chip->info->ops->set_egress_port(chip, direction, dsa_upstream_port(ds, diff --git a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index ab40087e1..ae16c0f48 100644 --- a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -423,7 +423,7 @@ Signed-off-by: David S. Miller if (bgmac->irq < 0) --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -4230,7 +4230,6 @@ static int macb_probe(struct platform_de +@@ -4234,7 +4234,6 @@ static int macb_probe(struct platform_de struct net_device *dev; struct resource *regs; void __iomem *mem; @@ -431,7 +431,7 @@ Signed-off-by: David S. Miller struct macb *bp; int err, val; -@@ -4343,15 +4342,11 @@ static int macb_probe(struct platform_de +@@ -4347,15 +4346,11 @@ static int macb_probe(struct platform_de if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) bp->rx_intr_mask |= MACB_BIT(RXUBR); @@ -787,7 +787,7 @@ Signed-off-by: David S. Miller mv643xx_eth_property(pnp, "tx-sram-addr", ppd.tx_sram_addr); --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -4526,7 +4526,6 @@ static int mvneta_probe(struct platform_ +@@ -4546,7 +4546,6 @@ static int mvneta_probe(struct platform_ struct net_device *dev; struct phylink *phylink; struct phy *comphy; @@ -795,7 +795,7 @@ Signed-off-by: David S. Miller char hw_mac_addr[ETH_ALEN]; const char *mac_from; int tx_csum_limit; -@@ -4623,10 +4622,9 @@ static int mvneta_probe(struct platform_ +@@ -4643,10 +4642,9 @@ static int mvneta_probe(struct platform_ goto err_free_ports; } diff --git a/target/linux/generic/backport-6.1/100-net-add-netdev_sw_irq_coalesce_default_on.patch b/target/linux/generic/backport-6.1/100-net-add-netdev_sw_irq_coalesce_default_on.patch index 12db0fab7..c20c27c41 100644 --- a/target/linux/generic/backport-6.1/100-net-add-netdev_sw_irq_coalesce_default_on.patch +++ b/target/linux/generic/backport-6.1/100-net-add-netdev_sw_irq_coalesce_default_on.patch @@ -34,7 +34,7 @@ Signed-off-by: David S. Miller #define NET_RX_SUCCESS 0 /* keep 'em coming, baby */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10529,6 +10529,22 @@ void netdev_set_default_ethtool_ops(stru +@@ -10530,6 +10530,22 @@ void netdev_set_default_ethtool_ops(stru } EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops); diff --git a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch index 64d768442..f52db97ff 100644 --- a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2283,7 +2283,7 @@ static int __init pktsched_init(void) +@@ -2286,7 +2286,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 1da388c86..2344db3bc 100644 --- a/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.4/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2492,6 +2492,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2497,6 +2497,9 @@ static int mv88e6xxx_setup_port(struct m if (dsa_is_cpu_port(ds, port)) reg = 0; diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index 76032d9b8..5d4f37e07 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2770,6 +2770,7 @@ int wake_up_state(struct task_struct *p, +@@ -2773,6 +2773,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch index 876337468..22f7c7c18 100644 --- a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3587,6 +3587,11 @@ static int xmit_one(struct sk_buff *skb, +@@ -3588,6 +3588,11 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/hack-6.1/790-SFP-GE-T-ignore-TX_FAULT.patch b/target/linux/generic/hack-6.1/790-SFP-GE-T-ignore-TX_FAULT.patch index e109d0660..ecd569e45 100644 --- a/target/linux/generic/hack-6.1/790-SFP-GE-T-ignore-TX_FAULT.patch +++ b/target/linux/generic/hack-6.1/790-SFP-GE-T-ignore-TX_FAULT.patch @@ -26,7 +26,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -394,6 +394,9 @@ static const struct sfp_quirk sfp_quirks +@@ -400,6 +400,9 @@ static const struct sfp_quirk sfp_quirks SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex, sfp_fixup_ignore_tx_fault), @@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report // 2500MBd NRZ in their EEPROM SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), -@@ -2328,7 +2331,8 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -2330,7 +2333,8 @@ static void sfp_sm_main(struct sfp *sfp, * or t_start_up, so assume there is a fault. */ sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, @@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { init_done: /* Create mdiobus and start trying for PHY */ -@@ -2557,10 +2561,12 @@ static void sfp_check_state(struct sfp * +@@ -2559,10 +2563,12 @@ static void sfp_check_state(struct sfp * mutex_lock(&sfp->st_mutex); state = sfp_get_state(sfp); changed = state ^ sfp->state; diff --git a/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index e49a10a13..185b195d0 100644 --- a/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -92,7 +92,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3583,9 +3583,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3584,9 +3584,17 @@ static int xmit_one(struct sk_buff *skb, { unsigned int len; int rc; @@ -111,7 +111,7 @@ #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb))) -@@ -5244,6 +5252,11 @@ void netdev_rx_handler_unregister(struct +@@ -5245,6 +5253,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. -@@ -5292,6 +5305,10 @@ static int __netif_receive_skb_core(stru +@@ -5293,6 +5306,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -134,7 +134,7 @@ net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_receive_skb(skb); -@@ -5329,6 +5346,15 @@ another_round: +@@ -5330,6 +5347,15 @@ another_round: goto out; } diff --git a/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index b21daea4f..cc19a5e62 100644 --- a/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1168,6 +1168,73 @@ static struct mtd_info * __init open_mtd +@@ -1177,6 +1177,73 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1251,6 +1318,12 @@ static int __init ubi_init(void) +@@ -1260,6 +1327,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch index a49b48f74..c1ce9f066 100644 --- a/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch +++ b/target/linux/generic/pending-5.4/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch @@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2663,6 +2663,7 @@ static int mv88e6xxx_setup(struct dsa_sw +@@ -2668,6 +2668,7 @@ static int mv88e6xxx_setup(struct dsa_sw chip->ds = ds; ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); diff --git a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 65b0e1084..daa407d90 100644 --- a/target/linux/generic/pending-5.4/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.4/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 -@@ -5082,6 +5082,7 @@ static int mv88e6xxx_register_switch(str +@@ -5087,6 +5087,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-6.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-6.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index da38ed241..99a03e31c 100644 --- a/target/linux/generic/pending-6.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-6.1/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1196,6 +1196,73 @@ static struct mtd_info * __init open_mtd +@@ -1205,6 +1205,73 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1280,6 +1347,12 @@ static int __init ubi_init(void) +@@ -1289,6 +1356,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index e9aa4756e..bbf638e81 100644 --- a/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -7603,6 +7603,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7604,6 +7604,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,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, -@@ -7654,6 +7696,7 @@ static int __netdev_upper_dev_link(struc +@@ -7655,6 +7697,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7750,6 +7793,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7751,6 +7794,7 @@ static void __netdev_upper_dev_unlink(st __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8802,6 +8846,7 @@ int dev_set_mac_address(struct net_devic +@@ -8803,6 +8847,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/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch index 05cfbdef1..84c78cfe3 100644 --- a/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch @@ -90,9 +90,9 @@ #endif --- a/drivers/net/tun.c +++ b/drivers/net/tun.c -@@ -2883,6 +2883,8 @@ static int tun_set_iff(struct net *net, - ~(NETIF_F_HW_VLAN_CTAG_TX | - NETIF_F_HW_VLAN_STAG_TX); +@@ -2853,6 +2853,8 @@ static int tun_set_iff(struct net *net, + return 0; + } + dev->priv_flags_qca_ecm |= IFF_QCA_ECM_TUN_TAP; /* QCA NSS ECM Support */ + diff --git a/target/linux/ipq806x/patches-5.4/999-07b-qca-nss-clients-qdisc-support.patch b/target/linux/ipq806x/patches-5.4/999-07b-qca-nss-clients-qdisc-support.patch index 41077bca0..0cb4a4740 100644 --- a/target/linux/ipq806x/patches-5.4/999-07b-qca-nss-clients-qdisc-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-07b-qca-nss-clients-qdisc-support.patch @@ -271,7 +271,7 @@ #endif --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2302,4 +2302,26 @@ static int __init pktsched_init(void) +@@ -2305,4 +2305,26 @@ static int __init pktsched_init(void) return 0; } diff --git a/target/linux/rockchip/patches-5.4/208--phy-rockchip-add-driver-for-Rockchip-USB-3.0-PHY.patch b/target/linux/rockchip/patches-5.4/208--phy-rockchip-add-driver-for-Rockchip-USB-3.0-PHY.patch index 27402a1e7..f8aa970b3 100644 --- a/target/linux/rockchip/patches-5.4/208--phy-rockchip-add-driver-for-Rockchip-USB-3.0-PHY.patch +++ b/target/linux/rockchip/patches-5.4/208--phy-rockchip-add-driver-for-Rockchip-USB-3.0-PHY.patch @@ -1176,4 +1176,3 @@ +MODULE_AUTHOR("William Wu "); +MODULE_DESCRIPTION("Rockchip USB 3.0 PHY driver"); +MODULE_LICENSE("GPL v2"); - diff --git a/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch b/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch index e386f9142..863498828 100644 --- a/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch +++ b/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch @@ -1,7 +1,7 @@ --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -56,6 +56,15 @@ vcc_rtl8153: vcc-rtl8153-regulator { - enable-active-high; +@@ -44,6 +44,15 @@ + }; }; + vcc_host_vbus: host-vbus-regulator { @@ -16,7 +16,7 @@ leds { compatible = "gpio-leds"; pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; -@@ -379,6 +388,19 @@ &u2phy_otg { +@@ -381,6 +390,19 @@ status = "okay"; }; @@ -86,4 +86,3 @@ sdmmc: dwmmc@ff500000 { compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xff500000 0x0 0x4000>; - diff --git a/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch b/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch index e9b79b6fa..ac0a4f61f 100644 --- a/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch +++ b/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch @@ -11,7 +11,7 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -993,6 +993,13 @@ +@@ -1034,6 +1034,13 @@ }; }; diff --git a/target/linux/rockchip/patches-5.4/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch b/target/linux/rockchip/patches-5.4/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch index 091e29597..78d6ddaff 100644 --- a/target/linux/rockchip/patches-5.4/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch +++ b/target/linux/rockchip/patches-5.4/807-arm64-dts-nanopi-r2s-add-rk3328-dmc-relate-node.patch @@ -24,7 +24,7 @@ Signed-off-by: hmz007 #include "rk3328.dtsi" / { -@@ -115,6 +116,72 @@ +@@ -124,6 +125,72 @@ regulator-max-microvolt = <5000000>; enable-active-high; }; @@ -97,7 +97,7 @@ Signed-off-by: hmz007 }; &cpu0 { -@@ -133,6 +200,10 @@ +@@ -142,6 +209,10 @@ cpu-supply = <&vdd_arm>; }; @@ -108,7 +108,7 @@ Signed-off-by: hmz007 &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; -@@ -198,6 +269,7 @@ +@@ -207,6 +278,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -116,7 +116,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -212,6 +284,7 @@ +@@ -221,6 +293,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; diff --git a/target/linux/x86/patches-6.1/992-enable-intel-guc.patch b/target/linux/x86/patches-6.1/992-enable-intel-guc.patch index 2162d3cf9..5ee66b5e8 100644 --- a/target/linux/x86/patches-6.1/992-enable-intel-guc.patch +++ b/target/linux/x86/patches-6.1/992-enable-intel-guc.patch @@ -16,4 +16,3 @@ /* Don't enable GuC/HuC on older Gen12 platforms */ if (IS_TIGERLAKE(i915) || IS_ROCKETLAKE(i915)) { - diff --git a/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch b/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch index d55b75a9f..641ee13a7 100644 --- a/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch +++ b/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch @@ -37,11 +37,9 @@ and performance for all other cases. net/ipv4/tcp_ipv4.c | 2 ++ 5 files changed, 53 insertions(+) -diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h -index 6c5b2efc4f17..bf2c9b5847e4 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h -@@ -182,6 +182,7 @@ struct netns_ipv4 { +@@ -188,6 +188,7 @@ struct netns_ipv4 { int sysctl_udp_rmem_min; u8 sysctl_fib_notify_on_flag_change; @@ -49,11 +47,9 @@ index 6c5b2efc4f17..bf2c9b5847e4 100644 #ifdef CONFIG_NET_L3_MASTER_DEV u8 sysctl_udp_l3mdev_accept; -diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h -index 521059d8dc0a..35fa0f23680c 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h -@@ -187,6 +187,13 @@ DEFINE_EVENT(tcp_event_sk, tcp_rcv_space_adjust, +@@ -187,6 +187,13 @@ DEFINE_EVENT(tcp_event_sk, tcp_rcv_space TP_ARGS(sk) ); @@ -67,13 +63,11 @@ index 521059d8dc0a..35fa0f23680c 100644 TRACE_EVENT(tcp_retransmit_synack, TP_PROTO(const struct sock *sk, const struct request_sock *req), -diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c -index 6f1e64d49232..a61e6b1ac0cc 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c -@@ -1406,6 +1406,13 @@ static struct ctl_table ipv4_net_table[] = { +@@ -1387,6 +1387,13 @@ static struct ctl_table ipv4_net_table[] .extra1 = SYSCTL_ZERO, - .extra2 = &two, + .extra2 = SYSCTL_TWO, }, + { + .procname = "tcp_collapse_max_bytes", @@ -85,11 +79,9 @@ index 6f1e64d49232..a61e6b1ac0cc 100644 { } }; -diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index f3b623967436..204f33f2835c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -5340,6 +5340,7 @@ static bool tcp_prune_ofo_queue(struct sock *sk) +@@ -5384,6 +5384,7 @@ static bool tcp_prune_ofo_queue(struct s static int tcp_prune_queue(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); @@ -97,7 +89,7 @@ index f3b623967436..204f33f2835c 100644 NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED); -@@ -5351,6 +5352,39 @@ static int tcp_prune_queue(struct sock *sk) +@@ -5395,6 +5396,39 @@ static int tcp_prune_queue(struct sock * if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) return 0; @@ -137,7 +129,7 @@ index f3b623967436..204f33f2835c 100644 tcp_collapse_ofo_queue(sk); if (!skb_queue_empty(&sk->sk_receive_queue)) tcp_collapse(sk, &sk->sk_receive_queue, NULL, -@@ -5370,6 +5404,8 @@ static int tcp_prune_queue(struct sock *sk) +@@ -5413,6 +5447,8 @@ static int tcp_prune_queue(struct sock * if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) return 0; @@ -146,19 +138,14 @@ index f3b623967436..204f33f2835c 100644 /* If we are really being abused, tell the caller to silently * drop receive data on the floor. It will get retransmitted * and hopefully then we'll have sufficient space. -diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index 0fe9461647da..4fadbf38525f 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -3218,6 +3218,8 @@ static int __net_init tcp_sk_init(struct net *net) +@@ -3215,6 +3215,8 @@ static int __net_init tcp_sk_init(struct else net->ipv4.tcp_congestion_control = &tcp_reno; + net->ipv4.sysctl_tcp_collapse_max_bytes = 0; + return 0; - fail: - tcp_sk_exit(net); --- -2.35.1 - + } + diff --git a/target/linux/x86/patches-6.1/999-Add-xtsproxy-Crypto-API-module.patch b/target/linux/x86/patches-6.1/999-Add-xtsproxy-Crypto-API-module.patch index 2344bde21..53b555f3a 100644 --- a/target/linux/x86/patches-6.1/999-Add-xtsproxy-Crypto-API-module.patch +++ b/target/linux/x86/patches-6.1/999-Add-xtsproxy-Crypto-API-module.patch @@ -13,13 +13,11 @@ when FPU is not usable. 3 files changed, 142 insertions(+) create mode 100644 crypto/xtsproxy.c -diff --git a/crypto/Kconfig b/crypto/Kconfig -index 094ef56ab7b4..9964667cef85 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -457,6 +457,16 @@ config CRYPTO_XTS - key size 256, 384 or 512 bits. This implementation currently - can't handle a sectorsize which is not a multiple of 16 bytes. +@@ -704,6 +704,16 @@ config CRYPTO_HCTR2 + + See https://eprint.iacr.org/2021/1441 +config CRYPTO_XTS_AES_SYNC + tristate "XTS AES synchronous implementation" @@ -32,23 +30,18 @@ index 094ef56ab7b4..9964667cef85 100644 + when FPU is not usable. + config CRYPTO_KEYWRAP - tristate "Key wrapping support" + tristate "KW (AES Key Wrap)" select CRYPTO_SKCIPHER -diff --git a/crypto/Makefile b/crypto/Makefile -index b279483fba50..4f6ddcbdc6d4 100644 --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -90,6 +90,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o +@@ -93,6 +93,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o obj-$(CONFIG_CRYPTO_CTS) += cts.o obj-$(CONFIG_CRYPTO_LRW) += lrw.o obj-$(CONFIG_CRYPTO_XTS) += xts.o +obj-$(CONFIG_CRYPTO_XTS_AES_SYNC) += xtsproxy.o obj-$(CONFIG_CRYPTO_CTR) += ctr.o - obj-$(CONFIG_CRYPTO_KEYWRAP) += keywrap.o - obj-$(CONFIG_CRYPTO_ADIANTUM) += adiantum.o -diff --git a/crypto/xtsproxy.c b/crypto/xtsproxy.c -new file mode 100644 -index 000000000000..51ecfb7b4891 + obj-$(CONFIG_CRYPTO_XCTR) += xctr.o + obj-$(CONFIG_CRYPTO_HCTR2) += hctr2.o --- /dev/null +++ b/crypto/xtsproxy.c @@ -0,0 +1,131 @@ @@ -183,6 +176,3 @@ index 000000000000..51ecfb7b4891 +MODULE_AUTHOR("Ignat Korchagin "); +MODULE_LICENSE("GPL"); +MODULE_ALIAS_CRYPTO("xts(aes)"); --- -2.29.1 -