From nobody Tue Mar 24 08:02:29 2026 X-Original-To: dev-commits-src-main@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 4fg2ZY5Nk9z6WK6f for ; Tue, 24 Mar 2026 08:02:29 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fg2ZY4T5Gz3fdl for ; Tue, 24 Mar 2026 08:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774339349; 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=NtPbZ0ebAOcQDXo9ZN1HuJFEWy8winyXG+N73QxyUKw=; b=wkHBIFvhEJpehju7J/h0wlNf60NO0pyU4rXAoL0xIfYk6a8u30s+e8cDcTe95ah4b7Kfzf WsU77HJKgoSDcweqncxriLZrmXligCWpsS9QA7rP6AIuYSk+m9Hf0ZdJd2iVtdrSzbgqGx fSSGziJxV2NOb1SibgX1LnlNANxnX1h9YosMny5WhUqSB+ZCdKWDDW8x4nIMknzKI0IAW5 09EKucMo8YQnj8QT96oUcKUoKDkFwhY+MWhUIiWmsFQxR+alX9Oyn68w7F+YaFVdp3AphK gJ/Y+WGagiyJlCyQkjLO1ML3X+ScQbhg616+terCaTq7zwua6Eb4f15qm4KfQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774339349; a=rsa-sha256; cv=none; b=re/2jN26LtOb0aOTmTRNaXDLGOB0Vn4ac4BFWNEa3Sixj32So79QHSzvubPL/nbTaqLtdz HFl2Fq99EPhWq23ys0lafzBEyOmjJZq6l2GHpADMpf876TZPtSjmSkF3JEJ/0RE2botKjK XIq8Bl50YaI25heMBPClG5+/nUSKwgaOcUFUEkk13nK09KKSycKmLYh1s6k7WVMe+XrCLD HsRl5ZgZ+f3REV1Ya0hwvoda0/MfwbTtJ6HPAgBQmQ5I63MZNGiXQOK76trGu+soesn7nA gDB1kiOEBMZ4zy5J0nMuq5Vge9YwfbT/nKeUitVn8UihhEPvbtmwdEw06GeJaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774339349; 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=NtPbZ0ebAOcQDXo9ZN1HuJFEWy8winyXG+N73QxyUKw=; b=lFn4yfmd7d9cJHOuP6KuuPceMaM5TvRhEPWfSULr+GKI5Ze786uVXadp+QE25T1RNvU3Vv i/wc5oRqWIsJ/mzZ8eCrOYLDJqnIpzFAJgSwWiQFiI5I5+aduehKGiqoRZDCguXHNLm8UN Qk4Eo3ZVWfGHKXnQZL+FGnpR4b6q/6Qc1LRMBjocmOALAG7KFyRSNtKCnhaRIPgpGT+gFH Z2CM7TqXdrewjNP6mw7hz/uPv6N/aFrfn6vcSTXCj04MWIrpjBvZiduCuWsgg7mUeQT6Ps qyrwh0+j2nxBtMd+DjUsr0kMmzk69ysEOTh5GLyYAvfpQRtbSR7A4UG7cYj7Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg2ZY41F4z1P61 for ; Tue, 24 Mar 2026 08:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a1c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 08:02:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: d8a8c890a1a3 - main - acpi_spmc: Fix checking expected DSMs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8a8c890a1a3a003dbd12ec0235304db7fbe9e6e Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 08:02:29 +0000 Message-Id: <69c24515.1a1c2.55d8515d@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d8a8c890a1a3a003dbd12ec0235304db7fbe9e6e commit d8a8c890a1a3a003dbd12ec0235304db7fbe9e6e Author: Aymeric Wibo AuthorDate: 2026-03-24 07:25:50 +0000 Commit: Aymeric Wibo CommitDate: 2026-03-24 08:00:58 +0000 acpi_spmc: Fix checking expected DSMs Previously was or'ing the indices of the DSMs directly, not their corresponding bits. This commit rectifies this. Reviewed by: olce Approved by: olce Fixes: c5daa5a4c32c ("acpi_spmc: Add system power management controller driver") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/https://reviews.freebsd.org/D56062 --- sys/dev/acpica/acpi_spmc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index a961b4a188dc..d6d4f2d34f2f 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2024-2025 The FreeBSD Foundation + * Copyright (c) 2024-2026 The FreeBSD Foundation * * This software was developed by Aymeric Wibo * under sponsorship from the FreeBSD Foundation. @@ -86,8 +86,9 @@ static struct dsm_set intel_dsm_set = { 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66}, }, - .dsms_expected = DSM_GET_DEVICE_CONSTRAINTS | DSM_DISPLAY_OFF_NOTIF | - DSM_DISPLAY_ON_NOTIF | DSM_ENTRY_NOTIF | DSM_EXIT_NOTIF, + .dsms_expected = (1 << DSM_GET_DEVICE_CONSTRAINTS) | + (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | + (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, @@ -102,9 +103,10 @@ static struct dsm_set ms_dsm_set = { 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61}, }, - .dsms_expected = DSM_DISPLAY_OFF_NOTIF | DSM_DISPLAY_ON_NOTIF | - DSM_ENTRY_NOTIF | DSM_EXIT_NOTIF | DSM_MODERN_ENTRY_NOTIF | - DSM_MODERN_EXIT_NOTIF, + .dsms_expected = (1 << DSM_DISPLAY_OFF_NOTIF) | + (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | + (1 << DSM_EXIT_NOTIF) | (1 << DSM_MODERN_ENTRY_NOTIF) | + (1 << DSM_MODERN_EXIT_NOTIF), }; static struct dsm_set amd_dsm_set = { @@ -124,9 +126,9 @@ static struct dsm_set amd_dsm_set = { 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21}, }, - .dsms_expected = AMD_DSM_GET_DEVICE_CONSTRAINTS | AMD_DSM_ENTRY_NOTIF | - AMD_DSM_EXIT_NOTIF | AMD_DSM_DISPLAY_OFF_NOTIF | - AMD_DSM_DISPLAY_ON_NOTIF, + .dsms_expected = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | + (1 << AMD_DSM_ENTRY_NOTIF) | (1 << AMD_DSM_EXIT_NOTIF) | + (1 << AMD_DSM_DISPLAY_OFF_NOTIF) | (1 << AMD_DSM_DISPLAY_ON_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, @@ -252,7 +254,7 @@ static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_set *dsm_set) { - const uint64_t dsms_supported = acpi_DSMQuery(handle, + uint64_t dsms_supported = acpi_DSMQuery(handle, (uint8_t *)&dsm_set->uuid, dsm_set->revision); /* @@ -261,6 +263,7 @@ acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, */ if ((dsms_supported & 1) == 0) return; + dsms_supported &= ~1; if ((dsms_supported & dsm_set->dsms_expected) != dsm_set->dsms_expected) { device_printf(sc->dev, "DSM set %s does not support expected "