From 131c0b1d4b8d94aa6f6ddfe13221fcfd5346992d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Fri, 24 Jan 2025 21:21:10 +0100 Subject: [PATCH] Update kernel to latest LTS (6.12.11) --- configs/aarch64_defconfig | 2 +- configs/aarch64_minimal_defconfig | 2 +- configs/x86_64_defconfig | 2 +- configs/x86_64_minimal_defconfig | 2 +- ...e6xxx-Fix-timeout-on-waiting-for-PPU.patch | 9 ++-- ...x-Improve-indirect-register-access-p.patch | 9 ++-- ...x-Honor-ports-being-managed-via-in-b.patch | 9 ++-- ...x-Limit-rsvd2cpu-policy-to-user-port.patch | 9 ++-- ...dsa-mv88e6xxx-Add-LED-infrastructure.patch | 9 ++-- ...-mv88e6xxx-Add-LED-support-for-6393X.patch | 9 ++-- ...Use-tag-priority-as-initial-skb-prio.patch | 9 ++-- ...MDB-memberships-whose-L2-addresses-o.patch | 9 ++-- ...t-EtherType-based-priority-overrides.patch | 9 ++-- ...x-Support-EtherType-based-priority-o.patch | 9 ++-- ...a-mv88e6xxx-Add-mqprio-qdisc-support.patch | 9 ++-- ...x-Use-VLAN-prio-over-IP-when-both-ar.patch | 9 ++-- ...8e6xxx-Trap-locally-terminated-VLANs.patch | 9 ++-- ...0g-Support-firmware-loading-on-88X33.patch | 9 ++-- ...0g-Fix-power-up-when-strapped-to-sta.patch | 9 ++-- ...rvell10g-Add-LED-support-for-88X3310.patch | 9 ++-- ...0g-Support-LEDs-tied-to-a-single-med.patch | 9 ++-- ...phy-Do-not-resume-PHY-when-attaching.patch | 9 ++-- ...-classifying-unknown-multicast-as-mr.patch | 9 ++-- ...e-router-ports-when-forwarding-L2-mu.patch | 8 +++- ...delay-for-applying-strict-multicast-.patch | 9 ++-- ...rentiate-MDB-additions-from-modifica.patch | 9 ++-- ...ie-tlv-Let-device-probe-even-when-TL.patch | 9 ++-- ...t-log-level-for-unauthorized-devices.patch | 9 ++-- ...x-collapse-disabled-state-into-block.patch | 44 +++++++++++++++++++ 29 files changed, 192 insertions(+), 75 deletions(-) rename patches/linux/{6.12.3 => 6.12.11}/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch (79%) rename patches/linux/{6.12.3 => 6.12.11}/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch (96%) rename patches/linux/{6.12.3 => 6.12.11}/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch (82%) rename patches/linux/{6.12.3 => 6.12.11}/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch (92%) rename patches/linux/{6.12.3 => 6.12.11}/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch (96%) rename patches/linux/{6.12.3 => 6.12.11}/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch (97%) rename patches/linux/{6.12.3 => 6.12.11}/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch (84%) rename patches/linux/{6.12.3 => 6.12.11}/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch (90%) rename patches/linux/{6.12.3 => 6.12.11}/0009-net-dsa-Support-EtherType-based-priority-overrides.patch (92%) rename patches/linux/{6.12.3 => 6.12.11}/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch (97%) rename patches/linux/{6.12.3 => 6.12.11}/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch (94%) rename patches/linux/{6.12.3 => 6.12.11}/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch (90%) rename patches/linux/{6.12.3 => 6.12.11}/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch (95%) rename patches/linux/{6.12.3 => 6.12.11}/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch (95%) rename patches/linux/{6.12.3 => 6.12.11}/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch (85%) rename patches/linux/{6.12.3 => 6.12.11}/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch (98%) rename patches/linux/{6.12.3 => 6.12.11}/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch (89%) rename patches/linux/{6.12.3 => 6.12.11}/0018-net-phy-Do-not-resume-PHY-when-attaching.patch (79%) rename patches/linux/{6.12.3 => 6.12.11}/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch (97%) rename patches/linux/{6.12.3 => 6.12.11}/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch (82%) rename patches/linux/{6.12.3 => 6.12.11}/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch (95%) rename patches/linux/{6.12.3 => 6.12.11}/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch (93%) rename patches/linux/{6.12.3 => 6.12.11}/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch (86%) rename patches/linux/{6.12.3 => 6.12.11}/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch (86%) create mode 100644 patches/linux/6.12.11/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 87323b45..6b6310ae 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.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11" 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 e76b533b..53021277 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.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11" 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 a4cb735f..a13e831c 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.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11" 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 6de8b9a9..13bac873 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.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11" 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/patches/linux/6.12.3/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch b/patches/linux/6.12.11/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch similarity index 79% rename from patches/linux/6.12.3/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch rename to patches/linux/6.12.11/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch index edb6f338..8eb242f2 100644 --- a/patches/linux/6.12.3/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch +++ b/patches/linux/6.12.11/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch @@ -1,15 +1,18 @@ -From 71fe6d55812e13fcbcbc703b925a3be5789fa360 Mon Sep 17 00:00:00 2001 +From 998f0e99f2bd7ab54e1d25acac4227335c8caaec Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Mar 2024 10:27:24 +0100 -Subject: [PATCH 01/24] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for +Subject: [PATCH 01/25] [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: Addiva Elektronik 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.3/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch b/patches/linux/6.12.11/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch similarity index 96% rename from patches/linux/6.12.3/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch rename to patches/linux/6.12.11/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch index c203c8cf..6fe5f5d3 100644 --- a/patches/linux/6.12.3/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch +++ b/patches/linux/6.12.11/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch @@ -1,8 +1,11 @@ -From b1ebd0aa174cae173c09772ff465eee20bfb8cf1 Mon Sep 17 00:00:00 2001 +From 3002b9e08272f3d740c2b582cf9b01fa1fde46b8 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 15:52:43 +0100 -Subject: [PATCH 02/24] net: dsa: mv88e6xxx: Improve indirect register access +Subject: [PATCH 02/25] 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: Addiva Elektronik 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.3/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch b/patches/linux/6.12.11/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch similarity index 82% rename from patches/linux/6.12.3/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch rename to patches/linux/6.12.11/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch index b9c8ce74..7a70043e 100644 --- a/patches/linux/6.12.3/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch +++ b/patches/linux/6.12.11/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch @@ -1,8 +1,11 @@ -From 178f00dd84b9c76f065edba012d51d82cda89188 Mon Sep 17 00:00:00 2001 +From 6bad36ecd3bb8f9b97c51f8ee2409f250344c1fc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Mon, 22 Apr 2024 23:18:01 +0200 -Subject: [PATCH 03/24] net: dsa: mv88e6xxx: Honor ports being managed via +Subject: [PATCH 03/25] 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: Addiva Elektronik 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.3/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch b/patches/linux/6.12.11/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch similarity index 92% rename from patches/linux/6.12.3/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch rename to patches/linux/6.12.11/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch index bc3aeb4d..de76772e 100644 --- a/patches/linux/6.12.3/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch +++ b/patches/linux/6.12.11/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch @@ -1,8 +1,11 @@ -From 41c8514d46aed546dae97817b582966aec19ac19 Mon Sep 17 00:00:00 2001 +From 980366a1f8709fdfe643edb666c86a916c681a6c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 24 Apr 2024 22:41:04 +0200 -Subject: [PATCH 04/24] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user +Subject: [PATCH 04/25] 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: Addiva Elektronik 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.3/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch b/patches/linux/6.12.11/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch similarity index 96% rename from patches/linux/6.12.3/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch rename to patches/linux/6.12.11/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch index f94c7594..006a6149 100644 --- a/patches/linux/6.12.3/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch +++ b/patches/linux/6.12.11/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch @@ -1,13 +1,16 @@ -From a78a31711dcb661b1b0f4d2a6e692112b53ee1d3 Mon Sep 17 00:00:00 2001 +From cfc55d98057160753158b7c5357c94ac24d918fe Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 19:44:32 +0100 -Subject: [PATCH 05/24] net: dsa: mv88e6xxx: Add LED infrastructure +Subject: [PATCH 05/25] net: dsa: mv88e6xxx: Add LED infrastructure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch b/patches/linux/6.12.11/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch similarity index 97% rename from patches/linux/6.12.3/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch rename to patches/linux/6.12.11/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch index 88f432a4..4028f3d3 100644 --- a/patches/linux/6.12.3/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch +++ b/patches/linux/6.12.11/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch @@ -1,7 +1,10 @@ -From 759f9f0a451dc0c3bc8e268ab2609e911f05e472 Mon Sep 17 00:00:00 2001 +From 180f2b90c73bc9fdfb27335327571daf8507f9c8 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 Nov 2023 21:59:35 +0100 -Subject: [PATCH 06/24] net: dsa: mv88e6xxx: Add LED support for 6393X +Subject: [PATCH 06/25] net: dsa: mv88e6xxx: Add LED support for 6393X +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch b/patches/linux/6.12.11/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch similarity index 84% rename from patches/linux/6.12.3/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch rename to patches/linux/6.12.11/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch index 944c722d..a36f2f0f 100644 --- a/patches/linux/6.12.3/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch +++ b/patches/linux/6.12.11/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch @@ -1,8 +1,11 @@ -From 18e2a5f297ee800b2c51adbf9958bc2b96e2370d Mon Sep 17 00:00:00 2001 +From 2e42839d4edb250b298f7683975382e9ec97c9a9 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 10:38:42 +0200 -Subject: [PATCH 07/24] net: dsa: tag_dsa: Use tag priority as initial +Subject: [PATCH 07/25] 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: Addiva Elektronik 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.3/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch b/patches/linux/6.12.11/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch similarity index 90% rename from patches/linux/6.12.3/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch rename to patches/linux/6.12.11/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch index 92a111d9..1246cf6c 100644 --- a/patches/linux/6.12.3/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch +++ b/patches/linux/6.12.11/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch @@ -1,8 +1,11 @@ -From 6fc99a4c2e4a263acf2ba3fb9e8a85f12661ba60 Mon Sep 17 00:00:00 2001 +From 681fc63548bae02cd286042a3470011617ff78fd Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 16 Jan 2024 16:00:55 +0100 -Subject: [PATCH 08/24] net: dsa: Support MDB memberships whose L2 addresses +Subject: [PATCH 08/25] 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: Addiva Elektronik 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.3/0009-net-dsa-Support-EtherType-based-priority-overrides.patch b/patches/linux/6.12.11/0009-net-dsa-Support-EtherType-based-priority-overrides.patch similarity index 92% rename from patches/linux/6.12.3/0009-net-dsa-Support-EtherType-based-priority-overrides.patch rename to patches/linux/6.12.11/0009-net-dsa-Support-EtherType-based-priority-overrides.patch index 67f3c434..a13886dd 100644 --- a/patches/linux/6.12.3/0009-net-dsa-Support-EtherType-based-priority-overrides.patch +++ b/patches/linux/6.12.11/0009-net-dsa-Support-EtherType-based-priority-overrides.patch @@ -1,10 +1,13 @@ -From 7b546aa81ea913bf3795dc4c843992c84c29d3b7 Mon Sep 17 00:00:00 2001 +From d1c7aeac75ffe6e1350d8a08ee9ba99209636df5 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 21 Mar 2024 19:12:15 +0100 -Subject: [PATCH 09/24] net: dsa: Support EtherType based priority overrides +Subject: [PATCH 09/25] net: dsa: Support EtherType based priority overrides +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik -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.3/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch b/patches/linux/6.12.11/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch similarity index 97% rename from patches/linux/6.12.3/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch rename to patches/linux/6.12.11/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch index 97a496fc..df0e3a18 100644 --- a/patches/linux/6.12.3/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch +++ b/patches/linux/6.12.11/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch @@ -1,11 +1,14 @@ -From 98a469ebd1c7a90aa3ab7dffcd58515d0b18376a Mon Sep 17 00:00:00 2001 +From 79d68d69f6cd6cf57ef5ed4bcba45134ff8ba174 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 22 Mar 2024 16:15:43 +0100 -Subject: [PATCH 10/24] net: dsa: mv88e6xxx: Support EtherType based priority +Subject: [PATCH 10/25] net: dsa: mv88e6xxx: Support EtherType based priority overrides +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik -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.3/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch b/patches/linux/6.12.11/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch similarity index 94% rename from patches/linux/6.12.3/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch rename to patches/linux/6.12.11/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch index 791070fb..aef5371f 100644 --- a/patches/linux/6.12.3/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch +++ b/patches/linux/6.12.11/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch @@ -1,7 +1,10 @@ -From f96b11cbcdf0cfaa60ed9be75f5b2e32c5d6c036 Mon Sep 17 00:00:00 2001 +From 57eabbff1169a5641c59fc698d7b122d17733d49 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 28 May 2024 11:04:22 +0200 -Subject: [PATCH 11/24] net: dsa: mv88e6xxx: Add mqprio qdisc support +Subject: [PATCH 11/25] net: dsa: mv88e6xxx: Add mqprio qdisc support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch b/patches/linux/6.12.11/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch similarity index 90% rename from patches/linux/6.12.3/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch rename to patches/linux/6.12.11/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch index af49f688..57617332 100644 --- a/patches/linux/6.12.3/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch +++ b/patches/linux/6.12.11/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch @@ -1,8 +1,11 @@ -From 0dea11bbeb08eab148807853626061591e5b8a7c Mon Sep 17 00:00:00 2001 +From 752cce791dfe31525e3974d6f6419e4be0535343 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 29 May 2024 13:20:41 +0200 -Subject: [PATCH 12/24] net: dsa: mv88e6xxx: Use VLAN prio over IP when both +Subject: [PATCH 12/25] 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: Addiva Elektronik 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.3/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch b/patches/linux/6.12.11/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch similarity index 95% rename from patches/linux/6.12.3/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch rename to patches/linux/6.12.11/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch index 7881faaa..134dbe04 100644 --- a/patches/linux/6.12.3/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch +++ b/patches/linux/6.12.11/0013-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch @@ -1,8 +1,11 @@ -From 15d0f3332c1253f90d47e4a949baa3bba42601d0 Mon Sep 17 00:00:00 2001 +From b3b9b97cbe4eebd6cd3d68744e11a1bde5b98a47 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 26 Nov 2024 19:45:59 +0100 -Subject: [PATCH 13/24] [FIX] net: dsa: mv88e6xxx: Trap locally terminated +Subject: [PATCH 13/25] [FIX] net: dsa: mv88e6xxx: Trap locally terminated VLANs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch b/patches/linux/6.12.11/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch similarity index 95% rename from patches/linux/6.12.3/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch rename to patches/linux/6.12.11/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch index f31f845b..3b39471b 100644 --- a/patches/linux/6.12.3/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch +++ b/patches/linux/6.12.11/0014-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch @@ -1,8 +1,11 @@ -From f07acc439e8e803cb16528db21f0dfa11029caf4 Mon Sep 17 00:00:00 2001 +From 1e19f28f4f44973f349ad8bbb2fe0f4624e3c0f3 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 19 Sep 2023 18:38:10 +0200 -Subject: [PATCH 14/24] net: phy: marvell10g: Support firmware loading on +Subject: [PATCH 14/25] net: phy: marvell10g: Support firmware loading on 88X3310 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch b/patches/linux/6.12.11/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch similarity index 85% rename from patches/linux/6.12.3/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch rename to patches/linux/6.12.11/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch index d23b2ae1..d037fda9 100644 --- a/patches/linux/6.12.3/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch +++ b/patches/linux/6.12.11/0015-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch @@ -1,15 +1,18 @@ -From 5fece876f73fadd87c9de33fbe4d5472679474bd Mon Sep 17 00:00:00 2001 +From 95ff23729224c6c08801c2dba8830b18c177431b Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 21 Nov 2023 20:15:24 +0100 -Subject: [PATCH 15/24] net: phy: marvell10g: Fix power-up when strapped to +Subject: [PATCH 15/25] 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: Addiva Elektronik 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.3/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch b/patches/linux/6.12.11/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch similarity index 98% rename from patches/linux/6.12.3/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch rename to patches/linux/6.12.11/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch index bd13f010..db7845cc 100644 --- a/patches/linux/6.12.3/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch +++ b/patches/linux/6.12.11/0016-net-phy-marvell10g-Add-LED-support-for-88X3310.patch @@ -1,7 +1,10 @@ -From 5f54194131bd332054da0a9143efc4423dac32b7 Mon Sep 17 00:00:00 2001 +From ecdfc7324dd50d79c81af453699467023d72e2bf Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 15 Nov 2023 20:58:42 +0100 -Subject: [PATCH 16/24] net: phy: marvell10g: Add LED support for 88X3310 +Subject: [PATCH 16/25] net: phy: marvell10g: Add LED support for 88X3310 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch b/patches/linux/6.12.11/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch similarity index 89% rename from patches/linux/6.12.3/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch rename to patches/linux/6.12.11/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch index 5a9ec383..1094be28 100644 --- a/patches/linux/6.12.3/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch +++ b/patches/linux/6.12.11/0017-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch @@ -1,8 +1,11 @@ -From 5a82579e304de13e3590cc7ff8c212781a82253e Mon Sep 17 00:00:00 2001 +From df3d8aede0c04a0ae93e0dc02ba6b471e3791500 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 12 Dec 2023 09:51:05 +0100 -Subject: [PATCH 17/24] net: phy: marvell10g: Support LEDs tied to a single +Subject: [PATCH 17/25] 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: Addiva Elektronik 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.3/0018-net-phy-Do-not-resume-PHY-when-attaching.patch b/patches/linux/6.12.11/0018-net-phy-Do-not-resume-PHY-when-attaching.patch similarity index 79% rename from patches/linux/6.12.3/0018-net-phy-Do-not-resume-PHY-when-attaching.patch rename to patches/linux/6.12.11/0018-net-phy-Do-not-resume-PHY-when-attaching.patch index 61e0e9c9..28cab3ce 100644 --- a/patches/linux/6.12.3/0018-net-phy-Do-not-resume-PHY-when-attaching.patch +++ b/patches/linux/6.12.11/0018-net-phy-Do-not-resume-PHY-when-attaching.patch @@ -1,7 +1,10 @@ -From 3d5cf4c863ab9bb4d72ac8e1f1f9fc48733e43c5 Mon Sep 17 00:00:00 2001 +From f76443118313f681a62cf34a6f8b38f743832dff Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Wed, 27 Mar 2024 10:10:19 +0100 -Subject: [PATCH 18/24] net: phy: Do not resume PHY when attaching +Subject: [PATCH 18/25] net: phy: Do not resume PHY when attaching +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch b/patches/linux/6.12.11/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch similarity index 97% rename from patches/linux/6.12.3/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch rename to patches/linux/6.12.11/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch index 1e7390ad..5ccde049 100644 --- a/patches/linux/6.12.3/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch +++ b/patches/linux/6.12.11/0019-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch @@ -1,8 +1,11 @@ -From 70f0a5d1576e4218af1f507c442f4317947ba992 Mon Sep 17 00:00:00 2001 +From cd73e20a5c51dc26ab6a768a813ab805ad8b0689 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Mar 2024 16:47:28 +0100 -Subject: [PATCH 19/24] net: bridge: avoid classifying unknown multicast as +Subject: [PATCH 19/25] 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: Addiva Elektronik 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.3/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch b/patches/linux/6.12.11/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch similarity index 82% rename from patches/linux/6.12.3/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch rename to patches/linux/6.12.11/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch index 3e6b7e07..9b643994 100644 --- a/patches/linux/6.12.3/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch +++ b/patches/linux/6.12.11/0020-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch @@ -1,8 +1,11 @@ -From f8dc202bdbe82e84d141c955c463aea6a871db37 Mon Sep 17 00:00:00 2001 +From ed61171f9f5d42000b7315d8af12691bb02dac35 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 06:44:41 +0100 -Subject: [PATCH 20/24] net: bridge: Ignore router ports when forwarding L2 +Subject: [PATCH 20/25] 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: Addiva Elektronik 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.3/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch b/patches/linux/6.12.11/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch similarity index 95% rename from patches/linux/6.12.3/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch rename to patches/linux/6.12.11/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch index 581ebca5..3623f792 100644 --- a/patches/linux/6.12.3/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch +++ b/patches/linux/6.12.11/0021-net-bridge-drop-delay-for-applying-strict-multicast-.patch @@ -1,8 +1,11 @@ -From abc00ff91772830a68abdcb4135ab5bd674599a8 Mon Sep 17 00:00:00 2001 +From 73702e1c0331ef8644f326f2dc155a73749cb1c5 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 4 Apr 2024 16:36:30 +0200 -Subject: [PATCH 21/24] net: bridge: drop delay for applying strict multicast +Subject: [PATCH 21/25] 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: Addiva Elektronik 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.3/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch b/patches/linux/6.12.11/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch similarity index 93% rename from patches/linux/6.12.3/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch rename to patches/linux/6.12.11/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch index d5678a58..45e33410 100644 --- a/patches/linux/6.12.3/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch +++ b/patches/linux/6.12.11/0022-net-bridge-Differentiate-MDB-additions-from-modifica.patch @@ -1,8 +1,11 @@ -From b2976eada955720555702d3ec70d381acc415adf Mon Sep 17 00:00:00 2001 +From a48795ef7dbcfd7f1921753ad943144b933020b0 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 16 May 2024 14:51:54 +0200 -Subject: [PATCH 22/24] net: bridge: Differentiate MDB additions from +Subject: [PATCH 22/25] net: bridge: Differentiate MDB additions from modifications +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.3/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch b/patches/linux/6.12.11/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch similarity index 86% rename from patches/linux/6.12.3/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch rename to patches/linux/6.12.11/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch index fe0f1f71..609aaea8 100644 --- a/patches/linux/6.12.3/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch +++ b/patches/linux/6.12.11/0023-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch @@ -1,8 +1,11 @@ -From a449d4073cf045a8dbaa4d134f483c7c479a4fcb Mon Sep 17 00:00:00 2001 +From f0bbef0a94ed2e00475036b25dac8746e061c114 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 24 Nov 2023 23:29:55 +0100 -Subject: [PATCH 23/24] nvmem: layouts: onie-tlv: Let device probe even when +Subject: [PATCH 23/25] 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: Addiva Elektronik 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.3/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch b/patches/linux/6.12.11/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch similarity index 86% rename from patches/linux/6.12.3/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch rename to patches/linux/6.12.11/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch index 1d82ffa4..88dae57b 100644 --- a/patches/linux/6.12.3/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch +++ b/patches/linux/6.12.11/0024-usb-core-adjust-log-level-for-unauthorized-devices.patch @@ -1,7 +1,10 @@ -From 3166577344620658f8aae9b9af765401fecff87a Mon Sep 17 00:00:00 2001 +From 7135f0ab4f04b5cea7a0b67df0fe91f925ef19df Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 29 Apr 2024 15:14:51 +0200 -Subject: [PATCH 24/24] usb: core: adjust log level for unauthorized devices +Subject: [PATCH 24/25] usb: core: adjust log level for unauthorized devices +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Organization: Addiva Elektronik 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.11/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch b/patches/linux/6.12.11/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch new file mode 100644 index 00000000..3714a0c1 --- /dev/null +++ b/patches/linux/6.12.11/0025-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch @@ -0,0 +1,44 @@ +From 733067c41391c3b9f10d0bf62b1097dce9996df1 Mon Sep 17 00:00:00 2001 +From: Joachim Wiberg +Date: Thu, 16 Jan 2025 12:35:12 +0100 +Subject: [PATCH 25/25] net: dsa: mv88e6xxx: collapse disabled state into + blocking +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Organization: Addiva Elektronik + +This patch changes the behavior of switchcore ports wrt. the port state. +Instead of disabling the port, the driver now treats the disabled state +the same as the blocking and listening state. + +On this particular type of device the disabled state means no traffic is +passed in or out. This interferes with protocols that perform any type +of link qualification. E.g., an LACP link aggregate (bond) used as a +bridge port with member ports from an mv88e6xxx switch core. Without +this patch, the bond is set to 'state disabled'. which is offloaded to +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(-) + +diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c +index 84900814c456..91e58297594c 100644 +--- a/drivers/net/dsa/mv88e6xxx/port.c ++++ b/drivers/net/dsa/mv88e6xxx/port.c +@@ -791,8 +791,6 @@ int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state) + + switch (state) { + case BR_STATE_DISABLED: +- state = MV88E6XXX_PORT_CTL0_STATE_DISABLED; +- break; + case BR_STATE_BLOCKING: + case BR_STATE_LISTENING: + state = MV88E6XXX_PORT_CTL0_STATE_BLOCKING; +-- +2.43.0 +