From patchwork Tue Oct 15 10:13:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Jobling X-Patchwork-Id: 1997293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=229X7Nls; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSVMz0HVmz1xsc for ; Tue, 15 Oct 2024 21:15:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type:List-Help: Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From:List-Post:List-Id: Message-ID:MIME-Version:To:Subject:Date:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=sVMG4xFE6TB8AxarmkqJEajkdlZZMb8NrYh6uigwEC8=; b=229X7NlsX3XDOrpwP/mYz6Huui UeqtLHxnIQvwY87S0gfsLgIFcSoZANqI74NWw2ZFU7+XKLN3ctlOGL+Sw8ftqi9uPZJzp3PlPjsHi 2RXeLtacaLbgOXKFKCxYxjuJJG8Cg/uobfKi1+xq6VH7+6W9rW7BpozrEdvXec1I0OmUW0ELuN2z2 l+XTVt6A5iZN2Y/hrJii+PyZ5euCGUp8XEhShSOIR3t08e0OCnpio3MkKEAH3eJ+qJawrW5b4ETt/ dUV+n5QOa7e34xHTEw431JS8tOPGXXZw77x/jpz83LhLjBchY2rkB42hvJ0xM6izidwdP8T5g5v2o 7xWvVi+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0eYj-00000007myO-0xo2; Tue, 15 Oct 2024 10:13:45 +0000 Date: Tue, 15 Oct 2024 21:13:38 +1100 Subject: [PATCH 4/5] qoriq: m300: Fix device names, to factory naming. To: openwrt-devel MIME-Version: 1.0 Message-ID: List-Id: OpenWrt Development List List-Post: X-Patchwork-Original-From: Evan Jobling via openwrt-devel From: Evan Jobling Precedence: list X-Mailman-Version: 2.1.34 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Evan Jobling List-Help: Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Initial port naming does not match factory. This required changes to preinit. Initial dsa port names match upstream documentation sw0p for consistency. The choice was arbitrary given it is unknown what factory used. The only conflicts are p0 and p1 which were previously named sweth3 / sweth4, but all ports of the switch were relabelled in device tree. What was previously eth3 and eth4 are renamed conduit1 and conduit0. This matches upstream terminology but are an arbitrary choice given it is unknown what factory used. Switch ports sweth3-sweth7 are renamed eth3-eth7 per factory by using new preinit label pass. Device image compat update as breaking changes to interface naming. Signed-off-by: Evan Jobling --- .../qoriq/base-files/etc/board.d/02_network | 16 +++++++++++++--- .../base-files/etc/board.d/05_compat-version | 2 +- .../boot/dts/fsl/watchguard-firebox-m300.dts | 10 +++++----- target/linux/qoriq/image/generic.mk | 4 ++-- 4 files changed, 21 insertions(+), 11 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 12adca2a8d..b1f3b2c0ee 100644 --- a/target/linux/qoriq/base-files/etc/board.d/02_network +++ b/target/linux/qoriq/base-files/etc/board.d/02_network @@ -19,9 +19,19 @@ watchguard,firebox-m300) ucidef_set_interfaces_lan_wan "eth1" "eth0" wg_set_opt_interface "eth2" "2" - for sweth in $(find /sys/class/net/ -name 'sweth*' -print); do - device="$(basename "$sweth")" - wg_set_opt_interface "$device" "${device#sweth}" + ucidef_set_network_device_path "conduit0" "platform/ffe000000.soc/ffe400000.fman/ffe4e6000.ethernet" + ucidef_set_network_device_path "conduit1" "platform/ffe000000.soc/ffe400000.fman/ffe4e4000.ethernet" + + ucidef_set_network_device_label "sw0p0" "eth3" + ucidef_set_network_device_label "sw0p1" "eth4" + ucidef_set_network_device_label "sw0p2" "eth5" + ucidef_set_network_device_label "sw0p3" "eth5" + ucidef_set_network_device_label "sw0p4" "eth7" + + + for eth in $(find /sys/class/net/ -name 'eth[3-7]' -print); do + device="$(basename "$eth")" + wg_set_opt_interface "$device" "${device#eth}" done ;; diff --git a/target/linux/qoriq/base-files/etc/board.d/05_compat-version b/target/linux/qoriq/base-files/etc/board.d/05_compat-version index 2036fbcc95..fc9885054a 100644 --- a/target/linux/qoriq/base-files/etc/board.d/05_compat-version +++ b/target/linux/qoriq/base-files/etc/board.d/05_compat-version @@ -7,7 +7,7 @@ board_config_update case "$(board_name)" in watchguard,firebox-m300) - ucidef_set_compat_version "1.1" + ucidef_set_compat_version "1.2" ;; esac 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 6628e0eb23..2ab84d0303 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 @@ -271,7 +271,7 @@ port@0 { reg = <0>; - label = "sweth3"; + label = "sw0p0"; phy-handle = <&switch0phy0>; nvmem-cells = <&macaddr_cfg_186c 0>; @@ -280,7 +280,7 @@ port@1 { reg = <1>; - label = "sweth4"; + label = "sw0p1"; phy-handle = <&switch0phy1>; nvmem-cells = <&macaddr_cfg_1880 0>; @@ -289,7 +289,7 @@ port@2 { reg = <2>; - label = "sweth5"; + label = "sw0p2"; phy-handle = <&switch0phy2>; nvmem-cells = <&macaddr_cfg_1894 0>; @@ -298,7 +298,7 @@ port@3 { reg = <3>; - label = "sweth6"; + label = "sw0p3"; phy-handle = <&switch0phy3>; nvmem-cells = <&macaddr_cfg_18a8 0>; @@ -307,7 +307,7 @@ port@4 { reg = <4>; - label = "sweth7"; + label = "sw0p4"; phy-handle = <&switch0phy4>; nvmem-cells = <&macaddr_cfg_18bc 0>; diff --git a/target/linux/qoriq/image/generic.mk b/target/linux/qoriq/image/generic.mk index d2b60d2296..951afe49ff 100644 --- a/target/linux/qoriq/image/generic.mk +++ b/target/linux/qoriq/image/generic.mk @@ -2,8 +2,8 @@ define Device/watchguard_firebox-m300 DEVICE_VENDOR := WatchGuard DEVICE_MODEL := Firebox M300 DEVICE_COMPAT_MESSAGE := \ - Kernel switched to FIT uImage. Update U-Boot environment. - DEVICE_COMPAT_VERSION := 1.1 + Device port names (sweth3-sweth7) changed to factory names (eth3-eth7). Conduit ports renamed. Clear or update your config. + DEVICE_COMPAT_VERSION := 1.2 DEVICE_DTS_DIR := $(DTS_DIR)/fsl DEVICE_PACKAGES := \ kmod-gpio-button-hotplug kmod-hwmon-w83793 kmod-leds-gpio kmod-ptp-qoriq \