From nobody Sun Feb 22 17:53:49 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 4fJs6k3s3Sz6TWJ3 for ; Sun, 22 Feb 2026 17:53:50 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJs6k0Wdxz3vV7 for ; Sun, 22 Feb 2026 17:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771782830; 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=GLNMH2HY4VlwABm2DXY5HP9cYyQg6KuvsGHLFjyHZQk=; b=Tar6bsLHCB8Hxiqas4h+D3nEYFxsb4hkaaFGHi/cGc3yhDTl8hPChbFX4cJmtOD4dpPX64 6UBSpOLddvmtfQ41Tv9NXt3TCmv4Wwdi6uCWF9/Z+OVxzvbCusNo05I1QkyU0l39+0znRW AI3psVtRW5TCmT6fTmuzv6vOETbR0aBn5oXmowRByk2NUJTyhmvzG/LpL0/dhJUT0ITDf1 0+sEGW5bZoFTyM5KMLN8bE0zH42MFdnmXge1mGF97spoBETE3P1MX+E8tApbA3+W9cAQTl 3rj7xX7zOqAzv5ot5hc/rABjw0eB+XyRKN89FlXESx6P0YG07p1qSM7rzZekMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771782830; a=rsa-sha256; cv=none; b=X1cWnCX15aV2JMuHrSfR136WWOxHzN01JZyu4CuAdFq/5p5DGLhzHhtuFxcPLgIXEP1lzo 20/Jp2ycWTgMnMvXsDdZo+5H8oUo18PGInsYoaUdrJT4puIbuTkQUNHJI4IMNaO7aDb+eQ 4n3RPtR07r+WsJJJm3Y2v06ztWs+RvPSAO6iMYrhOir8qrNVuDxakQvtAndn2jBEAqzOVR TCqNW2b7LOS3diiBZmKNtWKkWsrqcoQzdGgUHp0fxaoI0szXZo0ZwYlh8nF7MsITGR0bw8 f0bIWYch1W6xjhpixjUDzBDLc7Tn2M+cpUCeFCB0OXbU8RerSG5eb76Gam/p/A== 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=1771782830; 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=GLNMH2HY4VlwABm2DXY5HP9cYyQg6KuvsGHLFjyHZQk=; b=IhVm9K3wXNScKx6Q9bmhJ33KUhRaNVVt0yX8oZAXorORt9u10WKIY6DnNYiM6bJW8BoNUV dGXUKqg8bQsGqsrqLyLPcDaqAK6jJbXjlKd9nJ4gV5va2fZ3ViVHgJgQeXSUbjYIxEByGb SkKYC8+IQLtq6gA/3+WCCT+QoqPuBDXc+kaT/rueeu41hzwCkCnn6QcM4INqaHz+JxSHGw zprmeM1yjZc2DZDG5Xjzz65m8LCwjLVWMOU4d6r5oI3wdhawnISXw+5G5Zh708uH2fjZ5V vlt+51KdmhsvXNcBgDCFsMBiu1ptN1y3b15inlFPHUJw797qBzWyRsC+nGZKfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJs6j6XZKzv8F for ; Sun, 22 Feb 2026 17:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c27a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 17:53:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 4840558e5219 - main - OFW: Improve OFW_CPU. 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 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: 4840558e521934345793ef83b0d45a72fd615a7b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 17:53:49 +0000 Message-Id: <699b42ad.3c27a.79433058@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=4840558e521934345793ef83b0d45a72fd615a7b commit 4840558e521934345793ef83b0d45a72fd615a7b Author: Michal Meloun AuthorDate: 2025-11-06 19:01:18 +0000 Commit: Michal Meloun CommitDate: 2026-02-22 17:53:27 +0000 OFW: Improve OFW_CPU. Accept the assigned clock on the CPU node. Don't report a missing "clock-frequency" property if the CPU node has a "clocks" property. MFC after: 3 weeks --- sys/dev/ofw/ofw_cpu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 852ce6ea3759..7da34af6592a 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -43,7 +43,7 @@ #include #include -#if defined(__arm__) || defined(__arm64__) || defined(__riscv) +#if defined(__arm__) || defined(__aarch64__) || defined(__riscv) #include #define HAS_CLK #endif @@ -343,6 +343,11 @@ ofw_cpu_attach(device_t dev) if (sc->sc_cpu_pcpu == NULL) sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); +#ifdef HAS_CLK + clk_set_assigned(dev, node); + if (!OF_hasprop(node, "clocks")) { +#endif + if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) { if (get_freq_from_clk(dev, sc) != 0) { if (bootverbose) @@ -357,6 +362,10 @@ ofw_cpu_attach(device_t dev) sc->sc_nominal_mhz); OF_device_register_xref(OF_xref_from_node(node), dev); + +#ifdef HAS_CLK + } +#endif bus_identify_children(dev); bus_attach_children(dev); return (0);