From nobody Wed Sep 30 16:05:17 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 4hw0Hy0kGZz6tkk7 for ; Wed, 30 Sep 2026 16:05:18 +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 4hw0Hx654qz4WZ9 for ; Wed, 30 Sep 2026 16:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790784317; 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=DSUHij07Ygqn1hci7qdR9eKMXeCRJnAivcQK8TM7gFk=; b=FgK3bO2NsSIwcjJnPVp26QMSj4FXHwR0a40Giu/YisXYpRa/JuMGUYdboxmuwKasqjgr43 P9AAAsBRCbM9iochqZajSKygfXuj4CCuTJ+K7gBfNqI3LOm6B4+1pWYJjaucGepv6EfgRr /gNOjFZpr9f1wVMa0Qeiz4j8B5kVXxdKVu+j4IZOIJ0zTE2YqbejI8kL2EnMynAF8dmiCl Lf/qQPMyLA+iBNmHjy4gDtSzbAvFXK0WnLbRlJIzTn0GAi1iSjabM+CMuZhaJWiLQa99pY d+7xL54nyB30QK8DLYucHM1ryyqEgYtbRYs8HxfRG9S946E5pSv0VzeuINIsLg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790784317; b=mfIsmW7r18zPvCgIdl3WNUfLmt1VuHUtUu4TpCdDRQUCveEdNZwN6VJ6x+gF7+MW1JrIs5 5qdIVwBlEHwIFiIDIMVxjwCAddo2695y93P2itCkP2jxkllY8u9Cms0n+RZzw4J45dYhOW Nfn+gC/wHq+NREg7V+w1HHPfR32Sw/6eXeSbnlEhye9TpprpmsK1LpIpTcSUomtgY22XDu OKu4duLwfD4+8dQz2MHRdDtdQUu2mP0NTQUzWsTD7zlM1NohttOiv8PNsqgZ/HIralct9i pzI4eZmfOXXnIo2oOrD/UN52PzjdahkxEKZm095XpfNYGPJ9Mrq/LX6+VYzR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790784317; 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=DSUHij07Ygqn1hci7qdR9eKMXeCRJnAivcQK8TM7gFk=; b=sLEZXwzhL87RUCjvCPklhF3W5lDkalArfzDJQ8JiqmRquj+2vtIHttj5BG8gX/JFm7j6sh rP6Nl8IsWGfM4Pd3MRqWC8/CCoD7i2BKUDZaYtnsrUXiY72bMBhZNQ+vDWhVho0dKU9mkk 0LsugqSwzVisuSOs/mGwtlO68ggY0DQUE1wrPStg+Smmjdi4eHGyVdPNQxjMt0s7enuHrJ 9yzS0RJX2BP7hsvjvsyhPkZEJGn5fC0ibhG22sJQ6IDDaDKLbpfXPNRlBiyuuTtB9bhIpf X8gqJJHK+WkbZ1ARLAQCb58iFhYgaK9nNgIgg7wjnCsYNSSsvr3ZGLnuRBTQbQ== 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 4hw0Hx4WRdzsby for ; Wed, 30 Sep 2026 16:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32ee5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 16:05:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8d70bf332c51 - main - acpi_timer: I/O resource cleanups 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: 8d70bf332c519c427e3a36f54501201917506989 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 16:05:17 +0000 Message-Id: <6abd333d.32ee5.17064ac9@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8d70bf332c519c427e3a36f54501201917506989 commit 8d70bf332c519c427e3a36f54501201917506989 Author: John Baldwin AuthorDate: 2026-09-30 16:04:59 +0000 Commit: John Baldwin CommitDate: 2026-09-30 16:04:59 +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 --- 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 6fe0b6b80310..cc782f6d5ba6 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -58,8 +58,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; @@ -105,7 +103,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)); } /* @@ -117,7 +115,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__); @@ -141,10 +139,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; @@ -167,7 +164,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__); @@ -181,12 +178,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,