From nobody Wed Apr 09 21:17:56 2025 X-Original-To: dev-commits-src-main@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 4ZXwlT67Dgz5sP3P; Wed, 09 Apr 2025 21:17:57 +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 4ZXwlT27V6z3t5D; Wed, 09 Apr 2025 21:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744233477; 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=c+NwfXSbrkNGCx7BDWVVsVQxfBuFC0+UHwY3uqkKyKo=; b=D5yHAfvYc5fU2VbfO3/wLzDlVhfiRCZx5isDK8QT1Ltl7yD6+4DLQOEnjdMssgrbIjEhsK PaPAqFC1xBgeeWZYerWFS0KV13Wty0ld13sGV00Z9kPEOnSgzixC75BpLe7oLhFIwBhRA3 MFqvKMJnv2yv3DTnDMdHNz5sDw+69ytWzuOfI0qTA0HouSYjcN+OKO0+b1s+QO/hqjDjzQ j2wlgK8dB3bK7B2/TzL8MCSeBHbWcUgLueamC5NKte7t/BXRbNWXIDorag0m891fz7TruZ PURqebkSeq2/PF4AUXdqK2I8Ia3WTdampxqT/XcOCMyclsOrIVi5+bvzi4liRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744233477; a=rsa-sha256; cv=none; b=lMninITWmoPmgoS0f6oh6Kzvs9j/OrWpiE7kmL7I2uxjoUjMOE2EDOGo85HHL5n6CuVQWk gZQq1D/WDnuh0E5REydUq0WJvJrqtBO7ULtLQ56fUZWVaJ3f0MB1CIyZzfdXW26bugWP10 owjGKwGSvHhByerBZIUpM6IvtmVQBFs0KZ35ECoN/o1460efWow9uN8EDTqHVlbMZvTf4W lKELA0REEOrrM/00wTXEWZmFlrqTaTDLWSUCeL+Y4KKcajOQWTTMASwb+elDu0M4tB7TjI fcSh/wFziHX82sfigN791cC+orhhzTM9PKJJNEnBLM3I9xl3GinNigi9e1izAw== 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=1744233477; 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=c+NwfXSbrkNGCx7BDWVVsVQxfBuFC0+UHwY3uqkKyKo=; b=ayKsAUnc8R8J4hIs4CaeJBYXu2VdrrGCPvQappCEhdbuo4LdHm40O7P2pbl9FvI0+Tvf/0 ndmnvn3fD1OzSM8Mui+fd/Evm9crBIqgDP0kf3XUmcs0rS9Fl1HMhQG2vJ785rwzz5JkcJ Nr9gnxhglj2tqskNfzLhBrejX+nyPc7p91MrsSuA1appHPG7RwYZH/eR0+9y1SGttmnmKZ qi6pIlX9l3tSB0q64njcxeqQdWkq7nEeV2pVDswyMQgJJlQ08Czgyj7hEna6QJQCvr0az6 SrcFSaYlLwhYl6IP35IUVGfZXKkYNKsZW/TlcwfPhDzcM6qoUGe+Vclifr2NgQ== 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 4ZXwlT0SmhzZxr; Wed, 09 Apr 2025 21:17:57 +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 539LHu2B078103; Wed, 9 Apr 2025 21:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539LHuSd078100; Wed, 9 Apr 2025 21:17:56 GMT (envelope-from git) Date: Wed, 9 Apr 2025 21:17:56 GMT Message-Id: <202504092117.539LHuSd078100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a3fa657eddad - main - efi/metadata: Make a note that efi_map_header isn't standard List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3fa657eddade274a5cb684b5e5e890eef67ad25 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a3fa657eddade274a5cb684b5e5e890eef67ad25 commit a3fa657eddade274a5cb684b5e5e890eef67ad25 Author: Warner Losh AuthorDate: 2025-04-09 21:16:56 +0000 Commit: Warner Losh CommitDate: 2025-04-09 21:16:56 +0000 efi/metadata: Make a note that efi_map_header isn't standard efi_map_header is similar to, but not at all the same as the UEFI EFI_MEMORY_ATTRIBUTES_TABLE (we could easily have used the latter though, with one fewer non-standard types, but we can't change it easily now due to the last 10 years of boot loaders passing this in). Sponsored by: Netflix --- sys/arm/include/metadata.h | 11 ++++++++--- sys/arm64/include/metadata.h | 11 ++++++++--- sys/riscv/include/metadata.h | 11 ++++++++--- sys/x86/include/metadata.h | 11 ++++++++--- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h index 49f3a32826b8..d6f6f5ac8553 100644 --- a/sys/arm/include/metadata.h +++ b/sys/arm/include/metadata.h @@ -33,10 +33,15 @@ #define MODINFOMD_DTBP 0x1002 #define MODINFOMD_EFI_MAP 0x1003 +/* + * This is not the same as the UEFI standard EFI_MEMORY_ATTRIBUTES_TABLE, though + * memory_size / descritpr_size entries of EFI_MEMORY_DESCRIPTORS follow this table + * starting at a 16-byte alignment. + */ struct efi_map_header { - uint64_t memory_size; - uint64_t descriptor_size; - uint32_t descriptor_version; + uint64_t memory_size; /* Numnber of bytes that follow */ + uint64_t descriptor_size; /* Size of each EFI_MEMORY_DESCRIPTOR */ + uint32_t descriptor_version; /* Currently '1' */ }; /* diff --git a/sys/arm64/include/metadata.h b/sys/arm64/include/metadata.h index 7459aa90a6e2..30ec5115e670 100644 --- a/sys/arm64/include/metadata.h +++ b/sys/arm64/include/metadata.h @@ -31,10 +31,15 @@ #define MODINFOMD_DTBP 0x1002 #define MODINFOMD_EFI_FB 0x1003 +/* + * This is not the same as the UEFI standard EFI_MEMORY_ATTRIBUTES_TABLE, though + * memory_size / descritpr_size entries of EFI_MEMORY_DESCRIPTORS follow this table + * starting at a 16-byte alignment. + */ struct efi_map_header { - size_t memory_size; - size_t descriptor_size; - uint32_t descriptor_version; + size_t memory_size; /* Numnber of bytes that follow */ + size_t descriptor_size; /* Size of each EFI_MEMORY_DESCRIPTOR */ + uint32_t descriptor_version; /* Currently '1' */ }; struct efi_fb { diff --git a/sys/riscv/include/metadata.h b/sys/riscv/include/metadata.h index ddbad3fae3b4..7f7b763577e3 100644 --- a/sys/riscv/include/metadata.h +++ b/sys/riscv/include/metadata.h @@ -33,10 +33,15 @@ #define MODINFOMD_EFI_FB 0x1003 #define MODINFOMD_BOOT_HARTID 0x1004 +/* + * This is not the same as the UEFI standard EFI_MEMORY_ATTRIBUTES_TABLE, though + * memory_size / descritpr_size entries of EFI_MEMORY_DESCRIPTORS follow this table + * starting at a 16-byte alignment. + */ struct efi_map_header { - size_t memory_size; - size_t descriptor_size; - uint32_t descriptor_version; + size_t memory_size; /* Numnber of bytes that follow */ + size_t descriptor_size; /* Size of each EFI_MEMORY_DESCRIPTOR */ + uint32_t descriptor_version; /* Currently '1' */ }; /* diff --git a/sys/x86/include/metadata.h b/sys/x86/include/metadata.h index b3eb4b16c1ba..dd8a8ef6c73d 100644 --- a/sys/x86/include/metadata.h +++ b/sys/x86/include/metadata.h @@ -36,10 +36,15 @@ #define MODINFOMD_VBE_FB 0x1007 #define MODINFOMD_EFI_ARCH 0x1008 +/* + * This is not the same as the UEFI standard EFI_MEMORY_ATTRIBUTES_TABLE, though + * memory_size / descritpr_size entries of EFI_MEMORY_DESCRIPTORS follow this table + * starting at a 16-byte alignment. + */ struct efi_map_header { - uint64_t memory_size; - uint64_t descriptor_size; - uint32_t descriptor_version; + uint64_t memory_size; /* Numnber of bytes that follow */ + uint64_t descriptor_size; /* Size of each EFI_MEMORY_DESCRIPTOR */ + uint32_t descriptor_version; /* Currently '1' */ }; struct efi_fb {