From nobody Tue Oct 22 19:35:24 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 4XY2T849tGz5Vpw5; Tue, 22 Oct 2024 19:35:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY2T83WSdz4tbw; Tue, 22 Oct 2024 19:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625724; 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=vcNpy9nHGOSvQI01G+06gFk77Fwa7NXPeOSKFtzvo5Q=; b=CJjygb9yADdjrBzM0TubP28CGdeiTMMBo7hNqN3tdP6Vh37NojititSbcY28ZVzMDAd+3s xjde32MlwIcte8QC2k4m9jhM+6iGT2NbNYdJLmJcatnpX5hv5p7fKZOY/lhSwnRPdGMbj8 wbVyB2hn8LCvvd8ZhFnHXyJ2An635ghky6cGOTdtO35GK8gFtAgIsdk0loEy6UodWuWBji 8gLu47xAfe7Rb9b9mPHb3pqMM+dunuKxwjQnlZvy0rwS90ZxxGKJrAqHkCWB57RPx2L8DX 3N/aVRFoJlLk41M0w0okA0R2sirnlmAjaYN62xeIESkOYhq+ra8QvOS6wSRTPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625724; 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=vcNpy9nHGOSvQI01G+06gFk77Fwa7NXPeOSKFtzvo5Q=; b=nvezE2Y6JY/E06H7CoePdksb1pG9MDpotj5pxtmIpXtQIOAYeYSJa7iGpfQQg/NEm75uFQ bkuetKDopTuRDV/Edfdka0u2MbmT9acMF3pHUu0yfhqGZHO+5w9VAIf8bEahTLzW+I+3te xdcMr3jodJkpM0BQot7crqYk/6igKRGdkruZAU2OZHhX62tuHdrb+ms7hJ3xXclgkh8ovR 9w6ftZDvgRA0mncRqiyZ2MJDuf+SUm8d2KQC3ruCKOM+SQkFKfWsnT5+WNL/lhV0G+qWue mEGhmI8TFtV60DKqzbvODGQ/0EQ6DNlc6yRK9yjuX42KCIuYJF05A+HJDol50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729625724; a=rsa-sha256; cv=none; b=evL/oIcUdOVZ8/iKahZ0ajtfu9nZcvnhwLUe4+liRsYPiyiGpHicQ8ORJYl7bJx9NAMGsk YF3s/rmsHwC+rRWk+LJW1gRBzlyXGatGe6czhcFIsktC2OKDtnXwCep3zgOFQr1Ac4LfQG CNAC2cNXAMpvmpYvo60JlePICIOGGYoiFC1u71H14vrHc3b2O4rf0USgkH0H/71COxzqw7 yj5BEj5/N7HLbHCMPFxZRmfU9SBMCnJ9a21sVivzABU4KF5oclV/7129cxggBIxEfci/7I iZ2qBtiGWDE8Y4pMSClYX67G4gPlGjJ0PjYlXGPVyGFJR/V3p5Sdy50y8qlIxg== 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 4XY2T836RBzRvh; Tue, 22 Oct 2024 19:35:24 +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 49MJZOrF018324; Tue, 22 Oct 2024 19:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MJZOSv018321; Tue, 22 Oct 2024 19:35:24 GMT (envelope-from git) Date: Tue, 22 Oct 2024 19:35:24 GMT Message-Id: <202410221935.49MJZOSv018321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5a6e19cac0c6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5a6e19cac0c69f55c3b7b56c4489a611f4339a0e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5a6e19cac0c69f55c3b7b56c4489a611f4339a0e commit 5a6e19cac0c69f55c3b7b56c4489a611f4339a0e Author: Konstantin Belousov AuthorDate: 2024-10-20 01:40:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-22 19:34:34 +0000 acpidump: use acpica definitions for devscope types in DMAR decoding and add missed acpi namespace device type entry decoding. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 7ebd3e764005..119f74c196d5 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1414,14 +1414,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);