add EDK2 compatible system information report

Author: pbatard

boot.c

@@ -142,61 +142,6 @@ static VOID DisconnectBlockingDrivers(VOID) {
 	FreePool(Handles);
 }
 
-#if defined(_GNU_EFI)
-
-/*
- * Query SMBIOS to display some info about the system hardware and UEFI firmware.
- * Also display the current Secure Boot status.
- */
-static EFI_STATUS PrintSystemInfo(VOID)
-{
-	EFI_STATUS Status;
-	SMBIOS_STRUCTURE_POINTER Smbios;
-	SMBIOS_STRUCTURE_TABLE* SmbiosTable;
-	SMBIOS3_STRUCTURE_TABLE* Smbios3Table;
-	UINT8 Found = 0, *Raw;
-	UINTN MaximumSize, ProcessedSize = 0;
-
-	PrintInfo(L"UEFI v%d.%d (%s, 0x%08X)", gST->Hdr.Revision >> 16, gST->Hdr.Revision & 0xFFFF,
-		gST->FirmwareVendor, gST->FirmwareRevision);
-
-	Status = LibGetSystemConfigurationTable(&SMBIOS3TableGuid, (VOID**)&Smbios3Table);
-	if (Status == EFI_SUCCESS) {
-		Smbios.Hdr = (SMBIOS_HEADER*)Smbios3Table->TableAddress;
-		MaximumSize = (UINTN)Smbios3Table->TableMaximumSize;
-	} else {
-		Status = LibGetSystemConfigurationTable(&SMBIOSTableGuid, (VOID**)&SmbiosTable);
-		if (EFI_ERROR(Status))
-			return EFI_NOT_FOUND;
-		Smbios.Hdr = (SMBIOS_HEADER*)(UINTN)SmbiosTable->TableAddress;
-		MaximumSize = (UINTN)SmbiosTable->TableLength;
-	}
-
-	while ((Smbios.Hdr->Type != 0x7F) && (Found < 2)) {
-		Raw = Smbios.Raw;
-		if (Smbios.Hdr->Type == 0) {
-			PrintInfo(L"%a %a", LibGetSmbiosString(&Smbios, Smbios.Type0->Vendor),
-				LibGetSmbiosString(&Smbios, Smbios.Type0->BiosVersion));
-			Found++;
-		}
-		if (Smbios.Hdr->Type == 1) {
-			PrintInfo(L"%a %a", LibGetSmbiosString(&Smbios, Smbios.Type1->Manufacturer),
-				LibGetSmbiosString(&Smbios, Smbios.Type1->ProductName));
-			Found++;
-		}
-		LibGetSmbiosString(&Smbios, -1);
-		ProcessedSize += (UINTN)Smbios.Raw - (UINTN)Raw;
-		if (ProcessedSize > MaximumSize) {
-			PrintWarning(L"Aborting system report due to noncompliant SMBIOS");
-			return EFI_ABORTED;
-		}
-	}
-
-	return EFI_SUCCESS;
-}
-
-#endif /* _GNUEFI */
-
 /*
  * Application entry-point
  * NB: This must be set to 'efi_main' for gnu-efi crt0 compatibility
@@ -232,9 +177,7 @@ EFI_STATUS EFIAPI efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable
 	gST->ConOut->ClearScreen(gST->ConOut);
 
 	Print(L"\n*** UEFI:NTFS %s (%s) ***\n\n", VERSION_STRING, Arch);
-#if defined(_GNU_EFI)
 	PrintSystemInfo();
-#endif
 	SecureBootStatus = GetSecureBootStatus();
 	PrintInfo(L"Secure Boot status: %s",
 		(SecureBootStatus > 0) ? L"Enabled" :

boot.h

@@ -23,6 +23,12 @@
 #include <efistdarg.h>
 #include <libsmbios.h>
 
+#define gEfiSmbios3TableGuid SMBIOS3TableGuid
+#define gEfiSmbiosTableGuid SMBIOSTableGuid
+#define SMBIOS_STRUCTURE SMBIOS_HEADER
+#define SMBIOS_TABLE_ENTRY_POINT SMBIOS_STRUCTURE_TABLE
+#define SMBIOS_TABLE_3_0_ENTRY_POINT SMBIOS3_STRUCTURE_TABLE
+
 #else /* EDK2 */
 
 #include <Base.h>
