From nobody Tue Dec 9 20:12:35 2025 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 4dQqlS2DnCz6Jkh2 for ; Tue, 09 Dec 2025 20:12:36 +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 4dQqlR6fR4z3wR2 for ; Tue, 09 Dec 2025 20:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311155; 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=84g6cH6FQt1T0LXnqNZFPKDhjtIFLTH8bolvJdV5RlA=; b=O6dIytv22vL4imEWyt0hMe3SOpKH6zgeHCiNkQ44A9Q2Rtq4D331fv42LwdqG/kgfqW55L x6MHwvaP5Qb2iEabrQpjjAq9eGdyIUzlOzvGZWcTnIsQa+/WCPb7rmhUTRCZIvGisz9vc1 xssFMQrUynO6qELDi7FEbdKKczPRoDElrMHn0TmvW3/auDUF3Lz8zQCDx7Dr4VyZaqjidH fmHcuG49scbW5rHmXPXab6mAiVvabrjtF0+1Amcv2GXZY42X6TOby70svhNrTDk0K+gxo+ jgDRokZPwEsxEOxH6Iz6WGUGPC3FB5lLXql+88N6G98lO3+FvP5F/CJvVUPGoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311155; 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=84g6cH6FQt1T0LXnqNZFPKDhjtIFLTH8bolvJdV5RlA=; b=l8GDuRhhWGzlV7DiVVfu7Ju8dIB/6B2XrJwUYVxjyh9DB2KnP1IqVdSyLV3Yw7lO7IOC3T HdUWBn4lt38GJznDBSPNHlX87nkxVHQ8fssw9xRG78AIpy1muT26N/TsfrtdqpagaGJQ49 T5azGMQdxGK6aRh1vCzrMshrYR0clbNkHgQWCU/r6dV4pO9Fc9OQFVyH5mJK1KylDtdi/h EWO28LUf8MBe2WtkXvedKJy+Ubj4/M0RFjNDOI5tBeWwZ/3+tZDudjuPRy2aBIGqtULnFI iTmoGqMJOgDx5pOKe0/U7Nu/AVoioG6ymFfC2O6teVoMvuZ0684sX9+/k99Jtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765311156; a=rsa-sha256; cv=none; b=opfFIy9HreZLuIlJjYcRPf3zbelqrO0c2TS9lippPOYtvsSBZzKEVNUmNvL4uzodXsgs5B BEFTv6uPaw3oPmbTTY8HBdHdByEqWqJNwGkp+222nXU0+WegzzOD0toJVkCVw5eB1D87YY 36Lrl36AMl+HDuvBtZrPj6LlEWYX32nAss5t9mYvsjEhETgh1uFzxGq6X/nWdwTNzMv0S1 5fuwU/Utt6xy9qsS9u28gKJyVoKvI/GcML0Zswvm2jP93gXMLvFjxnZP+kWdRM29SW1VCS ffU6V7kAWOh6SXXP48mtXo9M4BLs8zChRQjZhLN4VY4wuEav8q097jngB/+7mQ== 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 4dQqlR5QXjz1CnJ for ; Tue, 09 Dec 2025 20:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d6f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 20:12:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 10568445de92 - main - acpi_PkgGas: Pass rid by value 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 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: 10568445de92d59379e1c59fcdc7566065332453 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 20:12:35 +0000 Message-Id: <693882b3.2d6f0.78be18b0@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10568445de92d59379e1c59fcdc7566065332453 commit 10568445de92d59379e1c59fcdc7566065332453 Author: John Baldwin AuthorDate: 2025-12-09 20:02:51 +0000 Commit: John Baldwin CommitDate: 2025-12-09 20:02:51 +0000 acpi_PkgGas: Pass rid by value Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53406 --- sys/dev/acpica/acpi_cpu.c | 2 +- sys/dev/acpica/acpi_package.c | 4 ++-- sys/dev/acpica/acpi_perf.c | 6 +++--- sys/dev/acpica/acpivar.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 37246890fd79..6eb364db276b 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -926,7 +926,7 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) { cx_ptr->res_rid = sc->cpu_cx_count; acpi_PkgGas(sc->cpu_dev, pkg, 0, &cx_ptr->res_type, - &cx_ptr->res_rid, &cx_ptr->p_lvlx, RF_SHAREABLE); + cx_ptr->res_rid, &cx_ptr->p_lvlx, RF_SHAREABLE); if (cx_ptr->p_lvlx) { cx_ptr->do_mwait = false; ACPI_DEBUG_PRINT((ACPI_DB_INFO, diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c index e0a3b40e507e..2ee439c64b8c 100644 --- a/sys/dev/acpica/acpi_package.c +++ b/sys/dev/acpica/acpi_package.c @@ -113,7 +113,7 @@ acpi_PkgStr(ACPI_OBJECT *res, int idx, void *dst, size_t size) } int -acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int *rid, +acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int rid, struct resource **dst, u_int flags) { ACPI_GENERIC_ADDRESS gas; @@ -126,7 +126,7 @@ acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int *rid, memcpy(&gas, obj->Buffer.Pointer + 3, sizeof(gas)); - return (acpi_bus_alloc_gas(dev, type, *rid, &gas, dst, flags)); + return (acpi_bus_alloc_gas(dev, type, rid, &gas, dst, flags)); } int diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c index ee7a4355f32a..6889dae3ad7f 100644 --- a/sys/dev/acpica/acpi_perf.c +++ b/sys/dev/acpica/acpi_perf.c @@ -191,7 +191,7 @@ acpi_perf_probe(device_t dev) pkg = (ACPI_OBJECT *)buf.Pointer; if (ACPI_PKG_VALID(pkg, 2)) { rid = 0; - error = acpi_PkgGas(dev, pkg, 0, &type, &rid, &res, 0); + error = acpi_PkgGas(dev, pkg, 0, &type, rid, &res, 0); switch (error) { case 0: bus_release_resource(dev, type, rid, res); @@ -326,7 +326,7 @@ acpi_perf_evaluate(device_t dev) goto out; } - error = acpi_PkgGas(sc->dev, pkg, 0, &sc->perf_ctrl_type, &sc->px_rid, + error = acpi_PkgGas(sc->dev, pkg, 0, &sc->perf_ctrl_type, sc->px_rid, &sc->perf_ctrl, 0); if (error) { /* @@ -342,7 +342,7 @@ acpi_perf_evaluate(device_t dev) } sc->px_rid++; - error = acpi_PkgGas(sc->dev, pkg, 1, &sc->perf_sts_type, &sc->px_rid, + error = acpi_PkgGas(sc->dev, pkg, 1, &sc->perf_sts_type, sc->px_rid, &sc->perf_status, 0); if (error) { if (error == EOPNOTSUPP) { diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 4da1a5a35a41..6db55b10570d 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -573,7 +573,7 @@ int acpi_PkgInt32(ACPI_OBJECT *res, int idx, uint32_t *dst); int acpi_PkgInt16(ACPI_OBJECT *res, int idx, uint16_t *dst); int acpi_PkgStr(ACPI_OBJECT *res, int idx, void *dst, size_t size); int acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, - int *rid, struct resource **dst, u_int flags); + int rid, struct resource **dst, u_int flags); int acpi_PkgFFH_IntelCpu(ACPI_OBJECT *res, int idx, int *vendor, int *class, uint64_t *address, int *accsize); ACPI_HANDLE acpi_GetReference(ACPI_HANDLE scope, ACPI_OBJECT *obj);