From nobody Thu Oct 08 20:44:19 2026 X-Original-To: dev-commits-src-branches@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 4j126D3hMDz4n32S for ; Thu, 08 Oct 2026 20:44:20 +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 4j126D10s0z4cKw for ; Thu, 08 Oct 2026 20:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492260; 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=fcLSmgQ60jK2lx8yUITLj3V0cr0XynxbxpwwadyDcYE=; b=aP9sC+2qI+ySsIO9rB14wPidwaEz/7EwVNHhe3E3QVow1bCad5K/p0OrkfRrQ39vWp3uTH 2EsBRQYVWnnlqI7iq6EciOiVGBQT5M+wX6AVcRsn4sNl4K3Hz45oLwu8qm8r4YpLgdvkEJ 9HyKa0meSeqVgFV6xP2vch7qSfqpNrhwIYvRrF1z+sUYdfy2gTc8VJZyp7QXT0T/I9N+9c fIOIf7m3gv1+P35mpcIrsVcYCEZJ+QwWCdm+fACWJz58ANYh6Zw1jYoGZJUOSGwYahlFMh KY4BpajKhqwe17cbZ27VUevZS0IXFkie8f3JqJRNRKjbWyiG+ScJh+L12ffaJg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492260; b=lkCVZzaLhawu8g7i+0WXZ39VptfO9KT0Y0JN5EebulHVOVV0dKEIZuDcgP5bpC2sAEWeV4 9cQK/RUjuzJaPCnSa6tGLQLbMQFif8Wm/Ub/GnvBslf01EZJz5AUyHzTJJPSrBRCImpCok n/ftamvA5enC71bX5rkXMj9uilAySfB2tYF1i/ISDq98s/OLAd9HjulfNnAJ7ohtyQY9eh +IGx0LiQuDaRQTsQa0VU2ZhUhVGh+qETpEgwhPuPHru4GeQwC+zUVQ5Evk/oR9yil6TLIY QTA8u6Bz0OyT0dq1xFG31UCMY8UycUI2nUWQLhJ2hBVWkMYD4MYPdlrmN1ZkqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492260; 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=fcLSmgQ60jK2lx8yUITLj3V0cr0XynxbxpwwadyDcYE=; b=vwPKzMxdASPnCVWAi2Gd9xv74O+dtUs8kmp9fgofFcEh4iGyD1U4UnKEgVDeKpVEjivfSn aYKCXLF+0CfbcZbXd1oBplW6LuS1GOoAjDIpLiV+SntpPZAe8xgZdlaQ8AfRaJCDbWOQJz jGNfWfCBYSd0OmVbdI9I5SAld9r1khi5i1JkkqTwhGHdvQDN+QJMPcr9tk6ie14905p6hw KmAOHaMJlFe+XoiezauELlWFcWi6y0DpTyTmpZoHGiHDHSnmekTBBeNyjL7R1hkWEPSkCT WDndGgWml3QIwltSSXh/GmlzQxQ4RmEUvkMaLYeuU879npdosoOJj7Psk8c5Rw== 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 4j126C6LgkzwWj for ; Thu, 08 Oct 2026 20:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32274 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3fd7a95dd023 - stable/15 - acpi_timer: I/O resource cleanups List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3fd7a95dd0230303ecacb5e245f9bffcd827b286 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:19 +0000 Message-Id: <6ac800a3.32274.233fb4d3@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3fd7a95dd0230303ecacb5e245f9bffcd827b286 commit 3fd7a95dd0230303ecacb5e245f9bffcd827b286 Author: John Baldwin AuthorDate: 2026-09-30 16:04:59 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:33 +0000 acpi_timer: I/O resource cleanups - Use bus_read_4 and remove explicit bus_space tag and handle - Pass rid by value to bus_alloc_resource_any Differential Revision: https://reviews.freebsd.org/D59934 (cherry picked from commit 8d70bf332c519c427e3a36f54501201917506989) --- sys/dev/acpica/acpi_timer.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 4a875884b4a6..b1c1d64cd171 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -57,8 +57,6 @@ ACPI_MODULE_NAME("TIMER") static device_t acpi_timer_dev; static struct resource *acpi_timer_reg; -static bus_space_handle_t acpi_timer_bsh; -static bus_space_tag_t acpi_timer_bst; static eventhandler_tag acpi_timer_eh; static u_int acpi_timer_frequency = 14318182 / 4; @@ -102,7 +100,7 @@ static __inline uint32_t acpi_timer_read(void) { - return (bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0)); + return (bus_read_4(acpi_timer_reg, 0)); } /* @@ -114,7 +112,7 @@ acpi_timer_identify(driver_t *driver, device_t parent) { device_t dev; rman_res_t rlen, rstart; - int rid, rtype; + int rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -138,10 +136,9 @@ acpi_timer_identify(driver_t *driver, device_t parent) default: return_VOID; } - rid = 0; rlen = AcpiGbl_FADT.PmTimerLength; rstart = AcpiGbl_FADT.XPmTimerBlock.Address; - if (bus_set_resource(dev, rtype, rid, rstart, rlen)) + if (bus_set_resource(dev, rtype, 0, rstart, rlen)) device_printf(dev, "couldn't set resource (%s 0x%jx+0x%jx)\n", (rtype == SYS_RES_IOPORT) ? "port" : "mem", rstart, rlen); return_VOID; @@ -164,7 +161,7 @@ acpi_timer_probe(device_t dev) static int acpi_timer_attach(device_t dev) { - int rid, rtype; + int rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -178,12 +175,9 @@ acpi_timer_attach(device_t dev) default: return (ENXIO); } - rid = 0; - acpi_timer_reg = bus_alloc_resource_any(dev, rtype, &rid, RF_ACTIVE); + acpi_timer_reg = bus_alloc_resource_any(dev, rtype, 0, RF_ACTIVE); if (acpi_timer_reg == NULL) return (ENXIO); - acpi_timer_bsh = rman_get_bushandle(acpi_timer_reg); - acpi_timer_bst = rman_get_bustag(acpi_timer_reg); /* Register suspend event handler. */ if (EVENTHANDLER_REGISTER(power_suspend, acpi_timer_suspend_handler,