From nobody Fri Jan 16 19:40:12 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 4dt9DY0Btkz6NlT7 for ; Fri, 16 Jan 2026 19:40:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9DX6L1Hz3w3h for ; Fri, 16 Jan 2026 19:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592412; 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=Hm+fLy5SpNi6bCCTuLBy0ZMdS5wMyVj2YSSDtLihT7w=; b=jIeIbw8iZv1fSf3/bJeDaMGtkgp52NUMa+akC3pJ5w1u8zieezsTP0v5yJYzK9QLzbOvQE quQp4eUTEakYiPPJfjur3PRvgr9Ze2uXoSgbMPUffSqwYbfnGieBtuEj6zUSi+JpZQ7ldZ KIs9HVSVUHNtQgWgRDnT9L25qViWlz8yujpXGoMSG0fiH3I2in/iggDLDRefyOUCy8ekTE bXWFrCUlhk6mrZx7Ndjbb3GxZ4TPRrTZ+wQjrvRWfUkuOKMKL8zPZbfczIqIZ4IHo8t+jv mDyfPHfraIzpdB50VGU+JwWWmHvKWhdjK7p4XhdNa7yDYZAUi4a7QWxTVM69Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592412; 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=Hm+fLy5SpNi6bCCTuLBy0ZMdS5wMyVj2YSSDtLihT7w=; b=UwyHNu2U+ofDF4dF1MqOUJ3HWMMgqxs7uxPWJhdgYsS93KumB3pDP+w2jeOSSGReVqq+W8 D1gq3D5+o+xP4+zJ0PDR/iQj/T/5IkmRxsNAZn2A4SbO5LztLiFdKduVvdVgpbzbxgcDjc voWI4rd8J7Ky2kRDrDjqsto5/Xs4gXWev38Vj6f3Z1av0HoteuacUNaFs+qy40zgCPM+z2 zw3FnG/7e1o5te2gg+dauwnQZxV54gCdnt92RFjKjVKn4qlEmHyQLFwKEYD9dL7mFvud/F DyNvHC2aIMGT4zp1rJWVWlufujmeyHL30bieIMQkD0SRjs9ydQve607+JHOikw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592412; a=rsa-sha256; cv=none; b=pgVCiuzGmsA0hEQdKZu5E/NEef8sp80kpL8rF2JTWYCxiqqw5y++VFuftLZakw5EKvameZ i+8Pg6R9lQXEv3weBzWXjW7Hr+zKZBQ0zOZkBTgsnYIJyz9gwHwKSV/tMtNeP6Sfn9mamB jHnGZLqgmoCTb4C9EgpsYPBpGoVa9diqqSc+ZRqA8NEv0f1rhUMd5aDDX2VWFN5YBv+Fy4 RUlVizqT0P5EcfBuZjBa7fWU2syYTw03DZZ5XMM8wU7mF0xz85+wHt0X+gPz1bzZL8f138 EIukbEMuUeVLznt9lhoI/RvdR/Y4GLsOJV4gIxiGyJ9nKyfBI4z7TmtO6uaEgQ== 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 4dt9DX5D9RzBl8 for ; Fri, 16 Jan 2026 19:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id daa6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0b6bb8193597 - stable/14 - LinuxKPI: acpi: fix guid_t argument type 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b6bb81935970d61bdc6580048c806ef17ef8cd4 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:12 +0000 Message-Id: <696a941c.daa6.62c09a26@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0b6bb81935970d61bdc6580048c806ef17ef8cd4 commit 0b6bb81935970d61bdc6580048c806ef17ef8cd4 Author: Bjoern A. Zeeb AuthorDate: 2025-07-31 00:42:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:39 +0000 LinuxKPI: acpi: fix guid_t argument type acpi_check_dsm() and acpi_evaluate_dsm_typed() take a guid_t argument and not a char *. For in-tree Linux based drivers this leads to a compile error due to a warning. Fix the function argument type and cast internally. While this made the long statements in the wrapper functions for *_dsm_* even less readable split them up using a local variable. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51649 (cherry picked from commit 21cb44bf33f137eaab1ff6f9287c6bc8c27677f0) --- sys/compat/linuxkpi/common/include/acpi/acpi_bus.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_acpi.c | 24 ++++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h index 47195e7d66a6..da50d25a63bb 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h @@ -45,9 +45,9 @@ struct acpi_bus_event { lkpi_acpi_dev_get_first_match_dev(__VA_ARGS__) ACPI_HANDLE bsd_acpi_get_handle(device_t bsddev); -bool acpi_check_dsm(ACPI_HANDLE handle, const char *uuid, int rev, +bool acpi_check_dsm(ACPI_HANDLE handle, const guid_t *uuid, int rev, uint64_t funcs); -ACPI_OBJECT * acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, +ACPI_OBJECT * acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const guid_t *uuid, int rev, int func, ACPI_OBJECT *argv4, ACPI_OBJECT_TYPE type); int register_acpi_notifier(struct notifier_block *nb); diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index d18c69d9210d..43783bb8727b 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -72,8 +72,9 @@ bsd_acpi_get_handle(device_t bsddev) } bool -acpi_check_dsm(ACPI_HANDLE handle, const char *uuid, int rev, uint64_t funcs) +acpi_check_dsm(ACPI_HANDLE handle, const guid_t *uuid, int rev, uint64_t funcs) { + UINT64 ret; if (funcs == 0) return (false); @@ -87,17 +88,20 @@ acpi_check_dsm(ACPI_HANDLE handle, const char *uuid, int rev, uint64_t funcs) */ funcs |= 1 << 0; - return ((acpi_DSMQuery(handle, uuid, rev) & funcs) == funcs); + ret = acpi_DSMQuery(handle, (const uint8_t *)uuid, rev); + return ((ret & funcs) == funcs); } ACPI_OBJECT * -acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, int rev, +acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const guid_t *uuid, int rev, int func, ACPI_OBJECT *argv4, ACPI_OBJECT_TYPE type) { ACPI_BUFFER buf; + ACPI_STATUS status; - return (ACPI_SUCCESS(acpi_EvaluateDSMTyped(handle, uuid, rev, func, - argv4, &buf, type)) ? (ACPI_OBJECT *)buf.Pointer : NULL); + status = acpi_EvaluateDSMTyped(handle, (const uint8_t *)uuid, rev, func, + argv4, &buf, type); + return (ACPI_SUCCESS(status) ? (ACPI_OBJECT *)buf.Pointer : NULL); } union linuxkpi_acpi_object * @@ -105,9 +109,11 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, UINT64 rev, UINT64 func, union linuxkpi_acpi_object *pkg) { ACPI_BUFFER buf; + ACPI_STATUS status; - return (ACPI_SUCCESS(acpi_EvaluateDSM(ObjHandle, (const uint8_t *)guid, - rev, func, (ACPI_OBJECT *)pkg, &buf)) ? + status = acpi_EvaluateDSM(ObjHandle, (const uint8_t *)guid, rev, func, + (ACPI_OBJECT *)pkg, &buf); + return (ACPI_SUCCESS(status) ? (union linuxkpi_acpi_object *)buf.Pointer : NULL); } @@ -323,13 +329,13 @@ bsd_acpi_get_handle(device_t bsddev) } bool -acpi_check_dsm(ACPI_HANDLE handle, const char *uuid, int rev, uint64_t funcs) +acpi_check_dsm(ACPI_HANDLE handle, const guid_t *uuid, int rev, uint64_t funcs) { return (false); } ACPI_OBJECT * -acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, int rev, +acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const guid_t *uuid, int rev, int func, ACPI_OBJECT *argv4, ACPI_OBJECT_TYPE type) { return (NULL);