diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index b38a294a..dbd59989 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -27,7 +27,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.12.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.14" 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 02298106..a349dc55 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -27,7 +27,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.12.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.14" 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 1edf5363..781c1948 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF 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.12.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.14" 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 575c3f92..54ba4b34 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF 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.12.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.14" 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 5f0a2ed6..356a9460 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -8,7 +8,7 @@ All notable changes to the project are documented in this file. ------------------------- ### Changes - - Upgrade Linux kernel to 6.12.13 (LTS) + - Upgrade Linux kernel to 6.12.14 (LTS) - YANG type for SSH private/public keys has changed, from ietf-crypto-types to infix-crypto-types - Add support for link aggregation (lag), static (balance-xor) and LACP diff --git a/patches/linux/6.12.13/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.14/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 83% rename from patches/linux/6.12.13/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.14/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index 1f077e57..09bf70b7 100644 --- a/patches/linux/6.12.13/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.14/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,15 +1,18 @@ -From 773a0e32210336d682148e2e4c87add5e69105ec Mon Sep 17 00:00:00 2001 +From 0b10cfdb401b2336b3eec9d3b1f4b851a3478009 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 Subject: [PATCH 01/26] [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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/linux/6.12.13/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.14/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 97% rename from patches/linux/6.12.13/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.14/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index c32771d7..4eef77e4 100644 --- a/patches/linux/6.12.13/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.14/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,8 +1,11 @@ -From 765cc95de163acf8022b093ce227184e04b49d7b Mon Sep 17 00:00:00 2001 +From a994279e52be28e36bd7e36583b5382ee4a1bd2c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 Subject: [PATCH 02/26] 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 @@ -14,7 +17,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 7 +++ drivers/net/dsa/mv88e6xxx/global1.h | 3 ++ diff --git a/patches/linux/6.12.13/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.14/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 86% rename from patches/linux/6.12.13/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.14/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index 33b6baba..0c521fdf 100644 --- a/patches/linux/6.12.13/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.14/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,8 +1,11 @@ -From eb1ba5920254e04daff5c9a09e90b8882bf34490 Mon Sep 17 00:00:00 2001 +From f26f0cf42d93be47dac68e99dc8d0cc63d7544a7 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 Subject: [PATCH 03/26] 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 @@ -14,7 +17,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/patches/linux/6.12.13/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.14/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 94% rename from patches/linux/6.12.13/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.14/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index 304702f8..0b2cb9bf 100644 --- a/patches/linux/6.12.13/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.14/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,8 +1,11 @@ -From 8b3590e253746d5704650889c106cf5454e26cd3 Mon Sep 17 00:00:00 2001 +From 539b9cc3c6fd59a6a7b9afffe7caf9eacedf1fe4 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 Subject: [PATCH 04/26] 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 @@ -30,7 +33,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/patches/linux/6.12.13/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.14/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 97% rename from patches/linux/6.12.13/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.14/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index 78f29b24..87360af4 100644 --- a/patches/linux/6.12.13/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.14/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,13 +1,16 @@ -From 3c13e341f9e18cdd819584086bed0d207a3f042a Mon Sep 17 00:00:00 2001 +From 117007dda54a6c8c213afae8a0251e4d83b94589 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 Subject: [PATCH 05/26] net: dsa: mv88e6xxx: Add LED infrastructure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Wires Parse DT for LEDs and register them for devices that support it, though no actual implementations exist yet. -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/Makefile | 1 + drivers/net/dsa/mv88e6xxx/chip.c | 5 +- diff --git a/patches/linux/6.12.13/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.14/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 97% rename from patches/linux/6.12.13/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.14/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index f92c5dba..96cd42aa 100644 --- a/patches/linux/6.12.13/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.14/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,7 +1,10 @@ -From eb8d96aab3ee81c40252f8c5e1628b3709e23cab Mon Sep 17 00:00:00 2001 +From f0e1560a5c3feff19bf2428b705e68afe85826ff Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 Subject: [PATCH 06/26] 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 Trigger support: @@ -9,7 +12,7 @@ Trigger support: - "timer" - "netdev" -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + drivers/net/dsa/mv88e6xxx/leds.c | 229 +++++++++++++++++++++++++++++++ diff --git a/patches/linux/6.12.13/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.14/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 88% rename from patches/linux/6.12.13/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.14/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 9516a801..68ffbd8e 100644 --- a/patches/linux/6.12.13/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.14/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,8 +1,11 @@ -From 06a7be8d8ca0241b89504595b0838ecf25b6c768 Mon Sep 17 00:00:00 2001 +From 35cd7b6ba72fa10fcd2e545215a92e089f5985e5 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 Subject: [PATCH 07/26] 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 @@ -20,7 +23,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- net/dsa/tag_dsa.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patches/linux/6.12.13/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.14/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 92% rename from patches/linux/6.12.13/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.14/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index d6d8a186..ca43345d 100644 --- a/patches/linux/6.12.13/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.14/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,8 +1,11 @@ -From 0312ac7f2a3d956ff9aec3f84b3b64302e59d36c Mon Sep 17 00:00:00 2001 +From fc15e54c2bccc427fa3de62703d838a461632f0b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 Subject: [PATCH 08/26] 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 @@ -30,7 +33,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- net/dsa/switch.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/patches/linux/6.12.13/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.14/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 93% rename from patches/linux/6.12.13/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.14/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index 8a2ef754..fc7d8677 100644 --- a/patches/linux/6.12.13/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.14/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,10 +1,13 @@ -From 45716feb5762311a384f38d8b6449fc652a73764 Mon Sep 17 00:00:00 2001 +From ced27a4bf5a6455e83dc308e980f3afc96ced2d3 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 Subject: [PATCH 09/26] net: dsa: 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- include/net/dsa.h | 4 ++++ net/dsa/user.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- diff --git a/patches/linux/6.12.13/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.14/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 98% rename from patches/linux/6.12.13/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.14/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index 5f17111b..fa2e5473 100644 --- a/patches/linux/6.12.13/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.14/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,11 +1,14 @@ -From d2802357f81b4995c92fdd6f2ab8ea923b69cef1 Mon Sep 17 00:00:00 2001 +From e66e3a276ca7a1a893a7521dcb2f7b437072f549 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 Subject: [PATCH 10/26] 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 64 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 21 ++++++++++ diff --git a/patches/linux/6.12.13/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.14/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 95% rename from patches/linux/6.12.13/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.14/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index a82eaf79..82557a14 100644 --- a/patches/linux/6.12.13/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.14/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,7 +1,10 @@ -From 985f9b471326f65d2c29978b511181200c1b32dd Mon Sep 17 00:00:00 2001 +From 69740f30d070e4b89103e8ebfcf92c7ff337ee92 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 Subject: [PATCH 11/26] net: dsa: mv88e6xxx: Add mqprio qdisc support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Wires Add support for attaching mqprio qdisc's to mv88e6xxx ports and use @@ -25,7 +28,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++ net/dsa/tag_dsa.c | 4 +- diff --git a/patches/linux/6.12.13/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.14/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 92% rename from patches/linux/6.12.13/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.14/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index a323b565..f1bf6f2d 100644 --- a/patches/linux/6.12.13/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.14/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,8 +1,11 @@ -From da95446b056b1efc27353d2549298580978a079f Mon Sep 17 00:00:00 2001 +From bfaa05fa61ff8a40358e54023833221abf043edc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 Subject: [PATCH 12/26] 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 @@ -23,7 +26,7 @@ main reasons for choosing the new default: core over trusted VLAN trunks, the packet should keep its original priority, independent of what inner protocol fields may indicate. -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/patches/linux/6.12.13/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.14/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 96% rename from patches/linux/6.12.13/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.14/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index 5a9dc371..1237ab9f 100644 --- a/patches/linux/6.12.13/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.14/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,8 +1,11 @@ -From e4a71c66724ba89a37dee71db5ae9e555676547e Mon Sep 17 00:00:00 2001 +From c5647af856a81598092b0661b45769e35030ccb8 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 Subject: [PATCH 13/26] [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 @@ -25,7 +28,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 33 ++++++++++++++++++-------------- include/net/switchdev.h | 4 ++++ diff --git a/patches/linux/6.12.13/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.14/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 96% rename from patches/linux/6.12.13/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.14/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index af6ff794..736fd6ce 100644 --- a/patches/linux/6.12.13/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.14/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,8 +1,11 @@ -From 9ade37c2fa9f5a6faebeaa8894d9703624eae5ef Mon Sep 17 00:00:00 2001 +From eeb0c10b82acec6634218abb46c2729f0a9f9ae5 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 Subject: [PATCH 14/26] 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 @@ -12,7 +15,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/patches/linux/6.12.13/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.14/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 88% rename from patches/linux/6.12.13/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.14/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index 9c8fe144..13c6c22c 100644 --- a/patches/linux/6.12.13/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.14/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,15 +1,18 @@ -From 9571b0e79717fbcef4540b9a20a4fb2fe4c57f26 Mon Sep 17 00:00:00 2001 +From 62f7ba36e1db4f01f1f1bfcdf2a15e38dc9efa6f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 Subject: [PATCH 15/26] 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/patches/linux/6.12.13/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.14/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 98% rename from patches/linux/6.12.13/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.14/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index af5cd832..c7ca23f2 100644 --- a/patches/linux/6.12.13/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.14/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,7 +1,10 @@ -From 05a6f49a221e797fdbd21501902bd969b9c64640 Mon Sep 17 00:00:00 2001 +From c26d23a84b9eec9867449a01a692d70282b127ae Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 Subject: [PATCH 16/26] 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 Pickup the LEDs from the state in which the hardware reset or @@ -18,7 +21,7 @@ Trigger support: - "netdev": Offload link or duplex information to the solid behavior; tx and/or rx activity to blink behavior. -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++ 1 file changed, 422 insertions(+) diff --git a/patches/linux/6.12.13/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.14/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 92% rename from patches/linux/6.12.13/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.14/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index 92cc8770..e645d132 100644 --- a/patches/linux/6.12.13/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.14/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,8 +1,11 @@ -From 202a7fccb4d46e38ed6f82788a44cf7320377549 Mon Sep 17 00:00:00 2001 +From e0fc506d5a66c52dcedd8216f82012ffb37c732c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 Subject: [PATCH 17/26] 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 @@ -15,7 +18,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/patches/linux/6.12.13/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.14/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 84% rename from patches/linux/6.12.13/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.14/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index ad2dbef6..2b902df2 100644 --- a/patches/linux/6.12.13/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.14/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,7 +1,10 @@ -From 31f2aa0e957643cc51be65750c4f65be8c507a18 Mon Sep 17 00:00:00 2001 +From c9977f82869ab70f731d4ea26e0ed9337ed5d304 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 Subject: [PATCH 18/26] 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 The PHY should not start negotiating with its link-partner until @@ -16,7 +19,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/phy/phy_device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/linux/6.12.13/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.14/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 97% rename from patches/linux/6.12.13/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.14/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index 6ea42ba4..3475679e 100644 --- a/patches/linux/6.12.13/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.14/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,8 +1,11 @@ -From 83c259d997fa40f0b9b9a3250746531df9c730c3 Mon Sep 17 00:00:00 2001 +From 63d1a9ffba21f9224b002df59c28756f4b682a5a Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 Subject: [PATCH 19/26] 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 @@ -16,7 +19,7 @@ Because a multicast router should always receive both known and unknown multicast. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- include/uapi/linux/if_bridge.h | 1 + net/bridge/br.c | 5 +++++ diff --git a/patches/linux/6.12.13/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.14/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 86% rename from patches/linux/6.12.13/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.14/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 6c5e012a..ba45d5a0 100644 --- a/patches/linux/6.12.13/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.14/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,8 +1,11 @@ -From f2d2f489eb2073e79d3908a4f9abe797ce5c5a17 Mon Sep 17 00:00:00 2001 +From 8de3989588928e780768ff3382875783e633d22e Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 Subject: [PATCH 20/26] 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 @@ -12,6 +15,7 @@ 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(-) diff --git a/patches/linux/6.12.13/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.14/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 96% rename from patches/linux/6.12.13/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.14/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 4ce2c3d1..fe122eb2 100644 --- a/patches/linux/6.12.13/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.14/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,8 +1,11 @@ -From 4a88856e21984b9292361ad77d7dfc13fad239a5 Mon Sep 17 00:00:00 2001 +From 609cc3577a1a544ed73027df050454535e6046da Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 Subject: [PATCH 21/26] 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 @@ -19,7 +22,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- net/bridge/br_multicast.c | 42 +++++++-------------------------------- net/bridge/br_private.h | 4 +--- diff --git a/patches/linux/6.12.13/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.14/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 94% rename from patches/linux/6.12.13/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.14/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index acbf6b3e..c01799d1 100644 --- a/patches/linux/6.12.13/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.14/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,8 +1,11 @@ -From 12fe155cedae381d143a0b61b5375d1edb7c46e6 Mon Sep 17 00:00:00 2001 +From 51e020d4a166e50f9c151ae5cccb08550dc61ac2 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 Subject: [PATCH 22/26] 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 @@ -22,7 +25,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- include/uapi/linux/rtnetlink.h | 2 ++ net/bridge/br_mdb.c | 4 ++-- diff --git a/patches/linux/6.12.13/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.14/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 89% rename from patches/linux/6.12.13/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.14/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index a6ef5f88..d31d5fd4 100644 --- a/patches/linux/6.12.13/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.14/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,8 +1,11 @@ -From d8d81ca2a348095d87110d3d6a65134f1b7ce212 Mon Sep 17 00:00:00 2001 +From f5b525c808b13b43934e78464d2b01a7d27ce4b6 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 Subject: [PATCH 23/26] 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 @@ -14,7 +17,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/nvmem/layouts/onie-tlv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/linux/6.12.13/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.14/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 89% rename from patches/linux/6.12.13/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.14/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index d4f07cc5..bf3ecd83 100644 --- a/patches/linux/6.12.13/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.14/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,7 +1,10 @@ -From 49592053a901870104c3ea6f6d4a4c18711c955d Mon Sep 17 00:00:00 2001 +From 39832d9e6aff85e80a367f9d43ce09fb239d82ac Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 Subject: [PATCH 24/26] usb: core: adjust log level for unauthorized devices +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Wires The fact that a USB device currently is not authorized is not an error, @@ -9,7 +12,7 @@ so let's adjust the log level so these messages slip below radar for the commonly used 'quiet' log level. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/usb/core/driver.c | 4 ++-- drivers/usb/core/generic.c | 2 +- diff --git a/patches/linux/6.12.13/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.14/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch similarity index 87% rename from patches/linux/6.12.13/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch rename to patches/linux/6.12.14/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch index 0aab713f..d859d191 100644 --- a/patches/linux/6.12.13/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch +++ b/patches/linux/6.12.14/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -1,8 +1,11 @@ -From a86053426ab5a0e9155e0b4c7c20495964fa4b59 Mon Sep 17 00:00:00 2001 +From ba0c10cb8ea89f4ebef34fc0dbee4df3545b8d2d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Jan 2025 12:35:12 +0100 Subject: [PATCH 25/26] 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. @@ -18,7 +21,7 @@ each member port, preventing LACPDUs from passing through to qualify the link and become active. Signed-off-by: Joachim Wiberg -Signed-off-by: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/port.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/patches/linux/6.12.13/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch b/patches/linux/6.12.14/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch similarity index 95% rename from patches/linux/6.12.13/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch rename to patches/linux/6.12.14/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch index 1c813e2b..888e1ba0 100644 --- a/patches/linux/6.12.13/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch +++ b/patches/linux/6.12.14/0026-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch @@ -1,8 +1,11 @@ -From a98487405e1a7b8b69569a3e5f7765f395c36f55 Mon Sep 17 00:00:00 2001 +From 43a67b5bb9b829e3317cc1fb9166f1ee6dea1b1e Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 12 Feb 2025 22:03:14 +0100 Subject: [PATCH 26/26] 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: @@ -47,7 +50,7 @@ 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: Tobias Waldekranz +Signed-off-by: Mattias Walström --- drivers/net/dsa/mv88e6xxx/chip.c | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-)