/*++\r
\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
in this driver.\r
\r
--*/\r
-#include "PiDxe.h"\r
+#include <FrameworkDxe.h>\r
+#include <IndustryStandard/SmBios.h>\r
#include <Protocol/Cpu.h>\r
-#include <Protocol/DataHub.h>\r
+#include <Protocol/Smbios.h>\r
#include <Guid/DataHubRecords.h>\r
-#include <Protocol/CpuIo.h>\r
+#include <Protocol/CpuIo2.h>\r
#include <Protocol/FrameworkHii.h>\r
+#include <Protocol/UnixThunk.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
-#include <Framework/DataHubRecords.h>\r
+#include <Library/UnixLib.h>\r
+\r
#include "CpuDriver.h"\r
#include "UnixDxe.h"\r
#include <Protocol/UnixIo.h>\r
4\r
},\r
{\r
- CpuMemoryServiceRead,\r
- CpuMemoryServiceWrite,\r
- CpuIoServiceRead,\r
- CpuIoServiceWrite\r
+ {\r
+ CpuMemoryServiceRead,\r
+ CpuMemoryServiceWrite\r
+ },\r
+ {\r
+ CpuIoServiceRead,\r
+ CpuIoServiceWrite\r
+ }\r
},\r
- 0,\r
TRUE\r
};\r
\r
-typedef union {\r
- EFI_CPU_DATA_RECORD *DataRecord;\r
- UINT8 *Raw;\r
-} EFI_CPU_DATA_RECORD_BUFFER;\r
-\r
-EFI_SUBCLASS_TYPE1_HEADER mCpuDataRecordHeader = {\r
- EFI_PROCESSOR_SUBCLASS_VERSION, // Version\r
- sizeof (EFI_SUBCLASS_TYPE1_HEADER), // Header Size\r
- 0, // Instance, Initialize later\r
- EFI_SUBCLASS_INSTANCE_NON_APPLICABLE, // SubInstance\r
- 0 // RecordType, Initialize later\r
-};\r
\r
//\r
// Service routines for the driver\r
\r
Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
Private->InterruptState = TRUE;\r
+ gUnix->EnableInterrupt ();\r
return EFI_SUCCESS;\r
}\r
\r
\r
Private = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);\r
Private->InterruptState = FALSE;\r
+ gUnix->DisableInterrupt ();\r
return EFI_SUCCESS;\r
}\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
+\r
+\r
+/**\r
+ Logs SMBIOS record.\r
+\r
+ @param Smbios Pointer to SMBIOS protocol instance.\r
+ @param Buffer Pointer to the data buffer.\r
+\r
+**/\r
VOID\r
-CpuUpdateDataHub (\r
+LogSmbiosData (\r
+ IN EFI_SMBIOS_PROTOCOL *Smbios,\r
+ IN UINT8 *Buffer\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EFI_SMBIOS_HANDLE SmbiosHandle;\r
+ \r
+ SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
+ Status = Smbios->Add (\r
+ Smbios,\r
+ NULL,\r
+ &SmbiosHandle,\r
+ (EFI_SMBIOS_TABLE_HEADER*)Buffer\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+}\r
+\r
+VOID\r
+CpuUpdateSmbios (\r
VOID\r
)\r
/*++\r
--*/\r
{\r
EFI_STATUS Status;\r
- EFI_CPU_DATA_RECORD_BUFFER RecordBuffer;\r
- UINT32 HeaderSize;\r
+ EFI_SMBIOS_PROTOCOL *Smbios;\r
UINT32 TotalSize;\r
- EFI_DATA_HUB_PROTOCOL *DataHub;\r
EFI_HII_HANDLE HiiHandle;\r
+ STRING_REF Token;\r
+ UINTN CpuVerStrLen;\r
+ EFI_STRING CpuVerStr;\r
+ SMBIOS_TABLE_TYPE4 *SmbiosRecord;\r
+ CHAR8 *OptionalStrStart;\r
\r
//\r
- // Locate DataHub protocol.\r
+ // Locate Smbios protocol.\r
//\r
- Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **)&Smbios);\r
+ \r
if (EFI_ERROR (Status)) {\r
return;\r
}\r
\r
- //\r
- // Initialize data record header\r
- //\r
- mCpuDataRecordHeader.Instance = 1;\r
- HeaderSize = sizeof (EFI_SUBCLASS_TYPE1_HEADER);\r
-\r
- RecordBuffer.Raw = AllocatePool (HeaderSize + EFI_CPU_DATA_MAXIMUM_LENGTH);\r
- if (RecordBuffer.Raw == NULL) {\r
- return ;\r
- }\r
-\r
//\r
// Initialize strings to HII database\r
//\r
);\r
ASSERT (HiiHandle != NULL);\r
\r
- CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);\r
\r
+ Token = STRING_TOKEN (STR_INTEL_GENUINE_PROCESSOR);\r
+ CpuVerStr = HiiGetPackageString(&gEfiCallerIdGuid, Token, NULL);\r
+ CpuVerStrLen = StrLen(CpuVerStr);\r
+ ASSERT (CpuVerStrLen <= SMBIOS_STRING_MAX_LENGTH);\r
\r
- RecordBuffer.DataRecord->DataRecordHeader.RecordType = ProcessorVersionRecordType;\r
- RecordBuffer.DataRecord->VariableRecord.ProcessorVersion = STRING_TOKEN (STR_INTEL_GENUINE_PROCESSOR);\r
- TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_VERSION_DATA);\r
-\r
- Status = DataHub->LogData (\r
- DataHub,\r
- &gEfiProcessorSubClassGuid,\r
- &gEfiCallerIdGuid,\r
- EFI_DATA_RECORD_CLASS_DATA,\r
- RecordBuffer.Raw,\r
- TotalSize\r
- );\r
+ TotalSize = sizeof(SMBIOS_TABLE_TYPE4) + CpuVerStrLen + 1 + 1;\r
+ SmbiosRecord = AllocatePool(TotalSize);\r
+ ZeroMem(SmbiosRecord, TotalSize);\r
\r
+ SmbiosRecord->Hdr.Type = EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION;\r
+ SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE4);\r
+ //\r
+ // Make handle chosen by smbios protocol.add automatically.\r
+ //\r
+ SmbiosRecord->Hdr.Handle = 0; \r
+ //\r
+ // Processor version is the 1st string.\r
+ //\r
+ SmbiosRecord->ProcessorVersion = 1;\r
//\r
// Store CPU frequency data record to data hub - It's an emulator so make up a value\r
//\r
- RecordBuffer.DataRecord->DataRecordHeader.RecordType = ProcessorCoreFrequencyRecordType;\r
- RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Value = 1234;\r
- RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Exponent = 6;\r
- TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_CORE_FREQUENCY_DATA);\r
-\r
- Status = DataHub->LogData (\r
- DataHub,\r
- &gEfiProcessorSubClassGuid,\r
- &gEfiCallerIdGuid,\r
- EFI_DATA_RECORD_CLASS_DATA,\r
- RecordBuffer.Raw,\r
- TotalSize\r
- );\r
-\r
- FreePool (RecordBuffer.Raw);\r
+ SmbiosRecord->CurrentSpeed = 1234;\r
+\r
+ OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1);\r
+ UnicodeStrToAsciiStr(CpuVerStr, OptionalStrStart);\r
+\r
+ //\r
+ // Now we have got the full smbios record, call smbios protocol to add this record.\r
+ //\r
+ LogSmbiosData(Smbios, (UINT8 *) SmbiosRecord);\r
+ FreePool (SmbiosRecord);\r
}\r
\r
EFI_STATUS\r
{\r
EFI_STATUS Status;\r
\r
- CpuUpdateDataHub ();\r
+ CpuUpdateSmbios ();\r
\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&mCpuTemplate.Handle,\r
&gEfiCpuArchProtocolGuid, &mCpuTemplate.Cpu,\r
- &gEfiCpuIoProtocolGuid, &mCpuTemplate.CpuIo,\r
+ &gEfiCpuIo2ProtocolGuid, &mCpuTemplate.CpuIo,\r
NULL\r
);\r
ASSERT_EFI_ERROR (Status);\r
projects / mirror_edk2.git / blobdiff