sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frontpage: get SMBIOS Data from table directly

Browse Source 
rather than getting it from the EFI SMBIOS protocol
This commit is contained in:
CoolStar
2016-12-08 16:15:14 -08:00
committed by Matt DeVillier
parent 0286bfae44
commit bdd22050f6
1 changed files with 105 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
View File

@@ -688,6 +688,42 @@ GetOptionalStringByIndex (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
UINT16 SmbiosTableLength (SMBIOS_STRUCTURE_POINTER SmbiosTableN)
{
CHAR8 *AChar;
UINT16 Length;
AChar = (CHAR8 *)(SmbiosTableN.Raw + SmbiosTableN.Hdr->Length);
while ((*AChar != 0) || (*(AChar + 1) != 0)) {
AChar ++; //stop at 00 - first 0
}
Length = (UINT16)((UINTN)AChar - (UINTN)SmbiosTableN.Raw + 2); //length includes 00
return Length;
}
SMBIOS_STRUCTURE_POINTER GetSmbiosTableFromType (
SMBIOS_TABLE_ENTRY_POINT *SmbiosPoint, UINT8 SmbiosType, UINTN IndexTable)
{
SMBIOS_STRUCTURE_POINTER SmbiosTableN;
UINTN SmbiosTypeIndex;
SmbiosTypeIndex = 0;
SmbiosTableN.Raw = (UINT8 *)((UINTN)SmbiosPoint->TableAddress);
if (SmbiosTableN.Raw == NULL) {
return SmbiosTableN;
}
while ((SmbiosTypeIndex != IndexTable) || (SmbiosTableN.Hdr->Type != SmbiosType)) {
if (SmbiosTableN.Hdr->Type == SMBIOS_TYPE_END_OF_TABLE) {
SmbiosTableN.Raw = NULL;
return SmbiosTableN;
}
if (SmbiosTableN.Hdr->Type == SmbiosType) {
SmbiosTypeIndex++;
}
SmbiosTableN.Raw = (UINT8 *)(SmbiosTableN.Raw + SmbiosTableLength (SmbiosTableN));
}
return SmbiosTableN;
}
VOID VOID
GetDeviceNameFromProduct ( GetDeviceNameFromProduct (
@@ -806,13 +842,9 @@ UpdateFrontPageStrings (
CHAR16 *NewString3; CHAR16 *NewString3;
EFI_STATUS Status; EFI_STATUS Status;
EFI_STRING_ID TokenToUpdate; EFI_STRING_ID TokenToUpdate;
EFI_SMBIOS_HANDLE SmbiosHandle; EFI_PHYSICAL_ADDRESS *Table;
EFI_SMBIOS_PROTOCOL *Smbios; SMBIOS_TABLE_ENTRY_POINT *EntryPoint;
SMBIOS_TABLE_TYPE0 *Type0Record; SMBIOS_STRUCTURE_POINTER SmbiosTable;
SMBIOS_TABLE_TYPE1 *Type1Record;
SMBIOS_TABLE_TYPE4 *Type4Record;
SMBIOS_TABLE_TYPE19 *Type19Record;
EFI_SMBIOS_TABLE_HEADER *Record;
UINT64 InstalledMemory; UINT64 InstalledMemory;
InstalledMemory = 0; InstalledMemory = 0;
@@ -820,37 +852,37 @@ UpdateFrontPageStrings (
// //
// Update Front Page strings // Update Front Page strings
// //
Status = gBS->LocateProtocol ( Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &Table);
&gEfiSmbiosProtocolGuid, if (EFI_ERROR (Status) || Table == NULL) {
NULL, } else {
(VOID **) &Smbios EntryPoint = (SMBIOS_TABLE_ENTRY_POINT*)Table;
);
if (!EFI_ERROR (Status)) { SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_BIOS_INFORMATION , 0);
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; if (SmbiosTable.Raw == NULL) {
Status = Smbios->GetNext (Smbios, &SmbiosHandle, NULL, &Record, NULL); } else {
while (!EFI_ERROR(Status)) {
NewString3 = AllocateZeroPool (0x60); NewString3 = AllocateZeroPool (0x60);
if (Record->Type == EFI_SMBIOS_TYPE_BIOS_INFORMATION) { StrIndex = SmbiosTable.Type0->BiosVersion;
Type0Record = (SMBIOS_TABLE_TYPE0 *) Record; Str2Index = SmbiosTable.Type0->BiosReleaseDate;
StrIndex = Type0Record->BiosVersion; GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), StrIndex, &NewString);
Str2Index = Type0Record->BiosReleaseDate; GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), Str2Index, &NewString2);
GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type0Record + Type0Record->Hdr.Length), StrIndex, &NewString);
GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type0Record + Type0Record->Hdr.Length), Str2Index, &NewString2);
StrCatS (NewString3, 0x40 / sizeof (CHAR16), L"FW: "); StrCatS (NewString3, 0x40 / sizeof (CHAR16), L"FW: ");
StrCatS (NewString3, 0x40 / sizeof (CHAR16), NewString2);
StrCatS (NewString3, 0x40 / sizeof (CHAR16), L"::");
StrCatS (NewString3, 0x40 / sizeof (CHAR16), NewString); StrCatS (NewString3, 0x40 / sizeof (CHAR16), NewString);
StrCatS (NewString3, 0x40 / sizeof (CHAR16), L" ");
StrCatS (NewString3, 0x40 / sizeof (CHAR16), NewString2);
TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION); TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION);
HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString3, NULL); HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString3, NULL);
FreePool (NewString); FreePool (NewString);
} }
if (Record->Type == SMBIOS_TYPE_SYSTEM_INFORMATION) { SmbiosTable = GetSmbiosTableFromType (EntryPoint, SMBIOS_TYPE_SYSTEM_INFORMATION , 0);
Type1Record = (SMBIOS_TABLE_TYPE1 *) Record; if (SmbiosTable.Raw == NULL) {
StrIndex = Type1Record->ProductName; } else {
Str2Index = Type1Record->Manufacturer; NewString3 = AllocateZeroPool (0x60);
GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type1Record + Type1Record->Hdr.Length), StrIndex, &NewString);
StrIndex = SmbiosTable.Type1->ProductName;
Str2Index = SmbiosTable.Type1->Manufacturer;
GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), StrIndex, &NewString);
NewString2 = AllocateZeroPool (0x60); NewString2 = AllocateZeroPool (0x60);
GetDeviceNameFromProduct(NewString, &NewString2); GetDeviceNameFromProduct(NewString, &NewString2);
StrCatS (NewString3, 0x60 / sizeof (CHAR16), NewString2); StrCatS (NewString3, 0x60 / sizeof (CHAR16), NewString2);
@@ -862,41 +894,33 @@ UpdateFrontPageStrings (
FreePool (NewString); FreePool (NewString);
} }
if (Record->Type == SMBIOS_TYPE_PROCESSOR_INFORMATION) { SmbiosTable = GetSmbiosTableFromType (EntryPoint, SMBIOS_TYPE_PROCESSOR_INFORMATION , 0);
Type4Record = (SMBIOS_TABLE_TYPE4 *) Record; if (SmbiosTable.Raw == NULL) {
StrIndex = Type4Record->ProcessorVersion; } else {
GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type4Record + Type4Record->Hdr.Length), StrIndex, &NewString); StrIndex = SmbiosTable.Type4->ProcessorVersion;
GetOptionalStringByIndex ((CHAR8*)((UINT8*)SmbiosTable.Raw + SmbiosTable.Hdr->Length), StrIndex, &NewString);
TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_CPU_MODEL); TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_CPU_MODEL);
HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString, NULL); HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString, NULL);
FreePool (NewString); FreePool (NewString);
} }
// if (Record->Type == SMBIOS_TYPE_PROCESSOR_INFORMATION) { SmbiosTable = GetSmbiosTableFromType (EntryPoint, SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS , 0);
// Type4Record = (SMBIOS_TABLE_TYPE4 *) Record; if (SmbiosTable.Raw == NULL) {
// ConvertProcessorToString(Type4Record->CurrentSpeed, 6, &NewString);
// TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_CPU_SPEED);
// HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString, NULL);
// FreePool (NewString);
// }
if ( Record->Type == SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS ) {
Type19Record = (SMBIOS_TABLE_TYPE19 *) Record;
if (Type19Record->StartingAddress != 0xFFFFFFFF ) {
InstalledMemory += RShiftU64(Type19Record->EndingAddress -
Type19Record->StartingAddress + 1, 10);
} else { } else {
InstalledMemory += RShiftU64(Type19Record->ExtendedEndingAddress - if (SmbiosTable.Type19->StartingAddress != 0xFFFFFFFF ) {
Type19Record->ExtendedStartingAddress + 1, 20); InstalledMemory += RShiftU64(SmbiosTable.Type19->EndingAddress -
SmbiosTable.Type19->StartingAddress + 1, 10);
} else {
InstalledMemory += RShiftU64(SmbiosTable.Type19->ExtendedEndingAddress -
SmbiosTable.Type19->ExtendedStartingAddress + 1, 20);
} }
// now update the total installed RAM size // now update the total installed RAM size
ConvertMemorySizeToString ((UINT32)InstalledMemory, &NewString ); ConvertMemorySizeToString ((UINT32)InstalledMemory, &NewString );
TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_MEMORY_SIZE); TokenToUpdate = STRING_TOKEN (STR_FRONT_PAGE_MEMORY_SIZE);
HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString, NULL); HiiSetString (gFrontPagePrivate.HiiHandle, TokenToUpdate, NewString, NULL);
FreePool (NewString); FreePool (NewString);
} }
Status = Smbios->GetNext (Smbios, &SmbiosHandle, NULL, &Record, NULL);
}
} }
return ; return ;