From nobody Sat Sep 6 17:07:57 2025 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 4cK05n6lQ0z66sQB; Sat, 06 Sep 2025 17:07:57 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cK05n4g2Wz40m6; Sat, 06 Sep 2025 17:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757178477; 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=juFZ3K52sqy7VOtqJGsc3JA9HslQAQvEi3XFc7wPmcQ=; b=dKjiSE+JqtDk5weclgFvEQ/qaVtesmHIgoefivamiAQPXnBAV0s5rRGep2DdQ+OvP4Kmw3 x2JtSgIe4ludxT7r3eVBptLhcHU686u3AjZUttOQn32Bp9WIYEJrykYl1KHM0GVySWWPqh t01Gq1SRi3wFJP2WMTQeW480ZKuA6MCeBuOEUjuvm0ke1rZB8NYYl0Fluw5h73nw0D+6ZP 0L5dgDfs9M+QwJPREQ9Pgeu3W6uEwU15hQqo1zolELDYxXMvwG+UpUfNaCzlHrHFY4dspU WHqISzCqWYAskfS0L+U0dMyAcBYz/bK4QpUW4VrL5c9l1FYD4unIBY10HmDHOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757178477; 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=juFZ3K52sqy7VOtqJGsc3JA9HslQAQvEi3XFc7wPmcQ=; b=GWGa0vcaXyUCJ2uSjX0fPZbYsSqd8jCk8erXk3SvfMg7q5PhPR/iP9nGB48PQ9dIqcs7gc nK2yfPswxzSVa13A4LWGA8oATIxgb8GZLaMMTv7mDuGI06/x5b8oa/Mo+fTPIZHDlZT/Zk dQUnQbXNBDLX1qRWJQQLZ2gMv5uB7/YUXuS3heXuYV+dA5eU2v+HUm5hvIKVpKbI5N8QxH zJhASfPOWO4nXfKaShDvFFQdsMyBx8ahHbJPNqVrpBEZrrG/b/u7wWw6i8e07EJAt59Dsd uvLmC4ji3ew8wBTBV920YjFYzC6BMXrk7j58hfKX/HD7ICtRoSlIiDNSELFG1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757178477; a=rsa-sha256; cv=none; b=J9jisRTue2F0w5bsYCWU2G+Y+VEBNk7ZXoOuyjA7J3QpB7QbcGNE8jcU5hDJsSeyUS/aWq D/A0QmQSIfHg67K8k5ZnIriuhJlOEy1ehYdVd7RoaCd0JbVgApXq98px8y26TohGTc9SNy SahFeYcUaNzOzMSQhCNi21Z34oue62Mt3E8gD1EWkf/XqyrE9RPAbPQFTld9q/5s6+P4Wn oRuY8eJ6JMd9lMPsbZZm9B6beymZn47HBjV7bRSDPbAV1k9rTDQAzEy53dYmgKBeQYxjsQ ARvSJFmdmfBWUtR1x3N2zDEUoxUYqB5KgO5zVWL+qHv2dz3sZxys4Zy4SbL26Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cK05n4BwYzkgH; Sat, 06 Sep 2025 17:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 586H7veF020665; Sat, 6 Sep 2025 17:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 586H7vmr020662; Sat, 6 Sep 2025 17:07:57 GMT (envelope-from git) Date: Sat, 6 Sep 2025 17:07:57 GMT Message-Id: <202509061707.586H7vmr020662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0737e2a961cd - main - sys/cpu.h: Some style(9) fixes 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0737e2a961cd712fff5b548bb6b823e48a8b527d Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0737e2a961cd712fff5b548bb6b823e48a8b527d commit 0737e2a961cd712fff5b548bb6b823e48a8b527d Author: Zhenlei Huang AuthorDate: 2025-09-06 17:02:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-06 17:02:33 +0000 sys/cpu.h: Some style(9) fixes MFC after: 3 days --- sys/sys/cpu.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h index b6a0094f0c51..5bb55679a05b 100644 --- a/sys/sys/cpu.h +++ b/sys/sys/cpu.h @@ -40,25 +40,31 @@ #define CPU_IVAR_CPUID_SIZE 3 #define CPU_IVAR_CPUID 4 -static __inline struct pcpu *cpu_get_pcpu(device_t dev) +static __inline struct pcpu * +cpu_get_pcpu(device_t dev) { uintptr_t v = 0; + BUS_READ_IVAR(device_get_parent(dev), dev, CPU_IVAR_PCPU, &v); return ((struct pcpu *)v); } -static __inline int32_t cpu_get_nominal_mhz(device_t dev) +static __inline int32_t +cpu_get_nominal_mhz(device_t dev) { uintptr_t v = 0; + if (BUS_READ_IVAR(device_get_parent(dev), dev, CPU_IVAR_NOMINAL_MHZ, &v) != 0) return (-1); return ((int32_t)v); } -static __inline const uint32_t *cpu_get_cpuid(device_t dev, size_t *count) +static __inline const uint32_t * +cpu_get_cpuid(device_t dev, size_t *count) { uintptr_t v = 0; + if (BUS_READ_IVAR(device_get_parent(dev), dev, CPU_IVAR_CPUID_SIZE, &v) != 0) return (NULL); @@ -124,10 +130,10 @@ TAILQ_HEAD(cf_level_lst, cf_level); * state. It is probably a bug to not combine this with "info only" */ #define CPUFREQ_TYPE_MASK 0xffff -#define CPUFREQ_TYPE_RELATIVE (1<<0) -#define CPUFREQ_TYPE_ABSOLUTE (1<<1) -#define CPUFREQ_FLAG_INFO_ONLY (1<<16) -#define CPUFREQ_FLAG_UNCACHED (1<<17) +#define CPUFREQ_TYPE_RELATIVE (1 << 0) +#define CPUFREQ_TYPE_ABSOLUTE (1 << 1) +#define CPUFREQ_FLAG_INFO_ONLY (1 << 16) +#define CPUFREQ_FLAG_UNCACHED (1 << 17) /* * When setting a level, the caller indicates the priority of this request. @@ -162,7 +168,7 @@ int cpufreq_settings_changed(device_t dev); * The new level and the result of the change (0 is success) is passed in. * If the driver wishes to revoke the change from cpufreq_pre_change, it * stores a non-zero error code in the result parameter and the change will - * not be made. If the post-change eventhandler gets a non-zero result, + * not be made. If the post-change eventhandler gets a non-zero result, * no change was made and the previous level remains in effect. If a change * is revoked, the post-change eventhandler is still called with the error * value supplied by the revoking driver. This gives listeners who cached