Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 25 Jan 2018 20:09:51 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328411 - in head/stand/efi: include loader
Message-ID:  <201801252009.w0PK9pP0052698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: emaste
Date: Thu Jan 25 20:09:51 2018
New Revision: 328411
URL: https://svnweb.freebsd.org/changeset/base/328411

Log:
  loader.efi: add missing EFI GUIDs
  
  These were found during bring-up on a new arm64 platform and in an
  amd64 VM.
  
  Submitted by:	Arshan Khanifar <arshankhanifar_gmail.com>
  Reviewed by:	imp
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D14036

Modified:
  head/stand/efi/include/efiapi.h
  head/stand/efi/loader/main.c

Modified: head/stand/efi/include/efiapi.h
==============================================================================
--- head/stand/efi/include/efiapi.h	Thu Jan 25 19:57:21 2018	(r328410)
+++ head/stand/efi/include/efiapi.h	Thu Jan 25 20:09:51 2018	(r328411)
@@ -840,6 +840,9 @@ typedef struct {
 #define SMBIOS_TABLE_GUID \
     { 0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }
 
+#define SMBIOS3_TABLE_GUID \
+	{ 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
+
 #define SAL_SYSTEM_TABLE_GUID  \
     { 0xeb9d2d32, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }
 
@@ -851,6 +854,15 @@ typedef struct {
 
 #define HOB_LIST_TABLE_GUID \
     { 0x7739f24c, 0x93d7, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }
+
+#define LZMA_DECOMPRESSION_GUID \
+	{ 0xee4e5898, 0x3914, 0x4259, {0x9d, 0x6e, 0xdc, 0x7b, 0xd7, 0x94, 0x3, 0xcf} }
+
+#define ARM_MP_CORE_INFO_TABLE_GUID \
+	{ 0xa4ee0728, 0xe5d7, 0x4ac5, {0xb2, 0x1e, 0x65, 0x8e, 0xd8, 0x57, 0xe8, 0x34} }
+
+#define ESRT_TABLE_GUID \
+	{ 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
 
 #define MEMORY_TYPE_INFORMATION_TABLE_GUID \
     { 0x4c19049f, 0x4137, 0x4dd3, {0x9c, 0x10, 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa} }

Modified: head/stand/efi/loader/main.c
==============================================================================
--- head/stand/efi/loader/main.c	Thu Jan 25 19:57:21 2018	(r328410)
+++ head/stand/efi/loader/main.c	Thu Jan 25 20:09:51 2018	(r328411)
@@ -65,8 +65,12 @@ EFI_GUID imgid = LOADED_IMAGE_PROTOCOL;
 EFI_GUID mps = MPS_TABLE_GUID;
 EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
 EFI_GUID smbios = SMBIOS_TABLE_GUID;
+EFI_GUID smbios3 = SMBIOS3_TABLE_GUID;
 EFI_GUID dxe = DXE_SERVICES_TABLE_GUID;
 EFI_GUID hoblist = HOB_LIST_TABLE_GUID;
+EFI_GUID lzmadecomp = LZMA_DECOMPRESSION_GUID;
+EFI_GUID mpcore = ARM_MP_CORE_INFO_TABLE_GUID;
+EFI_GUID esrt = ESRT_TABLE_GUID;
 EFI_GUID memtype = MEMORY_TYPE_INFORMATION_TABLE_GUID;
 EFI_GUID debugimg = DEBUG_IMAGE_INFO_TABLE_GUID;
 EFI_GUID fdtdtb = FDT_TABLE_GUID;
@@ -655,10 +659,18 @@ command_configuration(int argc, char *argv[])
 		else if (!memcmp(guid, &smbios, sizeof(EFI_GUID)))
 			printf("SMBIOS Table %p",
 			    ST->ConfigurationTable[i].VendorTable);
+		else if (!memcmp(guid, &smbios3, sizeof(EFI_GUID)))
+			printf("SMBIOS3 Table");
 		else if (!memcmp(guid, &dxe, sizeof(EFI_GUID)))
 			printf("DXE Table");
 		else if (!memcmp(guid, &hoblist, sizeof(EFI_GUID)))
 			printf("HOB List Table");
+		else if (!memcmp(guid, &lzmadecomp, sizeof(EFI_GUID)))
+			printf("LZMA Compression");
+		else if (!memcmp(guid, &mpcore, sizeof(EFI_GUID)))
+			printf("ARM MpCore Information Table");
+		else if (!memcmp(guid, &esrt, sizeof(EFI_GUID)))
+			printf("ESRT Table");
 		else if (!memcmp(guid, &memtype, sizeof(EFI_GUID)))
 			printf("Memory Type Information Table");
 		else if (!memcmp(guid, &debugimg, sizeof(EFI_GUID)))

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801252009.w0PK9pP0052698>