2019-09-03 11:58:42 +02:00
|
|
|
/**
|
|
|
|
smbios.c
|
|
|
|
original idea of SMBIOS patching by mackerintel
|
|
|
|
implementation for UEFI smbios table patching
|
|
|
|
Slice 2011.
|
|
|
|
|
|
|
|
portion copyright Intel
|
|
|
|
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
|
|
|
|
This program and the accompanying materials
|
|
|
|
are licensed and made available under the terms and conditions of the BSD License
|
|
|
|
which accompanies this distribution. The full text of the license may be found at
|
|
|
|
http://opensource.org/licenses/bsd-license.php
|
|
|
|
|
|
|
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
|
|
|
|
|
|
Module Name:
|
|
|
|
|
|
|
|
SmbiosGen.c
|
|
|
|
**/
|
|
|
|
|
2020-08-17 21:40:52 +02:00
|
|
|
#include <Platform.h> // Only use angled for Platform, else, xcode project won't compile
|
2021-02-06 18:16:46 +01:00
|
|
|
#include <Efi.h>
|
|
|
|
|
2020-04-16 09:48:13 +02:00
|
|
|
#include "smbios.h"
|
2020-04-16 09:15:26 +02:00
|
|
|
#include "cpu.h"
|
|
|
|
#include "platformdata.h"
|
|
|
|
#include "AcpiPatcher.h"
|
2020-09-23 15:47:47 +02:00
|
|
|
#include "guid.h"
|
2020-04-10 16:35:24 +02:00
|
|
|
|
2019-09-03 11:58:42 +02:00
|
|
|
#ifndef DEBUG_ALL
|
|
|
|
#define DEBUG_SMBIOS 1
|
|
|
|
#else
|
|
|
|
#define DEBUG_SMBIOS DEBUG_ALL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if DEBUG_SMBIOS == 0
|
|
|
|
#define DBG(...)
|
|
|
|
#else
|
|
|
|
#define DBG(...) DebugLog(DEBUG_SMBIOS, __VA_ARGS__)
|
|
|
|
#endif
|
|
|
|
|
2020-04-16 09:48:13 +02:00
|
|
|
#define REMAP_SMBIOS_TABLE_GUID { 0xeb9d2d35, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }
|
|
|
|
|
2019-09-03 11:58:42 +02:00
|
|
|
#define MAX_OEM_STRING 256
|
|
|
|
|
2020-04-16 11:09:22 +02:00
|
|
|
#define ROUND_PAGE(x) ((((unsigned)(x)) + EFI_PAGE_SIZE - 1) & ~(EFI_PAGE_SIZE - 1))
|
|
|
|
|
|
|
|
|
|
|
|
|
2019-09-03 11:58:42 +02:00
|
|
|
EFI_GUID *gTableGuidArray[] = {&gEfiSmbiosTableGuid, &gEfiSmbios3TableGuid};
|
2020-04-09 19:01:23 +02:00
|
|
|
|
2021-04-08 17:07:05 +02:00
|
|
|
constexpr LString8 unknown = "unknown"_XS8;
|
2019-09-03 11:58:42 +02:00
|
|
|
//
|
|
|
|
// syscl: implement Dell truncate fix
|
|
|
|
// remap EFI_SMBIOS_TABLE_1 to new guid to fix Dell
|
|
|
|
// SMBIOS Table 1 truncate issue credit David Passmore
|
|
|
|
//
|
|
|
|
EFI_GUID gRemapEfiSmbiosTableGuid = REMAP_SMBIOS_TABLE_GUID;
|
|
|
|
|
|
|
|
//EFI_PHYSICAL_ADDRESS *smbiosTable;
|
2020-10-03 19:02:31 +02:00
|
|
|
void *Smbios; //pointer to SMBIOS data
|
2019-09-03 11:58:42 +02:00
|
|
|
SMBIOS_TABLE_ENTRY_POINT *EntryPoint; //SmbiosEps original
|
|
|
|
SMBIOS_TABLE_ENTRY_POINT *SmbiosEpsNew; //new SmbiosEps
|
|
|
|
//for patching
|
|
|
|
APPLE_SMBIOS_STRUCTURE_POINTER SmbiosTable;
|
|
|
|
APPLE_SMBIOS_STRUCTURE_POINTER newSmbiosTable;
|
|
|
|
UINT16 NumberOfRecords;
|
|
|
|
UINT16 MaxStructureSize;
|
|
|
|
UINT8* Current; //pointer to the current end of tables
|
|
|
|
EFI_SMBIOS_TABLE_HEADER *Record;
|
|
|
|
EFI_SMBIOS_HANDLE Handle;
|
|
|
|
EFI_SMBIOS_TYPE Type;
|
|
|
|
|
|
|
|
UINTN stringNumber;
|
|
|
|
UINTN TableSize;
|
|
|
|
UINTN Index, Size, NewSize, MaxSize;
|
|
|
|
UINT16 CoreCache = 0;
|
|
|
|
UINT16 TotalCount = 0;
|
|
|
|
UINT16 L1, L2, L3;
|
|
|
|
UINT32 MaxMemory = 0;
|
|
|
|
UINT32 mTotalSystemMemory;
|
|
|
|
UINT64 gTotalMemory;
|
|
|
|
UINT16 mHandle3;
|
|
|
|
UINT16 mHandle16 = 0x1000;
|
|
|
|
UINT16 mHandle17[MAX_RAM_SLOTS];
|
|
|
|
UINT16 mHandle19;
|
|
|
|
UINT16 mMemory17[MAX_RAM_SLOTS];
|
|
|
|
UINT64 mInstalled[MAX_RAM_SLOTS];
|
|
|
|
UINT64 mEnabled[MAX_RAM_SLOTS];
|
|
|
|
BOOLEAN gMobile;
|
|
|
|
UINT8 gBootStatus;
|
|
|
|
BOOLEAN Once;
|
|
|
|
|
|
|
|
MEM_STRUCTURE gRAM;
|
|
|
|
//DMI* gDMI;
|
|
|
|
UINT8 gRAMCount = 0;
|
|
|
|
|
|
|
|
|
|
|
|
#define MAX_HANDLE 0xFEFF
|
|
|
|
#define SMBIOS_PTR SIGNATURE_32('_','S','M','_')
|
|
|
|
#define MAX_TABLE_SIZE 512
|
|
|
|
|
|
|
|
#define smbios_offsetof(s,m) ( (SMBIOS_TABLE_STRING) ((UINT8*)&((s*)0)->m - (UINT8*)0))
|
|
|
|
|
|
|
|
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE0_STR_IDX[] = {
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE0, Vendor),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE0, BiosVersion),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE0, BiosReleaseDate),
|
|
|
|
0x00
|
|
|
|
}; // offsets of structures that values are strings for type 0 Bios
|
|
|
|
|
|
|
|
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE1_STR_IDX[] = {
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, Manufacturer),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, ProductName),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, Version),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, SerialNumber),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, SKUNumber),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE1, Family),
|
|
|
|
0x00
|
|
|
|
}; // offsets of structures that values are strings for type 1 System
|
|
|
|
|
|
|
|
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE2_STR_IDX[] = {
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, Manufacturer),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, ProductName),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, Version),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, SerialNumber),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, AssetTag),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE2, LocationInChassis),
|
|
|
|
0x00
|
|
|
|
}; // offsets of structures that values are strings for type 2 BaseBoard
|
|
|
|
|
|
|
|
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE3_STR_IDX[] = {
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE3, Manufacturer),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE3, Version),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE3, SerialNumber),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE3, AssetTag),
|
|
|
|
0x00
|
|
|
|
}; // offsets of structures that values are strings for type 3 Chassis
|
|
|
|
|
|
|
|
SMBIOS_TABLE_STRING SMBIOS_TABLE_TYPE4_STR_IDX[] = {
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, Socket),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, ProcessorManufacture),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, ProcessorVersion),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, SerialNumber),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, AssetTag),
|
|
|
|
smbios_offsetof(SMBIOS_TABLE_TYPE4, PartNumber),
|
|
|
|
0x00
|
|
|
|
}; // offsets of structures that values are strings for type 3 Chassis
|
|
|
|
|
|
|
|
/* Functions */
|
|
|
|
|
|
|
|
// validate the SMBIOS entry point structure
|
|
|
|
BOOLEAN IsEntryPointStructureValid (IN SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure)
|
|
|
|
{
|
|
|
|
UINTN I;
|
|
|
|
UINT8 Length;
|
|
|
|
UINT8 Checksum = 0;
|
|
|
|
UINT8 *BytePtr;
|
|
|
|
|
|
|
|
if (!EntryPointStructure)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
BytePtr = (UINT8*) EntryPointStructure;
|
|
|
|
Length = EntryPointStructure->EntryPointLength;
|
|
|
|
|
|
|
|
for (I = 0; I < Length; I++) {
|
|
|
|
Checksum = Checksum + (UINT8) BytePtr[I];
|
|
|
|
}
|
|
|
|
|
|
|
|
// a valid SMBIOS EPS must have checksum of 0
|
|
|
|
return (Checksum == 0);
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void* FindOemSMBIOSPtr (void)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
UINTN Address;
|
|
|
|
|
|
|
|
// Search 0x0f0000 - 0x0fffff for SMBIOS Ptr
|
|
|
|
for (Address = 0xf0000; Address < 0xfffff; Address += 0x10) {
|
|
|
|
if (*(UINT32 *)(Address) == SMBIOS_PTR && IsEntryPointStructureValid((SMBIOS_TABLE_ENTRY_POINT*)Address)) {
|
2020-10-03 19:02:31 +02:00
|
|
|
return (void *)Address;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void* GetSmbiosTablesFromHob (void)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
EFI_PHYSICAL_ADDRESS *Table;
|
|
|
|
EFI_PEI_HOB_POINTERS GuidHob;
|
|
|
|
|
2020-02-21 22:22:30 +01:00
|
|
|
GuidHob.Raw = (__typeof_am__(GuidHob.Raw))GetFirstGuidHob (&gEfiSmbiosTableGuid);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (GuidHob.Raw != NULL) {
|
2020-02-20 15:28:24 +01:00
|
|
|
Table = (__typeof__(Table))GET_GUID_HOB_DATA (GuidHob.Guid);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (Table != NULL) {
|
2020-10-03 19:02:31 +02:00
|
|
|
return (void *)(UINTN)*Table;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
}
|
2020-02-21 22:22:30 +01:00
|
|
|
GuidHob.Raw = (__typeof_am__(GuidHob.Raw))GetFirstGuidHob (&gEfiSmbios3TableGuid);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (GuidHob.Raw != NULL) {
|
2020-02-21 22:22:30 +01:00
|
|
|
Table = (__typeof_am__(Table))GET_GUID_HOB_DATA (GuidHob.Guid);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (Table != NULL) {
|
2020-10-03 19:02:31 +02:00
|
|
|
return (void *)(UINTN)*Table;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void* GetSmbiosTablesFromConfigTables (void)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
EFI_STATUS Status;
|
|
|
|
EFI_PHYSICAL_ADDRESS *Table;
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (void **)&Table);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (EFI_ERROR(Status) || Table == NULL) {
|
|
|
|
Table = NULL;
|
2020-10-03 19:02:31 +02:00
|
|
|
Status = EfiGetSystemConfigurationTable (&gEfiSmbios3TableGuid, (void **)&Table);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (EFI_ERROR(Status)) {
|
|
|
|
Table = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Table;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This function determines ascii string length ending by space.
|
|
|
|
// search restricted to MaxLen, for example
|
|
|
|
// iStrLen("ABC ", 20) == 3
|
|
|
|
// if MaxLen=0 then as usual strlen but bugless
|
2020-02-17 21:41:09 +01:00
|
|
|
UINTN iStrLen(CONST CHAR8* String, UINTN MaxLen)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
UINTN Len = 0;
|
2020-02-17 21:41:09 +01:00
|
|
|
CONST CHAR8* BA;
|
2019-09-03 11:58:42 +02:00
|
|
|
if(MaxLen > 0) {
|
|
|
|
for (Len=0; Len<MaxLen; Len++) {
|
|
|
|
if (String[Len] == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BA = &String[Len - 1];
|
|
|
|
while ((Len != 0) && ((*BA == ' ') || (*BA == 0))) {
|
|
|
|
BA--; Len--;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
BA = String;
|
|
|
|
while(*BA){BA++; Len++;}
|
|
|
|
}
|
|
|
|
return Len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Internal functions for flat SMBIOS
|
|
|
|
|
|
|
|
UINT16 SmbiosTableLength (APPLE_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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
EFI_SMBIOS_HANDLE LogSmbiosTable (APPLE_SMBIOS_STRUCTURE_POINTER SmbiosTableN)
|
|
|
|
{
|
|
|
|
UINT16 Length = SmbiosTableLength(SmbiosTableN);
|
|
|
|
if (Length > MaxStructureSize) {
|
|
|
|
MaxStructureSize = Length;
|
|
|
|
}
|
|
|
|
CopyMem(Current, SmbiosTableN.Raw, Length);
|
|
|
|
Current += Length;
|
|
|
|
NumberOfRecords++;
|
|
|
|
return SmbiosTableN.Hdr->Handle;
|
|
|
|
}
|
|
|
|
|
2020-04-09 19:01:23 +02:00
|
|
|
// the procedure insert Buffer into SmbiosTable by copy and update Field
|
|
|
|
// the Buffer restricted by zero or by space
|
2020-08-15 15:47:56 +02:00
|
|
|
EFI_STATUS UpdateSmbiosString(OUT APPLE_SMBIOS_STRUCTURE_POINTER SmbiosTableN,
|
|
|
|
SMBIOS_TABLE_STRING* Field, const XString8& Buffer)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
CHAR8* AString;
|
|
|
|
CHAR8* C1; //pointers for copy
|
|
|
|
CHAR8* C2;
|
|
|
|
UINTN Length = SmbiosTableLength(SmbiosTableN);
|
|
|
|
UINTN ALength, BLength;
|
|
|
|
UINT8 IndexStr = 1;
|
|
|
|
|
2020-08-15 15:47:56 +02:00
|
|
|
if ((SmbiosTableN.Raw == NULL) || Buffer.isEmpty() || !Field) {
|
2019-09-03 11:58:42 +02:00
|
|
|
return EFI_NOT_FOUND;
|
|
|
|
}
|
|
|
|
AString = (CHAR8*)(SmbiosTableN.Raw + SmbiosTableN.Hdr->Length); //first string
|
|
|
|
while (IndexStr != *Field) {
|
|
|
|
if (*AString) {
|
|
|
|
IndexStr++;
|
|
|
|
}
|
|
|
|
while (*AString != 0) AString++; //skip string at index
|
|
|
|
AString++; //next string
|
|
|
|
if (*AString == 0) {
|
|
|
|
//this is end of the table
|
|
|
|
if (*Field == 0) {
|
|
|
|
AString[1] = 0; //one more zero
|
|
|
|
}
|
|
|
|
*Field = IndexStr; //index of the next string that is empty
|
|
|
|
if (IndexStr == 1) {
|
|
|
|
AString--; //first string has no leading zero
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// AString is at place to copy
|
|
|
|
ALength = iStrLen(AString, 0);
|
2020-08-15 15:47:56 +02:00
|
|
|
BLength = iStrLen(Buffer.c_str(), MAX_OEM_STRING);
|
2019-09-03 11:58:42 +02:00
|
|
|
// DBG("Table type %d field %d\n", SmbiosTable.Hdr->Type, *Field);
|
|
|
|
// DBG("Old string length=%d new length=%d\n", ALength, BLength);
|
|
|
|
if (BLength > ALength) {
|
|
|
|
//Shift right
|
|
|
|
C1 = (CHAR8*)SmbiosTableN.Raw + Length; //old end
|
|
|
|
C2 = C1 + BLength - ALength; //new end
|
|
|
|
*C2 = 0;
|
|
|
|
while (C1 != AString) *(--C2) = *(--C1);
|
|
|
|
|
|
|
|
} else if (BLength < ALength) {
|
|
|
|
//Shift left
|
|
|
|
C1 = AString + ALength; //old start
|
|
|
|
C2 = AString + BLength; //new start
|
|
|
|
while (C1 != ((CHAR8*)SmbiosTableN.Raw + Length)) {
|
|
|
|
*C2++ = *C1++;
|
|
|
|
}
|
|
|
|
*C2 = 0;
|
|
|
|
*(--C2) = 0; //end of table
|
|
|
|
}
|
2020-11-18 22:49:02 +01:00
|
|
|
//DBG("UpdateSmbiosString() -> CopyMem %s %lld\n", Buffer.c_str(), BLength);
|
2020-08-15 15:47:56 +02:00
|
|
|
CopyMem(AString, Buffer.c_str(), BLength);
|
2019-09-03 11:58:42 +02:00
|
|
|
*(AString + BLength) = 0; // not sure there is 0
|
|
|
|
|
|
|
|
return EFI_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
APPLE_SMBIOS_STRUCTURE_POINTER GetSmbiosTableFromType (SMBIOS_TABLE_ENTRY_POINT *SmbiosPoint,
|
|
|
|
UINT8 SmbiosType, UINTN IndexTable)
|
|
|
|
{
|
|
|
|
APPLE_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;
|
|
|
|
}
|
|
|
|
|
|
|
|
CHAR8* GetSmbiosString (APPLE_SMBIOS_STRUCTURE_POINTER SmbiosTableN, SMBIOS_TABLE_STRING StringN)
|
|
|
|
{
|
|
|
|
CHAR8 *AString;
|
|
|
|
UINT8 Ind;
|
|
|
|
|
|
|
|
Ind = 1;
|
|
|
|
AString = (CHAR8 *)(SmbiosTableN.Raw + SmbiosTableN.Hdr->Length); //first string
|
|
|
|
while (Ind != StringN) {
|
|
|
|
while (*AString != 0) {
|
|
|
|
AString ++;
|
|
|
|
}
|
|
|
|
AString ++; //skip zero ending
|
|
|
|
if (*AString == 0) {
|
|
|
|
return AString; //this is end of the table
|
|
|
|
}
|
|
|
|
Ind++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return AString; //return pointer to Ascii string
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void AddSmbiosEndOfTable()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
SMBIOS_STRUCTURE* StructurePtr = (SMBIOS_STRUCTURE*)Current;
|
|
|
|
StructurePtr->Type = SMBIOS_TYPE_END_OF_TABLE;
|
|
|
|
StructurePtr->Length = sizeof(SMBIOS_STRUCTURE);
|
|
|
|
StructurePtr->Handle = SMBIOS_TYPE_INACTIVE; //spec 2.7 p.120
|
|
|
|
Current += sizeof(SMBIOS_STRUCTURE);
|
|
|
|
*Current++ = 0;
|
|
|
|
*Current++ = 0; //double 0 at the end
|
|
|
|
NumberOfRecords++;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void UniquifySmbiosTableStr (APPLE_SMBIOS_STRUCTURE_POINTER SmbiosTableN, SMBIOS_TABLE_STRING* str_idx)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
INTN i, j;
|
|
|
|
SMBIOS_TABLE_STRING cmp_idx;
|
|
|
|
SMBIOS_TABLE_STRING cmp_str;
|
|
|
|
SMBIOS_TABLE_STRING ref_str;
|
|
|
|
|
|
|
|
if (0 == str_idx[0]) return; // SMBIOS doesn't have string structures, just return;
|
|
|
|
for (i = 1; ;i++) {
|
|
|
|
cmp_idx = str_idx[i];
|
|
|
|
if (0 == cmp_idx) break;
|
|
|
|
cmp_str = SmbiosTableN.Raw[cmp_idx];
|
|
|
|
if (0 == cmp_str) continue; // if string is undefine, continue
|
|
|
|
for (j = 0; j < i; j++) {
|
|
|
|
ref_str = SmbiosTableN.Raw[str_idx[j]];
|
|
|
|
if (cmp_str == ref_str) {
|
|
|
|
SmbiosTableN.Raw[cmp_idx] = 0; // pretend the string doesn't exist
|
|
|
|
// UpdateSmbiosString(SmbiosTableN, &SmbiosTableN.Raw[cmp_idx], GetSmbiosString(SmbiosTableN, ref_str));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Patching Functions */
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType0()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// BIOS information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_BIOS_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
// DBG("SmbiosTable: Type 0 (Bios Information) not found!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type0, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type0, (void*)SmbiosTable.Type0, TableSize); //can't point to union
|
2019-09-03 11:58:42 +02:00
|
|
|
/* Real Mac
|
|
|
|
BIOS Information (Type 0)
|
|
|
|
Raw Data:
|
|
|
|
Header and Data:
|
|
|
|
00 18 2E 00 01 02 00 00 03 7F 80 98 01 00 00 00
|
|
|
|
00 00 C1 02 00 01 FF FF
|
|
|
|
Strings:
|
|
|
|
Apple Inc.
|
|
|
|
MBP81.88Z.0047.B22.1109281426
|
|
|
|
09/28/11
|
|
|
|
|
|
|
|
*/
|
|
|
|
newSmbiosTable.Type0->BiosSegment = 0; //like in Mac
|
|
|
|
newSmbiosTable.Type0->SystemBiosMajorRelease = 0;
|
|
|
|
newSmbiosTable.Type0->SystemBiosMinorRelease = 1;
|
|
|
|
// newSmbiosTable.Type0->BiosCharacteristics.BiosCharacteristicsNotSupported = 0;
|
|
|
|
// newSmbiosTable.Type0->BIOSCharacteristicsExtensionBytes[1] |= 8; //UefiSpecificationSupported;
|
|
|
|
//Slice: ----------------------
|
|
|
|
//there is a bug in AppleSMBIOS-42 v1.7
|
|
|
|
//to eliminate this I have to zero first byte in the field
|
|
|
|
*(UINT8*)&newSmbiosTable.Type0->BiosCharacteristics = 0;
|
|
|
|
//dunno about latest version but there is a way to set good characteristics
|
|
|
|
//if use patched AppleSMBIOS
|
|
|
|
//----------------
|
|
|
|
Once = TRUE;
|
|
|
|
|
|
|
|
UniquifySmbiosTableStr(newSmbiosTable, SMBIOS_TABLE_TYPE0_STR_IDX);
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BiosVendor.trim();
|
|
|
|
if( gSettings.Smbios.BiosVendor.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type0->Vendor, gSettings.Smbios.BiosVendor);
|
|
|
|
}
|
|
|
|
GlobalConfig.RomVersionUsed.trim();
|
|
|
|
if( GlobalConfig.RomVersionUsed.notEmpty() ) {
|
|
|
|
if( GlobalConfig.EfiVersionUsed.notEmpty() ) {
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("UpdateSmbiosString : BiosVersion=EfiVersion=%s\n", GlobalConfig.EfiVersionUsed.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type0->BiosVersion, GlobalConfig.EfiVersionUsed);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("UpdateSmbiosString : BiosVersion=RomVersion=%s\n", GlobalConfig.RomVersionUsed.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type0->BiosVersion, GlobalConfig.RomVersionUsed);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-05 10:57:55 +02:00
|
|
|
}else{
|
|
|
|
DBG("UpdateSmbiosString : BiosVersion no update\n");
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.ReleaseDateUsed.trim();
|
|
|
|
if( GlobalConfig.ReleaseDateUsed.notEmpty() ) {
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("UpdateSmbiosString : ReleaseDate=%s\n", GlobalConfig.ReleaseDateUsed.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type0->BiosReleaseDate, GlobalConfig.ReleaseDateUsed);
|
2021-04-05 10:57:55 +02:00
|
|
|
}else{
|
|
|
|
DBG("UpdateSmbiosString : ReleaseDate no update\n");
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType1()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
CHAR8* s;
|
|
|
|
// System Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
DBG("SmbiosTable: Type 1 (System Information) not found!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.SmUUID = GuidLEToXString8(SmbiosTable.Type1->Uuid);
|
2019-09-03 11:58:42 +02:00
|
|
|
s = GetSmbiosString(SmbiosTable, SmbiosTable.Type1->ProductName);
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.OEMProductFromSmbios.strncpy(s, iStrLen(s, 64)); //strncpy take care of ending zero
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType1()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// System Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//Increase table size
|
|
|
|
Size = SmbiosTable.Type1->Hdr.Length; //old size
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable); //including strings
|
|
|
|
NewSize = 27; //sizeof(SMBIOS_TABLE_TYPE1);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type1, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type1, (void*)SmbiosTable.Type1, Size); //copy main table
|
2019-09-03 11:58:42 +02:00
|
|
|
CopyMem((CHAR8*)newSmbiosTable.Type1+NewSize, (CHAR8*)SmbiosTable.Type1+Size, TableSize - Size); //copy strings
|
|
|
|
newSmbiosTable.Type1->Hdr.Length = (UINT8)NewSize;
|
|
|
|
|
|
|
|
UniquifySmbiosTableStr(newSmbiosTable, SMBIOS_TABLE_TYPE1_STR_IDX);
|
|
|
|
|
|
|
|
newSmbiosTable.Type1->WakeUpType = SystemWakeupTypePowerSwitch;
|
|
|
|
Once = TRUE;
|
|
|
|
|
2020-09-23 15:47:47 +02:00
|
|
|
EFI_GUID SmUUID;
|
2021-04-03 16:42:49 +02:00
|
|
|
StrToGuidLE(gSettings.Smbios.SmUUID, &SmUUID);
|
2020-09-23 15:47:47 +02:00
|
|
|
if((SmUUID.Data3 & 0xF000) != 0) {
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)&newSmbiosTable.Type1->Uuid, (void*)&SmUUID, sizeof(SmUUID));
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.ManufactureName.trim();
|
|
|
|
if( gSettings.Smbios.ManufactureName.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->Manufacturer, gSettings.Smbios.ManufactureName);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.ProductName.trim();
|
|
|
|
if( gSettings.Smbios.ProductName.notEmpty() ){
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("%s : UpdateSmbiosString ProductName=%s\n", __PRETTY_FUNCTION__, gSettings.Smbios.ProductName.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->ProductName, gSettings.Smbios.ProductName);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.VersionNr.trim();
|
|
|
|
if( gSettings.Smbios.VersionNr.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->Version, gSettings.Smbios.VersionNr);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.SerialNr.trim();
|
|
|
|
if( gSettings.Smbios.SerialNr.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->SerialNumber, gSettings.Smbios.SerialNr);
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("%s : UpdateSmbiosString SerialNr=%s\n", __PRETTY_FUNCTION__, gSettings.Smbios.SerialNr.c_str());
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardNumber.trim();
|
|
|
|
if( gSettings.Smbios.BoardNumber.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->SKUNumber, gSettings.Smbios.BoardNumber); //iMac17,1 - there is nothing
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.FamilyName.trim();
|
|
|
|
if( gSettings.Smbios.FamilyName.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type1->Family, gSettings.Smbios.FamilyName);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType2()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
CHAR8* s;
|
|
|
|
// System Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = GetSmbiosString(SmbiosTable, SmbiosTable.Type2->ProductName);
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.OEMBoardFromSmbios.strncpy(s, iStrLen(s, 64) + 1);
|
2019-09-03 11:58:42 +02:00
|
|
|
s = GetSmbiosString(SmbiosTable, SmbiosTable.Type2->Manufacturer);
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.OEMVendorFromSmbios.strncpy(s, iStrLen(s, 64) + 1);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType2()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// BaseBoard Information
|
|
|
|
//
|
|
|
|
NewSize = 0x10; //sizeof(SMBIOS_TABLE_TYPE2);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type2, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
MsgLog("SmbiosTable: Type 2 (BaseBoard Information) not found, create new\n");
|
|
|
|
//Create new one
|
|
|
|
newSmbiosTable.Type2->Hdr.Type = 2;
|
|
|
|
newSmbiosTable.Type2->Hdr.Handle = 0x0200; //common rule
|
|
|
|
|
|
|
|
} else {
|
|
|
|
Size = SmbiosTable.Type2->Hdr.Length; //old size
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable); //including strings
|
|
|
|
|
|
|
|
if (NewSize > Size) {
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)newSmbiosTable.Type2, (void*)SmbiosTable.Type2, Size); //copy main table
|
2019-09-03 11:58:42 +02:00
|
|
|
CopyMem((CHAR8*)newSmbiosTable.Type2 + NewSize, (CHAR8*)SmbiosTable.Type2 + Size, TableSize - Size); //copy strings
|
|
|
|
} else {
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)newSmbiosTable.Type2, (void*)SmbiosTable.Type2, TableSize); //copy full table
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
newSmbiosTable.Type2->Hdr.Length = (UINT8)NewSize;
|
|
|
|
newSmbiosTable.Type2->ChassisHandle = mHandle3; //from GetTableType3
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type2->BoardType = gSettings.Smbios.BoardType;
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)&newSmbiosTable.Type2->FeatureFlag, sizeof(BASE_BOARD_FEATURE_FLAGS));
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type2->FeatureFlag.Motherboard = 1;
|
|
|
|
newSmbiosTable.Type2->FeatureFlag.Replaceable = 1;
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.BoardType == 11) {
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type2->FeatureFlag.Removable = 1;
|
|
|
|
}
|
|
|
|
Once = TRUE;
|
|
|
|
|
|
|
|
UniquifySmbiosTableStr(newSmbiosTable, SMBIOS_TABLE_TYPE2_STR_IDX);
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardManufactureName.trim();
|
|
|
|
if( gSettings.Smbios.BoardManufactureName.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type2->Manufacturer, gSettings.Smbios.BoardManufactureName);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardNumber.trim();
|
|
|
|
if( gSettings.Smbios.BoardNumber.notEmpty() ){
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("%s : UpdateSmbiosString ProductName=BoardNumber=%s\n", __PRETTY_FUNCTION__, gSettings.Smbios.BoardNumber.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type2->ProductName, gSettings.Smbios.BoardNumber);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardVersion.trim();
|
|
|
|
if( gSettings.Smbios.BoardVersion.notEmpty() ){
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("%s : UpdateSmbiosString Version=BoardVersion=%s\n", __PRETTY_FUNCTION__, gSettings.Smbios.BoardVersion.c_str());
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type2->Version, gSettings.Smbios.BoardVersion); //iMac17,1 - there is ProductName
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardSerialNumber.trim();
|
|
|
|
if( gSettings.Smbios.BoardSerialNumber.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type2->SerialNumber, gSettings.Smbios.BoardSerialNumber);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.LocationInChassis.trim();
|
|
|
|
if( gSettings.Smbios.LocationInChassis.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type2->LocationInChassis, gSettings.Smbios.LocationInChassis);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
//what about Asset Tag??? Not used in real mac. till now.
|
|
|
|
|
|
|
|
//Slice - for the table2 one patch more needed
|
|
|
|
/* spec
|
|
|
|
Field 0x0E - Identifies the number (0 to 255) of Contained Object Handles that follow
|
|
|
|
Field 0x0F - A list of handles of other structures (for example, Baseboard, Processor, Port, System Slots, Memory Device) that are contained by this baseboard
|
|
|
|
It may be good before our patching but changed after. We should at least check if all tables mentioned here are present in final structure
|
|
|
|
I just set 0 as in iMac11
|
|
|
|
*/
|
|
|
|
newSmbiosTable.Type2->NumberOfContainedObjectHandles = 0;
|
|
|
|
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType3()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// System Chassis Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
DBG("SmbiosTable: Type 3 (System Chassis Information) not found!\n");
|
|
|
|
gMobile = FALSE; //default value
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
mHandle3 = SmbiosTable.Type3->Hdr.Handle;
|
|
|
|
gMobile = ((SmbiosTable.Type3->Type) >= 8) && (SmbiosTable.Type3->Type != 0x0D); //iMac is desktop!
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType3()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// System Chassis Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
// DBG("SmbiosTable: Type 3 (System Chassis Information) not found!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
Size = SmbiosTable.Type3->Hdr.Length; //old size
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable); //including strings
|
|
|
|
NewSize = 0x15; //sizeof(SMBIOS_TABLE_TYPE3);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type3, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
if (NewSize > Size) {
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)newSmbiosTable.Type3, (void*)SmbiosTable.Type3, Size); //copy main table
|
2019-09-03 11:58:42 +02:00
|
|
|
CopyMem((CHAR8*)newSmbiosTable.Type3 + NewSize, (CHAR8*)SmbiosTable.Type3 + Size, TableSize - Size); //copy strings
|
|
|
|
newSmbiosTable.Type3->Hdr.Length = (UINT8)NewSize;
|
|
|
|
} else {
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)newSmbiosTable.Type3, (void*)SmbiosTable.Type3, TableSize); //copy full table
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
newSmbiosTable.Type3->BootupState = ChassisStateSafe;
|
|
|
|
newSmbiosTable.Type3->PowerSupplyState = ChassisStateSafe;
|
|
|
|
newSmbiosTable.Type3->ThermalState = ChassisStateOther;
|
|
|
|
newSmbiosTable.Type3->SecurityStatus = ChassisSecurityStatusOther; //ChassisSecurityStatusNone;
|
|
|
|
newSmbiosTable.Type3->NumberofPowerCords = 1;
|
|
|
|
newSmbiosTable.Type3->ContainedElementCount = 0;
|
|
|
|
newSmbiosTable.Type3->ContainedElementRecordLength = 0;
|
|
|
|
Once = TRUE;
|
|
|
|
|
|
|
|
UniquifySmbiosTableStr(newSmbiosTable, SMBIOS_TABLE_TYPE3_STR_IDX);
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.ChassisType != 0) {
|
|
|
|
newSmbiosTable.Type3->Type = gSettings.Smbios.ChassisType;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.ChassisManufacturer.trim();
|
|
|
|
if( gSettings.Smbios.ChassisManufacturer.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type3->Manufacturer, gSettings.Smbios.ChassisManufacturer);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
//SIC! According to iMac there must be the BoardNumber
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.BoardNumber.trim();
|
|
|
|
if( gSettings.Smbios.BoardNumber.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type3->Version, gSettings.Smbios.BoardNumber);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.SerialNr.trim();
|
|
|
|
if( gSettings.Smbios.SerialNr.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type3->SerialNumber, gSettings.Smbios.SerialNr);
|
2021-04-05 10:57:55 +02:00
|
|
|
DBG("%s : UpdateSmbiosString SerialNr=%s\n", __PRETTY_FUNCTION__, gSettings.Smbios.SerialNr.c_str());
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
gSettings.Smbios.ChassisAssetTag.trim();
|
|
|
|
if( gSettings.Smbios.ChassisAssetTag.notEmpty() ){
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type3->AssetTag, gSettings.Smbios.ChassisAssetTag);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType4()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Processor Information
|
|
|
|
//
|
|
|
|
INTN res = 0;
|
|
|
|
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
DBG("SmbiosTable: Type 4 (Processor Information) not found!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = (SmbiosTable.Type4->ExternalClock * 3 + 2) % 100;
|
|
|
|
if (res > 2) {
|
|
|
|
res = 0;
|
|
|
|
} else {
|
|
|
|
res = SmbiosTable.Type4->ExternalClock % 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
gCPUStructure.ExternalClock = (UINT32)((SmbiosTable.Type4->ExternalClock * 1000) + (res * 110));//MHz->kHz
|
|
|
|
|
2020-04-04 15:50:13 +02:00
|
|
|
//snwprintf(gSettings.BusSpeed, 10, "%d", gCPUStructure.ExternalClock);
|
2019-09-03 11:58:42 +02:00
|
|
|
//gSettings.BusSpeed = gCPUStructure.ExternalClock; //why duplicate??
|
|
|
|
gCPUStructure.CurrentSpeed = SmbiosTable.Type4->CurrentSpeed;
|
|
|
|
gCPUStructure.MaxSpeed = SmbiosTable.Type4->MaxSpeed;
|
|
|
|
|
2020-08-25 17:35:19 +02:00
|
|
|
size_t off = OFFSET_OF(SMBIOS_TABLE_TYPE4, EnabledCoreCount);
|
|
|
|
if (SmbiosTable.Type4->Hdr.Length > off) { //Smbios >= 2.5
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.EnabledCores = SmbiosTable.Type4->EnabledCoreCount;
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2021-04-03 16:42:49 +02:00
|
|
|
GlobalConfig.EnabledCores = 0; //to change later
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2020-04-04 15:50:13 +02:00
|
|
|
//snwprintf(gSettings.CpuFreqMHz, 10, "%d", gCPUStructure.CurrentSpeed);
|
2019-09-03 11:58:42 +02:00
|
|
|
//gSettings.CpuFreqMHz = gCPUStructure.CurrentSpeed;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType4()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Processor Information
|
|
|
|
//
|
|
|
|
UINTN AddBrand = 0;
|
|
|
|
UINT16 ProcChar = 0;
|
|
|
|
|
|
|
|
//Note. iMac11,2 has four tables for CPU i3
|
|
|
|
UINTN CpuNumber;
|
|
|
|
|
2020-03-25 19:32:44 +01:00
|
|
|
// DBG("BrandString=%s\n", BrandStr);
|
2019-09-03 11:58:42 +02:00
|
|
|
for (CpuNumber = 0; CpuNumber < gCPUStructure.Cores; CpuNumber++) {
|
|
|
|
// Get Table Type4
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, CpuNumber);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// we make SMBios v2.4 while it may be older so we have to increase size
|
|
|
|
Size = SmbiosTable.Type4->Hdr.Length; //old size
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable); //including strings
|
|
|
|
AddBrand = 0;
|
|
|
|
if (SmbiosTable.Type4->ProcessorVersion == 0) { //if no BrandString we can add
|
|
|
|
AddBrand = 48;
|
|
|
|
}
|
|
|
|
NewSize = sizeof(SMBIOS_TABLE_TYPE4);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type4, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type4, (void*)SmbiosTable.Type4, Size); //copy main table
|
2019-09-03 11:58:42 +02:00
|
|
|
CopyMem((CHAR8*)newSmbiosTable.Type4+NewSize, (CHAR8*)SmbiosTable.Type4+Size, TableSize - Size); //copy strings
|
|
|
|
newSmbiosTable.Type4->Hdr.Length = (UINT8)NewSize;
|
|
|
|
|
|
|
|
newSmbiosTable.Type4->MaxSpeed = (UINT16)gCPUStructure.MaxSpeed;
|
|
|
|
//old version has no such fields. Fill now
|
|
|
|
if (Size <= 0x20){
|
|
|
|
//sanity check and clear
|
|
|
|
newSmbiosTable.Type4->SerialNumber = 0;
|
|
|
|
newSmbiosTable.Type4->AssetTag = 0;
|
|
|
|
newSmbiosTable.Type4->PartNumber = 0;
|
|
|
|
}
|
|
|
|
if (Size <= 0x23) { //Smbios <=2.3
|
|
|
|
newSmbiosTable.Type4->CoreCount = gCPUStructure.Cores;
|
|
|
|
newSmbiosTable.Type4->ThreadCount = gCPUStructure.Threads;
|
|
|
|
newSmbiosTable.Type4->ProcessorCharacteristics = (UINT16)gCPUStructure.Features;
|
|
|
|
} //else we propose DMI data is better then cpuid().
|
|
|
|
// if (newSmbiosTable.Type4->CoreCount < newSmbiosTable.Type4->EnabledCoreCount) {
|
|
|
|
// newSmbiosTable.Type4->EnabledCoreCount = gCPUStructure.Cores;
|
|
|
|
// }
|
|
|
|
|
2021-02-06 18:16:46 +01:00
|
|
|
//DBG("insert ExternalClock: %d MHz\n", (INT32)(DivU64x32(gCPUStructure.ExternalClock, Kilo)));
|
|
|
|
newSmbiosTable.Type4->ExternalClock = (UINT16)DivU64x32 (gCPUStructure.ExternalClock, Kilo);
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type4->EnabledCoreCount = GlobalConfig.EnabledCores;
|
2019-09-03 11:58:42 +02:00
|
|
|
//some verifications
|
|
|
|
if ((newSmbiosTable.Type4->ThreadCount < newSmbiosTable.Type4->CoreCount) ||
|
|
|
|
newSmbiosTable.Type4->ThreadCount > newSmbiosTable.Type4->CoreCount * 2) {
|
|
|
|
newSmbiosTable.Type4->ThreadCount = gCPUStructure.Threads;
|
|
|
|
}
|
|
|
|
|
|
|
|
UniquifySmbiosTableStr(newSmbiosTable, SMBIOS_TABLE_TYPE4_STR_IDX);
|
|
|
|
|
|
|
|
// TODO: Set SmbiosTable.Type4->ProcessorFamily for all implemented CPU models
|
|
|
|
Once = TRUE;
|
|
|
|
if (gCPUStructure.Model == CPU_MODEL_ATOM) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelAtom;
|
|
|
|
}
|
|
|
|
if ((gCPUStructure.Model == CPU_MODEL_DOTHAN) ||
|
|
|
|
(gCPUStructure.Model == CPU_MODEL_YONAH)) {
|
|
|
|
if (gCPUStructure.Mobile) {
|
|
|
|
newSmbiosTable.Type4->ProcessorUpgrade = ProcessorUpgradeSocket478;
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreSoloMobile;
|
|
|
|
if (gCPUStructure.Cores == 2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreDuoMobile;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreSolo;
|
|
|
|
if (gCPUStructure.Cores == 2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreDuo;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Model == CPU_MODEL_MEROM) {
|
|
|
|
if (gCPUStructure.Mobile) {
|
|
|
|
if (gCPUStructure.Cores==2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2DuoMobile;
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Cores==1) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2SoloMobile;
|
|
|
|
}
|
|
|
|
} else { // Conroe
|
|
|
|
newSmbiosTable.Type4->ProcessorUpgrade = ProcessorUpgradeSocketLGA775;
|
|
|
|
if (gCPUStructure.Cores>2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Quad;
|
|
|
|
} else
|
|
|
|
if (gCPUStructure.Cores==2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Extreme;
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Cores==1) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Solo;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Model == CPU_MODEL_PENRYN) {
|
|
|
|
if (gCPUStructure.Mobile) {
|
|
|
|
if (gCPUStructure.Cores>2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2ExtremeMobile;
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Cores==2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2DuoMobile;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
newSmbiosTable.Type4->ProcessorUpgrade = ProcessorUpgradeSocketLGA775;
|
|
|
|
if (gCPUStructure.Cores>2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Quad;
|
|
|
|
} else if (gCPUStructure.Cores==2) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2;
|
|
|
|
} else {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Solo;
|
|
|
|
}
|
|
|
|
if (AsciiStrStr(gCPUStructure.BrandString, "Celeron")) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyDualCoreIntelCeleron;
|
|
|
|
} else if (AsciiStrStr(gCPUStructure.BrandString, "Extreme")) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2Extreme;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gCPUStructure.Model >= CPU_MODEL_NEHALEM) {
|
|
|
|
if (AsciiStrStr(gCPUStructure.BrandString, "i3"))
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreI3;
|
|
|
|
if (AsciiStrStr(gCPUStructure.BrandString, "i5"))
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreI5;
|
|
|
|
if (AsciiStrStr(gCPUStructure.BrandString, "i7"))
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCoreI7;
|
|
|
|
}
|
|
|
|
//spec 2.7 page 48 note 3
|
|
|
|
if ((newSmbiosTable.Type4->ProcessorFamily == ProcessorFamilyIntelCore2)
|
|
|
|
&& gCPUStructure.Mobile) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily = ProcessorFamilyIntelCore2DuoMobile;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set CPU Attributes
|
|
|
|
newSmbiosTable.Type4->L1CacheHandle = L1;
|
|
|
|
newSmbiosTable.Type4->L2CacheHandle = L2;
|
|
|
|
newSmbiosTable.Type4->L3CacheHandle = L3;
|
|
|
|
newSmbiosTable.Type4->ProcessorType = CentralProcessor;
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorSteppingId = gCPUStructure.Stepping;
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorModel = (gCPUStructure.Model & 0xF);
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorFamily = gCPUStructure.Family;
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorType = gCPUStructure.Type;
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorXModel = gCPUStructure.Extmodel;
|
|
|
|
newSmbiosTable.Type4->ProcessorId.Signature.ProcessorXFamily = gCPUStructure.Extfamily;
|
2020-10-03 19:02:31 +02:00
|
|
|
// CopyMem((void*)&newSmbiosTable.Type4->ProcessorId.FeatureFlags, (void*)&gCPUStructure.Features, 4);
|
2019-09-03 11:58:42 +02:00
|
|
|
// newSmbiosTable.Type4->ProcessorId.FeatureFlags = (PROCESSOR_FEATURE_FLAGS)(UINT32)gCPUStructure.Features;
|
|
|
|
if (Size <= 0x26) {
|
|
|
|
newSmbiosTable.Type4->ProcessorFamily2 = newSmbiosTable.Type4->ProcessorFamily;
|
|
|
|
ProcChar |= (gCPUStructure.ExtFeatures & CPUID_EXTFEATURE_EM64T)?0x04:0;
|
|
|
|
ProcChar |= (gCPUStructure.Cores > 1)?0x08:0;
|
|
|
|
ProcChar |= (gCPUStructure.Cores < gCPUStructure.Threads)?0x10:0;
|
|
|
|
ProcChar |= (gCPUStructure.ExtFeatures & CPUID_EXTFEATURE_XD)?0x20:0;
|
|
|
|
ProcChar |= (gCPUStructure.Features & CPUID_FEATURE_VMX)?0x40:0;
|
|
|
|
ProcChar |= (gCPUStructure.Features & CPUID_FEATURE_EST)?0x80:0;
|
|
|
|
newSmbiosTable.Type4->ProcessorCharacteristics = ProcChar;
|
|
|
|
}
|
|
|
|
|
2020-08-15 15:47:56 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type4->Socket, "U2E1"_XS8);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
2020-08-15 15:47:56 +02:00
|
|
|
XString8 BrandStr;
|
|
|
|
BrandStr.takeValueFrom(gCPUStructure.BrandString);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (AddBrand) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type4->ProcessorVersion, BrandStr);
|
|
|
|
}
|
|
|
|
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type4->AssetTag, BrandStr); //like mac
|
|
|
|
// looks to be MicroCode revision
|
|
|
|
if(gCPUStructure.MicroCode > 0){
|
2020-08-15 15:47:56 +02:00
|
|
|
BrandStr.S8Printf("%llX", gCPUStructure.MicroCode);
|
2019-09-03 11:58:42 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type4->SerialNumber, BrandStr);
|
|
|
|
}
|
|
|
|
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType6()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
UINT8 SizeField = 0;
|
|
|
|
//
|
|
|
|
// MemoryModule (TYPE 6)
|
|
|
|
|
|
|
|
// This table is obsolete accoding to Spec but Apple still using it so
|
|
|
|
// copy existing table if found, no patches will be here
|
|
|
|
// we can have more then 1 module.
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; Index++) {
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_MEMORY_MODULE_INFORMATON,Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
// MsgLog("SMBIOS Table 6 index %d not found\n", Index);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
SizeField = SmbiosTable.Type6->InstalledSize.InstalledOrEnabledSize & 0x7F;
|
|
|
|
if (SizeField < 0x7D) {
|
|
|
|
mInstalled[Index] = LShiftU64(1ULL, 20 + SizeField);
|
|
|
|
} else if (SizeField == 0x7F) {
|
|
|
|
mInstalled[Index] = 0;
|
|
|
|
} else
|
|
|
|
mInstalled[Index] = 4096ULL * (1024ULL * 1024ULL);
|
2020-03-25 19:32:44 +01:00
|
|
|
MsgLog("Table 6 MEMORY_MODULE %llu Installed %llX ", Index, mInstalled[Index]);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (SizeField >= 0x7D) {
|
|
|
|
mEnabled[Index] = 0;
|
|
|
|
} else
|
|
|
|
mEnabled[Index] = LShiftU64(1ULL, 20 + ((UINT8)SmbiosTable.Type6->EnabledSize.InstalledOrEnabledSize & 0x7F));
|
2020-03-25 19:32:44 +01:00
|
|
|
MsgLog("... enabled %llX \n", mEnabled[Index]);
|
2019-09-03 11:58:42 +02:00
|
|
|
LogSmbiosTable(SmbiosTable);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType7()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Cache Information
|
|
|
|
//
|
|
|
|
//TODO - should be separate table for each CPU core
|
|
|
|
//new handle for each core and attach Type4 tables for individual Type7
|
|
|
|
// Handle = 0x0700 + CoreN<<2 + CacheN (4-level cache is supported
|
|
|
|
// L1[CoreN] = Handle
|
|
|
|
|
|
|
|
BOOLEAN correctSD = FALSE;
|
|
|
|
|
|
|
|
//according to spec for Smbios v2.0 max handle is 0xFFFE, for v>2.0 (we made 2.6) max handle=0xFEFF.
|
|
|
|
// Value 0xFFFF means no cache
|
|
|
|
L1 = 0xFFFF; // L1 Cache
|
|
|
|
L2 = 0xFFFF; // L2 Cache
|
|
|
|
L3 = 0xFFFF; // L3 Cache
|
|
|
|
|
|
|
|
// Get Table Type7 and set CPU Caches
|
|
|
|
for (Index = 0; Index < MAX_CACHE_COUNT; Index++) {
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_CACHE_INFORMATION, Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type7, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type7, (void*)SmbiosTable.Type7, TableSize);
|
2019-09-03 11:58:42 +02:00
|
|
|
correctSD = (newSmbiosTable.Type7->SocketDesignation == 0);
|
|
|
|
CoreCache = newSmbiosTable.Type7->CacheConfiguration & 3;
|
|
|
|
Once = TRUE;
|
|
|
|
|
|
|
|
//SSocketD = "L1-Cache";
|
|
|
|
if(correctSD) {
|
2020-08-15 15:47:56 +02:00
|
|
|
XString8 SSocketD = S8Printf("L%c-Cache", 0x31 + CoreCache);
|
2019-09-03 11:58:42 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type7->SocketDesignation, SSocketD);
|
|
|
|
}
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
switch (CoreCache) {
|
|
|
|
case 0:
|
|
|
|
L1 = Handle;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
L2 = Handle;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
L3 = Handle;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType9()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
//
|
|
|
|
// System Slots (Type 9)
|
|
|
|
/*
|
|
|
|
SlotDesignation: PCI1
|
|
|
|
System Slot Type: PCI
|
|
|
|
System Slot Data Bus Width: 32 bit
|
|
|
|
System Slot Current Usage: Available
|
|
|
|
System Slot Length: Short length
|
|
|
|
System Slot Type: PCI
|
|
|
|
Slot Id: the value present in the Slot Number field of the PCI Interrupt Routing table entry that is associated with this slot is: 1
|
|
|
|
Slot characteristics 1: Provides 3.3 Volts | Slot's opening is shared with another slot, e.g. PCI/EISA shared slot. |
|
|
|
|
Slot characteristics 2: PCI slot supports Power Management Enable (PME#) signal |
|
|
|
|
SegmentGroupNum: 0x4350
|
|
|
|
BusNum: 0x49
|
|
|
|
DevFuncNum: 0x31
|
|
|
|
|
|
|
|
Real Mac always contain Airport table 9 as
|
|
|
|
09 0D xx xx 01 A5 08 03 03 00 00 04 06 "AirPort"
|
|
|
|
*/
|
|
|
|
//usage in macOS:
|
|
|
|
// SlotID == value of Name(_SUN, SlotID) 8bit
|
|
|
|
// SlotDesignation == name to "AAPL,slot-name"
|
|
|
|
// SlotType = 32bit PCI/SlotTypePciExpressX1/x4/x16
|
|
|
|
// real PC -> PCI, real Mac -> PCIe
|
|
|
|
|
|
|
|
for (Index = 0; Index < 15; Index++) {
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.SlotDevices[Index].Valid) {
|
2019-09-03 11:58:42 +02:00
|
|
|
INTN Dev, Func;
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type9, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type9->Hdr.Type = EFI_SMBIOS_TYPE_SYSTEM_SLOTS;
|
|
|
|
newSmbiosTable.Type9->Hdr.Length = sizeof(SMBIOS_TABLE_TYPE9);
|
|
|
|
newSmbiosTable.Type9->Hdr.Handle = (UINT16)(0x0900 + Index);
|
|
|
|
newSmbiosTable.Type9->SlotDesignation = 1;
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type9->SlotType = gSettings.Smbios.SlotDevices[Index].SlotType;
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type9->SlotDataBusWidth = SlotDataBusWidth1X;
|
|
|
|
newSmbiosTable.Type9->CurrentUsage = SlotUsageAvailable;
|
|
|
|
newSmbiosTable.Type9->SlotLength = SlotLengthShort;
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type9->SlotID = gSettings.Smbios.SlotDevices[Index].SlotID;
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type9->SlotCharacteristics1.Provides33Volts = 1;
|
|
|
|
newSmbiosTable.Type9->SlotCharacteristics2.HotPlugDevicesSupported = 1;
|
|
|
|
// take this from PCI bus for WiFi card
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type9->SegmentGroupNum = gSettings.Smbios.SlotDevices[Index].SegmentGroupNum;
|
|
|
|
newSmbiosTable.Type9->BusNum = gSettings.Smbios.SlotDevices[Index].BusNum;
|
|
|
|
newSmbiosTable.Type9->DevFuncNum = gSettings.Smbios.SlotDevices[Index].DevFuncNum;
|
2019-09-03 11:58:42 +02:00
|
|
|
//
|
2021-04-03 16:42:49 +02:00
|
|
|
Dev = gSettings.Smbios.SlotDevices[Index].DevFuncNum >> 3;
|
|
|
|
Func = gSettings.Smbios.SlotDevices[Index].DevFuncNum & 7;
|
2020-03-25 19:32:44 +01:00
|
|
|
DBG("insert table 9 for dev %llX:%llX\n", Dev, Func);
|
2021-04-03 16:42:49 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type9->SlotDesignation, gSettings.Smbios.SlotDevices[Index].SlotName);
|
2019-09-03 11:58:42 +02:00
|
|
|
LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType11()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// CHAR8 *OEMString = "Apple inc. uses Clover"; //something else here?
|
|
|
|
// System Information
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_OEM_STRINGS, 0);
|
|
|
|
if (SmbiosTable.Raw != NULL) {
|
|
|
|
MsgLog("Table 11 present, but rewritten for us\n");
|
|
|
|
}
|
|
|
|
// TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type11, MAX_TABLE_SIZE);
|
|
|
|
// CopyMem((void*)newSmbiosTable.Type11, (void*)SmbiosTable.Type11, 5); //minimum, other bytes = 0
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type11->Hdr.Type = EFI_SMBIOS_TYPE_OEM_STRINGS;
|
|
|
|
newSmbiosTable.Type11->Hdr.Length = 5;
|
|
|
|
newSmbiosTable.Type11->Hdr.Handle = 0x0B00; //common rule
|
|
|
|
|
|
|
|
newSmbiosTable.Type11->StringCount = 1;
|
|
|
|
//
|
2020-08-15 15:47:56 +02:00
|
|
|
// ZeroMem(OEMString, MAX_OEM_STRING);
|
|
|
|
// AsciiStrCatS(OEMString, MAX_OEM_STRING, "Apple ROM Version.\n");
|
|
|
|
// //AsciiStrCatS(OEMString, MAX_OEM_STRING, " BIOS ID:");
|
2021-04-03 16:42:49 +02:00
|
|
|
// //AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.Smbios.RomVersion, iStrLen(gSettings.Smbios.RomVersion, 64));
|
2020-08-15 15:47:56 +02:00
|
|
|
// // AsciiStrCatS(OEMString, MAX_OEM_STRING, "\n EFI Version:");
|
2021-04-03 16:42:49 +02:00
|
|
|
// // AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.Smbios.EfiVersion, iStrLen(gSettings.Smbios.EfiVersion, 64));
|
2020-08-15 15:47:56 +02:00
|
|
|
// AsciiStrCatS(OEMString, MAX_OEM_STRING, " Board-ID : ");
|
2021-04-03 16:42:49 +02:00
|
|
|
// AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.Smbios.BoardNumber, iStrLen(gSettings.Smbios.BoardNumber, 64));
|
2020-08-15 15:47:56 +02:00
|
|
|
// snprintf(TempRev, MAX_OEM_STRING, "\n⌘ Powered by %s\n", gRevisionStr);
|
|
|
|
// AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev);
|
2021-04-01 10:06:53 +02:00
|
|
|
#ifdef JIEF_DEBUG
|
|
|
|
XString8 OEMString = S8Printf("⌘ Powered by %s\n", gBuildId.c_str());
|
|
|
|
#else
|
2021-04-03 16:42:49 +02:00
|
|
|
XString8 OEMString = S8Printf("Apple ROM Version.\nBoard-ID : %s\n⌘ Powered by %s\n", gSettings.Smbios.BoardNumber.c_str(), gRevisionStr);
|
2021-04-01 10:06:53 +02:00
|
|
|
#endif
|
2019-09-03 11:58:42 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString);
|
|
|
|
|
|
|
|
LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-05-15 05:23:33 +02:00
|
|
|
//some unused but interesting tables. Just log as is
|
|
|
|
#define NUM_OTHER_TYPES 14
|
|
|
|
const UINT8 tableTypes[] = {8, 10, 13, 18, 21, 22, 27, 28, 32, 33, 41, 129, 217, 219};
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableTypeSome()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
2020-05-15 05:23:33 +02:00
|
|
|
for (UINTN IndexType = 0; IndexType < sizeof(tableTypes); IndexType++) {
|
2019-09-03 11:58:42 +02:00
|
|
|
for (Index = 0; Index < 32; Index++) {
|
|
|
|
SmbiosTable = GetSmbiosTableFromType(EntryPoint, tableTypes[IndexType], Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
LogSmbiosTable(SmbiosTable);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType16()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Physical Memory Array
|
|
|
|
//
|
|
|
|
mTotalSystemMemory = 0; //later we will add to the value, here initialize it
|
|
|
|
TotalCount = 0;
|
|
|
|
for (Index = 0; Index < 8; Index++) { //how many tables there may be?
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
// DBG("SmbiosTable: Type 16 (Physical Memory Array) not found!\n");
|
|
|
|
continue;
|
|
|
|
}
|
2020-03-25 19:32:44 +01:00
|
|
|
DBG("Type 16 Index = %llu\n", Index);
|
2019-09-03 11:58:42 +02:00
|
|
|
TotalCount += SmbiosTable.Type16->NumberOfMemoryDevices;
|
|
|
|
}
|
|
|
|
if (!TotalCount) {
|
|
|
|
TotalCount = MAX_RAM_SLOTS;
|
|
|
|
}
|
|
|
|
//Jief_Machak: VMWare report 64 memory slots !!! MAX_RAM_SLOTS is currently 24. Crash is PatchTable17.
|
|
|
|
if ( TotalCount > MAX_RAM_SLOTS ) TotalCount = MAX_RAM_SLOTS;
|
|
|
|
DBG("Total Memory Slots Count = %d\n", TotalCount);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType16()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Physical Memory Array
|
|
|
|
//
|
|
|
|
|
|
|
|
// Get Table Type16 and set Device Count
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
DBG("SmbiosTable: Type 16 (Physical Memory Array) not found!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type16, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type16, (void*)SmbiosTable.Type16, TableSize);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type16->Hdr.Handle = mHandle16;
|
2019-11-15 13:50:12 +01:00
|
|
|
// Slice - I am not sure if I want these values
|
2019-09-03 11:58:42 +02:00
|
|
|
// newSmbiosTable.Type16->Location = MemoryArrayLocationProprietaryAddonCard;
|
|
|
|
// newSmbiosTable.Type16->Use = MemoryArrayUseSystemMemory;
|
|
|
|
// newSmbiosTable.Type16->MemoryErrorCorrection = MemoryErrorCorrectionMultiBitEcc;
|
|
|
|
// MemoryErrorInformationHandle
|
|
|
|
newSmbiosTable.Type16->MemoryErrorInformationHandle = 0xFFFF;
|
|
|
|
newSmbiosTable.Type16->NumberOfMemoryDevices = gRAMCount;
|
|
|
|
DBG("NumberOfMemoryDevices = %d\n", gRAMCount);
|
|
|
|
LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType17()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Memory Device
|
|
|
|
//
|
|
|
|
BOOLEAN Found;
|
|
|
|
|
|
|
|
// Get Table Type17 and count Size
|
|
|
|
gRAMCount = 0;
|
|
|
|
for (Index = 0; Index < TotalCount; Index++) { //how many tables there may be?
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_MEMORY_DEVICE, Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
// DBG("SmbiosTable: Type 17 (Memory Device number %d) not found!\n", Index);
|
|
|
|
continue;
|
|
|
|
}
|
2020-11-12 22:25:56 +01:00
|
|
|
#ifndef JIEF_DEBUG // it's all 0 in VMWare
|
2020-03-25 19:32:44 +01:00
|
|
|
DBG("Type 17 Index = %llu\n", Index);
|
2020-11-12 22:25:56 +01:00
|
|
|
#endif
|
2019-09-03 11:58:42 +02:00
|
|
|
//gDMI->CntMemorySlots++;
|
|
|
|
if (SmbiosTable.Type17->MemoryErrorInformationHandle < 0xFFFE) {
|
|
|
|
DBG("Table has error information, checking\n"); //why skipping?
|
|
|
|
// Why trust it if it has an error? I guess we could look
|
|
|
|
// up the error handle and determine certain errors may
|
|
|
|
// be skipped where others may not but it seems easier
|
|
|
|
// to just skip all entries that have an error - apianti
|
|
|
|
// will try
|
|
|
|
Found = FALSE;
|
2020-05-15 05:23:33 +02:00
|
|
|
for (INTN Index2 = 0; Index2 < 24; Index2++) {
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION, Index2);
|
|
|
|
if (newSmbiosTable.Raw == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (newSmbiosTable.Type18->Hdr.Handle == SmbiosTable.Type17->MemoryErrorInformationHandle) {
|
|
|
|
Found = TRUE;
|
2020-04-09 19:01:23 +02:00
|
|
|
DBG("Found memory information in table 18/%lld, type=0x%X, operation=0x%X syndrome=0x%X\n", Index2,
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type18->ErrorType,
|
|
|
|
newSmbiosTable.Type18->ErrorOperation,
|
|
|
|
newSmbiosTable.Type18->VendorSyndrome);
|
|
|
|
switch (newSmbiosTable.Type18->ErrorType) {
|
|
|
|
case MemoryErrorOk:
|
|
|
|
DBG("...memory OK\n");
|
|
|
|
break;
|
|
|
|
case MemoryErrorCorrected:
|
|
|
|
DBG("...memory errors corrected\n");
|
|
|
|
break;
|
|
|
|
case MemoryErrorChecksum:
|
|
|
|
DBG("...error type: Checksum\n");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBG("...error type not shown\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Found) {
|
|
|
|
if ((newSmbiosTable.Type18->ErrorType != MemoryErrorOk) &&
|
|
|
|
(newSmbiosTable.Type18->ErrorType != MemoryErrorCorrected)) {
|
|
|
|
DBG("skipping wrong module\n");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Determine if slot has size
|
|
|
|
if (SmbiosTable.Type17->Size > 0) {
|
|
|
|
gRAM.SMBIOS[Index].InUse = TRUE;
|
|
|
|
gRAM.SMBIOS[Index].ModuleSize = SmbiosTable.Type17->Size;
|
2019-11-15 13:17:19 +01:00
|
|
|
if (SmbiosTable.Type17->Size == 0x7FFF) {
|
|
|
|
gRAM.SMBIOS[Index].ModuleSize = SmbiosTable.Type17->ExtendedSize;
|
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
// Determine if module frequency is sane value
|
|
|
|
if ((SmbiosTable.Type17->Speed > 0) && (SmbiosTable.Type17->Speed <= MAX_RAM_FREQUENCY)) {
|
|
|
|
gRAM.SMBIOS[Index].InUse = TRUE;
|
|
|
|
gRAM.SMBIOS[Index].Frequency = SmbiosTable.Type17->Speed;
|
|
|
|
if (SmbiosTable.Type17->Speed > gRAM.Frequency) {
|
|
|
|
gRAM.Frequency = SmbiosTable.Type17->Speed;
|
|
|
|
}
|
|
|
|
} else {
|
2020-11-12 22:25:56 +01:00
|
|
|
#ifndef JIEF_DEBUG // always the case in VMWare
|
2019-09-03 11:58:42 +02:00
|
|
|
DBG("Ignoring insane frequency value %dMHz\n", SmbiosTable.Type17->Speed);
|
2020-11-12 22:25:56 +01:00
|
|
|
#endif
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
// Fill rest of information if in use
|
|
|
|
if (gRAM.SMBIOS[Index].InUse) {
|
|
|
|
++(gRAM.SMBIOSInUse);
|
2021-04-03 16:42:49 +02:00
|
|
|
gRAM.SMBIOS[Index].Vendor.takeValueFrom(GetSmbiosString(SmbiosTable, SmbiosTable.Type17->Manufacturer));
|
|
|
|
gRAM.SMBIOS[Index].Vendor.trim();
|
|
|
|
gRAM.SMBIOS[Index].SerialNo.takeValueFrom(GetSmbiosString(SmbiosTable, SmbiosTable.Type17->SerialNumber));
|
|
|
|
gRAM.SMBIOS[Index].SerialNo.trim();
|
|
|
|
gRAM.SMBIOS[Index].PartNo.takeValueFrom(GetSmbiosString(SmbiosTable, SmbiosTable.Type17->PartNumber));
|
|
|
|
gRAM.SMBIOS[Index].PartNo.trim();
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
// DBG("CntMemorySlots = %d\n", gDMI->CntMemorySlots)
|
|
|
|
// DBG("gDMI->MemoryModules = %d\n", gDMI->MemoryModules)
|
2020-08-25 17:35:19 +02:00
|
|
|
if ((SmbiosTable.Type17->Speed > 0) && (SmbiosTable.Type17->Speed <= MAX_RAM_FREQUENCY)) {
|
|
|
|
DBG("SmbiosTable.Type17->Speed = %dMHz\n", gRAM.SMBIOS[Index].Frequency);
|
|
|
|
DBG("SmbiosTable.Type17->Size = %dMB\n", gRAM.SMBIOS[Index].ModuleSize);
|
|
|
|
DBG("SmbiosTable.Type17->Bank/Device = %s %s\n", GetSmbiosString(SmbiosTable, SmbiosTable.Type17->BankLocator), GetSmbiosString(SmbiosTable, SmbiosTable.Type17->DeviceLocator));
|
2021-04-03 16:42:49 +02:00
|
|
|
DBG("SmbiosTable.Type17->Vendor = %s\n", gRAM.SMBIOS[Index].Vendor.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->SerialNumber = %s\n", gRAM.SMBIOS[Index].SerialNo.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->PartNumber = %s\n", gRAM.SMBIOS[Index].PartNo.c_str());
|
2020-08-25 17:35:19 +02:00
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
if ((SmbiosTable.Type17->Size & 0x8000) == 0) {
|
|
|
|
mTotalSystemMemory += SmbiosTable.Type17->Size; //Mb
|
|
|
|
mMemory17[Index] = (UINT16)(SmbiosTable.Type17->Size > 0 ? mTotalSystemMemory : 0);
|
|
|
|
}
|
|
|
|
DBG("mTotalSystemMemory = %d\n", mTotalSystemMemory);
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType17()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
2020-08-15 15:47:56 +02:00
|
|
|
XString8 deviceLocator;
|
|
|
|
XString8 bankLocator;
|
2019-09-03 11:58:42 +02:00
|
|
|
UINT8 channelMap[MAX_RAM_SLOTS];
|
|
|
|
UINT8 expectedCount = 0;
|
|
|
|
UINT8 channels = 2;
|
|
|
|
BOOLEAN insertingEmpty = TRUE;
|
2021-04-03 16:42:49 +02:00
|
|
|
BOOLEAN trustSMBIOS = ((gRAM.SPDInUse == 0) || gSettings.Smbios.TrustSMBIOS);
|
2019-09-03 11:58:42 +02:00
|
|
|
BOOLEAN wrongSMBIOSBanks = FALSE;
|
|
|
|
BOOLEAN isMacPro = FALSE;
|
2021-04-03 16:42:49 +02:00
|
|
|
MACHINE_TYPES Model = GetModelFromString(gSettings.Smbios.ProductName);
|
2019-09-03 11:58:42 +02:00
|
|
|
if ((Model == MacPro31) || (Model == MacPro41) || (Model == MacPro51) || (Model == MacPro61)) {
|
|
|
|
isMacPro = TRUE;
|
|
|
|
}
|
|
|
|
// Inject user memory tables
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.InjectMemoryTables) {
|
2019-09-03 11:58:42 +02:00
|
|
|
DBG("Injecting user memory modules to SMBIOS\n");
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.SlotCounts == 0) {
|
2019-09-03 11:58:42 +02:00
|
|
|
DBG("User SMBIOS contains no memory modules\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Check channels
|
2021-04-03 16:42:49 +02:00
|
|
|
if ((gSettings.Smbios.Memory.UserChannels == 0) || (gSettings.Smbios.Memory.UserChannels > 8)) {
|
|
|
|
gSettings.Smbios.Memory.UserChannels = 1;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.SlotCounts >= MAX_RAM_SLOTS) {
|
|
|
|
gSettings.Smbios.Memory.SlotCounts = MAX_RAM_SLOTS;
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
DBG("Channels: %d\n", gSettings.Smbios.Memory.UserChannels);
|
2019-09-03 11:58:42 +02:00
|
|
|
// Setup interleaved channel map
|
|
|
|
if (channels >= 2) {
|
2021-04-03 16:42:49 +02:00
|
|
|
UINT8 doubleChannels = (UINT8)gSettings.Smbios.Memory.UserChannels << 1;
|
2019-09-03 11:58:42 +02:00
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
channelMap[Index] = (UINT8)(((Index / doubleChannels) * doubleChannels) +
|
2021-04-03 16:42:49 +02:00
|
|
|
((Index / gSettings.Smbios.Memory.UserChannels) % 2) + ((Index % gSettings.Smbios.Memory.UserChannels) << 1));
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
channelMap[Index] = (UINT8)Index;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBG("Interleave:");
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
DBG(" %d", channelMap[Index]);
|
|
|
|
}
|
|
|
|
DBG("\n");
|
|
|
|
// Memory Device
|
|
|
|
//
|
|
|
|
gRAMCount = 0;
|
|
|
|
// Inject tables
|
2021-04-03 16:42:49 +02:00
|
|
|
for (Index = 0; Index < gSettings.Smbios.Memory.SlotCounts; Index++) {
|
2019-09-03 11:58:42 +02:00
|
|
|
UINTN UserIndex = channelMap[Index];
|
2021-04-03 16:42:49 +02:00
|
|
|
UINT8 bank = (UINT8)(Index / gSettings.Smbios.Memory.UserChannels);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type17, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->Hdr.Type = EFI_SMBIOS_TYPE_MEMORY_DEVICE;
|
|
|
|
newSmbiosTable.Type17->Hdr.Length = sizeof(SMBIOS_TABLE_TYPE17);
|
|
|
|
newSmbiosTable.Type17->TotalWidth = 0xFFFF;
|
|
|
|
newSmbiosTable.Type17->DataWidth = 0xFFFF;
|
|
|
|
newSmbiosTable.Type17->Hdr.Handle = (UINT16)(0x1100 + UserIndex);
|
2020-02-27 13:06:01 +01:00
|
|
|
newSmbiosTable.Type17->FormFactor = (UINT8)(gMobile ? MemoryFormFactorSodimm : MemoryFormFactorDimm);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->TypeDetail.Synchronous = TRUE;
|
|
|
|
newSmbiosTable.Type17->DeviceSet = bank + 1;
|
|
|
|
newSmbiosTable.Type17->MemoryArrayHandle = mHandle16;
|
|
|
|
if (isMacPro) {
|
2020-08-15 15:47:56 +02:00
|
|
|
deviceLocator.S8Printf("DIMM%d", gRAMCount + 1);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-08-15 15:47:56 +02:00
|
|
|
deviceLocator.S8Printf("DIMM%d", bank);
|
|
|
|
bankLocator.S8Printf("BANK %llu", Index % channels);
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->BankLocator, bankLocator);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2020-08-15 15:47:56 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->DeviceLocator, deviceLocator);
|
2021-04-03 16:42:49 +02:00
|
|
|
if ((gSettings.Smbios.Memory.User[UserIndex].InUse) && (gSettings.Smbios.Memory.User[UserIndex].ModuleSize > 0)) {
|
2020-04-10 09:15:36 +02:00
|
|
|
DBG("user SMBIOS data:\n");
|
2021-04-03 16:42:49 +02:00
|
|
|
DBG("SmbiosTable.Type17->Vendor = %s\n", gSettings.Smbios.Memory.User[UserIndex].Vendor.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->SerialNumber = %s\n", gSettings.Smbios.Memory.User[UserIndex].SerialNo.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->PartNumber = %s\n", gSettings.Smbios.Memory.User[UserIndex].PartNo.c_str());
|
2020-04-10 09:15:36 +02:00
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.User[UserIndex].Vendor.notEmpty()) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, gSettings.Smbios.Memory.User[UserIndex].Vendor);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-04-09 19:01:23 +02:00
|
|
|
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.User[UserIndex].SerialNo.notEmpty()) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, gSettings.Smbios.Memory.User[UserIndex].SerialNo);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.User[UserIndex].PartNo.notEmpty()) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, gSettings.Smbios.Memory.User[UserIndex].PartNo);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type17->Speed = (UINT16)gSettings.Smbios.Memory.User[UserIndex].Frequency;
|
|
|
|
if (gSettings.Smbios.Memory.User[UserIndex].ModuleSize > 0x7FFF) {
|
2019-11-23 16:33:01 +01:00
|
|
|
newSmbiosTable.Type17->Size = 0x7FFF;
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type17->ExtendedSize = gSettings.Smbios.Memory.User[UserIndex].ModuleSize;
|
2019-12-23 17:46:07 +01:00
|
|
|
mTotalSystemMemory += newSmbiosTable.Type17->ExtendedSize; //Mb
|
2019-11-23 16:33:01 +01:00
|
|
|
} else {
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type17->Size = (UINT16)gSettings.Smbios.Memory.User[UserIndex].ModuleSize;
|
2019-12-23 17:46:07 +01:00
|
|
|
mTotalSystemMemory += newSmbiosTable.Type17->Size; //Mb
|
2019-11-23 16:33:01 +01:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type17->MemoryType = gSettings.Smbios.Memory.User[UserIndex].Type;
|
2019-09-03 11:58:42 +02:00
|
|
|
if ((newSmbiosTable.Type17->MemoryType != MemoryTypeDdr2) &&
|
|
|
|
(newSmbiosTable.Type17->MemoryType != MemoryTypeDdr4) &&
|
|
|
|
(newSmbiosTable.Type17->MemoryType != MemoryTypeDdr)) {
|
|
|
|
newSmbiosTable.Type17->MemoryType = MemoryTypeDdr3;
|
|
|
|
}
|
2020-08-15 15:47:56 +02:00
|
|
|
DBG("%s %s %dMHz %dMB(Ext:%dMB)\n", bankLocator.c_str(), deviceLocator.c_str(), newSmbiosTable.Type17->Speed,
|
2019-11-23 16:33:01 +01:00
|
|
|
newSmbiosTable.Type17->Size, newSmbiosTable.Type17->ExtendedSize);
|
2019-09-03 11:58:42 +02:00
|
|
|
mMemory17[gRAMCount] = (UINT16)mTotalSystemMemory;
|
|
|
|
// DBG("mTotalSystemMemory = %d\n", mTotalSystemMemory);
|
|
|
|
} else {
|
2020-08-15 15:47:56 +02:00
|
|
|
DBG("%s %s EMPTY\n", bankLocator.c_str(), deviceLocator.c_str());
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
newSmbiosTable.Type17->MemoryErrorInformationHandle = 0xFFFF;
|
|
|
|
mHandle17[gRAMCount++] = LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
if (mTotalSystemMemory > 0) {
|
|
|
|
DBG("mTotalSystemMemory = %d\n", mTotalSystemMemory);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Prevent inserting empty tables
|
|
|
|
if ((gRAM.SPDInUse == 0) && (gRAM.SMBIOSInUse == 0)) {
|
|
|
|
DBG("SMBIOS and SPD contain no modules in use\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Detect whether the SMBIOS is trusted information
|
|
|
|
if (trustSMBIOS) {
|
|
|
|
if (gRAM.SMBIOSInUse != 0) {
|
|
|
|
if (gRAM.SPDInUse != 0) {
|
|
|
|
if (gRAM.SPDInUse != gRAM.SMBIOSInUse) {
|
|
|
|
// Prefer the SPD information
|
|
|
|
if (gRAM.SPDInUse > gRAM.SMBIOSInUse) {
|
|
|
|
DBG("Not trusting SMBIOS because SPD reports more modules...\n");
|
|
|
|
trustSMBIOS = FALSE;
|
|
|
|
} else if (gRAM.SPD[0].InUse || !gRAM.SMBIOS[0].InUse) {
|
|
|
|
if (gRAM.SPDInUse > 1) {
|
|
|
|
DBG("Not trusting SMBIOS because SPD reports different modules...\n");
|
|
|
|
trustSMBIOS = FALSE;
|
|
|
|
} else if (gRAM.SMBIOSInUse == 1) {
|
|
|
|
channels = 1;
|
|
|
|
}
|
|
|
|
} else if (gRAM.SPDInUse == 1) {
|
|
|
|
// The SMBIOS may contain table for built-in module
|
|
|
|
if (gRAM.SMBIOSInUse <= 2) {
|
|
|
|
if (!gRAM.SMBIOS[0].InUse || !gRAM.SPD[2].InUse ||
|
|
|
|
(gRAM.SMBIOS[0].Frequency != gRAM.SPD[2].Frequency) ||
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize != gRAM.SPD[2].ModuleSize)) {
|
|
|
|
channels = 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DBG("Not trusting SMBIOS because SPD reports only one module...\n");
|
|
|
|
trustSMBIOS = FALSE;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DBG("Not trusting SMBIOS because SPD reports less modules...\n");
|
|
|
|
trustSMBIOS = FALSE;
|
|
|
|
}
|
|
|
|
} else if (gRAM.SPD[0].InUse != gRAM.SMBIOS[0].InUse) {
|
|
|
|
// Never trust a sneaky SMBIOS!
|
|
|
|
DBG("Not trusting SMBIOS because it's being sneaky...\n");
|
|
|
|
trustSMBIOS = FALSE;
|
|
|
|
}
|
|
|
|
} else if (gRAM.SMBIOSInUse == 1) {
|
|
|
|
channels = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (trustSMBIOS) {
|
|
|
|
DBG("Trusting SMBIOS...\n");
|
|
|
|
}
|
|
|
|
// Determine expected slot count
|
2021-04-03 16:42:49 +02:00
|
|
|
expectedCount = (gSettings.Smbios.Memory.SlotCounts != 0) ? gSettings.Smbios.Memory.SlotCounts : gRAM.SPDInUse;
|
2019-09-03 11:58:42 +02:00
|
|
|
if (trustSMBIOS) {
|
|
|
|
// Use the smbios in use count
|
|
|
|
if (expectedCount < gRAM.SMBIOSInUse) {
|
|
|
|
expectedCount = gRAM.SMBIOSInUse;
|
|
|
|
}
|
|
|
|
// Check if smbios has a good total count
|
|
|
|
if ((!gMobile || (TotalCount == 2)) &&
|
|
|
|
(expectedCount < TotalCount)) {
|
|
|
|
expectedCount = (UINT8)TotalCount;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Use default value of two for mobile or four for desktop
|
|
|
|
if (gMobile) {
|
|
|
|
if (expectedCount < 2) {
|
|
|
|
expectedCount = 2;
|
|
|
|
}
|
|
|
|
} else if (expectedCount < 4) {
|
|
|
|
expectedCount = 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Check for interleaved channels
|
|
|
|
if (channels >= 2) {
|
|
|
|
wrongSMBIOSBanks = ((gRAM.SMBIOS[1].InUse != gRAM.SPD[1].InUse) ||
|
|
|
|
(gRAM.SMBIOS[1].ModuleSize != gRAM.SPD[1].ModuleSize));
|
|
|
|
}
|
|
|
|
if (wrongSMBIOSBanks) {
|
|
|
|
DBG("Detected alternating SMBIOS channel banks\n");
|
|
|
|
}
|
|
|
|
// Determine if using triple or quadruple channel
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Memory.UserChannels != 0) {
|
|
|
|
channels = gSettings.Smbios.Memory.UserChannels;
|
2019-09-03 11:58:42 +02:00
|
|
|
} else if (gRAM.SPDInUse == 0) {
|
|
|
|
if (trustSMBIOS) {
|
|
|
|
if ((gRAM.SMBIOSInUse % 4) == 0) {
|
|
|
|
// Quadruple channel
|
|
|
|
if ((wrongSMBIOSBanks &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[1].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[2].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[3].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[1].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[2].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[3].ModuleSize)) ||
|
|
|
|
((gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[2].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[4].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[6].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[2].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[4].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[6].ModuleSize))) {
|
|
|
|
channels = 4;
|
|
|
|
}
|
|
|
|
} else if ((gRAM.SMBIOSInUse % 3) == 0) {
|
|
|
|
// Triple channel
|
|
|
|
if ((wrongSMBIOSBanks &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[1].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[2].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[1].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[2].ModuleSize)) ||
|
|
|
|
((gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[2].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].InUse == gRAM.SMBIOS[4].InUse) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[2].ModuleSize) &&
|
|
|
|
(gRAM.SMBIOS[0].ModuleSize == gRAM.SMBIOS[4].ModuleSize))) {
|
|
|
|
channels = 3;
|
|
|
|
}
|
|
|
|
} else if (!wrongSMBIOSBanks && ((gRAM.SMBIOSInUse % 2) != 0)) {
|
|
|
|
channels = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if ((gRAM.SPDInUse % 4) == 0) {
|
|
|
|
// Quadruple channel
|
|
|
|
if ((gRAM.SPD[0].InUse == gRAM.SPD[2].InUse) &&
|
|
|
|
(gRAM.SPD[0].InUse == gRAM.SPD[4].InUse) &&
|
|
|
|
(gRAM.SPD[0].InUse == gRAM.SPD[6].InUse) &&
|
|
|
|
(gRAM.SPD[0].ModuleSize == gRAM.SPD[2].ModuleSize) &&
|
|
|
|
(gRAM.SPD[0].ModuleSize == gRAM.SPD[4].ModuleSize) &&
|
|
|
|
(gRAM.SPD[0].ModuleSize == gRAM.SPD[6].ModuleSize)) {
|
|
|
|
channels = 4;
|
|
|
|
}
|
|
|
|
} else if ((gRAM.SPDInUse % 3) == 0) {
|
|
|
|
// Triple channel
|
|
|
|
if ((gRAM.SPD[0].InUse == gRAM.SPD[2].InUse) &&
|
|
|
|
(gRAM.SPD[0].InUse == gRAM.SPD[4].InUse) &&
|
|
|
|
(gRAM.SPD[0].ModuleSize == gRAM.SPD[2].ModuleSize) &&
|
|
|
|
(gRAM.SPD[0].ModuleSize == gRAM.SPD[4].ModuleSize)) {
|
|
|
|
channels = 3;
|
|
|
|
}
|
|
|
|
} else if ((gRAM.SPD[0].InUse != gRAM.SPD[2].InUse) ||
|
|
|
|
((gRAM.SPDInUse % 2) != 0)) {
|
|
|
|
channels = 1;
|
|
|
|
}
|
|
|
|
// Can't have less than the number of channels
|
|
|
|
if (expectedCount < channels) {
|
|
|
|
expectedCount = channels;
|
|
|
|
}
|
|
|
|
if (expectedCount > 0) {
|
|
|
|
--expectedCount;
|
|
|
|
}
|
|
|
|
DBG("Channels: %d\n", channels);
|
|
|
|
// Setup interleaved channel map
|
|
|
|
if (channels >= 2) {
|
|
|
|
UINT8 doubleChannels = (UINT8)channels << 1;
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
channelMap[Index] = (UINT8)(((Index / doubleChannels) * doubleChannels) +
|
|
|
|
((Index / channels) % 2) + ((Index % channels) << 1));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
channelMap[Index] = (UINT8)Index;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBG("Interleave:");
|
|
|
|
for (Index = 0; Index < MAX_RAM_SLOTS; ++Index) {
|
|
|
|
DBG(" %d", channelMap[Index]);
|
|
|
|
}
|
|
|
|
DBG("\n");
|
|
|
|
// Memory Device
|
|
|
|
//
|
|
|
|
gRAMCount = 0;
|
|
|
|
for (Index = 0; Index < TotalCount; Index++) {
|
|
|
|
UINTN SMBIOSIndex = wrongSMBIOSBanks ? Index : channelMap[Index];
|
|
|
|
UINTN SPDIndex = channelMap[Index];
|
|
|
|
UINT8 bank = (UINT8)Index / channels;
|
|
|
|
if (!insertingEmpty && (gRAMCount > expectedCount) &&
|
|
|
|
!gRAM.SPD[SPDIndex].InUse && (!trustSMBIOS || !gRAM.SMBIOS[SMBIOSIndex].InUse)) {
|
|
|
|
continue;
|
|
|
|
}
|
2020-04-10 09:15:36 +02:00
|
|
|
SmbiosTable = GetSmbiosTableFromType(EntryPoint, EFI_SMBIOS_TYPE_MEMORY_DEVICE, SMBIOSIndex);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (trustSMBIOS && gRAM.SMBIOS[SMBIOSIndex].InUse && (SmbiosTable.Raw != NULL)) {
|
2020-04-10 09:15:36 +02:00
|
|
|
DBG("trusted SMBIOS data:\n");
|
2021-04-03 16:42:49 +02:00
|
|
|
DBG("SmbiosTable.Type17->Vendor = %s\n", gRAM.SMBIOS[SMBIOSIndex].Vendor.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->SerialNumber = %s\n", gRAM.SMBIOS[SMBIOSIndex].SerialNo.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->PartNumber = %s\n", gRAM.SMBIOS[SMBIOSIndex].PartNo.c_str());
|
2020-04-10 09:15:36 +02:00
|
|
|
|
2019-09-03 11:58:42 +02:00
|
|
|
TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void*)newSmbiosTable.Type17, (void *)SmbiosTable.Type17, TableSize);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->AssetTag = 0;
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SMBIOS[SMBIOSIndex].Vendor.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, gRAM.SMBIOS[SMBIOSIndex].Vendor);
|
|
|
|
// gSettings.MemoryManufacturer.takeValueFrom(gRAM.SMBIOS[SMBIOSIndex].Vendor);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
|
|
|
// newSmbiosTable.Type17->Manufacturer = 0;
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SMBIOS[SMBIOSIndex].SerialNo.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, gRAM.SMBIOS[SMBIOSIndex].SerialNo);
|
|
|
|
// gSettings.MemorySerialNumber.takeValueFrom(gRAM.SMBIOS[SMBIOSIndex].SerialNo);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
|
|
|
// newSmbiosTable.Type17->SerialNumber = 0;
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SMBIOS[SMBIOSIndex].PartNo.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, gRAM.SMBIOS[SMBIOSIndex].PartNo);
|
|
|
|
// gSettings.MemoryPartNumber.takeValueFrom(gRAM.SMBIOS[SMBIOSIndex].PartNo);
|
|
|
|
DBG(" partNum=%s\n", gRAM.SMBIOS[SMBIOSIndex].PartNo.c_str());
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
|
|
|
// newSmbiosTable.Type17->PartNumber = 0;
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
DBG(" partNum unknown\n");
|
|
|
|
}
|
|
|
|
} else {
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type17, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->Hdr.Type = EFI_SMBIOS_TYPE_MEMORY_DEVICE;
|
|
|
|
newSmbiosTable.Type17->Hdr.Length = sizeof(SMBIOS_TABLE_TYPE17);
|
|
|
|
newSmbiosTable.Type17->TotalWidth = 0xFFFF;
|
|
|
|
newSmbiosTable.Type17->DataWidth = 0xFFFF;
|
|
|
|
}
|
|
|
|
Once = TRUE;
|
|
|
|
newSmbiosTable.Type17->Hdr.Handle = (UINT16)(0x1100 + Index);
|
2020-02-27 13:06:01 +01:00
|
|
|
newSmbiosTable.Type17->FormFactor = (UINT8)(gMobile ? MemoryFormFactorSodimm : MemoryFormFactorDimm);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->TypeDetail.Synchronous = TRUE;
|
|
|
|
newSmbiosTable.Type17->DeviceSet = bank + 1;
|
|
|
|
newSmbiosTable.Type17->MemoryArrayHandle = mHandle16;
|
|
|
|
|
|
|
|
if (gRAM.SPD[SPDIndex].InUse) {
|
2020-04-10 09:15:36 +02:00
|
|
|
DBG("SPD data in use:\n");
|
2021-04-03 16:42:49 +02:00
|
|
|
DBG("SmbiosTable.Type17->Vendor = %s\n", gRAM.SPD[SPDIndex].Vendor.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->SerialNumber = %s\n", gRAM.SPD[SPDIndex].SerialNo.c_str());
|
|
|
|
DBG("SmbiosTable.Type17->PartNumber = %s\n", gRAM.SPD[SPDIndex].PartNo.c_str());
|
2020-04-10 09:15:36 +02:00
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SPD[SPDIndex].Vendor.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, gRAM.SPD[SPDIndex].Vendor);
|
|
|
|
// gSettings.MemoryManufacturer.takeValueFrom(gRAM.SPD[SPDIndex].Vendor);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SPD[SPDIndex].SerialNo.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, gRAM.SPD[SPDIndex].SerialNo);
|
|
|
|
// gSettings.MemorySerialNumber.takeValueFrom(gRAM.SPD[SPDIndex].SerialNo);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->SerialNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2021-04-03 16:42:49 +02:00
|
|
|
if ( gRAM.SPD[SPDIndex].PartNo.notEmpty() ) {
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, gRAM.SPD[SPDIndex].PartNo);
|
|
|
|
// gSettings.MemoryPartNumber.takeValueFrom(gRAM.SPD[SPDIndex].PartNo);
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-02-17 21:41:09 +01:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->PartNumber, unknown);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
if (gRAM.Frequency > gRAM.SPD[SPDIndex].Frequency) {
|
|
|
|
newSmbiosTable.Type17->Speed = (UINT16)gRAM.Frequency;
|
|
|
|
} else {
|
|
|
|
newSmbiosTable.Type17->Speed = (UINT16)gRAM.SPD[SPDIndex].Frequency;
|
|
|
|
}
|
2019-12-23 17:46:07 +01:00
|
|
|
if (gRAM.SPD[SPDIndex].ModuleSize > 0x7FFF) {
|
|
|
|
newSmbiosTable.Type17->Size = 0x7FFF;
|
|
|
|
newSmbiosTable.Type17->ExtendedSize = gRAM.SPD[SPDIndex].ModuleSize;
|
|
|
|
} else {
|
|
|
|
newSmbiosTable.Type17->Size = (UINT16)gRAM.SPD[SPDIndex].ModuleSize;
|
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->MemoryType = gRAM.SPD[SPDIndex].Type;
|
|
|
|
}
|
|
|
|
if (trustSMBIOS && gRAM.SMBIOS[SMBIOSIndex].InUse &&
|
|
|
|
(newSmbiosTable.Type17->Speed < (UINT16)gRAM.SMBIOS[SMBIOSIndex].Frequency)) {
|
|
|
|
DBG("Type17->Speed corrected by SMBIOS from %dMHz to %dMHz\n", newSmbiosTable.Type17->Speed, gRAM.SMBIOS[SMBIOSIndex].Frequency);
|
|
|
|
newSmbiosTable.Type17->Speed = (UINT16)gRAM.SMBIOS[SMBIOSIndex].Frequency;
|
|
|
|
}
|
|
|
|
if (trustSMBIOS && gRAM.SMBIOS[SMBIOSIndex].InUse &&
|
2021-04-03 16:42:49 +02:00
|
|
|
gRAM.SMBIOS[SMBIOSIndex].Vendor.notEmpty() &&
|
|
|
|
( gRAM.SPD[SPDIndex].Vendor.isEmpty() || gRAM.SPD[SPDIndex].Vendor == "NoName"_XS8 )
|
|
|
|
) {
|
|
|
|
DBG("Type17->Manufacturer corrected by SMBIOS from NoName to %s\n", gRAM.SMBIOS[SMBIOSIndex].Vendor.c_str());
|
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->Manufacturer, gRAM.SMBIOS[SMBIOSIndex].Vendor);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2021-04-03 16:42:49 +02:00
|
|
|
// gSettings.MemorySpeed.S8Printf("%d", newSmbiosTable.Type17->Speed);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
// Assume DDR3 unless explicitly set to DDR2/DDR/DDR4
|
|
|
|
if ((newSmbiosTable.Type17->MemoryType != MemoryTypeDdr2) &&
|
|
|
|
(newSmbiosTable.Type17->MemoryType != MemoryTypeDdr4) &&
|
|
|
|
(newSmbiosTable.Type17->MemoryType != MemoryTypeDdr)) {
|
|
|
|
newSmbiosTable.Type17->MemoryType = MemoryTypeDdr3;
|
|
|
|
}
|
|
|
|
|
|
|
|
//now I want to update deviceLocator and bankLocator
|
|
|
|
if (isMacPro) {
|
2020-08-15 15:47:56 +02:00
|
|
|
deviceLocator.S8Printf("DIMM%d", gRAMCount + 1);
|
|
|
|
bankLocator.setEmpty();
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2020-08-15 15:47:56 +02:00
|
|
|
deviceLocator.S8Printf("DIMM%d", bank);
|
|
|
|
bankLocator.S8Printf("BANK %llu", Index % channels);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2020-08-15 15:47:56 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->DeviceLocator, deviceLocator);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (isMacPro) {
|
|
|
|
newSmbiosTable.Type17->BankLocator = 0; //like in MacPro5,1
|
|
|
|
} else {
|
2020-08-15 15:47:56 +02:00
|
|
|
UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type17->BankLocator, bankLocator);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2020-03-25 19:32:44 +01:00
|
|
|
DBG("SMBIOS Type 17 Index = %d => %llu %llu:\n", gRAMCount, SMBIOSIndex, SPDIndex);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (newSmbiosTable.Type17->Size == 0) {
|
2020-08-15 15:47:56 +02:00
|
|
|
DBG("%s %s EMPTY\n", bankLocator.c_str(), deviceLocator.c_str());
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type17->MemoryType = 0; //MemoryTypeUnknown;
|
|
|
|
} else {
|
|
|
|
insertingEmpty = FALSE;
|
2020-08-15 15:47:56 +02:00
|
|
|
DBG("%s %s %dMHz %dMB(Ext:%dMB)\n", bankLocator.c_str(), deviceLocator.c_str(), newSmbiosTable.Type17->Speed,
|
2019-12-23 17:46:07 +01:00
|
|
|
newSmbiosTable.Type17->Size, newSmbiosTable.Type17->ExtendedSize);
|
|
|
|
if (newSmbiosTable.Type17->Size == 0x7FFF) {
|
|
|
|
mTotalSystemMemory += newSmbiosTable.Type17->ExtendedSize; //Mb
|
|
|
|
} else {
|
|
|
|
mTotalSystemMemory += newSmbiosTable.Type17->Size; //Mb
|
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
mMemory17[gRAMCount] = (UINT16)mTotalSystemMemory;
|
|
|
|
// DBG("mTotalSystemMemory = %d\n", mTotalSystemMemory);
|
|
|
|
}
|
|
|
|
newSmbiosTable.Type17->MemoryErrorInformationHandle = 0xFFFF;
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.Attribute != -1) {
|
|
|
|
newSmbiosTable.Type17->Attributes = gSettings.Smbios.Attribute;
|
2019-11-15 13:17:19 +01:00
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
mHandle17[gRAMCount++] = LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
if (mTotalSystemMemory > 0) {
|
|
|
|
DBG("mTotalSystemMemory = %d\n", mTotalSystemMemory);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void
|
2019-09-03 11:58:42 +02:00
|
|
|
PatchTableType19 ()
|
|
|
|
{
|
|
|
|
//
|
|
|
|
// Generate Memory Array Mapped Address info (TYPE 19)
|
|
|
|
//
|
|
|
|
/*
|
|
|
|
/// This structure provides the address mapping for a Physical Memory Array.
|
|
|
|
/// One structure is present for each contiguous address range described.
|
|
|
|
///
|
|
|
|
typedef struct {
|
|
|
|
SMBIOS_STRUCTURE Hdr;
|
|
|
|
UINT32 StartingAddress;
|
|
|
|
UINT32 EndingAddress;
|
|
|
|
UINT16 MemoryArrayHandle;
|
|
|
|
UINT8 PartitionWidth;
|
|
|
|
} SMBIOS_TABLE_TYPE19;
|
|
|
|
|
|
|
|
*/
|
|
|
|
//Slice - I created one table as a sum of all other. It is needed for SetupBrowser
|
|
|
|
UINT32 TotalEnd = 0;
|
|
|
|
UINT8 PartWidth = 1;
|
|
|
|
UINT16 SomeHandle = 0x1300; //as a common rule handle=(type<<8 + index)
|
|
|
|
for (Index = 0; Index < TotalCount; Index++) {
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (SmbiosTable.Type19->EndingAddress > TotalEnd) {
|
|
|
|
TotalEnd = SmbiosTable.Type19->EndingAddress;
|
|
|
|
}
|
|
|
|
PartWidth = SmbiosTable.Type19->PartitionWidth;
|
|
|
|
//SomeHandle = SmbiosTable.Type19->Hdr.Handle;
|
|
|
|
}
|
|
|
|
if (TotalEnd == 0) {
|
|
|
|
TotalEnd = (UINT32)(LShiftU64(mTotalSystemMemory, 10) - 1);
|
|
|
|
}
|
|
|
|
gTotalMemory = LShiftU64(mTotalSystemMemory, 20);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type19, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type19->Hdr.Type = EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS;
|
|
|
|
newSmbiosTable.Type19->Hdr.Length = sizeof(SMBIOS_TABLE_TYPE19);
|
|
|
|
newSmbiosTable.Type19->Hdr.Handle = SomeHandle;
|
|
|
|
newSmbiosTable.Type19->MemoryArrayHandle = mHandle16;
|
|
|
|
newSmbiosTable.Type19->StartingAddress = 0;
|
|
|
|
newSmbiosTable.Type19->EndingAddress = TotalEnd;
|
|
|
|
newSmbiosTable.Type19->PartitionWidth = PartWidth;
|
|
|
|
mHandle19 = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType20 ()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
UINTN j = 0, k = 0, m = 0;
|
|
|
|
//
|
|
|
|
// Generate Memory Array Mapped Address info (TYPE 20)
|
|
|
|
// not needed neither for Apple nor for EFI
|
|
|
|
m = 0;
|
|
|
|
for (Index = 0; Index < TotalCount; Index++) {
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS, Index);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
TableSize = SmbiosTableLength(SmbiosTable);
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type20, MAX_TABLE_SIZE);
|
|
|
|
CopyMem((void*)newSmbiosTable.Type20, (void*)SmbiosTable.Type20, TableSize);
|
2019-09-03 11:58:42 +02:00
|
|
|
for (j=0; j < TotalCount; j++) {
|
|
|
|
//EndingAddress in kb while mMemory in Mb
|
|
|
|
if ((UINT32)(mMemory17[j] << 10) > newSmbiosTable.Type20->EndingAddress) {
|
|
|
|
newSmbiosTable.Type20->MemoryDeviceHandle = mHandle17[j];
|
|
|
|
k = newSmbiosTable.Type20->EndingAddress;
|
|
|
|
m += mMemory17[j];
|
2020-03-25 19:32:44 +01:00
|
|
|
DBG("Type20[%llu]->End = 0x%llX, Type17[%llu] = %llX\n",
|
2019-09-03 11:58:42 +02:00
|
|
|
Index, k, j, m);
|
2020-03-25 19:32:44 +01:00
|
|
|
// DBG(" MemoryDeviceHandle = 0x%X\n", newSmbiosTable.Type20->MemoryDeviceHandle);
|
2019-09-03 11:58:42 +02:00
|
|
|
mMemory17[j] = 0; // used
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// DBG("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
newSmbiosTable.Type20->MemoryArrayMappedAddressHandle = mHandle19;
|
|
|
|
//
|
|
|
|
// Record Smbios Type 20
|
|
|
|
//
|
|
|
|
LogSmbiosTable(newSmbiosTable);
|
|
|
|
}
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void GetTableType32()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
gBootStatus = SmbiosTable.Type32->BootStatus;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Apple Specific Structures.
|
|
|
|
* Firmware Table, FirmwareVolume (TYPE 128).
|
|
|
|
*/
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType128()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
/**
|
|
|
|
* Useful information.
|
|
|
|
*
|
|
|
|
* FW_REGION_RESERVED = 0,
|
|
|
|
* FW_REGION_RECOVERY = 1,
|
|
|
|
* FW_REGION_MAIN = 2,
|
|
|
|
* gHob->MemoryAbove1MB.PhysicalStart + ResourceLength or fix as 0x200000 - 0x600000,
|
|
|
|
* FW_REGION_NVRAM = 3,
|
|
|
|
* FW_REGION_CONFIG = 4,
|
|
|
|
* FW_REGION_DIAGVAULT = 5.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Get the existing 128 table if exists.
|
|
|
|
//SmbiosTable = GetSmbiosTableFromType (EntryPoint, 128, 0);
|
|
|
|
|
|
|
|
// initialise new table
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type128, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
// common rules
|
|
|
|
newSmbiosTable.Type128->Hdr.Type = 128;
|
|
|
|
newSmbiosTable.Type128->Hdr.Length = sizeof(SMBIOS_TABLE_TYPE128);
|
|
|
|
newSmbiosTable.Type128->Hdr.Handle = 0x8000;
|
|
|
|
|
|
|
|
// set firmware-features, example: 0x80001417, imac11,2 -> 0x1403.
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type128->FirmwareFeatures = gSettings.Smbios.gFwFeatures;
|
2019-09-03 11:58:42 +02:00
|
|
|
// set firmware-features mask
|
2021-04-03 16:42:49 +02:00
|
|
|
newSmbiosTable.Type128->FirmwareFeaturesMask = gSettings.Smbios.gFwFeaturesMask;
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* TODO: I have an idea that region should be the same as Efivar.bin
|
|
|
|
* @author Slice
|
|
|
|
*/
|
|
|
|
newSmbiosTable.Type128->RegionCount = 1;
|
|
|
|
newSmbiosTable.Type128->RegionType[0] = FW_REGION_MAIN;
|
|
|
|
//UpAddress = mTotalSystemMemory << 20; //Mb -> b
|
|
|
|
//gHob->MemoryAbove1MB.PhysicalStart;
|
|
|
|
newSmbiosTable.Type128->FlashMap[0].StartAddress = 0xFFE00000; //0xF0000;
|
|
|
|
//gHob->MemoryAbove1MB.PhysicalStart + gHob->MemoryAbove1MB.ResourceLength - 1;
|
|
|
|
newSmbiosTable.Type128->FlashMap[0].EndAddress = 0xFFEFFFFF;
|
|
|
|
//newSmbiosTable.Type128->RegionType[1] = FW_REGION_NVRAM; //Efivar
|
|
|
|
//newSmbiosTable.Type128->FlashMap[1].StartAddress = 0x15000; //0xF0000;
|
|
|
|
//newSmbiosTable.Type128->FlashMap[1].EndAddress = 0x1FFFF;
|
|
|
|
//region type=1 also present in mac
|
|
|
|
|
|
|
|
// log the new, 128, sbmios table
|
|
|
|
LogSmbiosTable(newSmbiosTable);
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType130()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
//
|
|
|
|
// MemorySPD (TYPE 130)
|
|
|
|
// TODO: read SPD and place here. But for a what?
|
|
|
|
//
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, 130, 0);
|
|
|
|
if (SmbiosTable.Raw == NULL) {
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
//
|
|
|
|
// Log Smbios Record Type130
|
|
|
|
//
|
|
|
|
LogSmbiosTable(SmbiosTable);
|
|
|
|
return ;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType131()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
// Get Table Type131
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, 131, 0);
|
|
|
|
if (SmbiosTable.Raw != NULL) {
|
2020-07-09 21:06:48 +02:00
|
|
|
MsgLog("Table 131 is present, CPUType=%hX\n", SmbiosTable.Type131->ProcessorType.Type);
|
2021-03-19 16:35:01 +01:00
|
|
|
MsgLog("Change to: %hX\n", gSettings.CPU.CpuType);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type131, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type131->Hdr.Type = 131;
|
|
|
|
newSmbiosTable.Type131->Hdr.Length = sizeof(SMBIOS_STRUCTURE)+2;
|
|
|
|
newSmbiosTable.Type131->Hdr.Handle = 0x8300; //common rule
|
|
|
|
// Patch ProcessorType
|
2021-03-19 16:35:01 +01:00
|
|
|
newSmbiosTable.Type131->ProcessorType.Type = gSettings.CPU.CpuType;
|
2019-09-03 11:58:42 +02:00
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType132()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
2021-03-19 14:04:19 +01:00
|
|
|
if (!GlobalConfig.SetTable132) {
|
2019-09-03 11:58:42 +02:00
|
|
|
//DBG("disabled Table 132\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get Table Type132
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, 132, 0);
|
|
|
|
if (SmbiosTable.Raw != NULL) {
|
2020-04-17 15:14:24 +02:00
|
|
|
MsgLog("Table 132 is present, QPI=%hX\n", SmbiosTable.Type132->ProcessorBusSpeed);
|
2021-03-19 16:35:01 +01:00
|
|
|
MsgLog("Change to: %hX\n", gSettings.CPU.QPI);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type132, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type132->Hdr.Type = 132;
|
|
|
|
newSmbiosTable.Type132->Hdr.Length = sizeof(SMBIOS_STRUCTURE)+2;
|
|
|
|
newSmbiosTable.Type132->Hdr.Handle = 0x8400; //ugly
|
|
|
|
|
|
|
|
// Patch ProcessorBusSpeed
|
2021-03-19 16:35:01 +01:00
|
|
|
if(gSettings.CPU.QPI){
|
|
|
|
newSmbiosTable.Type132->ProcessorBusSpeed = gSettings.CPU.QPI;
|
2019-09-03 11:58:42 +02:00
|
|
|
} else {
|
2021-02-06 18:16:46 +01:00
|
|
|
newSmbiosTable.Type132->ProcessorBusSpeed = (UINT16)(LShiftU64(DivU64x32(gCPUStructure.ExternalClock, Kilo), 2));
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchTableType133()
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.gPlatformFeature == 0xFFFF) {
|
2019-09-03 11:58:42 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Get Table Type133
|
|
|
|
SmbiosTable = GetSmbiosTableFromType (EntryPoint, 133, 0);
|
|
|
|
if (SmbiosTable.Raw != NULL) {
|
2020-03-25 19:32:44 +01:00
|
|
|
MsgLog("Table 133 is present, PlatformFeature=%llX\n", SmbiosTable.Type133->PlatformFeature);
|
2021-04-03 16:42:49 +02:00
|
|
|
MsgLog("Change to: %llX\n", gSettings.Smbios.gPlatformFeature);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
2020-10-03 19:02:31 +02:00
|
|
|
ZeroMem((void*)newSmbiosTable.Type133, MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
newSmbiosTable.Type133->Hdr.Type = 133;
|
|
|
|
newSmbiosTable.Type133->Hdr.Length = sizeof(SMBIOS_STRUCTURE)+8;
|
|
|
|
newSmbiosTable.Type133->Hdr.Handle = 0x8500; //ugly
|
2021-04-03 16:42:49 +02:00
|
|
|
// newSmbiosTable.Type133->PlatformFeature = gSettings.Smbios.gPlatformFeature;
|
|
|
|
CopyMem((void*)&newSmbiosTable.Type133->PlatformFeature, (void*)&gSettings.Smbios.gPlatformFeature, 8);
|
2019-09-03 11:58:42 +02:00
|
|
|
Handle = LogSmbiosTable(newSmbiosTable);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
EFI_STATUS PrepatchSmbios()
|
|
|
|
{
|
|
|
|
EFI_STATUS Status = EFI_SUCCESS;
|
|
|
|
UINTN BufferLen;
|
|
|
|
EFI_PHYSICAL_ADDRESS BufferPtr;
|
|
|
|
// UINTN Index;
|
|
|
|
DbgHeader("Get Smbios");
|
|
|
|
|
|
|
|
// Get SMBIOS Tables
|
|
|
|
Smbios = FindOemSMBIOSPtr();
|
|
|
|
// DBG("OEM SMBIOS EPS=%p\n", Smbios);
|
2020-03-25 19:32:44 +01:00
|
|
|
// DBG("OEM Tables = %X\n", ((SMBIOS_TABLE_ENTRY_POINT*)Smbios)->TableAddress);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (!Smbios) {
|
|
|
|
// DBG("Original SMBIOS System Table not found! Getting from Hob...\n");
|
|
|
|
Smbios = GetSmbiosTablesFromHob();
|
|
|
|
// DBG("HOB SMBIOS EPS=%p\n", Smbios);
|
|
|
|
if (!Smbios) {
|
|
|
|
// DBG("And here SMBIOS System Table not found! Trying System table ...\n");
|
|
|
|
// this should work on any UEFI
|
|
|
|
Smbios = GetSmbiosTablesFromConfigTables();
|
|
|
|
// DBG("ConfigTables SMBIOS EPS=%p\n", Smbios);
|
|
|
|
if (!Smbios) {
|
|
|
|
// DBG("And here SMBIOS System Table not found! Exiting...\n");
|
|
|
|
return EFI_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//original EPS and tables
|
|
|
|
EntryPoint = (SMBIOS_TABLE_ENTRY_POINT*)Smbios; //yes, it is old SmbiosEPS
|
2020-10-03 19:02:31 +02:00
|
|
|
// Smbios = (void*)(UINT32)EntryPoint->TableAddress; // here is flat Smbios database. Work with it
|
2019-09-03 11:58:42 +02:00
|
|
|
//how many we need to add for tables 128, 130, 131, 132 and for strings?
|
|
|
|
BufferLen = 0x20 + EntryPoint->TableLength + 64 * 10;
|
|
|
|
//new place for EPS and tables. Allocated once for both
|
|
|
|
BufferPtr = EFI_SYSTEM_TABLE_MAX_ADDRESS;
|
|
|
|
Status = gBS->AllocatePages (AllocateMaxAddress, EfiACPIMemoryNVS, /*EfiACPIReclaimMemory, */
|
|
|
|
EFI_SIZE_TO_PAGES(BufferLen), &BufferPtr);
|
2020-04-23 11:08:10 +02:00
|
|
|
if (EFI_ERROR(Status)) {
|
2019-09-03 11:58:42 +02:00
|
|
|
// DBG("There is error allocating pages in EfiACPIMemoryNVS!\n");
|
|
|
|
Status = gBS->AllocatePages (AllocateMaxAddress, /*EfiACPIMemoryNVS, */EfiACPIReclaimMemory,
|
|
|
|
ROUND_PAGE(BufferLen)/EFI_PAGE_SIZE, &BufferPtr);
|
2020-04-23 11:08:10 +02:00
|
|
|
if (EFI_ERROR(Status)) {
|
2019-09-03 11:58:42 +02:00
|
|
|
// DBG("There is error allocating pages in EfiACPIReclaimMemory!\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// DBG("Buffer @ %p\n", BufferPtr);
|
|
|
|
if (BufferPtr) {
|
|
|
|
SmbiosEpsNew = (SMBIOS_TABLE_ENTRY_POINT *)(UINTN)BufferPtr; //this is new EPS
|
|
|
|
} else {
|
|
|
|
SmbiosEpsNew = EntryPoint; //is it possible?!
|
|
|
|
}
|
|
|
|
ZeroMem(SmbiosEpsNew, BufferLen);
|
|
|
|
// DBG("New EntryPoint = %p\n", SmbiosEpsNew);
|
|
|
|
NumberOfRecords = 0;
|
|
|
|
MaxStructureSize = 0;
|
|
|
|
//preliminary fill EntryPoint with some data
|
2020-10-03 19:02:31 +02:00
|
|
|
CopyMem((void *)SmbiosEpsNew, (void *)EntryPoint, sizeof(SMBIOS_TABLE_ENTRY_POINT));
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
Smbios = (void*)(SmbiosEpsNew + 1); //this is a C-language trick. I hate it but use. +1 means +sizeof(SMBIOS_TABLE_ENTRY_POINT)
|
2019-09-03 11:58:42 +02:00
|
|
|
Current = (UINT8*)Smbios; //begin fill tables from here
|
|
|
|
SmbiosEpsNew->TableAddress = (UINT32)(UINTN)Current;
|
|
|
|
SmbiosEpsNew->EntryPointLength = sizeof(SMBIOS_TABLE_ENTRY_POINT); // no matter on other versions
|
2021-04-03 16:42:49 +02:00
|
|
|
if (gSettings.Smbios.SmbiosVersion != 0) {
|
|
|
|
SmbiosEpsNew->MajorVersion = (UINT8)(gSettings.Smbios.SmbiosVersion >> 8);
|
|
|
|
SmbiosEpsNew->MinorVersion = (UINT8)(gSettings.Smbios.SmbiosVersion & 0xFF);
|
2019-11-15 13:50:12 +01:00
|
|
|
SmbiosEpsNew->SmbiosBcdRevision = (SmbiosEpsNew->MajorVersion << 4) + SmbiosEpsNew->MinorVersion;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
//old behavior
|
|
|
|
SmbiosEpsNew->MajorVersion = 2;
|
|
|
|
SmbiosEpsNew->MinorVersion = 4;
|
|
|
|
SmbiosEpsNew->SmbiosBcdRevision = 0x24; //Slice - we want to have v2.6 but Apple still uses 2.4, let it be default value
|
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
//Create space for SPD
|
2020-08-15 15:47:56 +02:00
|
|
|
//gRAM = (__typeof__(gRAM))AllocateZeroPool(sizeof(MEM_STRUCTURE));
|
|
|
|
//gDMI = (__typeof__(gDMI))AllocateZeroPool(sizeof(DMI));
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
//Collect information for use in menu
|
|
|
|
GetTableType1();
|
|
|
|
GetTableType2();
|
|
|
|
GetTableType3();
|
|
|
|
GetTableType4();
|
|
|
|
GetTableType16();
|
|
|
|
GetTableType17();
|
|
|
|
GetTableType32(); //get BootStatus here to decide what to do
|
2020-04-17 15:14:24 +02:00
|
|
|
MsgLog("Boot status=%hhX\n", gBootStatus);
|
2019-09-03 11:58:42 +02:00
|
|
|
//for example the bootloader may go to Recovery is BootStatus is Fail
|
|
|
|
return Status;
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void PatchSmbios(void) //continue
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
|
|
|
|
DbgHeader("PatchSmbios");
|
|
|
|
|
2020-08-15 15:47:56 +02:00
|
|
|
newSmbiosTable.Raw = (UINT8*)AllocateZeroPool(MAX_TABLE_SIZE);
|
2019-09-03 11:58:42 +02:00
|
|
|
//Slice - order of patching is significant
|
|
|
|
PatchTableType0();
|
|
|
|
PatchTableType1();
|
|
|
|
PatchTableType2();
|
|
|
|
PatchTableType3();
|
|
|
|
PatchTableType7(); //we should know handles before patch Table4
|
|
|
|
PatchTableType4();
|
|
|
|
// PatchTableType6();
|
|
|
|
PatchTableType9();
|
2021-04-03 16:42:49 +02:00
|
|
|
if (!gSettings.Smbios.NoRomInfo) {
|
2019-12-12 15:51:55 +01:00
|
|
|
PatchTableType11();
|
|
|
|
}
|
2019-09-03 11:58:42 +02:00
|
|
|
PatchTableTypeSome();
|
|
|
|
PatchTableType17();
|
|
|
|
PatchTableType16();
|
|
|
|
PatchTableType19();
|
|
|
|
PatchTableType20();
|
|
|
|
PatchTableType128();
|
|
|
|
PatchTableType130();
|
|
|
|
PatchTableType131();
|
|
|
|
PatchTableType132();
|
|
|
|
PatchTableType133();
|
|
|
|
AddSmbiosEndOfTable();
|
|
|
|
if(MaxStructureSize > MAX_TABLE_SIZE){
|
|
|
|
// DBG("Too long SMBIOS!\n");
|
|
|
|
}
|
2020-10-03 19:02:31 +02:00
|
|
|
FreePool((void*)newSmbiosTable.Raw);
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
// there is no need to keep all tables in numeric order. It is not needed
|
|
|
|
// neither by specs nor by AppleSmbios.kext
|
|
|
|
}
|
|
|
|
|
2020-10-03 19:02:31 +02:00
|
|
|
void FinalizeSmbios() //continue
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
EFI_PEI_HOB_POINTERS GuidHob;
|
|
|
|
EFI_PEI_HOB_POINTERS HobStart;
|
|
|
|
EFI_PHYSICAL_ADDRESS *Table = NULL;
|
|
|
|
//UINTN TableLength = 0;
|
2020-05-15 05:23:33 +02:00
|
|
|
// BOOLEAN FoundTable3 = FALSE;
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
// Get Hob List
|
2020-02-21 22:22:30 +01:00
|
|
|
HobStart.Raw = (__typeof_am__(HobStart.Raw))GetHobList();
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
if (HobStart.Raw != NULL) {
|
|
|
|
// find SMBIOS in hob
|
|
|
|
for (Index = 0; Index < sizeof (gTableGuidArray) / sizeof (*gTableGuidArray); ++Index) {
|
2020-02-21 22:22:30 +01:00
|
|
|
GuidHob.Raw = (__typeof_am__(HobStart.Raw))GetNextGuidHob (gTableGuidArray[Index], HobStart.Raw);
|
2019-09-03 11:58:42 +02:00
|
|
|
if (GuidHob.Raw != NULL) {
|
2020-02-21 22:22:30 +01:00
|
|
|
Table = (__typeof_am__(Table))GET_GUID_HOB_DATA (GuidHob.Guid);
|
2019-09-03 11:58:42 +02:00
|
|
|
//TableLength = GET_GUID_HOB_DATA_SIZE (GuidHob);
|
|
|
|
if (Table != NULL) {
|
|
|
|
if (Index != 0) {
|
2020-05-15 05:23:33 +02:00
|
|
|
// FoundTable3 = TRUE; //don't know how to use it. Real Mac have table3 in the format of table2
|
2019-09-03 11:58:42 +02:00
|
|
|
DBG("Found SMBIOS3 Table\n");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// Install SMBIOS in Config table
|
|
|
|
SmbiosEpsNew->TableLength = (UINT16)((UINT32)(UINTN)Current - (UINT32)(UINTN)Smbios);
|
|
|
|
SmbiosEpsNew->NumberOfSmbiosStructures = NumberOfRecords;
|
|
|
|
SmbiosEpsNew->MaxStructureSize = MaxStructureSize;
|
|
|
|
SmbiosEpsNew->IntermediateChecksum = 0;
|
|
|
|
SmbiosEpsNew->IntermediateChecksum = (UINT8)(256 - Checksum8((UINT8*)SmbiosEpsNew + 0x10, SmbiosEpsNew->EntryPointLength - 0x10));
|
|
|
|
SmbiosEpsNew->EntryPointStructureChecksum = 0;
|
|
|
|
SmbiosEpsNew->EntryPointStructureChecksum = (UINT8)(256 - Checksum8((UINT8*)SmbiosEpsNew, SmbiosEpsNew->EntryPointLength));
|
2020-11-18 22:49:02 +01:00
|
|
|
//DBG("SmbiosEpsNew->TableLength = %d\n", SmbiosEpsNew->TableLength);
|
|
|
|
//DBG("SmbiosEpsNew->EntryPointLength = %d\n", SmbiosEpsNew->EntryPointLength);
|
|
|
|
//DBG("SmbiosEpsNew->MaxStructureSize = %d\n", SmbiosEpsNew->MaxStructureSize);
|
|
|
|
//DBG("DMI checksum = %d\n", Checksum8((UINT8*)SmbiosEpsNew, SmbiosEpsNew->EntryPointLength));
|
|
|
|
//XString8 tmpDbg;
|
|
|
|
//XString8 tmptmpDbg;
|
|
|
|
//tmpDbg.dataSized(SmbiosEpsNew->TableLength*3+5*SmbiosEpsNew->TableLength/32+128);
|
|
|
|
//for ( size_t i = 0 ; i < SmbiosEpsNew->TableLength ; ) {
|
|
|
|
// size_t j;
|
|
|
|
// for ( j = 0 ; j < SmbiosEpsNew->TableLength && j < 32 ; j++ ) {
|
|
|
|
//// DBG("%02x ", ((UINT8*)(SmbiosEpsNew+1))[i+j] );
|
|
|
|
// tmptmpDbg.S8Printf("%02x ", ((UINT8*)(SmbiosEpsNew+1))[i+j] );
|
|
|
|
// tmpDbg.strcat(tmptmpDbg);
|
|
|
|
// }
|
|
|
|
//// DBG(" - ");
|
|
|
|
// tmptmpDbg.S8Printf(" - ");
|
|
|
|
// tmpDbg.strcat(tmptmpDbg);
|
|
|
|
// for ( j = 0 ; j < SmbiosEpsNew->TableLength && j < 32 ; j++ ) {
|
|
|
|
// UINT8 c = ((UINT8*)(SmbiosEpsNew+1))[i+j];
|
|
|
|
//// DBG("%c ", c > 32 ? c : '.');
|
|
|
|
// tmptmpDbg.S8Printf("%c", c > 32 ? c : '.');
|
|
|
|
// tmpDbg.strcat(tmptmpDbg);
|
|
|
|
// }
|
|
|
|
//// DBG("\n");
|
|
|
|
// tmptmpDbg.S8Printf("\n");
|
|
|
|
// tmpDbg.strcat(tmptmpDbg);
|
|
|
|
// i += j;
|
|
|
|
//}
|
|
|
|
//DBG("%s", tmpDbg.c_str());
|
|
|
|
//auto foo = SmbiosEpsNew;
|
2019-09-03 11:58:42 +02:00
|
|
|
|
|
|
|
//
|
|
|
|
// syscl: one more step: check if we need remap SMBIOS Table Type 1 Guid
|
|
|
|
//
|
|
|
|
// to fix Dell's SMBIOS truncate credit David Passmore
|
|
|
|
//
|
2021-03-25 15:32:56 +01:00
|
|
|
if (gSettings.KernelAndKextPatches.KPDELLSMBIOS)
|
2019-09-03 11:58:42 +02:00
|
|
|
{
|
|
|
|
//
|
|
|
|
// syscl: remap smbios table 1 guid
|
|
|
|
//
|
|
|
|
DBG("Remap smbios table type 1 guid.\n");
|
2020-10-03 19:02:31 +02:00
|
|
|
gBS->InstallConfigurationTable (&gRemapEfiSmbiosTableGuid, (void*)SmbiosEpsNew);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//
|
|
|
|
// use origin smbios guid table
|
|
|
|
//
|
|
|
|
DBG("Use origin smbios table type 1 guid.\n");
|
2020-10-03 19:02:31 +02:00
|
|
|
gBS->InstallConfigurationTable (&gEfiSmbiosTableGuid, (void*)SmbiosEpsNew);
|
2019-09-03 11:58:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
gST->Hdr.CRC32 = 0;
|
|
|
|
gBS->CalculateCrc32 ((UINT8 *) &gST->Hdr, gST->Hdr.HeaderSize, &gST->Hdr.CRC32);
|
|
|
|
|
|
|
|
//
|
|
|
|
// Fix it in Hob list
|
|
|
|
//
|
|
|
|
// No smbios in Hob list on Aptio, so no need to update it there.
|
|
|
|
// But even if it would be there, loading of macOS would overwrite it
|
|
|
|
// since this list on my board is inside space needed for kernel
|
|
|
|
// (ha! like many other UEFI stuff).
|
|
|
|
// It's enough to add it to Conf.table.
|
|
|
|
//
|
|
|
|
if (Table != NULL) {
|
|
|
|
//PauseForKey(L"installing SMBIOS in Hob\n");
|
|
|
|
*Table = (UINT32)(UINTN)SmbiosEpsNew;
|
|
|
|
}
|
2020-10-17 15:01:33 +02:00
|
|
|
// egSaveFile(NULL, SWPrintf("%ls\\misc\\smbios.bin", self.getCloverDirFullPath().wc_str()).wc_str(), (UINT8*)(UINTN)SmbiosEpsNew, SmbiosEpsNew->TableLength);
|
2019-09-03 11:58:42 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|