From nobody Tue Oct 29 07:00:32 2024 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 4Xd1Nw3gZPz5b5xQ; Tue, 29 Oct 2024 07:00:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xd1Nw3Bwqz4b67; Tue, 29 Oct 2024 07:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730185232; 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=tg3FbKyJIO6+f3xMtQLCh6gJWJ/TLEUGpS8wVt9HzL0=; b=Ehv8EuNVF5TJ9swpNYjMYUrsm7wRy4sExEuDC00ob+jR3ZjEUUimZnUbqAh1CBBC0IltgE SC1qqdhP/11oiIOieNt+6LMu5Vy5MqwU6qbD5HlVMAg15yEiuHFNqN3phJhz6pkbvFOUoz /N1OM9qIAATxbcCp7bSgD6W13CmCX0v8v7nPiO9m/IwWDmKqekRCDFFUegPFodH6o2U4s4 Ou/Pr0V5XBY/TIMpl3w6GAV+1zrhJNeIxqOjJFTNEx8QNuWUKKSoS7ukJt+iZ/uq55/mZd iJJiESav0U2tp/3UHKSQbwNieRFV6jLoRD/W2df+eLNFiR8mxHb+91w6aCiITQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730185232; 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=tg3FbKyJIO6+f3xMtQLCh6gJWJ/TLEUGpS8wVt9HzL0=; b=iZbokOiFwjCiyFGh7K6yKWy5FBJbKYGYIlQZf5NEY5qpe4xfNQ8UMPIyzbX7naADtDsirg Ww0IvFPqsi1TsqT7rW85co/aGgLEyKTs10W23vb3A/J+ywOkOaAlDMEoILdHFfVZD+j1fi o92uPUk0L7bmzUtWE9d2PFpqzPHNhzo/xynJyR2vx7AsGXzUbyubB+Ip9pKYswwBY7H7VM F+9KmB98iES3qsORWe20mcOXmVkTkYbKLS55WwT3itos3vmmuW12M6rTiSkKJBzJux2VGf hmHW80GxWdP/7UdmH9HfVLiqfvRyUCT3nGnINKBPI+8/lxaVKa9s7iI7hOxgOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730185232; a=rsa-sha256; cv=none; b=nLAXfsyTGRf01QUT0nc4teGg93fywwa1W3DQux/k7+pXAo2Vy5ij2W1W/HabAuuvpSTsYC nzkKRrY5s9i+jumVMn+vXGWAAssfASsVgiyQhKyXVCqSjaawetfV+vDdWG3imB2O+ZbUwE PDgl+itrMD2MGqbqXN9Eu7IJ2xDdw6NJUV8x9vhE3iLs0bgfOlH5esYisEkcKOt6aNfff8 zNPAlQW9k7YvPEjgCCEOX+etcC4L2OogpWw7vz+XSv1w5LsrPhkdb+uQxloTKL529B9azg aBHOwTeeR7VD/Ol8LzxsxjVZ00/EU+voWg4J6o/oeXwGF3DJf2fZq6GmmCFESw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xd1Nw2nxNz1CKs; Tue, 29 Oct 2024 07:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49T70WmK004699; Tue, 29 Oct 2024 07:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49T70W1a004696; Tue, 29 Oct 2024 07:00:32 GMT (envelope-from git) Date: Tue, 29 Oct 2024 07:00:32 GMT Message-Id: <202410290700.49T70W1a004696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 89d82079c8ac - stable/14 - acpidump: use acpica definitions for devscope types in DMAR decoding 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 89d82079c8ac52a79bfb48ce95bd543ef53ae495 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89d82079c8ac52a79bfb48ce95bd543ef53ae495 commit 89d82079c8ac52a79bfb48ce95bd543ef53ae495 Author: Konstantin Belousov AuthorDate: 2024-10-20 01:40:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-29 06:59:54 +0000 acpidump: use acpica definitions for devscope types in DMAR decoding (cherry picked from commit 5a6e19cac0c69f55c3b7b56c4489a611f4339a0e) --- usr.sbin/acpi/acpidump/acpi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index af0068649fbb..31c3045ab6ea 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1275,14 +1275,16 @@ devscope_type2str(int type) static char typebuf[16]; switch (type) { - case 1: + case ACPI_DMAR_SCOPE_TYPE_ENDPOINT: return ("PCI Endpoint Device"); - case 2: + case ACPI_DMAR_SCOPE_TYPE_BRIDGE: return ("PCI Sub-Hierarchy"); - case 3: + case ACPI_DMAR_SCOPE_TYPE_IOAPIC: return ("IOAPIC"); - case 4: + case ACPI_DMAR_SCOPE_TYPE_HPET: return ("HPET"); + case ACPI_DMAR_SCOPE_TYPE_NAMESPACE: + return ("ACPI NS DEV"); default: snprintf(typebuf, sizeof(typebuf), "%d", type); return (typebuf);