diff --git a/configs/aarch32_defconfig b/configs/aarch32_defconfig index bf1988b21..89c943f79 100644 --- a/configs/aarch32_defconfig +++ b/configs/aarch32_defconfig @@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/aarch32_minimal_defconfig b/configs/aarch32_minimal_defconfig index 93d273c80..4e5a8645c 100644 --- a/configs/aarch32_minimal_defconfig +++ b/configs/aarch32_minimal_defconfig @@ -29,7 +29,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 80838e8b2..0d7d02c14 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig index 3e9f665a5..1c7d00b76 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index d037fb936..8ca1610ff 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index 4a414e792..b50fed2eb 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 5af5ea55e..878483d14 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -29,7 +29,7 @@ All notable changes to the project are documented in this file. ### Changes -- Upgrade Linux kernel to 6.18.5 (LTS) +- Upgrade Linux kernel to 6.18.6 (LTS) - Upgrade libyang to 4.2.2 - Upgrade sysrepo to 4.2.10 - Upgrade netopeer2 (NETCONF) to 2.7.0 diff --git a/patches/linux/6.18.5/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.18.6/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 95% rename from patches/linux/6.18.5/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.18.6/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index 8a6e5b056..ed2b18c9a 100644 --- a/patches/linux/6.18.5/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.18.6/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,12 +1,8 @@ -From 2cda5240aa8504deefb0a1758b2088136183cde4 Mon Sep 17 00:00:00 2001 +From 257b51fcd94ca99b13555354327ce2dbaaba4003 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 -Subject: [PATCH 01/29] net: phy: marvell10g: Support firmware loading on +Subject: [PATCH 01/30] net: phy: marvell10g: Support firmware loading on 88X3310 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires When probing, if a device is waiting for firmware to be loaded into its RAM, ask userspace for the binary and load it over XMDIO. @@ -14,8 +10,6 @@ its RAM, ask userspace for the binary and load it over XMDIO. We have no choice but to bail out of the probe if firmware is not available, as the device does not have any built-in image on which to fall back. - -Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) @@ -239,6 +233,3 @@ index 8fd42131cdbf..44294519231e 100644 MODULE_DESCRIPTION("Marvell Alaska X/M multi-gigabit Ethernet PHY driver"); +MODULE_FIRMWARE("mrvl/x3310fw.hdr"); MODULE_LICENSE("GPL"); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.18.6/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 83% rename from patches/linux/6.18.5/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.18.6/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index 66cf143d6..31abc75d4 100644 --- a/patches/linux/6.18.5/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.18.6/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,18 +1,12 @@ -From 65ce7e078d94e739a2255f07f697215ba5172e03 Mon Sep 17 00:00:00 2001 +From 7cb0e3b358c7d9118e179e2e0684ec66bed1ba18 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 -Subject: [PATCH 02/29] net: phy: marvell10g: Fix power-up when strapped to +Subject: [PATCH 02/30] net: phy: marvell10g: Fix power-up when strapped to start powered down -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires On devices which are hardware strapped to start powered down (PDSTATE == 1), make sure that we clear the power-down bit on all units affected by this setting. - -Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) @@ -48,6 +42,3 @@ index 44294519231e..40439db49601 100644 /* Sometimes, the power down bit doesn't clear immediately, and * a read of this register causes the bit not to clear. Delay --- -2.43.0 - diff --git a/patches/linux/6.18.5/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.18.6/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 97% rename from patches/linux/6.18.5/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.18.6/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index abfe980dd..5791b8248 100644 --- a/patches/linux/6.18.5/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.18.6/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,11 +1,7 @@ -From 19c9739b06feceb9df4142fa7323a51fc8782113 Mon Sep 17 00:00:00 2001 +From e12b368dfff77e0741cb3d9d7636ec4dfbbfd0f9 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 -Subject: [PATCH 03/29] net: phy: marvell10g: Add LED support for 88X3310 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 03/30] net: phy: marvell10g: Add LED support for 88X3310 Pickup the LEDs from the state in which the hardware reset or bootloader left them, but also support further configuration via @@ -20,8 +16,6 @@ Trigger support: software blinking - "netdev": Offload link or duplex information to the solid behavior; tx and/or rx activity to blink behavior. - -Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++ 1 file changed, 422 insertions(+) @@ -515,6 +509,3 @@ index 40439db49601..7ae4744f147b 100644 }, { .phy_id = MARVELL_PHY_ID_88X3310, --- -2.43.0 - diff --git a/patches/linux/6.18.5/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.18.6/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 88% rename from patches/linux/6.18.5/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.18.6/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index 4e7737bfa..5711fd5ac 100644 --- a/patches/linux/6.18.5/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.18.6/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,12 +1,8 @@ -From aeed21718ad95ea9e4cb668d47fe5c4c9ca7d383 Mon Sep 17 00:00:00 2001 +From 13346d7128b4ef758e801ad619d3e8a17b5c01a9 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 -Subject: [PATCH 04/29] net: phy: marvell10g: Support LEDs tied to a single +Subject: [PATCH 04/30] net: phy: marvell10g: Support LEDs tied to a single media side -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires In a combo-port setup, i.e. where both the copper and fiber interface are available to the user, the LEDs may be physically located either @@ -17,8 +13,6 @@ tied to a particular media side, and use that information to refine the offloading of the "netdev" trigger, such that LEDs attached to the RJ45 jack only lights up when a copper link is established, and vice versa for the SFP cage. - -Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) @@ -78,6 +72,3 @@ index 7ae4744f147b..5e48355ffcef 100644 /* mv3310_led_polarity_set() will not be called unless the * device tree specifies a mode that of_phy_led() considers to * be a non-default configuration. I.e., something other than --- -2.43.0 - diff --git a/patches/linux/6.18.5/0005-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.18.6/0005-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 77% rename from patches/linux/6.18.5/0005-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.18.6/0005-net-phy-Do-not-resume-PHY-when-attaching.patch index 23fe8fb68..fa0962a86 100644 --- a/patches/linux/6.18.5/0005-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.18.6/0005-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,11 +1,7 @@ -From 1df613d51cd26250219870cd175324652adde99e Mon Sep 17 00:00:00 2001 +From ac79628c9cc6191d01b56f18c4a4202f8dc19b41 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 -Subject: [PATCH 05/29] net: phy: Do not resume PHY when attaching -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 05/30] net: phy: Do not resume PHY when attaching The PHY should not start negotiating with its link-partner until explicitly instructed to do so. @@ -18,8 +14,6 @@ Otherwise, drivers that attached to their PHYs during probing (e.g. DSA) would end up with a physical link being established, even though the corresponding interface was still administratively down. - -Signed-off-by: Mattias Walström --- drivers/net/phy/phy_device.c | 1 - 1 file changed, 1 deletion(-) @@ -36,6 +30,3 @@ index 7a67c900e79a..5c61faf4b10a 100644 if (!phydev->is_on_sfp_module) phy_led_triggers_register(phydev); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.18.6/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 96% rename from patches/linux/6.18.5/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.18.6/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index 54b714722..9ed81aead 100644 --- a/patches/linux/6.18.5/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.18.6/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,12 +1,8 @@ -From 499093fbb2cc3d4db2e60e1d07908acf2c0d857a Mon Sep 17 00:00:00 2001 +From ee691bd5beac643fc2266de5803aca437b3e6e3d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 -Subject: [PATCH 06/29] net: bridge: avoid classifying unknown multicast as +Subject: [PATCH 06/30] net: bridge: avoid classifying unknown multicast as mrouters_only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to the per-port mcast_flood setting, as well as to detected and configured @@ -19,7 +15,6 @@ Because a multicast router should always receive both known and unknown multicast. Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- include/uapi/linux/if_bridge.h | 1 + net/bridge/br.c | 5 +++++ @@ -253,6 +248,3 @@ index b9b2981c4841..ccbaaa96f7c7 100644 static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx, struct sk_buff *skb) { --- -2.43.0 - diff --git a/patches/linux/6.18.5/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.18.6/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 79% rename from patches/linux/6.18.5/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.18.6/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 1410dcb1e..33dd0193e 100644 --- a/patches/linux/6.18.5/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.18.6/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,12 +1,8 @@ -From 4b0261a3a65f5f28b2d6e356b7a4740b939984fa Mon Sep 17 00:00:00 2001 +From fd03fe3161bf4f9d0d21eba97aa26602134ad573 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 -Subject: [PATCH 07/29] net: bridge: Ignore router ports when forwarding L2 +Subject: [PATCH 07/30] net: bridge: Ignore router ports when forwarding L2 multicast -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Multicast router ports are either statically configured or learned from control protocol traffic (IGMP/MLD/PIM). These protocols regulate IP @@ -15,7 +11,6 @@ of unknown multicast or using permanent MDB entries. Signed-off-by: Tobias Waldekranz Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- net/bridge/br_private.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) @@ -36,6 +31,3 @@ index ccbaaa96f7c7..d7187bead496 100644 } static inline struct net_bridge_port * --- -2.43.0 - diff --git a/patches/linux/6.18.5/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.18.6/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 95% rename from patches/linux/6.18.5/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.18.6/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 3d642258c..05ad61b63 100644 --- a/patches/linux/6.18.5/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.18.6/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,12 +1,8 @@ -From af297677c0ac5ab96eca7ca1e837d621404015e1 Mon Sep 17 00:00:00 2001 +From 4232ec4a201c4931f0ef66c3b4aaf2fe964d2759 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 -Subject: [PATCH 08/29] net: bridge: drop delay for applying strict multicast +Subject: [PATCH 08/30] net: bridge: drop delay for applying strict multicast filtering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires This *local* patch drops the initial delay before applying strict multicast filtering, introduced in [1] and recently updated in [2]. @@ -22,7 +18,6 @@ A proper fix for upstreaming could be to add a knob to disable the delay. [2]: https://lore.kernel.org/netdev/20240127175033.9640-1-linus.luessing@c0d3.blue/ Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- net/bridge/br_multicast.c | 42 +++++++-------------------------------- net/bridge/br_private.h | 4 +--- @@ -189,6 +184,3 @@ index d7187bead496..83dc15fdcefd 100644 } static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx, --- -2.43.0 - diff --git a/patches/linux/6.18.5/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.18.6/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 92% rename from patches/linux/6.18.5/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.18.6/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch index bdb157497..eba436857 100644 --- a/patches/linux/6.18.5/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.18.6/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,12 +1,8 @@ -From 2543c1537f5554d5467975e96f9a5ac1f48c1b9e Mon Sep 17 00:00:00 2001 +From 78318eb5a2f161c3ebd41b2db0df3e53f9181221 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 -Subject: [PATCH 09/29] net: bridge: Differentiate MDB additions from +Subject: [PATCH 09/30] net: bridge: Differentiate MDB additions from modifications -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Before this change, the reception of an IGMPv3 report (and analogously for MLDv2) that adds a new group, would trigger two MDB RTM_NEWMDB @@ -24,8 +20,6 @@ generated. Therefore, discriminate new groups from changes to existing groups by introducing a RTM_SETMDB events to be used in the latter scenario. - -Signed-off-by: Mattias Walström --- include/uapi/linux/rtnetlink.h | 2 ++ net/bridge/br_mdb.c | 4 ++-- @@ -107,6 +101,3 @@ index 66d709f6b19d..4d1b27d2cdbc 100644 unlock_continue: spin_unlock(&brmctx->br->multicast_lock); } --- -2.43.0 - diff --git a/patches/linux/6.18.5/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.18.6/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 84% rename from patches/linux/6.18.5/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.18.6/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index 7f477bec8..a8813d653 100644 --- a/patches/linux/6.18.5/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.18.6/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,12 +1,8 @@ -From 6ebc47bbd15263a24d06c1200ee85e425385a9e1 Mon Sep 17 00:00:00 2001 +From 024b3276078901705ee919dec50dd3af6e90e9ad Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 -Subject: [PATCH 10/29] nvmem: layouts: onie-tlv: Let device probe even when +Subject: [PATCH 10/30] nvmem: layouts: onie-tlv: Let device probe even when TLV is invalid -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Before this change, probing an NVMEM device, expected to contain a valid TLV, would fail if it had not been provisioned yet. But an @@ -16,8 +12,6 @@ be successfully probed. Therefore, settle for reporting data corruption issues in the log, and simply refrain from registering any cells in those cases. - -Signed-off-by: Mattias Walström --- drivers/nvmem/layouts/onie-tlv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -53,6 +47,3 @@ index 0967a32319a2..48547d5bb502 100644 data = table + hdr_len; ret = onie_tlv_add_cells(dev, nvmem, data_len, data); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch b/patches/linux/6.18.6/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch similarity index 81% rename from patches/linux/6.18.5/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch rename to patches/linux/6.18.6/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch index 6bdac2896..c51004faa 100644 --- a/patches/linux/6.18.5/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch +++ b/patches/linux/6.18.6/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch @@ -1,12 +1,8 @@ -From 28d1887a75ae6b46e96111a6cddc5efbd7d0e3b7 Mon Sep 17 00:00:00 2001 +From cb3ceebe0fc9510bc3ee2c707fa6bdca28ad749b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 11 Aug 2024 11:27:35 +0200 -Subject: [PATCH 11/29] net: usb: r8152: add r8153b support for link/activity +Subject: [PATCH 11/30] net: usb: r8152: add r8153b support for link/activity LEDs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires This patch adds support for the link/activity LEDs on the NanoPi R2S and OrangePi R1 Plus. @@ -17,7 +13,6 @@ https://github.com/friendlyarm/kernel-rockchip/ Specifically commit be0b1939b271c307ab1fef5fb1478beaafc6de17 Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- drivers/net/usb/r8152.c | 8 ++++++++ 1 file changed, 8 insertions(+) @@ -48,6 +43,3 @@ index a22d4bb2cf3b..ae89323ade06 100644 rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ --- -2.43.0 - diff --git a/patches/linux/6.18.5/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch b/patches/linux/6.18.6/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch similarity index 83% rename from patches/linux/6.18.5/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch rename to patches/linux/6.18.6/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch index 6e7825b03..0aa28650b 100644 --- a/patches/linux/6.18.5/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch +++ b/patches/linux/6.18.6/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch @@ -1,12 +1,8 @@ -From 71b2cad84f563649512a1753ffd48e57c1cb0dab Mon Sep 17 00:00:00 2001 +From db387a57f3aacdd24d391642ad0382fbf1d8f955 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 10 Aug 2025 18:52:54 +0200 -Subject: [PATCH 12/29] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to +Subject: [PATCH 12/30] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to match case -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires For ref. see: https://wiki.banana-pi.org/File:Bpi-r3_Metal_case.jpg @@ -14,7 +10,6 @@ Also, comment out gpio-keys (reset and wps) since they clash with with the PCIe controller. Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) @@ -74,6 +69,3 @@ index e7654dc9a1c9..4cc6aff07225 100644 phy-mode = "2500base-x"; sfp = <&sfp2>; managed = "in-band-status"; --- -2.43.0 - diff --git a/patches/linux/6.18.5/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/patches/linux/6.18.6/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch similarity index 90% rename from patches/linux/6.18.5/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch rename to patches/linux/6.18.6/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch index 6f8691be8..6cb241495 100644 --- a/patches/linux/6.18.5/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch +++ b/patches/linux/6.18.6/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch @@ -1,12 +1,8 @@ -From 673f624878aae8e2718995baf693ac352ea91a70 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= +From ed41839c56eaaca89a8a6139f17c8a084d01be09 Mon Sep 17 00:00:00 2001 +From: Mattias Walström Date: Wed, 20 Aug 2025 21:38:24 +0200 -Subject: [PATCH 13/29] drm/panel-simple: Add a timing for the Raspberry Pi 7" +Subject: [PATCH 13/30] drm/panel-simple: Add a timing for the Raspberry Pi 7" panel -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires The Raspberry Pi 7" 800x480 panel uses a Toshiba TC358762 DSI to DPI bridge chip, so there is a requirement for the timings @@ -45,7 +41,6 @@ on Pi4. parent PLL). Signed-off-by: Dave Stevenson -Signed-off-by: Mattias Walström --- drivers/gpu/drm/panel/panel-simple.c | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) @@ -106,6 +101,3 @@ index 0019de93be1b..3cddde5733ca 100644 .compatible = "rocktech,rk043fn48h", .data = &rocktech_rk043fn48h, }, { --- -2.43.0 - diff --git a/patches/linux/6.18.5/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch b/patches/linux/6.18.6/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch similarity index 92% rename from patches/linux/6.18.5/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch rename to patches/linux/6.18.6/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch index 0bae15c29..88602f82a 100644 --- a/patches/linux/6.18.5/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch +++ b/patches/linux/6.18.6/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch @@ -1,16 +1,10 @@ -From 8c468f604841179197c32a467e81050e98e96d03 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= +From 1ff1463bf79e6cf94b24d4ad099db4eeadd37fb3 Mon Sep 17 00:00:00 2001 +From: Mattias Walström Date: Thu, 21 Aug 2025 11:20:23 +0200 -Subject: [PATCH 14/29] input:touchscreen:edt-ft5x06: Add polled mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 14/30] input:touchscreen:edt-ft5x06: Add polled mode Not all hardware has interrupts therefore we need to poll the touchscreen. - -Signed-off-by: Mattias Walström --- drivers/input/touchscreen/edt-ft5x06.c | 74 ++++++++++++++++++++------ 1 file changed, 58 insertions(+), 16 deletions(-) @@ -163,6 +157,3 @@ index bf498bd4dea9..30308d840935 100644 gpiod_set_value_cansleep(reset_gpio, 1); usleep_range(1000, 2000); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.18.6/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 73% rename from patches/linux/6.18.5/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.18.6/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index baf90984b..acf866c4e 100644 --- a/patches/linux/6.18.5/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.18.6/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,24 +1,18 @@ -From 4ef0fd107eae67ef12cb2d38ab11882e0f2a3776 Mon Sep 17 00:00:00 2001 +From e8e05c96ecbf32bacfac67b0ff9ab10ecdf61da6 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 -Subject: [PATCH 15/29] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for +Subject: [PATCH 15/30] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on 6393X -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires In a multi-chip setup, delays of up to 750ms are observed before the device (6393X) signals completion of PPU initialization (Global 1, register 0, bit 15). Therefore, increase the timeout threshold to 1s. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index b4d48997bf46..73264c1c1565 100644 +index 09002c853b78..22f4fe642578 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -87,7 +87,7 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val) @@ -30,6 +24,3 @@ index b4d48997bf46..73264c1c1565 100644 u16 data; int err; int i; --- -2.43.0 - diff --git a/patches/linux/6.18.5/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.18.6/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 94% rename from patches/linux/6.18.5/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.18.6/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index 9bb071ade..81455faae 100644 --- a/patches/linux/6.18.5/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.18.6/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,12 +1,8 @@ -From b2be28e5956e3d7547acb591da968f4f64d812cb Mon Sep 17 00:00:00 2001 +From 400d9ae26cdfd29ebbf546de92c9b75710717f71 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 -Subject: [PATCH 16/29] net: dsa: mv88e6xxx: Improve indirect register access +Subject: [PATCH 16/30] net: dsa: mv88e6xxx: Improve indirect register access perf on 6393 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires When operating in multi-chip mode, the 6393 family maps a subset of commonly used global registers to the outermost address space (in @@ -16,8 +12,6 @@ previous families). Therefore, add a new set of SMI operations which remaps accesses to such registers to the corresponding directly addressable register. All other accesses use the regular indirect interface. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 7 +++ drivers/net/dsa/mv88e6xxx/global1.h | 3 ++ @@ -27,10 +21,10 @@ Signed-off-by: Mattias Walström 5 files changed, 119 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 73264c1c1565..2a27e41a2dea 100644 +index 22f4fe642578..c51588e74aed 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6566,6 +6566,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip) +@@ -6543,6 +6543,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip) /* Update the compatible info with the probed one */ chip->info = info; @@ -214,6 +208,3 @@ index c6c71d5757f5..788cf68b7b33 100644 int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip, struct mii_bus *bus, int sw_addr); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.18.6/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 77% rename from patches/linux/6.18.5/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.18.6/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index 9c23ef5b7..fcf49d887 100644 --- a/patches/linux/6.18.5/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.18.6/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,12 +1,8 @@ -From 582aea58b399dd70bab23a8313bc640096ca7c9d Mon Sep 17 00:00:00 2001 +From 4c15bcc33cacc54b17a46bf6407a44e3f9d400c0 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 -Subject: [PATCH 17/29] net: dsa: mv88e6xxx: Honor ports being managed via +Subject: [PATCH 17/30] net: dsa: mv88e6xxx: Honor ports being managed via in-band-status -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Keep all link parameters in their unforced states when the port is declared as being managed via in-band-status, and let the MAC @@ -16,14 +12,12 @@ USXGMII autoneg) This state is the default set up by mv88e6xxx_port_setup_mac(), so all we have to do is to make the phylink MAC callbacks no-ops in cases when in-band-status is being used. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 2a27e41a2dea..7da618978ba7 100644 +index c51588e74aed..de230df48545 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -965,6 +965,9 @@ static void mv88e6xxx_mac_link_down(struct phylink_config *config, @@ -46,6 +40,3 @@ index 2a27e41a2dea..7da618978ba7 100644 ops = chip->info->ops; mv88e6xxx_reg_lock(chip); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.18.6/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 91% rename from patches/linux/6.18.5/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.18.6/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index 0e3379ecb..920bd15cc 100644 --- a/patches/linux/6.18.5/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.18.6/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,12 +1,8 @@ -From 8b1ed160c587b517fb6bcb803b78842aa9ab9488 Mon Sep 17 00:00:00 2001 +From 0ef493228499a0578d0c7e6180c242e87db320ba Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 -Subject: [PATCH 18/29] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user +Subject: [PATCH 18/30] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user ports on 6393X -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires For packets with a DA in the IEEE reserved L2 group range, originating from a CPU, forward it as normal, rather than classifying it as @@ -32,8 +28,6 @@ Before this change, due to rsvd2cpu being enabled on the CPU port, the switch would try to trap it back to the CPU. Given that the CPU is trusted, instead assume that it indeed meant for the packet to be forwarded like any other. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) @@ -101,6 +95,3 @@ index 66b1b7277281..df19dfa5cc3d 100644 if (err) return err; --- -2.43.0 - diff --git a/patches/linux/6.18.5/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.18.6/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 82% rename from patches/linux/6.18.5/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.18.6/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 0988dcd9e..f65d844d6 100644 --- a/patches/linux/6.18.5/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.18.6/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,12 +1,8 @@ -From d57c5a250f32f99dc58aeb642b02a706e1f7ed32 Mon Sep 17 00:00:00 2001 +From 07a88581d188048bb8bfaf3b1252795ed97fb8cc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 -Subject: [PATCH 19/29] net: dsa: tag_dsa: Use tag priority as initial +Subject: [PATCH 19/30] net: dsa: tag_dsa: Use tag priority as initial skb->priority -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Use the 3-bit priority field from the DSA tag as the initial packet priority on ingress to the CPU. @@ -22,8 +18,6 @@ Ideally we could then map this priority to an internal one, like we can do with an "ingress-qos-map" on VLAN interfaces. Until that is implemented, support the setup that is likely to be the most common; a 1:1 mapping from FPri to skb->priority. - -Signed-off-by: Mattias Walström --- net/dsa/tag_dsa.c | 7 +++++++ 1 file changed, 7 insertions(+) @@ -46,6 +40,3 @@ index 2a2c4fb61a65..a00ae6bf2971 100644 return skb; } --- -2.43.0 - diff --git a/patches/linux/6.18.5/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.18.6/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 89% rename from patches/linux/6.18.5/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.18.6/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index 5185bdb3a..46812fd73 100644 --- a/patches/linux/6.18.5/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.18.6/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,12 +1,8 @@ -From 1ddc69f6f28652c29a8cbee0170cebc44b3cb4d9 Mon Sep 17 00:00:00 2001 +From 4d05f3f20eacca0786a13dc37fe223ce6a449d38 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 -Subject: [PATCH 20/29] net: dsa: Support MDB memberships whose L2 addresses +Subject: [PATCH 20/30] net: dsa: Support MDB memberships whose L2 addresses overlap -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Multiple IP multicast groups (32 for v4, 2^80 for v6) map to the same L2 address. This means that switchdev drivers may receive multiple MDB @@ -32,8 +28,6 @@ as long as the count is positive. Fortunately, all the infrastructure needed to do this is already in place, since it is also needed on CPU and DSA ports. Thus, "implement" this by simply removing the guards which previously skipped reference countung on user ports. - -Signed-off-by: Mattias Walström --- net/dsa/switch.c | 16 ---------------- 1 file changed, 16 deletions(-) @@ -72,6 +66,3 @@ index 3d2feeea897b..628e8a884dde 100644 mutex_lock(&dp->addr_lists_lock); a = dsa_mac_addr_find(&dp->mdbs, mdb->addr, mdb->vid, db); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0021-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.18.6/0021-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 91% rename from patches/linux/6.18.5/0021-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.18.6/0021-net-dsa-Support-EtherType-based-priority-overrides.patch index 2fab3b15d..d5b332b56 100644 --- a/patches/linux/6.18.5/0021-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.18.6/0021-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,13 +1,8 @@ -From f38ee70d9df5f42679937910f34068edc8c4e16a Mon Sep 17 00:00:00 2001 +From d64cce84bde89a3a05e07973391913c70bb02b95 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 -Subject: [PATCH 21/29] net: dsa: Support EtherType based priority overrides -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 21/30] net: dsa: Support EtherType based priority overrides -Signed-off-by: Mattias Walström --- include/net/dsa.h | 4 ++++ net/dsa/user.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- @@ -116,6 +111,3 @@ index f59d66f0975d..58174ad612d2 100644 } break; case IEEE_8021QAZ_APP_SEL_DSCP: --- -2.43.0 - diff --git a/patches/linux/6.18.5/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.18.6/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 94% rename from patches/linux/6.18.5/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.18.6/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index 86a9ae36a..53cd6c250 100644 --- a/patches/linux/6.18.5/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.18.6/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,14 +1,9 @@ -From c196348fb4b2023a26aacad062a18fa68a178a63 Mon Sep 17 00:00:00 2001 +From ffaa967a50adf49318769dbf72e948ec6048a3be Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 -Subject: [PATCH 22/29] net: dsa: mv88e6xxx: Support EtherType based priority +Subject: [PATCH 22/30] net: dsa: mv88e6xxx: Support EtherType based priority overrides -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 64 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 21 ++++++++++ @@ -19,7 +14,7 @@ Signed-off-by: Mattias Walström 6 files changed, 207 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 7da618978ba7..a7e9c141e053 100644 +index de230df48545..c99aef8afa5d 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1688,6 +1688,11 @@ static int mv88e6xxx_rmu_setup(struct mv88e6xxx_chip *chip) @@ -34,7 +29,7 @@ index 7da618978ba7..a7e9c141e053 100644 if (chip->info->ops->pot_clear) return chip->info->ops->pot_clear(chip); -@@ -3384,6 +3389,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3381,6 +3386,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) p = &chip->ports[port]; p->chip = chip; p->port = port; @@ -42,7 +37,7 @@ index 7da618978ba7..a7e9c141e053 100644 /* Look up corresponding fwnode if any */ ports_fwnode = device_get_named_child_node(chip->dev, "ethernet-ports"); -@@ -6622,6 +6628,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev) +@@ -6599,6 +6605,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev) chip->dev = dev; mutex_init(&chip->reg_lock); @@ -50,7 +45,7 @@ index 7da618978ba7..a7e9c141e053 100644 INIT_LIST_HEAD(&chip->mdios); idr_init(&chip->policies); INIT_LIST_HEAD(&chip->msts); -@@ -7161,6 +7168,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, +@@ -7138,6 +7145,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, return err_sync ? : err_pvt; } @@ -112,7 +107,7 @@ index 7da618978ba7..a7e9c141e053 100644 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = { .mac_select_pcs = mv88e6xxx_mac_select_pcs, .mac_prepare = mv88e6xxx_mac_prepare, -@@ -7230,6 +7292,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { +@@ -7207,6 +7269,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_change = mv88e6xxx_crosschip_lag_change, .crosschip_lag_join = mv88e6xxx_crosschip_lag_join, .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, @@ -122,7 +117,7 @@ index 7da618978ba7..a7e9c141e053 100644 static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h -index 2f211e55cb47..d66380eef2b0 100644 +index e073446ee7d0..5d5e7ab63fca 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -301,6 +301,11 @@ struct mv88e6xxx_port { @@ -373,6 +368,3 @@ index c1d2f99efb1c..d2ba9ed1f23e 100644 int mv88e6xxx_port_set_message_port(struct mv88e6xxx_chip *chip, int port, bool message_port); int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port, --- -2.43.0 - diff --git a/patches/linux/6.18.5/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.18.6/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 89% rename from patches/linux/6.18.5/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.18.6/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index 458822200..475a462aa 100644 --- a/patches/linux/6.18.5/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.18.6/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,11 +1,7 @@ -From 0bdbde2ac4f2028725db158623f3baecc1f81813 Mon Sep 17 00:00:00 2001 +From 71a47eb3d28ad8ce3287f334a4b19e77d3cd8f9b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 -Subject: [PATCH 23/29] net: dsa: mv88e6xxx: Add mqprio qdisc support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 23/30] net: dsa: mv88e6xxx: Add mqprio qdisc support Add support for attaching mqprio qdisc's to mv88e6xxx ports and use the packet's traffic class as the outgoing priority when no PCP bits @@ -27,15 +23,13 @@ are effectively only specifying the QPri. Since FPri is always a 3-bit field, even on older chips with only 4 physical queues, always report 8 queues and let the chip's policy handle the mapping down to the "real" number. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++ net/dsa/tag_dsa.c | 4 +- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index a7e9c141e053..20bdc3e106e7 100644 +index c99aef8afa5d..2c533aeb7374 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -32,6 +32,7 @@ @@ -46,7 +40,7 @@ index a7e9c141e053..20bdc3e106e7 100644 #include "chip.h" #include "devlink.h" -@@ -7223,6 +7224,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, +@@ -7200,6 +7201,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port, return err; } @@ -115,7 +109,7 @@ index a7e9c141e053..20bdc3e106e7 100644 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = { .mac_select_pcs = mv88e6xxx_mac_select_pcs, .mac_prepare = mv88e6xxx_mac_prepare, -@@ -7294,6 +7357,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { +@@ -7271,6 +7334,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, .port_add_etype_prio = mv88e6xxx_port_add_etype_prio, .port_del_etype_prio = mv88e6xxx_port_del_etype_prio, @@ -123,7 +117,7 @@ index a7e9c141e053..20bdc3e106e7 100644 }; static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) -@@ -7320,6 +7384,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) +@@ -7297,6 +7361,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) */ ds->num_lag_ids = mv88e6xxx_has_lag(chip) ? 16 : 0; @@ -160,6 +154,3 @@ index a00ae6bf2971..55c296e0b5b0 100644 dsa_header[3] = vid & 0xff; } --- -2.43.0 - diff --git a/patches/linux/6.18.5/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.18.6/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 83% rename from patches/linux/6.18.5/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.18.6/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index a1e39d31f..0d23ffa6a 100644 --- a/patches/linux/6.18.5/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.18.6/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,12 +1,8 @@ -From 343b13988e5428e41899392021bee32383988e0d Mon Sep 17 00:00:00 2001 +From d0f91e5c9fc2b3189a05e9d9b9124359f08bf43b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 -Subject: [PATCH 24/29] net: dsa: mv88e6xxx: Use VLAN prio over IP when both +Subject: [PATCH 24/30] net: dsa: mv88e6xxx: Use VLAN prio over IP when both are available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Switch the priority sourcing precdence to prefer VLAN PCP over IP DSCP, when both are available. @@ -25,17 +21,15 @@ main reasons for choosing the new default: packet's priority. As the packet then moves through the network core over trusted VLAN trunks, the packet should keep its original priority, independent of what inner protocol fields may indicate. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 20bdc3e106e7..d199a1c67aaa 100644 +index 2c533aeb7374..969f772fcb27 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3425,9 +3425,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3422,9 +3422,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) /* Port Control: disable Drop-on-Unlock, disable Drop-on-Lock, * disable Header mode, enable IGMP/MLD snooping, disable VLAN @@ -52,7 +46,7 @@ index 20bdc3e106e7..d199a1c67aaa 100644 * * If this is the CPU link, use DSA or EDSA tagging depending * on which tagging mode was configured. -@@ -3438,6 +3442,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3435,6 +3439,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) * forwarding of unknown unicasts and multicasts. */ reg = MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP | @@ -60,6 +54,3 @@ index 20bdc3e106e7..d199a1c67aaa 100644 MV88E6XXX_PORT_CTL0_STATE_FORWARDING; /* Forward any IPv4 IGMP or IPv6 MLD frames received * by a USER port to the CPU port to allow snooping. --- -2.43.0 - diff --git a/patches/linux/6.18.5/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.18.6/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 91% rename from patches/linux/6.18.5/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.18.6/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index e9a0eef6d..e3ce9d107 100644 --- a/patches/linux/6.18.5/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.18.6/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,12 +1,8 @@ -From ee53e8d8b2c5e6f29f14953dfe051b9995c95931 Mon Sep 17 00:00:00 2001 +From 8d5ba9ac1c9a7d45e237e052f36c0d6e1994ed65 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 -Subject: [PATCH 25/29] [FIX] net: dsa: mv88e6xxx: Trap locally terminated +Subject: [PATCH 25/30] [FIX] net: dsa: mv88e6xxx: Trap locally terminated VLANs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires Before this change, in a setup like the following, packets assigned to VLAN 10 were forwarded between the switch ports, even though the @@ -27,8 +23,6 @@ a VLAN upper interface, rather than to offload bridge VLANs, are marked as policy entries. As the VTU policy of user ports is already set to TRAP (to ensure proper standalone port operation), this will cause all packets assigned to these VLANs to properly terminated. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 33 ++++++++++++++++++-------------- include/net/switchdev.h | 4 ++++ @@ -36,7 +30,7 @@ Signed-off-by: Mattias Walström 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index d199a1c67aaa..141a3105be9f 100644 +index 969f772fcb27..161ce87a8871 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2611,7 +2611,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port, @@ -79,7 +73,7 @@ index d199a1c67aaa..141a3105be9f 100644 if (err) { dev_err(ds->dev, "p%d: failed to add VLAN %d%c\n", port, vlan->vid, untagged ? 'u' : 't'); -@@ -3477,14 +3479,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3474,14 +3476,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) if (err) return err; @@ -104,7 +98,7 @@ index d199a1c67aaa..141a3105be9f 100644 chip->info->ops->port_set_policy) { err = chip->info->ops->port_set_policy(chip, port, MV88E6XXX_POLICY_MAPPING_VTU, -@@ -3514,7 +3519,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3511,7 +3516,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) */ err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_STANDALONE, MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED, @@ -113,7 +107,7 @@ index d199a1c67aaa..141a3105be9f 100644 if (err) return err; -@@ -3528,7 +3533,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) +@@ -3525,7 +3530,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) */ err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_BRIDGED, MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED, @@ -159,6 +153,3 @@ index 58174ad612d2..c0019d0c1172 100644 }; struct dsa_switch *ds = dp->ds; struct netdev_hw_addr *ha; --- -2.43.0 - diff --git a/patches/linux/6.18.5/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.18.6/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 82% rename from patches/linux/6.18.5/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.18.6/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index 46fd76192..e75a1d8eb 100644 --- a/patches/linux/6.18.5/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.18.6/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,12 +1,8 @@ -From 741a311f8a905ca53c5a60863a05b8ce074ad1bb Mon Sep 17 00:00:00 2001 +From c5318cd4af7ae08946d748fede2c6ad7c20793e0 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 -Subject: [PATCH 26/29] net: dsa: mv88e6xxx: collapse disabled state into +Subject: [PATCH 26/30] net: dsa: mv88e6xxx: collapse disabled state into blocking -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires This patch changes the behavior of switchcore ports wrt. the port state. Instead of disabling the port, the driver now treats the disabled state @@ -21,7 +17,6 @@ each member port, preventing LACPDUs from passing through to qualify the link and become active. Signed-off-by: Joachim Wiberg -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/port.c | 2 -- 1 file changed, 2 deletions(-) @@ -39,6 +34,3 @@ index e1fee09eae2f..e28fdd21de38 100644 case BR_STATE_BLOCKING: case BR_STATE_LISTENING: state = MV88E6XXX_PORT_CTL0_STATE_BLOCKING; --- -2.43.0 - diff --git a/patches/linux/6.18.5/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.18.6/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 90% rename from patches/linux/6.18.5/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.18.6/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index b16a8ffd3..c16630d01 100644 --- a/patches/linux/6.18.5/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.18.6/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,12 +1,8 @@ -From 3b1fd215706810d155e37e29a4ff9d8c8125d853 Mon Sep 17 00:00:00 2001 +From 03d4905996709abdde6108b79baa44ad840ad512 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 -Subject: [PATCH 27/29] net: dsa: mv88e6xxx: Only activate LAG offloading when +Subject: [PATCH 27/30] net: dsa: mv88e6xxx: Only activate LAG offloading when bridged -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires The current port isolation scheme for mv88e6xxx is detailed here: https://lore.kernel.org/netdev/20220203101657.990241-1-tobias@waldekranz.com/ @@ -49,14 +45,12 @@ existing port isolation to work as intended. Before joining a bridge, the offload does not offer any performance benefit anyway. All ingressing packet will always have to go to the CPU; egress traffic always relies on software hashing. - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 141a3105be9f..2014a0958380 100644 +index 161ce87a8871..d379799c0a16 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3058,6 +3058,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, @@ -96,7 +90,7 @@ index 141a3105be9f..2014a0958380 100644 err = mv88e6xxx_port_commit_pvid(chip, port); if (err) dev_err(ds->dev, -@@ -7089,30 +7105,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port, +@@ -7066,30 +7082,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack) { struct mv88e6xxx_chip *chip = ds->priv; @@ -128,7 +122,7 @@ index 141a3105be9f..2014a0958380 100644 mv88e6xxx_reg_unlock(chip); return err; } -@@ -7121,13 +7120,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port, +@@ -7098,13 +7097,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port, struct dsa_lag lag) { struct mv88e6xxx_chip *chip = ds->priv; @@ -145,6 +139,3 @@ index 141a3105be9f..2014a0958380 100644 } static int mv88e6xxx_crosschip_lag_change(struct dsa_switch *ds, int sw_index, --- -2.43.0 - diff --git a/patches/linux/6.18.5/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.18.6/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 97% rename from patches/linux/6.18.5/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.18.6/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 5a5ef1c74..d1cf5f149 100644 --- a/patches/linux/6.18.5/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.18.6/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,11 +1,7 @@ -From 12212af51b5e14c53c473426eba96d87c0bfb9b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= +From 3fe2afd5b90dfae465cf58a35eccc911eab684d6 Mon Sep 17 00:00:00 2001 +From: Mattias Walström Date: Wed, 14 Jan 2026 18:22:41 +0100 -Subject: [PATCH 28/29] net: dsa: mv88e6xxx: Add LED support for 6393X -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: Wires +Subject: [PATCH 28/30] net: dsa: mv88e6xxx: Add LED support for 6393X Original commit: commit 462277b926140ee2d231317e92afb6cabf640268 @@ -18,8 +14,6 @@ Date: Thu Nov 16 21:59:35 2023 +0100 - "none" - "timer" - "netdev" - -Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + drivers/net/dsa/mv88e6xxx/leds.c | 403 +++++++++++++++++++++++++++++++ @@ -28,10 +22,10 @@ Signed-off-by: Mattias Walström 4 files changed, 450 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c -index 2014a0958380..2e9737c5eb7d 100644 +index d379799c0a16..7bc3169839d3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -5681,6 +5681,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { +@@ -5658,6 +5658,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .port_disable_pri_override = mv88e6xxx_port_disable_pri_override, .port_get_cmode = mv88e6352_port_get_cmode, .port_set_cmode = mv88e6393x_port_set_cmode, @@ -545,6 +539,3 @@ index d2ba9ed1f23e..f4a56671fc4c 100644 #endif int mv88e6xxx_port_drop_untagged(struct mv88e6xxx_chip *chip, int port, bool drop_untagged); --- -2.43.0 - diff --git a/patches/linux/6.18.5/0029-wireless-broadcom-brcm80211-Allow-wlan0-to-be-delete.patch b/patches/linux/6.18.6/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch similarity index 98% rename from patches/linux/6.18.5/0029-wireless-broadcom-brcm80211-Allow-wlan0-to-be-delete.patch rename to patches/linux/6.18.6/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch index 39c16c36a..393637241 100644 --- a/patches/linux/6.18.5/0029-wireless-broadcom-brcm80211-Allow-wlan0-to-be-delete.patch +++ b/patches/linux/6.18.6/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch @@ -1,12 +1,11 @@ -From e660d11d572fa039bdbcf8ed44c8aff6868184ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= +From 6d6e9958d1066f53e1359c09ff3e92386244c89e Mon Sep 17 00:00:00 2001 +From: Mattias Walström Date: Thu, 15 Jan 2026 22:47:37 +0100 -Subject: [PATCH 29/29] wifi: brcmfmac: support deletion and recreation of +Subject: [PATCH 29/30] wifi: brcmfmac: support deletion and recreation of primary interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Organization: Wires The Broadcom FullMAC firmware does not allow the primary interface (bsscfgidx 0) to be deleted - it always exists in firmware. However, @@ -397,6 +396,3 @@ index e1752a513c73..2dc0fbba271d 100644 if (brcmf_cfg80211_vif_event_armed(cfg)) return ERR_PTR(-EBUSY); --- -2.43.0 - diff --git a/patches/linux/6.18.6/0030-wifi-brcmfmac-check-connection-state-before-querying.patch b/patches/linux/6.18.6/0030-wifi-brcmfmac-check-connection-state-before-querying.patch new file mode 100644 index 000000000..a66ba66c9 --- /dev/null +++ b/patches/linux/6.18.6/0030-wifi-brcmfmac-check-connection-state-before-querying.patch @@ -0,0 +1,40 @@ +From f7255dd74a2bc1125622670d2468c8ab452f6a03 Mon Sep 17 00:00:00 2001 +From: Mattias Walström +Date: Mon, 19 Jan 2026 13:06:53 +0100 +Subject: [PATCH 30/30] wifi: brcmfmac: check connection state before querying + station info +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In station mode, brcmf_cfg80211_get_station() queries the firmware for +station info even when not connected to an AP. This results in error +-52 (EBADE) from firmware and noisy log messages: + + brcmf_cfg80211_get_station: GET STA INFO failed, -52 + +Add a check for BRCMF_VIF_STATUS_CONNECTED before querying station +info in station mode. AP mode is not affected as it needs to query +info about connected clients regardless of its own connection state. + +Signed-off-by: Mattias Walström +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +index 9c8128551072..1d937e41b95f 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -3303,6 +3303,11 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, + if (brcmf_is_ibssmode(ifp->vif)) + return brcmf_cfg80211_get_station_ibss(ifp, sinfo); + ++ /* In station mode, we can only get station info when connected */ ++ if (!brcmf_is_apmode(ifp->vif) && ++ !test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state)) ++ return -ENOENT; ++ + memset(&sta_info_le, 0, sizeof(sta_info_le)); + memcpy(&sta_info_le, mac, ETH_ALEN); + err = brcmf_fil_iovar_data_get(ifp, "tdls_sta_info", diff --git a/patches/linux/linux.hash b/patches/linux/linux.hash index f39d18a63..73f627a26 100644 --- a/patches/linux/linux.hash +++ b/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Calculated with utils/kernel-refresh.sh -sha256 189d1f409cef8d0d234210e04595172df392f8cb297e14b447ed95720e2fd940 linux-6.18.5.tar.xz +sha256 472497197b2f68d4dbf1bc32cc6dc669ca220ff4c0eb0dc39a9cff9a88f9a31b linux-6.18.6.tar.xz