From nobody Thu Jun 11 16:58:36 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 4gbpkp1Rwfz6hstw for ; Thu, 11 Jun 2026 16:58:42 +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 4gbpkn5wm8z41Np for ; Thu, 11 Jun 2026 16:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781197121; 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=npJslJ5BUIX/D1Uq6IC5UDPlQe5vEe2ONeY4daax5Ws=; b=ENTqpKTm3aws2PkUAenc52KeNlMXHOeIUNRiFqBHB0K8c9XVDCPoHwGIdTiadnpHGq1khi 9uALEcuLteY9SaSn5bPVxVw8anwcB8QtUH7FaliRt8wptCmOumTeaQFVZZigjR2/VR2CK8 fVajK51WXuYzdSxrt1yEeL4vyxNQCfLxOwsJEAPMUkF686TL2Pze6lldyYwISmXstxpeNT OMXzpzu1X7qnu71SJl/LFHgbCySMGaEOHvSIhQi4R7pg0XV47A44aBVY01Jnz5P6aWMXUh HtFyf+AHDUbpRN6l+yNqipTY6qhUU9npfPWnj3wQwY6JQ2woJSlDfUUaDGgmDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781197121; a=rsa-sha256; cv=none; b=njrVWjdJ88tFfIKn7yuVdB22i1Ub4Tndg8Flzfob+Dllx2fgiogKKaLyJBLu/4lPsRzgod DLrJpIJNvDOC5XlPmemVGwdCKAiJjC8VdQUw4Vyr07/1kaxH7JPZrptKZf0SZfdQyMWrP6 udgWVmkb9KPexxj975Xs8Z79Hqx999yqRAoVMKnDNntiX7HKDZDhMFZdIp3P0iOnJwhHg2 pmkKLYO7YXOQPfRHRq7u6RqQS3xrvpSqXt9+SI9n/qnkqHnG5nGBPeMd5nGuqPP71DHAUC zvwnOq2nmHrSLL0jyGftbj7AaT377ZUsFFR80EtSUoVI92R25fn7Bi9OzJ5ZfA== 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=1781197121; 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=npJslJ5BUIX/D1Uq6IC5UDPlQe5vEe2ONeY4daax5Ws=; b=vBwuavymHFdAZyH+uzLydvVpVKnNK4esaa+W34+pfP8yYyVS14/KI8+huq6XeMw/hI2Iub /RoBuVVvU7v5DwR6QlfuyP0nk7GphdPW5D2HF9XAzB0Mn7qjNt3abIAsKoEXV12tm3ycTO lPUBZInge4+D4Wc/RyNi5vNLtnnQtIF7c0G6GPY8ZEyt/LzDgQAlJlTmmWr1PW7FVbsJ8v vM/t6vuzuadPvaHlZsfv04hBCG9bopod7aHehwNBSVDOKxJeDo1nZzsiJDL8dJxkj+N4tn +iXx5+8X7bdPDcgmVXHk7ElIE00LRpNIYmp8b7T2+15sqDKw4yvR5eFzg09TCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbpkn4tcxz10Kg for ; Thu, 11 Jun 2026 16:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 16:58:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: a1b2bcb808e4 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a1b2bcb808e427562c11ee6ed83f69411f424401 Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 16:58:36 +0000 Message-Id: <6a2ae93c.3be40.1a7c416e@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b2bcb808e427562c11ee6ed83f69411f424401 commit a1b2bcb808e427562c11ee6ed83f69411f424401 Author: Brian Scott AuthorDate: 2026-05-11 16:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-06-11 16:37:24 +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 (cherry picked from commit 351fad05e075c388dece4cd6dd8613494b870bad) --- 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); }