From nobody Sat Sep 19 21:19:10 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 4hnMnJ194Qz6sJ92 for ; Sat, 19 Sep 2026 21:19:16 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hnMnH6RwLz4bpP for ; Sat, 19 Sep 2026 21:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789852755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMSLLngpS+uGCUQmjBFP989q3CofSXLjUVUR1/fb9jE=; b=TD0pLWjajGKOgB7+pFJGgUbvRlcvXuZRIyUGRB7OxU6AMlqBmsf8+2xYQA4NobQWrDmMhv nUzfLh93rU0E8C3456BzwAQ686ZDbEbomMJ6elMIOrkMHDzWJj9JRJRYwVlQ7RoEfSprN6 ZQVwlq7aFQ6QjqrnPtlH4ewcG9TXe7SN6/lOLRh0Upz+GxEMllnS9Lo95P1jMk6Y+eKt6l bXdDC3F/MgDSg1gcOtIL0OKeqDptq9lHfr+TPyJSnGh62Q/3yT3HujAPqyW+xlvNjEseuZ I6Prc9ukmijq4giL7kT/602gP2rN7aKovAgrT6+pmi1q/LMpiDvShlkYhcuMUg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789852755; b=ocVHgIT0hQ+JsQ8HHy/kNa2Q5l3HdkpP8eeChT5sGlbwHGKBvLQZ6IRuG4OQ4NA95ayxPY xbjLta7J0pyd7ej0LGealJC1TdDBJhNFovcC+ciMVUGDA9UeRq+sMaiafUtVrt7g1UegNH +muEj5V8mz+A930Xyf17xT9dwd90nTIsu+Ro4uKrSv4qPjSyVMc1kthpT7j4hpyDWdsfa2 SyuqGFINACWzWq6pjQmTFkK0AdzJ/VsjF40gX+uS3f2h8zIsoDYnR/oEfAziXk4GzC6jPj lplAhkNPVqXfUHqiTPfyEK3Brk2JfYsb1hB4cpRcCaExE95LVSCoFy0fGPFZwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789852755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMSLLngpS+uGCUQmjBFP989q3CofSXLjUVUR1/fb9jE=; b=kmbmTm6QvjCmxeQVaCIOkzF6heqm/Q9+TNxftKcJjU6M+EaTEg/1KfHufzZ126sKh3HgT7 N/l+/gz4a956UcbBGg102YRDWP9HXEWGtSGUpZUmtL1UykMXkFEEuoFnSnBvJMiQhZf50v ymkbxnxADuXK9HcXaCR75UTuM564VkvvtbDZhUcHgTjo6491z/bMW7NEDnJFsWpiLFDbEb jARjXXhSiZH59EWlzkEWdbj5Gl5U/o6/is+lVsLb1kRKdktVSFknYAacNNCh39THHp2gyU e6ChrTAyRaAwS967ytsMAVR8shJYEGAKTgZD7QnkjVKAzcTdhoQeX/UZJyjfBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hnMnH51syz1Jcr for ; Sat, 19 Sep 2026 21:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 187a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 19 Sep 2026 21:19:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Antranig Vartanian From: Adrian Chadd Subject: git: ed4d2671efbd - main - acpidump: Add decoding of the MSDM 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: 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed4d2671efbd8fa97c0e027e6945340a02d4725f Auto-Submitted: auto-generated Date: Sat, 19 Sep 2026 21:19:10 +0000 Message-Id: <6aaefc4e.187a6.781540d0@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4d2671efbd8fa97c0e027e6945340a02d4725f commit ed4d2671efbd8fa97c0e027e6945340a02d4725f Author: Antranig Vartanian AuthorDate: 2026-09-19 19:06:07 +0000 Commit: Adrian Chadd CommitDate: 2026-09-19 19:07:07 +0000 acpidump: Add decoding of the MSDM table Add support for dumping the Microsoft Data Management (MSDM) table, which contains the Windows product key embedded in firmware by the OEM. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59662 --- usr.sbin/acpi/acpidump/acpi.c | 25 +++++++++++++++++++++++++ usr.sbin/acpi/acpidump/acpidump.8 | 5 ++++- usr.sbin/acpi/acpidump/acpidump.h | 15 +++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 0b125b5591ba..e3fd91909d42 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -70,6 +70,7 @@ static void acpi_handle_madt(ACPI_TABLE_HEADER *sdp); static void acpi_handle_ecdt(ACPI_TABLE_HEADER *sdp); static void acpi_handle_hpet(ACPI_TABLE_HEADER *sdp); static void acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp); +static void acpi_handle_msdm(ACPI_TABLE_HEADER *sdp); static void acpi_handle_slit(ACPI_TABLE_HEADER *sdp); static void acpi_handle_wddt(ACPI_TABLE_HEADER *sdp); static void acpi_handle_lpit(ACPI_TABLE_HEADER *sdp); @@ -1121,6 +1122,29 @@ acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } +static void +acpi_handle_msdm(ACPI_TABLE_HEADER *sdp) +{ + struct msdm_body *msdm; + + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); + msdm = (struct msdm_body *)((char *)sdp + sizeof(ACPI_TABLE_HEADER)); + if (sdp->Length < sizeof(ACPI_TABLE_HEADER) + + offsetof(struct msdm_body, data) + msdm->data_length) { + warnx("MSDM table is corrupt"); + printf(END_COMMENT); + return; + } + printf("\tVersion=%u\n", msdm->version); + printf("\tDataType=%u\n", msdm->data_type); + printf("\tDataLength=%u\n", msdm->data_length); + printf("\tData="); + acpi_print_string((char *)msdm->data, msdm->data_length); + printf("\n"); + printf(END_COMMENT); +} + static void acpi_handle_slit(ACPI_TABLE_HEADER *sdp) { @@ -2747,6 +2771,7 @@ static const struct { { ACPI_SIG_LPIT, acpi_handle_lpit }, { ACPI_SIG_MADT, acpi_handle_madt }, { ACPI_SIG_MCFG, acpi_handle_mcfg }, + { ACPI_SIG_MSDM, acpi_handle_msdm }, { ACPI_SIG_NFIT, acpi_handle_nfit }, { ACPI_SIG_SLIT, acpi_handle_slit }, { ACPI_SIG_SPCR, acpi_handle_spcr }, diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8 index ec43f36f0895..1d50a57be622 100644 --- a/usr.sbin/acpi/acpidump/acpidump.8 +++ b/usr.sbin/acpi/acpidump/acpidump.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 5, 2024 +.Dd August 2, 2026 .Dt ACPIDUMP 8 .Os .Sh NAME @@ -134,6 +134,9 @@ Intel Streamlined Advanced Programmable Interrupt Controller present in the system. .It MCFG PCI Express Memory-mapped Configuration PCI config space base address register. +.It MSDM Microsoft Data Management Table +Contains the Microsoft software licensing data, including the +product key embedded in firmware by the OEM. .It NFIT NVDIMM Firmware Interface Table NVDIMM information in the system. .It RSD PTR diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h index 8755a96dd8af..e271a318fc3f 100644 --- a/usr.sbin/acpi/acpidump/acpidump.h +++ b/usr.sbin/acpi/acpidump/acpidump.h @@ -130,6 +130,21 @@ enum TCPApcclient_ids { PCCLIENT_ID_MAX, }; +/* MSDM */ +/* + * ACPICA's ACPI_TABLE_MSDM only defines the common ACPI header; the + * body below is the Microsoft-proprietary layout per "Microsoft + * Software Licensing Tables (SLIC and MSDM)", November 29, 2011. + */ +struct msdm_body { + uint32_t version; + uint32_t reserved; + uint32_t data_type; + uint32_t data_reserved; + uint32_t data_length; + uint8_t data[]; +} __packed; + /* * Load the DSDT from a previous save file. Note that other tables are * not saved (i.e. FADT)