From nobody Fri Aug 26 02:50:01 2022 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 4MDPSn4yGlz4b9sm; Fri, 26 Aug 2022 02:50:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDPSn4LL4z3DVR; Fri, 26 Aug 2022 02:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661482201; 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=uwlfMtPtVaHVDCNBxharT2Nfze/P0kcdBDGKxl7WsH4=; b=vBZFRQ0MRgwO8Qpfq0ZnLa2WFiBdT0x5pWKlwZBzIXIQu+joBAUgBVtxRzgZDnLDeqpYt4 XoPFcFO+Ob5vBuGkQtgiELtG0Py/6rB5KjtnaYW20jegCuPmo9kfEA3OnJPG7N80dY3pAZ HocCDmexPL24bsEbXMPyQmcwcggF0jji1TG3yFGiUx5pNvazxqx9wEI3Bfe6pihoh0IRHM BxV7r14cd9yLy2I31XRpPFJjND/H0JatzKDcIpUfg7mMh2YjJwcT8UI+ndXu0f5/TSW3MI PS90bmLdUJUGwEcg/ILBHtx3dLb+0+aGirt5A6qHiiCsuJ4gv/pvSBM9pcQa2A== 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 4MDPSn3HDQz1BM0; Fri, 26 Aug 2022 02:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27Q2o1vj022988; Fri, 26 Aug 2022 02:50:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q2o1rh022975; Fri, 26 Aug 2022 02:50:01 GMT (envelope-from git) Date: Fri, 26 Aug 2022 02:50:01 GMT Message-Id: <202208260250.27Q2o1rh022975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 9644bc4a1126 - stable/13 - Decode couple arrays in NFIT table. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9644bc4a112615ba9ad6b7db3095ef399be5ca7b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661482201; 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=uwlfMtPtVaHVDCNBxharT2Nfze/P0kcdBDGKxl7WsH4=; b=R9pAdXwG3nu4PNwrINHQ7xkkslmYaXeC8XRy1x9JYF79WNDa+ktIDP7FSqOVGpWFpiG8Nh XwTJDKMxUdJglkFhYnuyrHLUlsdNWQph0pejRkWgYOIWU6YbZ6yTRxjIhsHexzp+wuLW2N hINoqFDbjQOAFNs1tLQDTTlIjCIWAjDmtyBCqwwY8t4evjqgcHqaaWGefziMo0R04d4bWH dXjoKgshxI1/4zC2gK5Ay4ii//TDM9WN8TlTmKF7micsx9fC+SZNHF8OGsFiazIXYuj0ok q6lQulpsKbWxU2L1fVAsYKQOG3oMD8CQrotahFiN2Q3yakRSrhsh1RXcRTCQgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661482201; a=rsa-sha256; cv=none; b=Y+1sIWu/JUpou+OOUc5LHnNqZzRd6hqv5hehfvjBW8RGO63LPuMM9LJgKzjcwjkMDGl+H5 q+BCg2eAdCW0KIWppcu73CBAhySVUH2Liu1vrWu5KOmdwihEIARCEQGI9kV2bFNjMwynz3 ZCkqKB8928O1xpR0/S35pejEGwG8pQTFekUcvx4i9pr9c0vFneYB55J90lS1IBNfEw+2JL PDOMnUJ1CPXSgqrhY0GSmWQhp1JvjFWglwdN0Pedh4HYZJb+M2aGw1FnWRxtO4hZTl+qM2 4n81x/Rphxh+NDcN0YNiDBOZ2T85miWERgivTfV/gbNcj83aU77cxzCDckKwRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=9644bc4a112615ba9ad6b7db3095ef399be5ca7b commit 9644bc4a112615ba9ad6b7db3095ef399be5ca7b Author: Alexander Motin AuthorDate: 2022-08-19 01:30:38 +0000 Commit: Alexander Motin CommitDate: 2022-08-26 02:49:39 +0000 Decode couple arrays in NFIT table. MFC after: 1 week (cherry picked from commit 3b7935f33b50aa69637e722c3d3fd275c0efd3cd) --- usr.sbin/acpi/acpidump/acpi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index c560a38411ba..6f758e60a176 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1578,7 +1578,7 @@ static void acpi_print_nfit(ACPI_NFIT_HEADER *nfit) { char *uuidstr; - uint32_t status; + uint32_t m, status; ACPI_NFIT_SYSTEM_ADDRESS *sysaddr; ACPI_NFIT_MEMORY_MAP *mmap; @@ -1655,7 +1655,10 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) (u_int)ileave->InterleaveIndex); printf("\tLineCount=%u\n", (u_int)ileave->LineCount); printf("\tLineSize=%u\n", (u_int)ileave->LineSize); - /* XXX ileave->LineOffset[i] output is not supported */ + for (m = 0; m < ileave->LineCount; m++) { + printf("\tLine%uOffset=0x%08x\n", (u_int)m + 1, + (u_int)ileave->LineOffset[m]); + } break; case ACPI_NFIT_TYPE_SMBIOS: smbios = (ACPI_NFIT_SMBIOS *)nfit; @@ -1716,7 +1719,10 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) fladdr = (ACPI_NFIT_FLUSH_ADDRESS *)nfit; printf("\tDeviceHandle=%u\n", (u_int)fladdr->DeviceHandle); printf("\tHintCount=%u\n", (u_int)fladdr->HintCount); - /* XXX fladdr->HintAddress[i] output is not supported */ + for (m = 0; m < fladdr->HintCount; m++) { + printf("\tHintAddress%u=0x%016jx\n", (u_int)m + 1, + (uintmax_t)fladdr->HintAddress[m]); + } break; case ACPI_NFIT_TYPE_CAPABILITIES: caps = (ACPI_NFIT_CAPABILITIES *)nfit;