Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/aarch32_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/aarch32_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/aarch64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/aarch64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
From 2cda5240aa8504deefb0a1758b2088136183cde4 Mon Sep 17 00:00:00 2001
From 257b51fcd94ca99b13555354327ce2dbaaba4003 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
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.

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 <lazzer@gmail.com>
---
drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++
1 file changed, 161 insertions(+)
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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 <lazzer@gmail.com>
---
drivers/net/phy/marvell10g.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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
Expand All @@ -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 <lazzer@gmail.com>
---
drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++
1 file changed, 422 insertions(+)
Expand Down Expand Up @@ -515,6 +509,3 @@ index 40439db49601..7ae4744f147b 100644
},
{
.phy_id = MARVELL_PHY_ID_88X3310,
--
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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
Expand All @@ -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 <lazzer@gmail.com>
---
drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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.
Expand All @@ -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 <lazzer@gmail.com>
---
drivers/net/phy/phy_device.c | 1 -
1 file changed, 1 deletion(-)
Expand All @@ -36,6 +30,3 @@ index 7a67c900e79a..5c61faf4b10a 100644
if (!phydev->is_on_sfp_module)
phy_led_triggers_register(phydev);

--
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <troglobit@gmail.com>
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
Expand All @@ -19,7 +15,6 @@ Because a multicast router should always receive both known and unknown
multicast.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
---
include/uapi/linux/if_bridge.h | 1 +
net/bridge/br.c | 5 +++++
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <troglobit@gmail.com>
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
Expand All @@ -15,7 +11,6 @@ of unknown multicast or using permanent MDB entries.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
---
net/bridge/br_private.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Expand All @@ -36,6 +31,3 @@ index ccbaaa96f7c7..d7187bead496 100644
}

static inline struct net_bridge_port *
--
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <troglobit@gmail.com>
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].
Expand All @@ -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 <troglobit@gmail.com>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
---
net/bridge/br_multicast.c | 42 +++++++--------------------------------
net/bridge/br_private.h | 4 +---
Expand Down Expand Up @@ -189,6 +184,3 @@ index d7187bead496..83dc15fdcefd 100644
}

static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
--
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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
Expand All @@ -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 <lazzer@gmail.com>
---
include/uapi/linux/rtnetlink.h | 2 ++
net/bridge/br_mdb.c | 4 ++--
Expand Down Expand Up @@ -107,6 +101,3 @@ index 66d709f6b19d..4d1b27d2cdbc 100644
unlock_continue:
spin_unlock(&brmctx->br->multicast_lock);
}
--
2.43.0

Original file line number Diff line number Diff line change
@@ -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 <tobias@waldekranz.com>
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
Expand All @@ -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 <lazzer@gmail.com>
---
drivers/nvmem/layouts/onie-tlv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <troglobit@gmail.com>
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.
Expand All @@ -17,7 +13,6 @@ https://github.com/friendlyarm/kernel-rockchip/
Specifically commit be0b1939b271c307ab1fef5fb1478beaafc6de17

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
---
drivers/net/usb/r8152.c | 8 ++++++++
1 file changed, 8 insertions(+)
Expand Down Expand Up @@ -48,6 +43,3 @@ index a22d4bb2cf3b..ae89323ade06 100644
rtl_tally_reset(tp);

tp->coalesce = 15000; /* 15 us */
--
2.43.0

Loading