From nobody Tue May 12 14:00:42 2026 X-Original-To: dev-commits-src-all@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 4gFJCN3lDKz6cDkH for ; Tue, 12 May 2026 14:00:48 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFJCN1yG5z3HKY for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=n4hYEmf30iVUqE7XZ9bduCVbe2PHS+bxCh/nzOavVmqywC6mlPgw9FVj5CtdQ/LJjkc++a sb2gpYXgyUEuG2xgH+5+ZiF8wnvG8Y55A9T0vWGxpKZOoBBAJWrENCJhKLO64MC3H6qu+l ZKkLDyAVf2RgcLShyM1vzxdh1CWJrngL92p8VdrxeU2LDkiSRelqVyEBASF4iDXXTdiWkO IDxVkF1Kp3M3qPGMqNt4DhLSMskwJ+Dcl/6KhEur4yHr/HY+uI+MXCtCq0naEcQLRUjjH+ abDUV4TmDTEjk8XNSyvOhdm7Tupdsn8Yw8Uknx3FmyEvmhesWxMiGV7TiBx1uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778594448; a=rsa-sha256; cv=none; b=p0XiqqdYqibb9ZA5GxgK6twGqk8+8Db17xUfLxjrkT460IKRZhCUWNttY60ftDfJ4YCzXe /k3jgMWbXdhiCyC8xVEWlRkMqtZ7i8pnZKC0LD/TUoQsGJaO/vlJpkEO7BYykXoc2G6UZQ RuREQ2brlPvmdGk88C8tMa/qNzPBLWvj3cgr/gWqYHuCdwCY+u6zhXPnG0YqZJM8L3fdFP teaQCdsRhC6v0DQ5YRifhhRTO+l7+vwxj0hWJDIjBMctI7dxFCsAkhHJem6wTdxYMUGBRr CwiFnrQ1KBzkJRW9h/7SU1LuBAudA8Uus/toZ3Tp0hSEz9IVL7gvK7LCTElpgg== 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=1778594448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=o4XKxuIp6FE3ZZcnShHledMvcXGHiDxdsCcMVaJ3Qez+b/JM8EU/N1FTgJV7dRwRC0MN8h rl2htwi66jefdyLBe9M4RMrZQM3r38P2KoutgHyERYWCfFSnyIxcerO7WU4pCz5W5+dAJC I8TKAAjHHVXhzfncct8XiOcX0m0ZUSBVEeotCRn91B3YH2T2zsZ0PxsFbvUwQtnkuQ7Mk2 5g6tb2WeIxfDteb4CVzfQjYtsUiCYxsq4KNj1ICK9CmbFbMQU/PhgUVtD8KRaBeqg/D3gG KJDI4prYar8XP8aKh++Q9L1ArRPlbFQLiLnA5WWS5kTtqXLwLJ0O4WC6fdYQtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCN1Wj1z151j for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 243ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:00:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: 351fad05e075 - main - if_eqos_starfive: Read MAC address from device tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 351fad05e075c388dece4cd6dd8613494b870bad Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:00:42 +0000 Message-Id: <6a03328a.243ef.7c686076@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=351fad05e075c388dece4cd6dd8613494b870bad commit 351fad05e075c388dece4cd6dd8613494b870bad Author: Brian Scott AuthorDate: 2026-05-11 16:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-05-12 14:00:10 +0000 if_eqos_starfive: Read MAC address from device tree u-boot/opensbi determines the ethernet MAC address from ROM and passes it to the OS in the device tree. This change sets the correct MAC address from this source. This prevents the eqos class driver from generating random MAC addresses at each boot. Tested on Starfive VisionFive 2, riscv64 SBC. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56782 --- sys/dev/eqos/if_eqos_starfive.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/eqos/if_eqos_starfive.c b/sys/dev/eqos/if_eqos_starfive.c index 62f8b3f38983..f81118fd3094 100644 --- a/sys/dev/eqos/if_eqos_starfive.c +++ b/sys/dev/eqos/if_eqos_starfive.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #define JH7110_CSR_FREQ 198000000 #define WR4(sc, o, v) bus_write_4(sc->base.res[EQOS_RES_MEM], (o), (v)) +#define RD4(sc, o) bus_read_4(sc->base.res[EQOS_RES_MEM], (o)) static const struct ofw_compat_data compat_data[] = { {"starfive,jh7110-dwmac", 1}, @@ -131,6 +133,8 @@ if_eqos_starfive_init(device_t dev) struct if_eqos_starfive_softc *sc = device_get_softc(dev); hwreset_t rst_ahb, rst_stmmaceth; phandle_t node; + uint8_t eaddr[ETHER_ADDR_LEN]; + uint32_t maclo, machi; node = ofw_bus_get_node(dev); @@ -186,6 +190,14 @@ if_eqos_starfive_init(device_t dev) return (ENXIO); } + if (OF_getprop(node, "local-mac-address", eaddr, sizeof(eaddr)) == + sizeof(eaddr)) { + machi = eaddr[5] | (eaddr[4] << 8); + WR4(sc, GMAC_MAC_ADDRESS0_HIGH, machi); + maclo = eaddr[3] | (eaddr[2] << 8) | (eaddr[1] << 16) | + (eaddr[0] << 24); + WR4(sc, GMAC_MAC_ADDRESS0_LOW, maclo); + } return (0); }