From 0ba2e0868eb15251abfb51a046b5a66b2eedf9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=B6rner?= Date: Fri, 4 Oct 2024 22:50:49 +0200 Subject: [PATCH 1/5] rtl83xx: fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes an unwanted special character in a debug-message. Signed-off-by: Peter Körner --- target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c index b17d9ae5d5..5468fc0653 100644 --- a/target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c @@ -374,7 +374,7 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv) /* Check for the integrated SerDes of the RTL8380M first */ if (of_property_read_bool(phy_node, "phy-is-integrated") && priv->id == 0x8380 && pn >= 24) { - pr_debug("----> FÓUND A SERDES\n"); + pr_debug("----> FOUND A SERDES\n"); priv->ports[pn].phy = PHY_RTL838X_SDS; continue; } From 553e8da0679606f6921b2f71d147f08ad11f4669 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 1 Sep 2024 15:33:43 -0700 Subject: [PATCH 2/5] qoriq: use nvmem for MAC addresses Userspace handling is deprecated. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16308 Signed-off-by: Stijn Tintel --- .../qoriq/base-files/etc/board.d/02_network | 6 --- target/linux/qoriq/config-6.6 | 2 + .../boot/dts/fsl/watchguard-firebox-m300.dts | 51 +++++++++++++++++++ 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/target/linux/qoriq/base-files/etc/board.d/02_network b/target/linux/qoriq/base-files/etc/board.d/02_network index 355c8d37a4..12adca2a8d 100644 --- a/target/linux/qoriq/base-files/etc/board.d/02_network +++ b/target/linux/qoriq/base-files/etc/board.d/02_network @@ -19,15 +19,9 @@ watchguard,firebox-m300) ucidef_set_interfaces_lan_wan "eth1" "eth0" wg_set_opt_interface "eth2" "2" - sweth_mac_offset=0x186d - for sweth in $(find /sys/class/net/ -name 'sweth*' -print); do device="$(basename "$sweth")" - mac="$(mtd_get_mac_text wg_cfg0 "$sweth_mac_offset")" - switchports="$switchports $device" - ucidef_set_network_device_mac "$device" "$mac" wg_set_opt_interface "$device" "${device#sweth}" - sweth_mac_offset=$(printf "0x%X\n" $(( $sweth_mac_offset + 0x14))) done ;; diff --git a/target/linux/qoriq/config-6.6 b/target/linux/qoriq/config-6.6 index 3f42563db1..750e6c6551 100644 --- a/target/linux/qoriq/config-6.6 +++ b/target/linux/qoriq/config-6.6 @@ -280,6 +280,8 @@ CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=24 CONFIG_NR_IRQS=512 +CONFIG_NVMEM=y +CONFIG_NVMEM_LAYOUTS=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts index c611263099..6628e0eb23 100644 --- a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts +++ b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts @@ -115,6 +115,42 @@ reg = <0x10000 0x20000>; label = "wg_cfg0"; read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_cfg_186c: macaddr@186c { + compatible = "mac-base"; + reg = <0x186c 0x11>; + #nvmem-cell-cells = <1>; + }; + + macaddr_cfg_1880: macaddr@1880 { + compatible = "mac-base"; + reg = <0x1880 0x11>; + #nvmem-cell-cells = <1>; + }; + + macaddr_cfg_1894: macaddr@1894 { + compatible = "mac-base"; + reg = <0x1894 0x11>; + #nvmem-cell-cells = <1>; + }; + + macaddr_cfg_18a8: macaddr@18a8 { + compatible = "mac-base"; + reg = <0x18a8 0x11>; + #nvmem-cell-cells = <1>; + }; + + macaddr_cfg_18bc: macaddr@18bc { + compatible = "mac-base"; + reg = <0x18bc 0x11>; + #nvmem-cell-cells = <1>; + }; + }; }; partition@30000 { @@ -237,30 +273,45 @@ reg = <0>; label = "sweth3"; phy-handle = <&switch0phy0>; + + nvmem-cells = <&macaddr_cfg_186c 0>; + nvmem-cell-names = "mac-address"; }; port@1 { reg = <1>; label = "sweth4"; phy-handle = <&switch0phy1>; + + nvmem-cells = <&macaddr_cfg_1880 0>; + nvmem-cell-names = "mac-address"; }; port@2 { reg = <2>; label = "sweth5"; phy-handle = <&switch0phy2>; + + nvmem-cells = <&macaddr_cfg_1894 0>; + nvmem-cell-names = "mac-address"; }; port@3 { reg = <3>; label = "sweth6"; phy-handle = <&switch0phy3>; + + nvmem-cells = <&macaddr_cfg_18a8 0>; + nvmem-cell-names = "mac-address"; }; port@4 { reg = <4>; label = "sweth7"; phy-handle = <&switch0phy4>; + + nvmem-cells = <&macaddr_cfg_18bc 0>; + nvmem-cell-names = "mac-address"; }; // OEM bootlog suggests multiple ports are attached to switch From 61175a0506e855d5a74778cfe2c1e59a277a1c23 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 13 Oct 2024 22:25:10 +0300 Subject: [PATCH 3/5] qoriq: drop source-only flag While the qoriq target currently supports only one device, the WatchGuard Firebox M300, the feedback from people using it is that it's a great bang for the buck. Additionally, people suggest having no snapshots available hurts adoption. Signed-off-by: Stijn Tintel --- target/linux/qoriq/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/qoriq/Makefile b/target/linux/qoriq/Makefile index 59c413aa50..782d2dc646 100644 --- a/target/linux/qoriq/Makefile +++ b/target/linux/qoriq/Makefile @@ -8,7 +8,7 @@ ARCH:=powerpc64 BOARD:=qoriq BOARDNAME:=NXP QorIQ (PowerPC) CPU_TYPE:=e5500 -FEATURES:=boot-part ext4 fpu legacy-sdcard powerpc64 ramdisk rootfs-part rtc source-only +FEATURES:=boot-part ext4 fpu legacy-sdcard powerpc64 ramdisk rootfs-part rtc SUBTARGETS:=generic KERNEL_PATCHVER:=6.6 From 36e67f7b624555617f5a19da146abd4b6498e58f Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 13 Oct 2024 20:21:44 +0300 Subject: [PATCH 4/5] libbpf: bump to 1.4.6 Release notes: https://github.com/libbpf/libbpf/releases/tag/v1.4.6 Signed-off-by: Stijn Tintel --- package/libs/libbpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libbpf/Makefile b/package/libs/libbpf/Makefile index a6fe9831d7..89fe730a98 100644 --- a/package/libs/libbpf/Makefile +++ b/package/libs/libbpf/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libbpf -PKG_VERSION:=1.4.5 +PKG_VERSION:=1.4.6 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/libbpf/libbpf -PKG_MIRROR_HASH:=09ad44597d170c12f9f710f7ac4bacfa2b01d110c45810ac0f16c6a3f5d51a0d +PKG_MIRROR_HASH:=0d0d70750c8e45baba19f8cc065771e5d842a90f3ad1637003cae6887dabf11e PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION))) From 2d350fded62d559d5a037d0febc9c806ae4f1d6e Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 13 Oct 2024 16:12:58 +0300 Subject: [PATCH 5/5] xdp-tools: bump to 1.4.3 Release notes: https://github.com/xdp-project/xdp-tools/releases/tag/v1.4.3 Remove upstreamed patch 023-libxdp-fix-compilation-on-multiarch-systems.patch. Signed-off-by: Stijn Tintel --- package/network/utils/xdp-tools/Makefile | 4 +-- ...fix-compilation-on-multiarch-systems.patch | 30 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch diff --git a/package/network/utils/xdp-tools/Makefile b/package/network/utils/xdp-tools/Makefile index 4d6ca312f6..8c4071991f 100644 --- a/package/network/utils/xdp-tools/Makefile +++ b/package/network/utils/xdp-tools/Makefile @@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xdp-tools PKG_RELEASE:=1 -PKG_VERSION:=1.4.2 -PKG_HASH:=49c2b96b2be878449a797a74ca515a63e13418cb8ea904df08f8ef9cb2ac5570 +PKG_VERSION:=1.4.3 +PKG_HASH:=6e727e2c7c079dec86575c5d0e7aac7ecd582aabe04b3b176d7ef50e653b60c0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/xdp-project/xdp-tools/tar.gz/v$(PKG_VERSION)? diff --git a/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch b/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch deleted file mode 100644 index 89276fca89..0000000000 --- a/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cb1ef3322671a67e2050a3eee18b49cdb4ed4bed Mon Sep 17 00:00:00 2001 -From: Andre Heider -Date: Wed, 18 Jan 2023 20:54:41 +0100 -Subject: [PATCH] libxdp: fix compilation on multiarch systems - -Multiarch systems require an additional include path, which is covered -by ARCH_INCLUDES here. Just as lib/util, add it to BPF_CFLAGS. - -Fixes compilation on debian: - -In file included from xdp-dispatcher.c:3: -In file included from ../../headers/linux/bpf.h:11: -/usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found - -Signed-off-by: Andre Heider ---- - lib/libxdp/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/libxdp/Makefile -+++ b/lib/libxdp/Makefile -@@ -28,7 +28,7 @@ PC_FILE := $(OBJDIR)/libxdp.pc - TEMPLATED_SOURCES := xdp-dispatcher.c - - CFLAGS += -I$(HEADER_DIR) --BPF_CFLAGS += -I$(HEADER_DIR) -+BPF_CFLAGS += -I$(HEADER_DIR) $(ARCH_INCLUDES) - - - ifndef BUILD_STATIC_ONLY