From 198e536d1507831b8e02a091a011d64848998be5 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Thu, 31 Aug 2023 15:20:11 +0800 Subject: [PATCH 1/5] kernel: bump to 5.4.255, 6.1.50 (#11497) --- include/kernel-5.4 | 4 ++-- include/kernel-6.1 | 4 ++-- .../patches-5.4/160-kmap_coherent.patch | 2 +- ...xxx-Split-monitor-port-configuration.patch | 2 +- ...e6xxx-Add-support-for-port-mirroring.patch | 4 ++-- ...x-fix-broken-if-statement-because-of.patch | 2 +- ...t-dsa-mt7530-use-external-PCS-driver.patch | 24 +++++++++---------- .../661-use_fq_codel_by_default.patch | 2 +- ...-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- .../generic/hack-6.1/280-rfkill-stubs.patch | 2 +- ...-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- .../generic/hack-6.1/902-debloat_proc.patch | 2 +- ...760-net-dsa-mv88e6xxx-fix-vlan-setup.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- ...d-knob-for-filtering-rx-tx-BPDU-pack.patch | 2 +- ...e-all-MACs-are-powered-down-before-r.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- ...gister-OF-node-for-internal-MDIO-bus.patch | 4 ++-- .../999-03a-qca-nss-ecm-support.patch | 2 +- ...99-07b-qca-nss-clients-qdisc-support.patch | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/kernel-5.4 b/include/kernel-5.4 index f83a4ccf501e0c..9188e0617c2cdd 100644 --- a/include/kernel-5.4 +++ b/include/kernel-5.4 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.4 = .254 -LINUX_KERNEL_HASH-5.4.254 = 51608da961b5e34d6a9452a7b302699e109633f769a4253c74b1048abba8d9c7 +LINUX_VERSION-5.4 = .255 +LINUX_KERNEL_HASH-5.4.255 = 34d5ed902f47d90f27b9d5d6b8db0d3fa660834111f9452e166d920968a4a061 diff --git a/include/kernel-6.1 b/include/kernel-6.1 index 61bad0e5ca7cf7..79d9b49ad79efe 100644 --- a/include/kernel-6.1 +++ b/include/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .47 -LINUX_KERNEL_HASH-6.1.47 = 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab +LINUX_VERSION-6.1 = .50 +LINUX_KERNEL_HASH-6.1.50 = b27ac1443eea563bc546ee1f67d9802bc8d6c0f6f18707407fba01f9f78c488c diff --git a/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch index 55e99dbdddf3bc..1ccfdd6d786fa9 100644 --- a/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch +++ b/target/linux/bcm47xx/patches-5.4/160-kmap_coherent.patch @@ -8,7 +8,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485 --- --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h -@@ -243,6 +243,9 @@ +@@ -260,6 +260,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) #endif diff --git a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch index 683178727c3f55..4881281bdfe885 100644 --- a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch +++ b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.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 -@@ -2384,7 +2384,14 @@ static int mv88e6xxx_setup_upstream_port +@@ -2392,7 +2392,14 @@ static int mv88e6xxx_setup_upstream_port if (chip->info->ops->set_egress_port) { err = chip->info->ops->set_egress_port(chip, 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 6205f8333450a3..2fac8defef4cd0 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 -@@ -4934,6 +4934,80 @@ static int mv88e6xxx_port_mdb_del(struct +@@ -4942,6 +4942,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) { -@@ -4988,6 +5062,8 @@ static const struct dsa_switch_ops mv88e +@@ -4996,6 +5070,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 035e3634a28659..4fc9dffcb93a41 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 -@@ -5001,7 +5001,7 @@ static void mv88e6xxx_port_mirror_del(st +@@ -5009,7 +5009,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-6.1/788-v6.3-net-dsa-mt7530-use-external-PCS-driver.patch b/target/linux/generic/backport-6.1/788-v6.3-net-dsa-mt7530-use-external-PCS-driver.patch index aa781dc7b68497..8010076fc003fa 100644 --- a/target/linux/generic/backport-6.1/788-v6.3-net-dsa-mt7530-use-external-PCS-driver.patch +++ b/target/linux/generic/backport-6.1/788-v6.3-net-dsa-mt7530-use-external-PCS-driver.patch @@ -81,7 +81,7 @@ Tested-by: Frank Wunderlich #include #include #include -@@ -2611,128 +2612,11 @@ static int mt7531_rgmii_setup(struct mt7 +@@ -2615,128 +2616,11 @@ static int mt7531_rgmii_setup(struct mt7 return 0; } @@ -210,7 +210,7 @@ Tested-by: Frank Wunderlich static int mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface) -@@ -2755,11 +2639,11 @@ mt7531_mac_config(struct dsa_switch *ds, +@@ -2759,11 +2643,11 @@ mt7531_mac_config(struct dsa_switch *ds, phydev = dp->slave->phydev; return mt7531_rgmii_setup(priv, port, interface, phydev); case PHY_INTERFACE_MODE_SGMII: @@ -224,7 +224,7 @@ Tested-by: Frank Wunderlich default: return -EINVAL; } -@@ -2784,11 +2668,11 @@ mt753x_phylink_mac_select_pcs(struct dsa +@@ -2788,11 +2672,11 @@ mt753x_phylink_mac_select_pcs(struct dsa switch (interface) { case PHY_INTERFACE_MODE_TRGMII: @@ -238,7 +238,7 @@ Tested-by: Frank Wunderlich default: return NULL; } -@@ -3029,86 +2913,6 @@ static void mt7530_pcs_get_state(struct +@@ -3033,86 +2917,6 @@ static void mt7530_pcs_get_state(struct state->pause |= MLO_PAUSE_TX; } @@ -325,7 +325,7 @@ Tested-by: Frank Wunderlich static int mt753x_pcs_config(struct phylink_pcs *pcs, unsigned int mode, phy_interface_t interface, const unsigned long *advertising, -@@ -3128,18 +2932,57 @@ static const struct phylink_pcs_ops mt75 +@@ -3132,18 +2936,57 @@ static const struct phylink_pcs_ops mt75 .pcs_an_restart = mt7530_pcs_an_restart, }; @@ -389,7 +389,7 @@ Tested-by: Frank Wunderlich int i, ret; /* Initialise the PCS devices */ -@@ -3147,8 +2990,6 @@ mt753x_setup(struct dsa_switch *ds) +@@ -3151,8 +2994,6 @@ mt753x_setup(struct dsa_switch *ds) priv->pcs[i].pcs.ops = priv->info->pcs_ops; priv->pcs[i].priv = priv; priv->pcs[i].port = i; @@ -398,7 +398,7 @@ Tested-by: Frank Wunderlich } ret = priv->info->sw_setup(ds); -@@ -3163,6 +3004,16 @@ mt753x_setup(struct dsa_switch *ds) +@@ -3167,6 +3008,16 @@ mt753x_setup(struct dsa_switch *ds) if (ret && priv->irq) mt7530_free_irq_common(priv); @@ -415,7 +415,7 @@ Tested-by: Frank Wunderlich return ret; } -@@ -3254,7 +3105,7 @@ static const struct mt753x_info mt753x_t +@@ -3258,7 +3109,7 @@ static const struct mt753x_info mt753x_t }, [ID_MT7531] = { .id = ID_MT7531, @@ -424,7 +424,7 @@ Tested-by: Frank Wunderlich .sw_setup = mt7531_setup, .phy_read = mt7531_ind_phy_read, .phy_write = mt7531_ind_phy_write, -@@ -3362,7 +3213,7 @@ static void +@@ -3366,7 +3217,7 @@ static void mt7530_remove(struct mdio_device *mdiodev) { struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev); @@ -433,7 +433,7 @@ Tested-by: Frank Wunderlich if (!priv) return; -@@ -3381,6 +3232,10 @@ mt7530_remove(struct mdio_device *mdiode +@@ -3385,6 +3236,10 @@ mt7530_remove(struct mdio_device *mdiode mt7530_free_irq(priv); dsa_unregister_switch(priv->ds); @@ -446,7 +446,7 @@ Tested-by: Frank Wunderlich --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h -@@ -369,47 +369,8 @@ enum mt7530_vlan_port_acc_frm { +@@ -371,47 +371,8 @@ enum mt7530_vlan_port_acc_frm { CCR_TX_OCT_CNT_BAD) /* MT7531 SGMII register group */ @@ -496,7 +496,7 @@ Tested-by: Frank Wunderlich /* Register for system reset */ #define MT7530_SYS_CTRL 0x7000 -@@ -708,13 +669,13 @@ struct mt7530_fdb { +@@ -710,13 +671,13 @@ struct mt7530_fdb { * @pm: The matrix used to show all connections with the port. * @pvid: The VLAN specified is to be considered a PVID at ingress. Any * untagged frames will be assigned to the related VLAN. 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 e0d8b3fbb06b23..5eba93625a71ab 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 -@@ -2300,7 +2300,7 @@ static int __init pktsched_init(void) +@@ -2327,7 +2327,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 2344db3bcbaefc..0e778e808e845f 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 -@@ -2497,6 +2497,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2505,6 +2505,9 @@ static int mv88e6xxx_setup_port(struct m if (dsa_is_cpu_port(ds, port)) reg = 0; diff --git a/target/linux/generic/hack-6.1/280-rfkill-stubs.patch b/target/linux/generic/hack-6.1/280-rfkill-stubs.patch index ff6638f7a05b4c..7a650d132eb3ae 100644 --- a/target/linux/generic/hack-6.1/280-rfkill-stubs.patch +++ b/target/linux/generic/hack-6.1/280-rfkill-stubs.patch @@ -26,7 +26,7 @@ Signed-off-by: John Crispin * @name: name of the struct -- the string is not copied internally --- a/net/Makefile +++ b/net/Makefile -@@ -51,7 +51,7 @@ obj-$(CONFIG_TIPC) += tipc/ +@@ -52,7 +52,7 @@ obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ obj-$(CONFIG_SMC) += smc/ diff --git a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 59235ea00a2c6f..9c45115ebb09dc 100644 --- a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -3480,6 +3480,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/hack-6.1/902-debloat_proc.patch b/target/linux/generic/hack-6.1/902-debloat_proc.patch index 1b7b72f44df4d2..abf588f12fc372 100644 --- a/target/linux/generic/hack-6.1/902-debloat_proc.patch +++ b/target/linux/generic/hack-6.1/902-debloat_proc.patch @@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau if (!pe) --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -4183,6 +4183,8 @@ static const struct seq_operations vmall +@@ -4187,6 +4187,8 @@ static const struct seq_operations vmall static int __init proc_vmalloc_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 c1ce9f066adcb7..38449e8f1e2d08 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 -@@ -2668,6 +2668,7 @@ static int mv88e6xxx_setup(struct dsa_sw +@@ -2676,6 +2676,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 a9b7d784afccf1..cdb03614650531 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 -@@ -5088,6 +5088,7 @@ static int mv88e6xxx_register_switch(str +@@ -5096,6 +5096,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/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.1/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch index 4c09ed6b50d57b..989aca8f3537bf 100644 --- a/target/linux/generic/pending-6.1/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch +++ b/target/linux/generic/pending-6.1/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch @@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau struct rtnl_link { rtnl_doit_func doit; -@@ -4823,7 +4823,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu +@@ -4840,7 +4840,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu brport_nla_put_flag(skb, flags, mask, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) || brport_nla_put_flag(skb, flags, mask, diff --git a/target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch b/target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch index d4148ff551dd1f..32c2ce1831db85 100644 --- a/target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch +++ b/target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch @@ -15,7 +15,7 @@ Signed-off-by: Alexander Couzens --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2208,6 +2208,10 @@ mt7530_setup(struct dsa_switch *ds) +@@ -2212,6 +2212,10 @@ mt7530_setup(struct dsa_switch *ds) return -ENODEV; } diff --git a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 230ad2d036a905..ac59b4b5ea6162 100644 --- a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-6.1/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 -@@ -6980,6 +6980,7 @@ static int mv88e6xxx_register_switch(str +@@ -6988,6 +6988,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/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch b/target/linux/generic/pending-6.1/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch index 17ab87a1861a82..201beb8d539839 100644 --- a/target/linux/generic/pending-6.1/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch +++ b/target/linux/generic/pending-6.1/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2098,10 +2098,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr +@@ -2102,10 +2102,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr { struct dsa_switch *ds = priv->ds; struct device *dev = priv->dev; @@ -30,7 +30,7 @@ Signed-off-by: David Bauer bus = devm_mdiobus_alloc(dev); if (!bus) return -ENOMEM; -@@ -2118,7 +2121,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr +@@ -2122,7 +2125,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr if (priv->irq) mt7530_setup_mdio_irq(priv); diff --git a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch index 966aeb33c9fdf3..71d64e375fd72b 100644 --- a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch +++ b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch @@ -172,7 +172,7 @@ }; #define bond_slave_get_rcu(dev) \ -@@ -758,4 +759,12 @@ static inline void bond_tx_drop(struct n +@@ -735,4 +736,12 @@ static inline void bond_tx_drop(struct n dev_kfree_skb_any(skb); } 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 69993c23efd09d..bb8beed3d8e89a 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 -@@ -2319,4 +2319,26 @@ static int __init pktsched_init(void) +@@ -2346,4 +2346,26 @@ static int __init pktsched_init(void) return 0; } From b570280edf895a3c56b9051f1758071ccaf77118 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 22 Jan 2023 23:18:21 +0800 Subject: [PATCH 2/5] r8125: bump to version 9.011.00-1 --- package/lean/r8125/Makefile | 12 ++++---- .../lean/r8125/patches/020-5.19-support.patch | 18 ------------ .../patches/020-fixes-build-werror.patch | 28 +++++++++++++++++++ .../030-add-LED-configuration-from-OF.patch | 4 +-- 4 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 package/lean/r8125/patches/020-5.19-support.patch create mode 100644 package/lean/r8125/patches/020-fixes-build-werror.patch diff --git a/package/lean/r8125/Makefile b/package/lean/r8125/Makefile index 3c2112878eb778..67a5a3dc929b80 100644 --- a/package/lean/r8125/Makefile +++ b/package/lean/r8125/Makefile @@ -1,18 +1,18 @@ -# Attribution: https://gist.github.com/lenew/9b41ba901c3393047ede0766760f9d55 - -#Put this source to 'package/lean/r8125' folder of OpenWRT/LEDE SDK -#Build(make menuconfig, make defconfig, make) +# +# Download realtek r8125 linux driver from official site: +# [https://www.realtek.com/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software] +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 -PKG_VERSION:=9.010.01-2 +PKG_VERSION:=9.011.00-1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)? -PKG_HASH:=b3e1b36578ba92a775049535e7434a9fc46710a721846c3706aca3d265db8cb9 +PKG_HASH:=750a05c05f318fc5e1e05e6b2d1f61a76fffa3133eae1bf9ce5ff6d03ae29cb7 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only diff --git a/package/lean/r8125/patches/020-5.19-support.patch b/package/lean/r8125/patches/020-5.19-support.patch deleted file mode 100644 index 481c7739ebef18..00000000000000 --- a/package/lean/r8125/patches/020-5.19-support.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/r8125_n.c -+++ b/src/r8125_n.c -@@ -116,6 +116,15 @@ - #define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw" - #define FIRMWARE_8168FP_4 "rtl_nic/rtl8168fp-4.fw" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) -+static inline void netif_set_gso_max_size(struct net_device *dev, -+ unsigned int size) -+{ -+ /* dev->gso_max_size is read locklessly from sk_setup_caps() */ -+ WRITE_ONCE(dev->gso_max_size, size); -+} -+#endif -+ - /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). - The RTL chips use a 64 element hash table based on the Ethernet CRC. */ - static const int multicast_filter_limit = 32; diff --git a/package/lean/r8125/patches/020-fixes-build-werror.patch b/package/lean/r8125/patches/020-fixes-build-werror.patch new file mode 100644 index 00000000000000..4b6895c98a527c --- /dev/null +++ b/package/lean/r8125/patches/020-fixes-build-werror.patch @@ -0,0 +1,28 @@ +--- a/src/r8125_rss.c ++++ b/src/r8125_rss.c +@@ -57,21 +57,21 @@ static int rtl8125_get_rss_hash_opts(struct rtl8125_private *tp, + switch (cmd->flow_type) { + case TCP_V4_FLOW: + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; +- /* fallthrough */ ++ fallthrough; + case UDP_V4_FLOW: + if (tp->rss_flags & RTL_8125_RSS_FLAG_HASH_UDP_IPV4) + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; +- /* fallthrough */ ++ fallthrough; + case IPV4_FLOW: + cmd->data |= RXH_IP_SRC | RXH_IP_DST; + break; + case TCP_V6_FLOW: + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; +- /* fallthrough */ ++ fallthrough; + case UDP_V6_FLOW: + if (tp->rss_flags & RTL_8125_RSS_FLAG_HASH_UDP_IPV6) + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; +- /* fallthrough */ ++ fallthrough; + case IPV6_FLOW: + cmd->data |= RXH_IP_SRC | RXH_IP_DST; + break; diff --git a/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch b/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch index 85dea0d3f53dbd..b429862fdce760 100644 --- a/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch +++ b/package/lean/r8125/patches/030-add-LED-configuration-from-OF.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -10425,6 +10426,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_private *tp) +@@ -11479,6 +11480,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_private *tp) } } @@ -32,7 +32,7 @@ static void rtl8125_init_software_variable(struct net_device *dev) { -@@ -10856,6 +10874,8 @@ rtl8125_init_software_variable(struct net_device *dev) +@@ -11957,6 +11975,8 @@ rtl8125_init_software_variable(struct net_device *dev) if (tp->InitRxDescType == RX_DESC_RING_TYPE_3) tp->rtl8125_rx_config |= EnableRxDescV3; From 565ff98e01afe31dc0f76123d7738856d9979925 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 1 Sep 2023 18:56:49 +0300 Subject: [PATCH 3/5] scripts/download.pl: remove stale GNOME download sites Remove stale sites from @GNOME alias: * remove 2 sites that have stale 3 years old content * remove 2 sites that have dropped GNOME * convert 2 sites from FTP to HTTP Signed-off-by: Hannu Nyman --- scripts/download.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/download.pl b/scripts/download.pl index 9a0f48f38b3fa3..419fb947ae9ea4 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -314,12 +314,8 @@ sub cleanup push @mirrors, "https://download.gnome.org/sources/$1"; push @mirrors, "https://mirror.csclub.uwaterloo.ca/gnome/sources/$1"; push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1"; - push @mirrors, "http://ftp.kaist.ac.kr/gnome/sources/$1"; - push @mirrors, "http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/$1"; - push @mirrors, "http://mirror.internode.on.net/pub/gnome/sources/$1"; - push @mirrors, "http://ftp.belnet.be/ftp.gnome.org/sources/$1"; - push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1"; - push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1"; + push @mirrors, "http://ftp.cse.buffalo.edu/pub/Gnome/sources/$1"; + push @mirrors, "http://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1"; } else { push @mirrors, $mirror; } From 4013351243ba51967beea9e0e8d09816bd4d853f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 13 Aug 2023 22:32:20 +0200 Subject: [PATCH 4/5] linux-firmware: Update Intel AX200 and AX210 firmware This updates the Intel iwlwifi firmware for AX200 and AX210 from version 66 to version 72. Version 72 is the latest version supported by iwlwifi from kernel 6.1. Signed-off-by: Hauke Mehrtens Reviewed-by: Robert Marko --- package/firmware/linux-firmware/intel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index ab3f8fac8928e7..b947b3fbe0e74e 100644 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -173,7 +173,7 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260)) Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware) define Package/iwlwifi-firmware-ax200/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-66.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-72.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-ax200)) @@ -187,7 +187,7 @@ $(eval $(call BuildPackage,iwlwifi-firmware-ax201)) Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware) define Package/iwlwifi-firmware-ax210/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-66.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-72.ucode $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-ax210)) From 65b9b129d12423599ea4f277f6abdcce0e5d65ef Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 10 Aug 2023 17:50:38 +0200 Subject: [PATCH 5/5] linux-firmware: update to 20230804 Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 680f8fb104c815..ef6cd075de4548 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20230625 +PKG_VERSION:=20230804 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=87597111c0d4b71b31e53cb85a92c386921b84c825a402db8c82e0e86015500d +PKG_HASH:=88d46c543847ee3b03404d4941d91c92974690ee1f6fdcbee9cef3e5f97db688 PKG_MAINTAINER:=Felix Fietkau