From patchwork Fri Nov 10 10:25:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1862387 X-Patchwork-Delegate: zajec5@gmail.com 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=JL+AUE5p; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Ph9dn1hf; 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 4SRZkh45zyz1yRF for ; Fri, 10 Nov 2023 21:27:08 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3T30t5cJnSPYG3I+csmnIWvPgc7qqcLyxyLthleQYKc=; b=JL+AUE5pC+HHNT jdQ95CmE1A9G2CdxHvvpw94uAKHuewINQCQBfGzsCpLoHOjr7YB6hhv/El3DqE/4s1pwtLkb6XHI8 hY5+zuuQ1/EaOSYQ/H3QJRNdECHxR3xBybf5XmziT4bxy/5oEdotpY7OyETXhQBsKJf6EeEQVfyn8 y7RbvAhr22ByuvxJ77jED21JQDnZ1DN2PaXhApH4r9CScdoRncaJfj7L+ItRUtmipxpJLIW7WwUzI 7YHgKJmr3bm1onNRA7PAP8IZfe18dOUsgXUvcfwBwwG0AYI8LEY5CQ3tgyul1IAEhA/Ldq7HbwPo2 xvPNpeJWqmbQQANfMm5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r1OhR-008IwG-2V; Fri, 10 Nov 2023 10:25:17 +0000 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r1OhN-008Iub-27 for openwrt-devel@lists.openwrt.org; Fri, 10 Nov 2023 10:25:15 +0000 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c595f5dc84so32735091fa.0 for ; Fri, 10 Nov 2023 02:25:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699611911; x=1700216711; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DuY4sW8BxYwJ6+wovgaPWveljjA00UNKyMX2wwjbHw8=; b=Ph9dn1hfoaP/2j/Ogj9vSeJRARZzdXQZxbvMhPzI4nvIrBX7FJns2rv93INdAPO6+8 a7q2RSzzOgSNbAArjri/FPTyXdfmyKNO4mN52cBu7oE+Z+KCDxD2cNBsee1qgAm9Vn/Q Q/IpljoAodgf5Pxt3ZAVC1oPNf+9t3d2g3jXzuswEdBtDYr536R2UtGd399TYFMLUk++ bx0zDho75RRY8YGNcmqLgB2akMZbObVg6SgnBLVAijbRp6FaL8YXBl+RixitITzEzeM6 ReRlvq/TVuSRq0dGMVeTRQvhYMyt5ZqlsL732DzuWQyYkgKzdX59z6EcLL1wXxXMDl0Q 7WUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699611911; x=1700216711; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DuY4sW8BxYwJ6+wovgaPWveljjA00UNKyMX2wwjbHw8=; b=gOh5UFXpuH3SsCeFn0Rtt+RQOMlS3pKG3Zx+iDz0SxW7+jdz54OY4XZjoBnIEww9QP 1F1BhpILlaEcn9k3sVzO/f51Ho+z58eOJiVdtNIyguk54iIxZD+pj7HLhyAnORuBXD3u I0Ms7lK/kRIc4Lmmd9uFhP9oRYT4hwa69oZpHq0TCZl2KZymjUe7aZfv9zw4jQW6W0ob 9Cm5fbiecaUalx4FcM5555QQC2siR1UAfiUIxzC2XzxcIMam2mJyp6M0LXV6gmgTJuCJ L1XdGsniYlpWJ2f1t5Um39Y2ZIyk1kLxqA/COnLkHyZcFDnKmsFwrZ6PKMDgCvpUMUgn XH+Q== X-Gm-Message-State: AOJu0Yyo9PVhBd6IYo8rE51DKcwHOYU1tac9yestvI6d0FmNRDY2+Odx qJAKg0UauGZS/ebx+3CUMxgqnodhqqg= X-Google-Smtp-Source: AGHT+IHTXXseOOMCaCtVa3SUhPxwedR+dxu1U9Cf+4X4JFusX4Ttn7d7WViVCnqZoDF0r6spwfBMUw== X-Received: by 2002:a05:6512:250b:b0:50a:7103:e27f with SMTP id be11-20020a056512250b00b0050a7103e27fmr445521lfb.21.1699611910810; Fri, 10 Nov 2023 02:25:10 -0800 (PST) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id i3-20020a056512224300b0050916c6903dsm1345920lfu.18.2023.11.10.02.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 02:25:10 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: yangshiji66@outlook.com, Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Ansuel Smith , Catrinel Catrinescu , Felix Fietkau Subject: [PATCH] ath79: use "fixed-layout" for Embedded Wireless devices Date: Fri, 10 Nov 2023 11:25:05 +0100 Message-Id: <20231110102505.24322-1-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231110_022513_700174_2660A1B6 X-CRM114-Status: GOOD ( 12.67 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Those_?= =?unknown-8bit?q?devices_have_Ethernet_interfaces?= =?unknown-8bit?q?_using_base_MAC_address_increased_by_0x40_in_the_3rd_indexe?= =?unknown-8bit?q?d_byte_=2800=3A00=3A00=3AFF=3A00=3A00=29=2E?= =?unknown-8bit?q?_To_describe_that_we_were_using_a_custom_=28downstream=29_?= =?unknown-8bit?q?=22mac-address-increment?= =?unknown-8bit?b?IFsuLi5dIA==?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoyMmYgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Those devices have Ethernet interfaces using base MAC address increased by 0x40 in the 3rd indexed byte (00:00:00:FF:00:00). To describe that we were using a custom (downstream) "mac-address-increment-byte" property. The same result can be achieved by using "mac-base" with a properly adjusted offset value (0x40 << 16). It may be not pretty but it should work without custom property or downstream kernel patch to support it. Cc: Ansuel Smith Cc: Catrinel Catrinescu Cc: Felix Fietkau Signed-off-by: Rafał Miłecki Reviewed-by: Rosen Penev --- .../dts/ar9331_embeddedwireless_dorin.dts | 26 ++++++++-------- .../dts/ar9344_embeddedwireless_balin.dts | 30 ++++++++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index de6b709b5c..6286f203ef 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -85,6 +85,18 @@ label = "art"; reg = <0xff0000 0x010000>; read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_art_1002: macaddr@1002 { + compatible = "mac-base"; + reg = <0x1002 0x6>; + #nvmem-cell-cells = <1>; + }; + }; }; }; }; @@ -93,10 +105,8 @@ ð1 { status = "okay"; - nvmem-cells = <&macaddr_art_1002>; + nvmem-cells = <&macaddr_art_1002 0x400000>; nvmem-cell-names = "mac-address"; - mac-address-increment-byte = <3>; - mac-address-increment = <0x40>; }; &mdio1 { @@ -108,13 +118,3 @@ mtd-cal-data = <&art 0x1000>; }; - -&art { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; - }; -}; diff --git a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts index a84c273f86..de13865818 100644 --- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts +++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts @@ -83,16 +83,20 @@ reg = <0xff0000 0x010000>; read-only; - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - calibration_art_1000: calibration_data@1000 { - reg = <0x1000 0x440>; - }; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + calibration_art_1000: calibration_data@1000 { + reg = <0x1000 0x440>; + }; + + macaddr_art_1002: macaddr@1002 { + compatible = "mac-base"; + reg = <0x1002 0x6>; + #nvmem-cell-cells = <1>; + }; }; }; }; @@ -106,10 +110,8 @@ ð1 { status = "okay"; - nvmem-cells = <&macaddr_art_1002>; + nvmem-cells = <&macaddr_art_1002 0x400000>; nvmem-cell-names = "mac-address"; - mac-address-increment-byte = <3>; - mac-address-increment = <0x40>; gmac-config { device = <&gmac>; @@ -121,7 +123,7 @@ &wmac { status = "okay"; - nvmem-cells = <&macaddr_art_1002>, <&calibration_art_1000>; + nvmem-cells = <&macaddr_art_1002 0>, <&calibration_art_1000>; nvmem-cell-names = "mac-address", "calibration"; };