From nobody Mon Jul 13 08:36:54 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gzG531Tgsz6ksM3 for ; Mon, 13 Jul 2026 08:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzG526Rz9z43Cp for ; Mon, 13 Jul 2026 08:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783931814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeQq4r0hXozwyz8a1FGUsSRUDe7IzKwl5WqxFfSxnCM=; b=uKQtFNPSHigZ0qZEiPnBUaNmpuNNA681rAS3sTSdrl+CTKYnxTxkOuG5mC71yuqliKRFMr WrK4ZBUR4iljqyQyFwf/wPM48wQRba1fHXVkhv/mCzteMSMCgN9RW/cgNBnZjlVeefkWEM MIJzyPEW3VKhhooAHUvMfPqs2XaheB3mASw2CuctN298m268BrJoMzwvFDTQWD19En45LB 3fcQuJekrw3C4ilGhXU4KQIdUU/LiksjvcnweiWDI9nd1+AeDmVU2JEcGNUvB9q+dYBa4/ DrEDRizdZ5rU60sen9TGtwiWrIg1jO9Mg9b95m5T+5jEV+yo3ubqNPR2Agm60w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783931814; a=rsa-sha256; cv=none; b=PABYogF+YO/cbZmlXvg5seOQpsxsG84t+dM95I8Al8blTXrXUDDN/Vjql4Mm18gqnW/Qmu FxMSfUNtM+9AYGDze5iRUNZS3qb5OREbmsYMSdmKYWQWi4u9wVxu2kAC5qvbZJnwhH5ALU K+UkJ5fritTVgG1VCB/0jB+VPU3yrZqAZThX6q516z6BQM7qPue2sJO2iL+4HRQwJWvzd4 Q6fdyUKl6Dqwe4qh5HEhP1jA/A6eFLBWrgRoHprdg2JxWtOe3/OALWj/mNGx8c23fbQNB+ 1wm+ig+YC5HImTKTzXpWNKZrTUHF6h95AfrzY+PrNk8rjzrarAd1w9i6aBUSzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783931814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SeQq4r0hXozwyz8a1FGUsSRUDe7IzKwl5WqxFfSxnCM=; b=g/2eOAoyXYDr40DUq+ROpKwwLQGYcPk0LHSDEMF/JkCrkqNJzo2KgZDRrpeC8s3/xICVUe 2xT1FAc0psm4DEzXl1Tul0UObnt9XCYhdBd6DaalSJiSSt+66M46oAYgBbpIljxRxgp5RO VrF4TVB2ep2mnWBwOrb/NARhjkTDONQkYao5GVIRPrHlccTykOyUG4vk06LabJTzPC03ep 01B8CBlrPdD+thca2YGSbE2gTSyTFhofs2e/09Vd8wATKKuUbGv0WvePItnlYw3k+dKvwz 4sssG9E8rHJdN6VM2trNQyRv+CueJARoJquFEbBEcig9LRhy7+bzheLJe4pevA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzG525C9czrm3 for ; Mon, 13 Jul 2026 08:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3466a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 08:36:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 920518cf2e75 - main - FDT: implement fdt_ether_get_addr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 920518cf2e75012135104886d92814c048baa2fb Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 08:36:54 +0000 Message-Id: <6a54a3a6.3466a.6cbf6a26@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=920518cf2e75012135104886d92814c048baa2fb commit 920518cf2e75012135104886d92814c048baa2fb Author: Michal Meloun AuthorDate: 2026-07-13 08:34:22 +0000 Commit: Michal Meloun CommitDate: 2026-07-13 08:35:47 +0000 FDT: implement fdt_ether_get_addr() Introduce fdt_ether_get_addr() in fdt_common.c/h that tries standard DT properties in the correct order and falls back to a random address when needed. This should be used by ethernet drivers instead of open-coding the same logic. MFC after: 2 weeks Reviewed by: mhorne, adrian, bz, jrtc27 Differential Revision: https://reviews.freebsd.org/D58104 --- sys/dev/fdt/fdt_common.c | 40 ++++++++++++++++++++++++++++++++++++++++ sys/dev/fdt/fdt_common.h | 4 ++++ 2 files changed, 44 insertions(+) diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index f43551c6310e..93897b598b30 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -553,3 +553,43 @@ fdt_get_chosen_bootargs(char *bootargs, size_t max_size) return (ENXIO); return (0); } + +/* + * fdt_ether_get_addr - Get ethernet MAC address using FDT properties. + * Order: + * 1. "mac-address" + * 2. "local-mac-address" + * 3. Keep pre-initialized value (if valid) + * 4. random ether_gen_addr() as last resort + */ +void +fdt_ether_get_addr(phandle_t node, struct ifnet *ifp, uint8_t *eaddr) +{ + uint8_t tmp[ETHER_ADDR_LEN]; + int len; + + /* Firstly try "mac-address" */ + len = OF_getprop(node, "mac-address", tmp, sizeof(tmp)); + if (len == ETHER_ADDR_LEN && !ETHER_IS_ZERO(tmp) && + !ETHER_IS_MULTICAST(tmp)) { + bcopy(tmp, eaddr, ETHER_ADDR_LEN); + return; + } + + /* Next use "local-mac-address" */ + len = OF_getprop(node, "local-mac-address", tmp, sizeof(tmp)); + if (len == ETHER_ADDR_LEN && !ETHER_IS_ZERO(tmp) && + !ETHER_IS_MULTICAST(tmp)) { + bcopy(tmp, eaddr, ETHER_ADDR_LEN); + return; + } + + /* Next use existing one if set */ + if (!ETHER_IS_ZERO(eaddr) && !ETHER_IS_MULTICAST(eaddr)) + return; + + /* Last resort - generate random one */ + ether_gen_addr(ifp, (struct ether_addr *)eaddr); + + return; +} diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index f597233f9771..3eee6913ad72 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -33,8 +33,11 @@ #include #include +#include #include #include +#include +#include #define FDT_MEM_REGIONS 64 @@ -70,6 +73,7 @@ typedef void (*fdt_mem_region_cb)(const struct mem_region *, void *); int fdt_addrsize_cells(phandle_t, int *, int *); u_long fdt_data_get(const void *, int); int fdt_data_to_res(const pcell_t *, int, int, u_long *, u_long *); +void fdt_ether_get_addr(phandle_t node, struct ifnet *ifp, uint8_t *eaddr); phandle_t fdt_find_compatible(phandle_t, const char *, int); phandle_t fdt_depth_search_compatible(phandle_t, const char *, int); int fdt_foreach_mem_region(fdt_mem_region_cb, void *);