\r
#include "SmbiosProcessor.h"\r
\r
-extern UINT8 ProcessorSubClassStrings[];\r
+extern UINT8 ProcessorSubClassStrings[];\r
\r
-#define CACHE_SOCKETED_SHIFT 3\r
-#define CACHE_LOCATION_SHIFT 5\r
-#define CACHE_ENABLED_SHIFT 7\r
-#define CACHE_OPERATION_MODE_SHIFT 8\r
+#define CACHE_SOCKETED_SHIFT 3\r
+#define CACHE_LOCATION_SHIFT 5\r
+#define CACHE_ENABLED_SHIFT 7\r
+#define CACHE_OPERATION_MODE_SHIFT 8\r
\r
typedef enum {\r
CacheModeWriteThrough = 0, ///< Cache is write-through\r
CacheLocationMax\r
} CACHE_LOCATION;\r
\r
-EFI_HII_HANDLE mHiiHandle;\r
+EFI_HII_HANDLE mHiiHandle;\r
\r
EFI_SMBIOS_PROTOCOL *mSmbios;\r
\r
-SMBIOS_TABLE_TYPE4 mSmbiosProcessorTableTemplate = {\r
- { // Hdr\r
- EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, // Type\r
- sizeof (SMBIOS_TABLE_TYPE4), // Length\r
- 0 // Handle\r
- },\r
- 1, // Socket\r
- CentralProcessor, // ProcessorType\r
- ProcessorFamilyIndicatorFamily2, // ProcessorFamily\r
- 2, // ProcessorManufacture\r
- { // ProcessorId\r
- { // Signature\r
- 0\r
- },\r
- { // FeatureFlags\r
- 0\r
- }\r
- },\r
- 3, // ProcessorVersion\r
- { // Voltage\r
+SMBIOS_TABLE_TYPE4 mSmbiosProcessorTableTemplate = {\r
+ { // Hdr\r
+ EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, // Type\r
+ sizeof (SMBIOS_TABLE_TYPE4), // Length\r
+ 0 // Handle\r
+ },\r
+ 1, // Socket\r
+ CentralProcessor, // ProcessorType\r
+ ProcessorFamilyIndicatorFamily2, // ProcessorFamily\r
+ 2, // ProcessorManufacture\r
+ { // ProcessorId\r
+ { // Signature\r
0\r
},\r
- 0, // ExternalClock\r
- 0, // MaxSpeed\r
- 0, // CurrentSpeed\r
- 0, // Status\r
- ProcessorUpgradeUnknown, // ProcessorUpgrade\r
- 0xFFFF, // L1CacheHandle\r
- 0xFFFF, // L2CacheHandle\r
- 0xFFFF, // L3CacheHandle\r
- 4, // SerialNumber\r
- 5, // AssetTag\r
- 6, // PartNumber\r
- 0, // CoreCount\r
- 0, //EnabledCoreCount\r
- 0, // ThreadCount\r
- 0, // ProcessorCharacteristics\r
- ProcessorFamilyARM, // ProcessorFamily2\r
- 0, // CoreCount2\r
- 0, // EnabledCoreCount2\r
- 0 // ThreadCount2\r
+ { // FeatureFlags\r
+ 0\r
+ }\r
+ },\r
+ 3, // ProcessorVersion\r
+ { // Voltage\r
+ 0\r
+ },\r
+ 0, // ExternalClock\r
+ 0, // MaxSpeed\r
+ 0, // CurrentSpeed\r
+ 0, // Status\r
+ ProcessorUpgradeUnknown, // ProcessorUpgrade\r
+ 0xFFFF, // L1CacheHandle\r
+ 0xFFFF, // L2CacheHandle\r
+ 0xFFFF, // L3CacheHandle\r
+ 4, // SerialNumber\r
+ 5, // AssetTag\r
+ 6, // PartNumber\r
+ 0, // CoreCount\r
+ 0, // EnabledCoreCount\r
+ 0, // ThreadCount\r
+ 0, // ProcessorCharacteristics\r
+ ProcessorFamilyARM, // ProcessorFamily2\r
+ 0, // CoreCount2\r
+ 0, // EnabledCoreCount2\r
+ 0 // ThreadCount2\r
};\r
\r
/** Sets the HII variable `StringId` is `Pcd` isn't empty.\r
**/\r
UINT16\r
GetCpuFrequency (\r
- IN UINT8 ProcessorNumber\r
+ IN UINT8 ProcessorNumber\r
)\r
{\r
return (UINT16)(OemGetCpuFreq (ProcessorNumber) / 1000 / 1000);\r
**/\r
UINTN\r
GetCacheSocketStr (\r
- IN UINT8 CacheLevel,\r
- IN BOOLEAN DataCache,\r
- IN BOOLEAN UnifiedCache,\r
- OUT CHAR16 *CacheSocketStr\r
+ IN UINT8 CacheLevel,\r
+ IN BOOLEAN DataCache,\r
+ IN BOOLEAN UnifiedCache,\r
+ OUT CHAR16 *CacheSocketStr\r
)\r
{\r
- UINTN CacheSocketStrLen;\r
+ UINTN CacheSocketStrLen;\r
\r
- if (CacheLevel == CpuCacheL1 && !DataCache && !UnifiedCache) {\r
+ if ((CacheLevel == CpuCacheL1) && !DataCache && !UnifiedCache) {\r
CacheSocketStrLen = UnicodeSPrint (\r
CacheSocketStr,\r
SMBIOS_STRING_MAX_LENGTH - 1,\r
L"L%x Instruction Cache",\r
- CacheLevel);\r
- } else if (CacheLevel == CpuCacheL1 && DataCache) {\r
- CacheSocketStrLen = UnicodeSPrint (CacheSocketStr,\r
+ CacheLevel\r
+ );\r
+ } else if ((CacheLevel == CpuCacheL1) && DataCache) {\r
+ CacheSocketStrLen = UnicodeSPrint (\r
+ CacheSocketStr,\r
SMBIOS_STRING_MAX_LENGTH - 1,\r
L"L%x Data Cache",\r
- CacheLevel);\r
+ CacheLevel\r
+ );\r
} else {\r
- CacheSocketStrLen = UnicodeSPrint (CacheSocketStr,\r
+ CacheSocketStrLen = UnicodeSPrint (\r
+ CacheSocketStr,\r
SMBIOS_STRING_MAX_LENGTH - 1,\r
L"L%x Cache",\r
- CacheLevel);\r
+ CacheLevel\r
+ );\r
}\r
\r
return CacheSocketStrLen;\r
**/\r
VOID\r
ConfigureCacheArchitectureInformation (\r
- IN UINT8 CacheLevel,\r
- IN BOOLEAN DataCache,\r
- IN BOOLEAN UnifiedCache,\r
- OUT SMBIOS_TABLE_TYPE7 *Type7Record\r
+ IN UINT8 CacheLevel,\r
+ IN BOOLEAN DataCache,\r
+ IN BOOLEAN UnifiedCache,\r
+ OUT SMBIOS_TABLE_TYPE7 *Type7Record\r
)\r
{\r
- UINT8 Associativity;\r
- UINT32 CacheSize32;\r
- UINT16 CacheSize16;\r
- UINT64 CacheSize64;\r
+ UINT8 Associativity;\r
+ UINT32 CacheSize32;\r
+ UINT16 CacheSize16;\r
+ UINT64 CacheSize64;\r
\r
if (!DataCache && !UnifiedCache) {\r
Type7Record->SystemCacheType = CacheTypeInstruction;\r
} else if (UnifiedCache) {\r
Type7Record->SystemCacheType = CacheTypeUnified;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
\r
- CacheSize64 = SmbiosProcessorGetCacheSize (CacheLevel,\r
- DataCache,\r
- UnifiedCache\r
- );\r
+ CacheSize64 = SmbiosProcessorGetCacheSize (\r
+ CacheLevel,\r
+ DataCache,\r
+ UnifiedCache\r
+ );\r
\r
- Associativity = SmbiosProcessorGetCacheAssociativity (CacheLevel,\r
- DataCache,\r
- UnifiedCache\r
- );\r
+ Associativity = SmbiosProcessorGetCacheAssociativity (\r
+ CacheLevel,\r
+ DataCache,\r
+ UnifiedCache\r
+ );\r
\r
CacheSize64 /= 1024; // Minimum granularity is 1K\r
\r
CacheSize16 = -1;\r
}\r
\r
- Type7Record->MaximumCacheSize = CacheSize16;\r
- Type7Record->InstalledSize = CacheSize16;\r
+ Type7Record->MaximumCacheSize = CacheSize16;\r
+ Type7Record->InstalledSize = CacheSize16;\r
Type7Record->MaximumCacheSize2 = CacheSize32;\r
- Type7Record->InstalledSize2 = CacheSize32;\r
+ Type7Record->InstalledSize2 = CacheSize32;\r
\r
switch (Associativity) {\r
case 2:\r
(CacheLevel - 1);\r
}\r
\r
-\r
/** Allocates and initializes an SMBIOS_TABLE_TYPE7 structure.\r
\r
@param[in] CacheLevel The cache level (L1-L7).\r
**/\r
SMBIOS_TABLE_TYPE7 *\r
AllocateAndInitCacheInformation (\r
- IN UINT8 CacheLevel,\r
- IN BOOLEAN DataCache,\r
- IN BOOLEAN UnifiedCache\r
+ IN UINT8 CacheLevel,\r
+ IN BOOLEAN DataCache,\r
+ IN BOOLEAN UnifiedCache\r
)\r
{\r
SMBIOS_TABLE_TYPE7 *Type7Record;\r
\r
// Allocate and fetch the cache description\r
StringBufferSize = sizeof (CHAR16) * SMBIOS_STRING_MAX_LENGTH;\r
- CacheSocketStr = AllocateZeroPool (StringBufferSize);\r
+ CacheSocketStr = AllocateZeroPool (StringBufferSize);\r
if (CacheSocketStr == NULL) {\r
return NULL;\r
}\r
\r
- CacheSocketStrLen = GetCacheSocketStr (CacheLevel,\r
- DataCache,\r
- UnifiedCache,\r
- CacheSocketStr);\r
+ CacheSocketStrLen = GetCacheSocketStr (\r
+ CacheLevel,\r
+ DataCache,\r
+ UnifiedCache,\r
+ CacheSocketStr\r
+ );\r
\r
- TableSize = sizeof (SMBIOS_TABLE_TYPE7) + CacheSocketStrLen + 1 + 1;\r
+ TableSize = sizeof (SMBIOS_TABLE_TYPE7) + CacheSocketStrLen + 1 + 1;\r
Type7Record = AllocateZeroPool (TableSize);\r
if (Type7Record == NULL) {\r
- FreePool(CacheSocketStr);\r
+ FreePool (CacheSocketStr);\r
return NULL;\r
}\r
\r
- Type7Record->Hdr.Type = EFI_SMBIOS_TYPE_CACHE_INFORMATION;\r
+ Type7Record->Hdr.Type = EFI_SMBIOS_TYPE_CACHE_INFORMATION;\r
Type7Record->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE7);\r
Type7Record->Hdr.Handle = SMBIOS_HANDLE_PI_RESERVED;\r
\r
Type7Record->SocketDesignation = 1;\r
\r
Type7Record->SupportedSRAMType.Unknown = 1;\r
- Type7Record->CurrentSRAMType.Unknown = 1;\r
- Type7Record->CacheSpeed = 0;\r
- Type7Record->ErrorCorrectionType = CacheErrorUnknown;\r
+ Type7Record->CurrentSRAMType.Unknown = 1;\r
+ Type7Record->CacheSpeed = 0;\r
+ Type7Record->ErrorCorrectionType = CacheErrorUnknown;\r
\r
OptionalStrStart = (CHAR8 *)(Type7Record + 1);\r
UnicodeStrToAsciiStrS (CacheSocketStr, OptionalStrStart, CacheSocketStrLen + 1);\r
**/\r
VOID\r
AddSmbiosCacheTypeTable (\r
- IN UINTN ProcessorIndex,\r
- OUT EFI_SMBIOS_HANDLE *L1CacheHandle,\r
- OUT EFI_SMBIOS_HANDLE *L2CacheHandle,\r
- OUT EFI_SMBIOS_HANDLE *L3CacheHandle\r
+ IN UINTN ProcessorIndex,\r
+ OUT EFI_SMBIOS_HANDLE *L1CacheHandle,\r
+ OUT EFI_SMBIOS_HANDLE *L2CacheHandle,\r
+ OUT EFI_SMBIOS_HANDLE *L3CacheHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- SMBIOS_TABLE_TYPE7 *Type7Record;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
- UINT8 CacheLevel;\r
- UINT8 MaxCacheLevel;\r
- BOOLEAN DataCacheType;\r
- BOOLEAN SeparateCaches;\r
+ EFI_STATUS Status;\r
+ SMBIOS_TABLE_TYPE7 *Type7Record;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ UINT8 CacheLevel;\r
+ UINT8 MaxCacheLevel;\r
+ BOOLEAN DataCacheType;\r
+ BOOLEAN SeparateCaches;\r
\r
Status = EFI_SUCCESS;\r
\r
// process the instruction cache.\r
for (DataCacheType = 0; DataCacheType <= 1; DataCacheType++) {\r
// If there's no separate data/instruction cache, skip the second iteration\r
- if (DataCacheType == 1 && !SeparateCaches) {\r
+ if ((DataCacheType == 1) && !SeparateCaches) {\r
continue;\r
}\r
\r
- Type7Record = AllocateAndInitCacheInformation (CacheLevel,\r
- DataCacheType,\r
- !SeparateCaches\r
- );\r
+ Type7Record = AllocateAndInitCacheInformation (\r
+ CacheLevel,\r
+ DataCacheType,\r
+ !SeparateCaches\r
+ );\r
if (Type7Record == NULL) {\r
continue;\r
}\r
\r
- ConfigureCacheArchitectureInformation(CacheLevel,\r
- DataCacheType,\r
- !SeparateCaches,\r
- Type7Record\r
- );\r
+ ConfigureCacheArchitectureInformation (\r
+ CacheLevel,\r
+ DataCacheType,\r
+ !SeparateCaches,\r
+ Type7Record\r
+ );\r
\r
// Allow the platform to fill in other information such as speed, SRAM type etc.\r
- if (!OemGetCacheInformation (ProcessorIndex, CacheLevel,\r
- DataCacheType, !SeparateCaches, Type7Record)) {\r
+ if (!OemGetCacheInformation (\r
+ ProcessorIndex,\r
+ CacheLevel,\r
+ DataCacheType,\r
+ !SeparateCaches,\r
+ Type7Record\r
+ ))\r
+ {\r
continue;\r
}\r
\r
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
// Finally, install the table\r
- Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle,\r
- (EFI_SMBIOS_TABLE_HEADER *)Type7Record);\r
+ Status = mSmbios->Add (\r
+ mSmbios,\r
+ NULL,\r
+ &SmbiosHandle,\r
+ (EFI_SMBIOS_TABLE_HEADER *)Type7Record\r
+ );\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
**/\r
EFI_STATUS\r
AllocateType4AndSetProcessorInformationStrings (\r
- SMBIOS_TABLE_TYPE4 **Type4Record,\r
- UINT8 ProcessorIndex,\r
- BOOLEAN Populated\r
+ SMBIOS_TABLE_TYPE4 **Type4Record,\r
+ UINT8 ProcessorIndex,\r
+ BOOLEAN Populated\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_STRING_ID ProcessorManu;\r
- EFI_STRING_ID ProcessorVersion;\r
- EFI_STRING_ID SerialNumber;\r
- EFI_STRING_ID AssetTag;\r
- EFI_STRING_ID PartNumber;\r
- EFI_STRING ProcessorStr;\r
- EFI_STRING ProcessorManuStr;\r
- EFI_STRING ProcessorVersionStr;\r
- EFI_STRING SerialNumberStr;\r
- EFI_STRING AssetTagStr;\r
- EFI_STRING PartNumberStr;\r
- CHAR8 *OptionalStrStart;\r
- CHAR8 *StrStart;\r
- UINTN ProcessorStrLen;\r
- UINTN ProcessorManuStrLen;\r
- UINTN ProcessorVersionStrLen;\r
- UINTN SerialNumberStrLen;\r
- UINTN AssetTagStrLen;\r
- UINTN PartNumberStrLen;\r
- UINTN TotalSize;\r
- UINTN StringBufferSize;\r
+ EFI_STATUS Status;\r
+ EFI_STRING_ID ProcessorManu;\r
+ EFI_STRING_ID ProcessorVersion;\r
+ EFI_STRING_ID SerialNumber;\r
+ EFI_STRING_ID AssetTag;\r
+ EFI_STRING_ID PartNumber;\r
+ EFI_STRING ProcessorStr;\r
+ EFI_STRING ProcessorManuStr;\r
+ EFI_STRING ProcessorVersionStr;\r
+ EFI_STRING SerialNumberStr;\r
+ EFI_STRING AssetTagStr;\r
+ EFI_STRING PartNumberStr;\r
+ CHAR8 *OptionalStrStart;\r
+ CHAR8 *StrStart;\r
+ UINTN ProcessorStrLen;\r
+ UINTN ProcessorManuStrLen;\r
+ UINTN ProcessorVersionStrLen;\r
+ UINTN SerialNumberStrLen;\r
+ UINTN AssetTagStrLen;\r
+ UINTN PartNumberStrLen;\r
+ UINTN TotalSize;\r
+ UINTN StringBufferSize;\r
\r
Status = EFI_SUCCESS;\r
\r
AssetTagStr = NULL;\r
PartNumberStr = NULL;\r
\r
- ProcessorManu = STRING_TOKEN (STR_PROCESSOR_MANUFACTURE);\r
- ProcessorVersion = STRING_TOKEN (STR_PROCESSOR_VERSION);\r
- SerialNumber = STRING_TOKEN (STR_PROCESSOR_SERIAL_NUMBER);\r
- AssetTag = STRING_TOKEN (STR_PROCESSOR_ASSET_TAG);\r
- PartNumber = STRING_TOKEN (STR_PROCESSOR_PART_NUMBER);\r
+ ProcessorManu = STRING_TOKEN (STR_PROCESSOR_MANUFACTURE);\r
+ ProcessorVersion = STRING_TOKEN (STR_PROCESSOR_VERSION);\r
+ SerialNumber = STRING_TOKEN (STR_PROCESSOR_SERIAL_NUMBER);\r
+ AssetTag = STRING_TOKEN (STR_PROCESSOR_ASSET_TAG);\r
+ PartNumber = STRING_TOKEN (STR_PROCESSOR_PART_NUMBER);\r
\r
SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorManufacturer, ProcessorManu);\r
SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorVersion, ProcessorVersion);\r
\r
// Processor Designation\r
StringBufferSize = sizeof (CHAR16) * SMBIOS_STRING_MAX_LENGTH;\r
- ProcessorStr = AllocateZeroPool (StringBufferSize);\r
+ ProcessorStr = AllocateZeroPool (StringBufferSize);\r
if (ProcessorStr == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- ProcessorStrLen = UnicodeSPrint (ProcessorStr, StringBufferSize,\r
- L"CPU%02d", ProcessorIndex + 1);\r
+ ProcessorStrLen = UnicodeSPrint (\r
+ ProcessorStr,\r
+ StringBufferSize,\r
+ L"CPU%02d",\r
+ ProcessorIndex + 1\r
+ );\r
\r
// Processor Manufacture\r
- ProcessorManuStr = HiiGetPackageString (&gEfiCallerIdGuid, ProcessorManu, NULL);\r
+ ProcessorManuStr = HiiGetPackageString (&gEfiCallerIdGuid, ProcessorManu, NULL);\r
ProcessorManuStrLen = StrLen (ProcessorManuStr);\r
\r
// Processor Version\r
- ProcessorVersionStr = HiiGetPackageString (&gEfiCallerIdGuid, ProcessorVersion, NULL);\r
+ ProcessorVersionStr = HiiGetPackageString (&gEfiCallerIdGuid, ProcessorVersion, NULL);\r
ProcessorVersionStrLen = StrLen (ProcessorVersionStr);\r
\r
// Serial Number\r
- SerialNumberStr = HiiGetPackageString (&gEfiCallerIdGuid, SerialNumber, NULL);\r
+ SerialNumberStr = HiiGetPackageString (&gEfiCallerIdGuid, SerialNumber, NULL);\r
SerialNumberStrLen = StrLen (SerialNumberStr);\r
\r
// Asset Tag\r
- AssetTagStr = HiiGetPackageString (&gEfiCallerIdGuid, AssetTag, NULL);\r
+ AssetTagStr = HiiGetPackageString (&gEfiCallerIdGuid, AssetTag, NULL);\r
AssetTagStrLen = StrLen (AssetTagStr);\r
\r
// Part Number\r
- PartNumberStr = HiiGetPackageString (&gEfiCallerIdGuid, PartNumber, NULL);\r
+ PartNumberStr = HiiGetPackageString (&gEfiCallerIdGuid, PartNumber, NULL);\r
PartNumberStrLen = StrLen (PartNumberStr);\r
\r
TotalSize = sizeof (SMBIOS_TABLE_TYPE4) +\r
**/\r
EFI_STATUS\r
AddSmbiosProcessorTypeTable (\r
- IN UINTN ProcessorIndex\r
+ IN UINTN ProcessorIndex\r
)\r
{\r
- EFI_STATUS Status;\r
- SMBIOS_TABLE_TYPE4 *Type4Record;\r
- EFI_SMBIOS_HANDLE SmbiosHandle;\r
- EFI_SMBIOS_HANDLE L1CacheHandle;\r
- EFI_SMBIOS_HANDLE L2CacheHandle;\r
- EFI_SMBIOS_HANDLE L3CacheHandle;\r
- UINT8 *LegacyVoltage;\r
- PROCESSOR_STATUS_DATA ProcessorStatus;\r
- UINT64 *ProcessorId;\r
- PROCESSOR_CHARACTERISTIC_FLAGS ProcessorCharacteristics;\r
- OEM_MISC_PROCESSOR_DATA MiscProcessorData;\r
- BOOLEAN ProcessorPopulated;\r
-\r
- Type4Record = NULL;\r
-\r
- MiscProcessorData.Voltage = 0;\r
- MiscProcessorData.CurrentSpeed = 0;\r
- MiscProcessorData.CoreCount = 0;\r
- MiscProcessorData.CoresEnabled = 0;\r
- MiscProcessorData.ThreadCount = 0;\r
- MiscProcessorData.MaxSpeed = 0;\r
- L1CacheHandle = 0xFFFF;\r
- L2CacheHandle = 0xFFFF;\r
- L3CacheHandle = 0xFFFF;\r
+ EFI_STATUS Status;\r
+ SMBIOS_TABLE_TYPE4 *Type4Record;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ EFI_SMBIOS_HANDLE L1CacheHandle;\r
+ EFI_SMBIOS_HANDLE L2CacheHandle;\r
+ EFI_SMBIOS_HANDLE L3CacheHandle;\r
+ UINT8 *LegacyVoltage;\r
+ PROCESSOR_STATUS_DATA ProcessorStatus;\r
+ UINT64 *ProcessorId;\r
+ PROCESSOR_CHARACTERISTIC_FLAGS ProcessorCharacteristics;\r
+ OEM_MISC_PROCESSOR_DATA MiscProcessorData;\r
+ BOOLEAN ProcessorPopulated;\r
+\r
+ Type4Record = NULL;\r
+\r
+ MiscProcessorData.Voltage = 0;\r
+ MiscProcessorData.CurrentSpeed = 0;\r
+ MiscProcessorData.CoreCount = 0;\r
+ MiscProcessorData.CoresEnabled = 0;\r
+ MiscProcessorData.ThreadCount = 0;\r
+ MiscProcessorData.MaxSpeed = 0;\r
+ L1CacheHandle = 0xFFFF;\r
+ L2CacheHandle = 0xFFFF;\r
+ L3CacheHandle = 0xFFFF;\r
\r
ProcessorPopulated = OemIsProcessorPresent (ProcessorIndex);\r
\r
return Status;\r
}\r
\r
- OemGetProcessorInformation (ProcessorIndex,\r
- &ProcessorStatus,\r
- (PROCESSOR_CHARACTERISTIC_FLAGS*)\r
- &Type4Record->ProcessorCharacteristics,\r
- &MiscProcessorData);\r
+ OemGetProcessorInformation (\r
+ ProcessorIndex,\r
+ &ProcessorStatus,\r
+ (PROCESSOR_CHARACTERISTIC_FLAGS *)\r
+ &Type4Record->ProcessorCharacteristics,\r
+ &MiscProcessorData\r
+ );\r
\r
if (ProcessorPopulated) {\r
- AddSmbiosCacheTypeTable (ProcessorIndex, &L1CacheHandle,\r
- &L2CacheHandle, &L3CacheHandle);\r
+ AddSmbiosCacheTypeTable (\r
+ ProcessorIndex,\r
+ &L1CacheHandle,\r
+ &L2CacheHandle,\r
+ &L3CacheHandle\r
+ );\r
}\r
\r
- LegacyVoltage = (UINT8*)&Type4Record->Voltage;\r
-\r
- *LegacyVoltage = MiscProcessorData.Voltage;\r
- Type4Record->CurrentSpeed = MiscProcessorData.CurrentSpeed;\r
- Type4Record->MaxSpeed = MiscProcessorData.MaxSpeed;\r
- Type4Record->Status = ProcessorStatus.Data;\r
- Type4Record->L1CacheHandle = L1CacheHandle;\r
- Type4Record->L2CacheHandle = L2CacheHandle;\r
- Type4Record->L3CacheHandle = L3CacheHandle;\r
- Type4Record->CoreCount = MiscProcessorData.CoreCount;\r
- Type4Record->CoreCount2 = MiscProcessorData.CoreCount;\r
- Type4Record->EnabledCoreCount = MiscProcessorData.CoresEnabled;\r
- Type4Record->EnabledCoreCount2 = MiscProcessorData.CoresEnabled;\r
- Type4Record->ThreadCount = MiscProcessorData.ThreadCount;\r
- Type4Record->ThreadCount2 = MiscProcessorData.ThreadCount;\r
-\r
- Type4Record->CurrentSpeed = GetCpuFrequency (ProcessorIndex);\r
+ LegacyVoltage = (UINT8 *)&Type4Record->Voltage;\r
+\r
+ *LegacyVoltage = MiscProcessorData.Voltage;\r
+ Type4Record->CurrentSpeed = MiscProcessorData.CurrentSpeed;\r
+ Type4Record->MaxSpeed = MiscProcessorData.MaxSpeed;\r
+ Type4Record->Status = ProcessorStatus.Data;\r
+ Type4Record->L1CacheHandle = L1CacheHandle;\r
+ Type4Record->L2CacheHandle = L2CacheHandle;\r
+ Type4Record->L3CacheHandle = L3CacheHandle;\r
+ Type4Record->CoreCount = MiscProcessorData.CoreCount;\r
+ Type4Record->CoreCount2 = MiscProcessorData.CoreCount;\r
+ Type4Record->EnabledCoreCount = MiscProcessorData.CoresEnabled;\r
+ Type4Record->EnabledCoreCount2 = MiscProcessorData.CoresEnabled;\r
+ Type4Record->ThreadCount = MiscProcessorData.ThreadCount;\r
+ Type4Record->ThreadCount2 = MiscProcessorData.ThreadCount;\r
+\r
+ Type4Record->CurrentSpeed = GetCpuFrequency (ProcessorIndex);\r
Type4Record->ExternalClock =\r
(UINT16)(SmbiosGetExternalClockFrequency () / 1000 / 1000);\r
\r
- ProcessorId = (UINT64*)&Type4Record->ProcessorId;\r
+ ProcessorId = (UINT64 *)&Type4Record->ProcessorId;\r
*ProcessorId = SmbiosGetProcessorId ();\r
\r
- ProcessorCharacteristics = SmbiosGetProcessorCharacteristics ();\r
- Type4Record->ProcessorCharacteristics |= *((UINT64*)&ProcessorCharacteristics);\r
+ ProcessorCharacteristics = SmbiosGetProcessorCharacteristics ();\r
+ Type4Record->ProcessorCharacteristics |= *((UINT64 *)&ProcessorCharacteristics);\r
\r
- Type4Record->ProcessorFamily = SmbiosGetProcessorFamily ();\r
+ Type4Record->ProcessorFamily = SmbiosGetProcessorFamily ();\r
Type4Record->ProcessorFamily2 = SmbiosGetProcessorFamily2 ();\r
\r
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
- Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle,\r
- (EFI_SMBIOS_TABLE_HEADER *)Type4Record);\r
+ Status = mSmbios->Add (\r
+ mSmbios,\r
+ NULL,\r
+ &SmbiosHandle,\r
+ (EFI_SMBIOS_TABLE_HEADER *)Type4Record\r
+ );\r
\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",\r
- __FUNCTION__, DEBUG_LINE_NUMBER, Status));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",\r
+ __FUNCTION__,\r
+ DEBUG_LINE_NUMBER,\r
+ Status\r
+ ));\r
}\r
+\r
FreePool (Type4Record);\r
\r
return Status;\r
**/\r
EFI_STATUS\r
EFIAPI\r
-ProcessorSubClassEntryPoint(\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ProcessorSubClassEntryPoint (\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT32 ProcessorIndex;\r
+ EFI_STATUS Status;\r
+ UINT32 ProcessorIndex;\r
\r
//\r
// Locate dependent protocols\r
//\r
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID**)&mSmbios);\r
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **)&mSmbios);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_ERROR, "Could not locate SMBIOS protocol. %r\n", Status));\r
return Status;\r
//\r
// Add our default strings to the HII database. They will be modified later.\r
//\r
- mHiiHandle = HiiAddPackages (&gEfiCallerIdGuid,\r
- NULL,\r
- ProcessorSubClassStrings,\r
- NULL,\r
- NULL\r
- );\r
+ mHiiHandle = HiiAddPackages (\r
+ &gEfiCallerIdGuid,\r
+ NULL,\r
+ ProcessorSubClassStrings,\r
+ NULL,\r
+ NULL\r
+ );\r
if (mHiiHandle == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
projects / mirror_edk2.git / blobdiff