@@ -52,6 +58,9 @@
 #include <Guid/FileInfo.h>
 #include <Guid/FileSystemInfo.h>
 #include <Guid/FileSystemVolumeLabelInfo.h>
+#include <Guid/SmBios.h>
+
+#include <IndustryStandard/SmBios.h>
 
 #endif /* __MAKEWITH_GNUEFI */
 
@@ -90,6 +99,17 @@
 /* Convenience assertion macro */
 #define P_ASSERT(f, l, a)   if(!(a)) do { Print(L"*** ASSERT FAILED: %a(%d): %a ***\n", f, l, #a); while(1); } while(0)
 
+/*
+ * EDK2 and gnu-efi's CompareGuid() return opposite values for a match!
+ * EDK2 returns boolean TRUE, whereas gnu-efi returns INTN 0, so we
+ * define a common boolean macro that follows EDK2 convention always.
+ */
+#if defined(_GNU_EFI)
+#define COMPARE_GUID(a, b) (CompareGuid(a, b) == 0)
+#else
+#define COMPARE_GUID CompareGuid
+#endif
+
 /*
  * Secure string length, that asserts if the string is NULL or if
  * the length is larger than a predetermined value (STRING_MAX)
@@ -158,4 +178,5 @@ EFI_DEVICE_PATH* GetParentDevice(CONST EFI_DEVICE_PATH* DevicePath);
 INTN CompareDevicePaths(CONST EFI_DEVICE_PATH* dp1, CONST EFI_DEVICE_PATH* dp2);
 EFI_STATUS SetPathCase(CONST EFI_FILE_HANDLE Root, CHAR16* Path);
 CHAR16* DevicePathToString(CONST EFI_DEVICE_PATH* DevicePath);
+EFI_STATUS PrintSystemInfo(VOID);
 INTN GetSecureBootStatus(VOID);

system.c

@@ -1,6 +1,7 @@
 /*
  * uefi-ntfs: UEFI → NTFS/exFAT chain loader - System Information
  * Copyright © 2014-2021 Pete Batard <pete@akeo.ie>
+ * With parts from EDK © 1998  Intel Corporation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +19,115 @@
 
 #include "boot.h"
 
+/*
+ * Read a system configuration table from a TableGuid.
+ */
+static EFI_STATUS GetSystemConfigurationTable(EFI_GUID* TableGuid, VOID** Table)
+{
+	UINTN Index;
+	P_ASSERT(__FILE__, __LINE__, Table != NULL);
+
+	for (Index = 0; Index < gST->NumberOfTableEntries; Index++) {
+		if (COMPARE_GUID(TableGuid, &(gST->ConfigurationTable[Index].VendorGuid))) {
+			*Table = gST->ConfigurationTable[Index].VendorTable;
+			return EFI_SUCCESS;
+		}
+	}
+	return EFI_NOT_FOUND;
+}
+
+/*
+ * Return SMBIOS string given the string number.
+ * Arguments:
+ *  Smbios          - Pointer to SMBIOS structure
+ *  StringNumber    - String number to return. 0xFFFF can be used to skip all
+ *                    strings and point to the next SMBIOS structure.
+ * Returns:
+ *  Pointer to string, or pointer to next SMBIOS structure if StringNumber == 0xFFFF.
+ */
+static CHAR8* GetSmbiosString(SMBIOS_STRUCTURE_POINTER* Smbios, UINT16 StringNumber)
+{
+	UINT16 Index;
+	CHAR8* String;
+
+	// Skip over formatted section
+	String = (CHAR8*)(Smbios->Raw + Smbios->Hdr->Length);
+
+	// Look through unformated section
+	for (Index = 1; Index <= StringNumber; Index++) {
+		if (StringNumber == Index)
+			return String;
+
+		// Skip string
+		for (; *String != 0; String++);
+		String++;
+
+		if (*String == 0) {
+			// If double NUL then we are done.
+			// Return pointer to next structure in Smbios.
+			// If you pass 0xFFFF for StringNumber you always get here.
+			Smbios->Raw = (UINT8*)++String;
+			return NULL;
+		}
+	}
+	return NULL;
+}
+
+/*
+ * Query SMBIOS to display some info about the system hardware and UEFI firmware.
+ */
+EFI_STATUS PrintSystemInfo(VOID)
+{
+	EFI_STATUS Status;
+	SMBIOS_STRUCTURE_POINTER Smbios;
+	SMBIOS_TABLE_ENTRY_POINT* SmbiosTable;
+	SMBIOS_TABLE_3_0_ENTRY_POINT* Smbios3Table;
+	UINT8 Found = 0, *Raw;
+	UINTN MaximumSize, ProcessedSize = 0;
+
+	PrintInfo(L"UEFI v%d.%d (%s, 0x%08X)", gST->Hdr.Revision >> 16, gST->Hdr.Revision & 0xFFFF,
+		gST->FirmwareVendor, gST->FirmwareRevision);
+
+	Status = GetSystemConfigurationTable(&gEfiSmbios3TableGuid, (VOID**)&Smbios3Table);
+	if (Status == EFI_SUCCESS) {
+		Smbios.Hdr = (SMBIOS_STRUCTURE*)(UINTN)Smbios3Table->TableAddress;
+		MaximumSize = (UINTN)Smbios3Table->TableMaximumSize;
+	} else {
+		Status = GetSystemConfigurationTable(&gEfiSmbiosTableGuid, (VOID**)&SmbiosTable);
+		if (EFI_ERROR(Status))
+			return EFI_NOT_FOUND;
+		Smbios.Hdr = (SMBIOS_STRUCTURE*)(UINTN)SmbiosTable->TableAddress;
+		MaximumSize = (UINTN)SmbiosTable->TableLength;
+	}
+	// Sanity check
+	if (MaximumSize > 1024 * 1024) {
+		PrintWarning(L"Aborting system report due to unexpected SMBIOS table length (0x%08X)", MaximumSize);
+		return EFI_ABORTED;
+	}
+
+	while ((Smbios.Hdr->Type != 0x7F) && (Found < 2)) {
+		Raw = Smbios.Raw;
+		if (Smbios.Hdr->Type == 0) {
+			PrintInfo(L"%a %a", GetSmbiosString(&Smbios, Smbios.Type0->Vendor),
+				GetSmbiosString(&Smbios, Smbios.Type0->BiosVersion));
+			Found++;
+		}
+		if (Smbios.Hdr->Type == 1) {
+			PrintInfo(L"%a %a", GetSmbiosString(&Smbios, Smbios.Type1->Manufacturer),
+				GetSmbiosString(&Smbios, Smbios.Type1->ProductName));
+			Found++;
+		}
+		GetSmbiosString(&Smbios, 0xFFFF);
+		ProcessedSize += (UINTN)Smbios.Raw - (UINTN)Raw;
+		if (ProcessedSize > MaximumSize) {
+			PrintWarning(L"Aborting system report due to noncompliant SMBIOS");
+			return EFI_ABORTED;
+		}
+	}
+
+	return EFI_SUCCESS;
+}
+
 /*
  * Query the Secure Boot related firmware variables.
  * Returns:

uefi-ntfs.inf

@@ -42,6 +42,8 @@
 [Guids]
   gEfiFileSystemInfoGuid
   gEfiFileSystemVolumeLabelInfoIdGuid
+  gEfiSmbiosTableGuid
+  gEfiSmbios3TableGuid
 
 [Protocols]
   gEfiBlockIoProtocolGuid