From patchwork Mon Jul 17 06:59:38 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: 1808565 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; 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=) 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=iLzj3Lx4; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=SNm+1RNZ; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R4CjJ5Lbjz20FM for ; Mon, 17 Jul 2023 17:03:32 +1000 (AEST) 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=xEW713EQLrefg+Cv3h2pcpV5pmHksNG3+YanJYTvf1I=; b=iLzj3Lx4mqUEgc ftEcKyX6qM+T63ViE9jofAjVlEdmYZKm7Pr3fQ9fwyPmtvAE77aD+KxJCFJ0qTRC1Rs17aRwqSXDu HCQ9u00Yi6nLN8hS7ywGMBxISWEBXOYqt3mZbmgqfUaAbGgNtVtsvyNY0IK5/hgG+wH0uyDHP8JTm 5zQ1yy7zLxL1LzW6J2UKkOc8XUcPklDxA+qCpQtjMzMmtAatEONiG5XqUqBiWXAaPQ9R4Uj9IArQ6 bsMbOYV20TU2nhFeQ4IFrjnCGJQBUSygpEC47p6HBvr5Bd+3K36zwyTVl5mdf4tyab6hsRJg3keee 9CHVZ//JZ1OSSfmreynA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qLIDM-003GO1-1A; Mon, 17 Jul 2023 07:00:13 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qLIDI-003GNQ-0B for openwrt-devel@lists.openwrt.org; Mon, 17 Jul 2023 07:00:09 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-4f4b2bc1565so6519754e87.2 for ; Mon, 17 Jul 2023 00:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689577206; x=1692169206; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PjJ4TRoI9H4utu6i7jBFLdowAyiBnePdB0kjOQUJfS0=; b=SNm+1RNZunz+polqHzdBtLuUdvDmtlbMG0Y7BPuzVGW2hQ3P2aV9+XeL8qQ7b30HYQ 20/qmcUTX7tqYQksnt3Y6uPZWzj1VT3+pIfpMas9NsfBJiLsvpYg6s4dd3HGzM9f0WjV 8d7WHiwIdpOygnJyOG0FKdDIuhzq/bVOWQSenDgUtPjtVS6UPLMcD5hZ4I0GiMYYt46h AlWaituvg6Q8m/PKO8javSkEQ8uehXplYhaW2HPQJAnh9vKaRotId98M1tyEqPr30ReC T9GbGLW/9nHUGzj+mjybqEOPDnBNMPn5R7RXoq2jS7IHAJEnUPIT8hfFHNMS+j3pSBjT ow8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689577206; x=1692169206; 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=PjJ4TRoI9H4utu6i7jBFLdowAyiBnePdB0kjOQUJfS0=; b=bHJD4ldhEjN7ZeivQ8AmWZmd2Ao+GlWNJ8DDxMwWkkCufzyHY726Q0jwCjEIrHEgdy nUpXejlOqVb6yajcF0Gr6KTBXb16zdydOtGnGUi86QeVMFpKQ0+TLG7bFwRIodgexF6h Vs6DS9+Ijl8tm2c3S+egNtdjS9DfE5TM+1YYMYOwTANNF5HBQjkhnXO0QqY4pAdsacOy 2LLA1SpKWVept/bIYWaeLg9iiJ8pp/+IJ0CxQKKNgWpzZShCbQpjT0rDoOBbyNwYd2V5 c3iuBdXVrUAKcTOVbNqwipUMrS4tT+XOiJ27+G39dQhq3hVlqG6In15HXnq4THtgGgHt 6pDA== X-Gm-Message-State: ABy/qLbOuXwTkVaZvsprP3xlzD5mgiR0ah+LC5Wvu2vBzwYw10YLNvkV 6RpHAqJm2T2Wrpb5ebxW1DO+aC73qZ5gOA== X-Google-Smtp-Source: APBJJlEmV+lpeQ9cewbHb+wnxyovUT2HD8TnySx7AHQ093RgtwJUxpfeCeuUQjBYsUsX0oz3x85Xuw== X-Received: by 2002:a05:6512:3c90:b0:4f1:3d7d:409e with SMTP id h16-20020a0565123c9000b004f13d7d409emr9204855lfv.0.1689577205491; Mon, 17 Jul 2023 00:00:05 -0700 (PDT) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id c5-20020ac25305000000b004f3789c8bd5sm2656280lfh.132.2023.07.17.00.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 00:00:05 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Christian Svensson , Tommy Nevtelen , Viktor Ekmark , Daniel Wennberg Subject: [PATCH] octeon: use fixed layout cell "mac-base" for Cisco vEdge 1000 Date: Mon, 17 Jul 2023 08:59:38 +0200 Message-Id: <20230717065938.4773-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-20230717_000008_204812_FF31A243 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. 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_This_d?= =?unknown-8bit?q?rops_a_use_of_downstream_=22mac-address-increment=22=2E?= =?unknown-8bit?q?_Cc=3A_Christian_Svensson_Cc=3A_Tommy_Nevtelen_Cc=3A_Viktor?= =?unknown-8bit?q?_Ekmark_Cc=3A_Daniel_Wennberg?= =?unknown-8bit?q?_Signed-off-by=3A_Rafa=C5=82_Mi=C5=82ecki_---_I_didn=27t_ha?= =?unknown-8bit?q?ve_a_chance_to_try_=22fixed-layout=22?= =?unknown-8bit?b?IHdpdGggImF0bWVsLDI0YzUxMiIuIFRoaXMgaXMgdSBbLi4uXSA=?= =?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_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?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoxMzUgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?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=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 This drops a use of downstream "mac-address-increment". Cc: Christian Svensson Cc: Tommy Nevtelen Cc: Viktor Ekmark Cc: Daniel Wennberg Signed-off-by: Rafał Miłecki Tested-by: Christian Svensson --- I didn't have a chance to try "fixed-layout" with "atmel,24c512". This is untested. Can you guys verify if reading MAC still works with this patch, please? --- .../cavium-octeon/cn6130_cisco_vedge1000.dts | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts index e1f308dd52..4680d6ea14 100644 --- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts +++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn6130_cisco_vedge1000.dts @@ -24,7 +24,7 @@ <0x11800 0xe0002000 0x00 0x08>; cell-index = <0x00>; interrupts = <0x00 0x3e 0x01 0x2e>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 0>; nvmem-cell-names = "mac-address"; phy-handle = <&mgmtphy>; }; @@ -32,25 +32,22 @@ pip: pip@11800a0000000 { interface@0 { ethernet@0 { - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 3>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(3)>; label = "lan2"; /delete-property/ local-mac-address; }; ethernet@1 { - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 4>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(4)>; label = "lan3"; /delete-property/ local-mac-address; }; ethernet@2 { - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 1>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(1)>; label = "lan0"; /delete-property/ local-mac-address; }; @@ -58,9 +55,8 @@ ethernet@3 { compatible = "cavium,octeon-3860-pip-port"; reg = <0x3>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 2>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(2)>; label = "lan1"; }; }; @@ -69,36 +65,32 @@ ethernet@0 { compatible = "cavium,octeon-3860-pip-port"; reg = <0x0>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 7>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(7)>; label = "lan6"; }; ethernet@1 { compatible = "cavium,octeon-3860-pip-port"; reg = <0x1>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 8>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(8)>; label = "lan7"; }; ethernet@2 { compatible = "cavium,octeon-3860-pip-port"; reg = <0x2>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 5>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(5)>; label = "lan4"; }; ethernet@3 { compatible = "cavium,octeon-3860-pip-port"; reg = <0x3>; - nvmem-cells = <&macaddr_eeprom>; + nvmem-cells = <&macaddr_eeprom 6>; nvmem-cell-names = "mac-address"; - mac-address-increment = <(6)>; label = "lan5"; }; }; @@ -135,11 +127,17 @@ compatible = "atmel,24c512"; reg = <0x54>; pagesize = <0x80>; - #address-cells = <1>; - #size-cells = <1>; - macaddr_eeprom: mac-address@8 { - reg = <0x8 6>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_eeprom: mac-address@8 { + compatible = "mac-base"; + reg = <0x8 6>; + #nvmem-cell-cells = <1>; + }; }; }; };