From nobody Wed Sep 30 16:05:18 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 4hw0Hz4r3hz6tkrb for ; Wed, 30 Sep 2026 16:05:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw0Hz2H8fz4WRg for ; Wed, 30 Sep 2026 16:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790784319; 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=s85vMs3UbZd9+vzOEMPW+GSzwrN01lNInSI5zUHyjbc=; b=RKUsmzYPlYWoYZTo9EmLhZHz98rJVK7WZeACi3/p9OQHZDHCgwblcmrKdHeEHpub5fy3SB IJCPCGhlbkjxpL8uK9FyhwdZ1eucMcf7pAPP2oC1bDf8SUrGNQCTA+cMANQkfxQNMcfJ77 3EEHBBiPtdj57QiFZbPWC+GgO8PNb8KlEqn+VPmJVG2gsQGarhcxoyrvEREH9KIMnssi7p W6o8mbzsNOO8a8n1PtvanMVJUWHU5a2RUWKxGnM9OW6Mb3ZM9j87iaSyYHRJ7w36BP4ATh AQZBJaKJgMss9vcKV3300nQWF5yT32dkP/mxtTI+KV2ACQBDM86X32ICmTr4Sw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790784319; b=ThwikR845b+/wN+Br6lmOkEY8DffRyeQ9N0vnpFDqxLZ1ODgOCVKk1dWhaGXEZoC38Yo4z XCEThEUoYUgg4pEGmZJcszT2xCYGYn6BYUw5kBCnrLhyaC2+gricuylbWcukzRza/wW/cO 4HUJFG0Wl3uRrVy60fB6PUgTJfgqihwSfwWVvxhaSyQB1NrT4EAprnYA1G2DNM2K4YAZWs gHJVzFUxx3zwqNhsyre3ij1UYpEAcHiDbe5r6QU0ynDsaP+d/rkxsVLZtubfb0mtXosnFo +tXx2l7p1zuTohvaeNi+L8zILbUCogMGWx4M5AFXy2aJfiKFaf+yBd1HufC9+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790784319; 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=s85vMs3UbZd9+vzOEMPW+GSzwrN01lNInSI5zUHyjbc=; b=tt/hS/nQ4zMaukQvy0eVa3601Qq1GeJlGsyAdioQJUPrgWr8U08w8L9bIAyFHJKFSirLfa RexOGyZ4A/uQToz7kAFZ6uPUBKk5WT+n5mXA/neDILJmAxPmtVg2o3aNyegtlBvON+IIIo KxGWSu+eivqpuIKUF1ecimewKfaz0ZFneeS/vEqyvcdotJt6QeDaaJNED8CwdK0Dpu9n4L 2K+1OjglU9OG0FPPXJhYl2ifrbkvpa9BifKpfgasUlxwuOOD7vl6MYtTKAqGfSxFQY+AO2 9STy9QWUQ4mP9XFpiVGbNTEytaP5G32F/4v2ILie1e2cqbSS7qKCDGzK8dsWNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hw0Hy5JzRzsnf for ; Wed, 30 Sep 2026 16:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3343d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 16:05:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 381840e88072 - main - acpi_timer: Remove unneeded acpi_timer_freq global variable 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 381840e88072a90df7ffb5731c08935412edbc19 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 16:05:18 +0000 Message-Id: <6abd333e.3343d.6a1ce18@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=381840e88072a90df7ffb5731c08935412edbc19 commit 381840e88072a90df7ffb5731c08935412edbc19 Author: John Baldwin AuthorDate: 2026-09-30 16:04:59 +0000 Commit: John Baldwin CommitDate: 2026-09-30 16:04:59 +0000 acpi_timer: Remove unneeded acpi_timer_freq global variable This was just an alias of acpi_timer_timecounter.tc_frequency. While here, register the machdep.acpi_timer_freq sysctl node dynamically only if the driver attaches rather than making the handler fail with EOPNOTSUPP if the driver had not attached. Differential Revision: https://reviews.freebsd.org/D59935 --- sys/dev/acpica/acpi_timer.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index cc782f6d5ba6..68513e437282 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -60,7 +60,7 @@ static device_t acpi_timer_dev; static struct resource *acpi_timer_reg; static eventhandler_tag acpi_timer_eh; -static u_int acpi_timer_frequency = 14318182 / 4; +#define ACPI_TIMER_FREQUENCY (14318182 / 4) static void acpi_timer_identify(driver_t *driver, device_t parent); static int acpi_timer_probe(device_t dev); @@ -157,7 +157,7 @@ acpi_timer_probe(device_t dev) device_set_descf(dev, "%d-bit timer at %u.%06uMHz", (AcpiGbl_FADT.Flags & ACPI_FADT_32BIT_TIMER) != 0 ? 32 : 24, - acpi_timer_frequency / 1000000, acpi_timer_frequency % 1000000); + ACPI_TIMER_FREQUENCY / 1000000, ACPI_TIMER_FREQUENCY % 1000000); return (0); } @@ -194,10 +194,14 @@ acpi_timer_attach(device_t dev) acpi_timer_timecounter.tc_counter_mask = 0xffffffff; else acpi_timer_timecounter.tc_counter_mask = 0x00ffffff; - acpi_timer_timecounter.tc_frequency = acpi_timer_frequency; + acpi_timer_timecounter.tc_frequency = ACPI_TIMER_FREQUENCY; tc_init(&acpi_timer_timecounter); + SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO, + "acpi_timer_freq", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, 0, acpi_timer_sysctl_freq, "I", "ACPI timer frequency"); + return (0); } @@ -268,19 +272,11 @@ acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS) int error; u_int freq; - if (acpi_timer_timecounter.tc_frequency == 0) - return (EOPNOTSUPP); - freq = acpi_timer_frequency; + freq = acpi_timer_timecounter.tc_frequency; error = sysctl_handle_int(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { - acpi_timer_frequency = freq; - acpi_timer_timecounter.tc_frequency = acpi_timer_frequency; + acpi_timer_timecounter.tc_frequency = freq; } return (error); } - -SYSCTL_PROC(_machdep, OID_AUTO, acpi_timer_freq, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, - acpi_timer_sysctl_freq, "I", - "ACPI timer frequency");