From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 Nov 2024 16:18:14 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tFxKP-000fON-2o for lore@lore.pengutronix.de; Tue, 26 Nov 2024 16:18:14 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tFxKP-0004H1-KQ for lore@pengutronix.de; Tue, 26 Nov 2024 16:18:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BTgcXxOP1oviRFK16Mu9xyKmBTrJ48qoR61GhzJel1U=; b=Mf/bUBBRIbHJ55kWDoDfW/w1C9 Tu0pbKjwnSlI+aDg8kw4ZiclKKgdBJ+iqEzax7F6Pl55/lJ0VK0xo3Vb8vKjIenIXC3b5vS5BBrDe na/BYCVjiKjSFXxh/uPKwg2p9hREW2OVcLVBQHi829S6gKnd2Hz6X4bH5nv0d+ossUSsTVte8I7JQ LfDo4hIt8iFEOOPXVSgpllP5qQh/iHUNvX9aYjZ9ZcB3wtc3LhHITWq+/MLQWAT4un3NOEiq+jL8N vc35VGTwbthDYP7B6KT/Y8RUXcu1HRbu3HYqksX+dm39BjTV+rWyphTSms7OIsKPK6W8CvCGvOVVe lrAvGj3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFxK1-0000000AyRr-2Fw8; Tue, 26 Nov 2024 15:17:49 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFxJy-0000000AyPq-3UPV for barebox@lists.infradead.org; Tue, 26 Nov 2024 15:17:48 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tFxJx-0003vC-H5; Tue, 26 Nov 2024 16:17:45 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tFxJw-000Gro-1l; Tue, 26 Nov 2024 16:17:45 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tFxJw-00FD3f-1y; Tue, 26 Nov 2024 16:17:45 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 26 Nov 2024 16:17:42 +0100 Message-Id: <20241126151744.3621717-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241126151744.3621717-1-a.fatoum@pengutronix.de> References: <20241126151744.3621717-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_071746_866077_CAD9873A X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/4] net: factor out eth_of_get_fixup_node X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) We only know at fixup time, which MAC addresses were actually assigned to interfaces. Factor out eth_of_get_fixup_node from the MAC address assignment code, so board code can use this to retrace which MAC addresses would be fixed up. Signed-off-by: Ahmad Fatoum --- include/net.h | 12 ++++++++++++ net/eth.c | 29 +++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/include/net.h b/include/net.h index 1b6995b50043..4d4996c720ef 100644 --- a/include/net.h +++ b/include/net.h @@ -128,6 +128,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node, void eth_register_ethaddr(int ethid, const char *ethaddr); void of_eth_register_ethaddr(struct device_node *node, const char *ethaddr); #endif + +#ifdef CONFIG_OFTREE +struct device_node *eth_of_get_fixup_node(struct device_node *root, + const char *node_path, int ethid); +#else +static inline struct device_node *eth_of_get_fixup_node(struct device_node *root, + const char *node_path, int ethid) +{ + return NULL; +} +#endif + /* * Ethernet header */ diff --git a/net/eth.c b/net/eth.c index 7229530c055b..a1d6860be830 100644 --- a/net/eth.c +++ b/net/eth.c @@ -319,19 +319,11 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv) } #ifdef CONFIG_OFTREE -static void eth_of_fixup_node(struct device_node *root, - const char *node_path, int ethid, - const u8 ethaddr[ETH_ALEN]) +struct device_node *eth_of_get_fixup_node(struct device_node *root, + const char *node_path, int ethid) { struct device_node *bb_node, *fixup_node; char *name; - int ret; - - if (!is_valid_ether_addr(ethaddr)) { - pr_debug("%s: no valid mac address, cannot fixup\n", - __func__); - return; - } if (node_path) { bb_node = of_find_node_by_path_from(0, node_path); @@ -344,6 +336,23 @@ static void eth_of_fixup_node(struct device_node *root, fixup_node = of_find_node_by_alias(root, eth); } + return fixup_node; +} + +static void eth_of_fixup_node(struct device_node *root, + const char *node_path, int ethid, + const u8 ethaddr[ETH_ALEN]) +{ + struct device_node *fixup_node; + int ret; + + if (!is_valid_ether_addr(ethaddr)) { + pr_debug("%s: no valid mac address, cannot fixup\n", + __func__); + return; + } + + fixup_node = eth_of_get_fixup_node(root, node_path, ethid); if (!fixup_node) { pr_debug("%s: no node to fixup\n", __func__); return; -- 2.39.5