From nobody Wed May 13 12:39:43 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 4gFtMM2k02z6dLFZ for ; Wed, 13 May 2026 12:39:43 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMM12J1z3vdx for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675983; 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=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=NVW0PBw+48OCewdTa3YIWtkNz2fzW3Jkix/wapPqxy4UJFcLwASxzJjfvN5cYUGemhFtoS asFY8o7FQY+D34yNm/17ZJ8DogRYausO5RCREx4RkPEBWBjt1RNyrfXZX4rPEvb0gc1+DE t0GOd6BO0untZAq2g6iZWq8vGrb6kzoVoOIODTHiBL3+NISwT3flM2xF0A7C7XS+G9ItxA rBI+6B75RkglqWdQ3cXVkLiTScBKcflj/2WuleLmPDLJvbimVRwD5mN6kj2P6V3kGc48bk XPR9/DUbSwPQwCWhGA4nKM//zAr8sg+q+b9ZiWCtphvDC1tDLdVwwz8TbxGvCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675983; a=rsa-sha256; cv=none; b=cdmgzBJytvoyTYI7x2FOWrc4mswdmv0EWyd2G+X4UbQVFUncbCsDL0yohDTb0JdOSqVpJq FPftBYYrulA3oD90CtCE7Cnm7fu6xmtiaWTP3lVV/X+aS/f19IjtrQhtb4d6XDvjs+zq/b QAgxt4MUbwfPLUHrKZFqoQKx+BPEGBPYCp/oB+T+JmoqSZVdmhdfeI2P8XB1kRlPWWlEYt tPWfnqBPg/o0T+DfVC8yGdtIN4Xf2oGPp/Rs5Cg0vK6fj+ptG7Fp6ZDVyesL1e47PM/Gx1 SeJiMlUnYj6PBX2/qVI8lJOuwxck4Em8sWCmVf550YD6oQYTeZ9uSSWSQ5u2zQ== 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=1778675983; 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=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=YN/ehbhs+IizMoNRvimzy3UhmY0L1xDXq95ytkF8UXKJHpFZE/reMqa5UIMPhTtWu9TBJp EDHfvwx0eLLIwhwKh8doF4UgI9clDAZRw3o8XW3485nTHzebLqRImCaQ/57dOTQC4bnkZj Cuqw0DRaS9GnMp7hdWpnX9SHrHXdVygKxXobTm5tVqKlfJrZVCA7pjuZh1WWSIhZdqqIKH /0YFb9BeDDSCv6XsHHrCCtxG9dq9m1R7eSbGRQuEzxE5X2e2kC1mjrvmfOHsEK/QMEkCr4 ztQmEkNatX2UDjrIhGNwSHtOZBaN8DvB8qv2pG3CnQfKsPnOaqSIVvUlgHefFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMM0VDzzr22 for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 3c2d2bcc6f5d - main - acpi_spmc(4): Factor out printing DSM call error, delineate function 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:43 +0000 Message-Id: <6a04710f.1be1c.6ab03c7e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 commit 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Author: Olivier Certner AuthorDate: 2026-05-04 15:40:46 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Factor out printing DSM call error, delineate function Introduce failed_to_call_dsm(), which prepends "function" before the function index for better clarity. For now, it prints the function number, as before, but will soon print a human-readable name. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56805 --- sys/dev/acpica/acpi_spmc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 30be1b4a32e7..f5951a4809d5 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -186,6 +186,15 @@ has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) return ((sc->dsms & dsm_bit) != 0); } +static void +failed_to_call_dsm(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const int function_index) +{ + (void)device_printf(sc->dev, + "Failed to call DSM %s (rev %u) function %d\n", + dsm->name, dsm->revision, function_index); +} + static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *dsm); static int acpi_spmc_get_constraints(device_t dev); @@ -470,8 +479,7 @@ acpi_spmc_get_constraints(device_t dev) dsm->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, dsm_index.i, dsm->revision); + failed_to_call_dsm(sc, dsm, dsm_index.i); return (ENXIO); } @@ -555,13 +563,10 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); - if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, function_index, dsm->revision); - return; - } - - AcpiOsFree(result.Pointer); + if (ACPI_FAILURE(status)) + failed_to_call_dsm(sc, dsm, function_index); + else + AcpiOsFree(result.Pointer); } /*