Reviewed-by: Tim He <[email protected]> -----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of lushifex Sent: Tuesday, December 01, 2015 2:42 PM To: [email protected] Subject: [edk2] [Patch] [patch] Vlv2TbltDevicePkg: Add SsdtUpdate Application to update Ssdt table to ACPI table.
Signed-off-by: lushifex <[email protected]> --- .../Application/SsdtUpdate/SsdtUpdate.asl | 28 +++ .../Application/SsdtUpdate/SsdtUpdate.c | 200 +++++++++++++++++++++ .../Application/SsdtUpdate/SsdtUpdate.h | 39 ++++ .../Application/SsdtUpdate/SsdtUpdate.inf | 64 +++++++ Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 + Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + 7 files changed, 334 insertions(+) create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.h create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl new file mode 100644 index 0000000..bdf48fa --- /dev/null +++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl @@ -0,0 +1,28 @@ +/** @file + The definition block in ACPI table for Genernal device. + + Copyright (c) 2015, 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. + +**/ + +DefinitionBlock ( + "Gene.aml", + "SSDT", + 2, + "INTEL ", + "GeneTabl", + 0x1000 + ) +{ + Scope (\_SB) + { + } +} diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c new file mode 100644 index 0000000..f50a76d --- /dev/null +++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c @@ -0,0 +1,200 @@ +/** @file + Update SSDT table to ACPI table. + + Copyright (c) 2013 - 2015, 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. + +**/ + +#include "SsdtUpdate.h" + +FV_INPUT_DATA mInputData = {0}; + +/** + Read file data from given file name. + + @param[in] FileName Pointer the readed given file name. + @param[out] Buffer The buffer which read the given file name's data. + @param[out] BufferSize The buffer size which read the given file name's data. + + @retval EFI_SUCCESS The file data is successfully readed. + @retval EFI_ERROR The file data is unsuccessfully readed. + +**/ +STATIC +EFI_STATUS +ReadFileData ( + IN CHAR16 *FileName, + OUT UINT8 **Buffer, + OUT UINT32 *BufferSize + ) +{ + EFI_STATUS Status; + SHELL_FILE_HANDLE FileHandle; + UINT64 Size; + VOID *NewBuffer; + UINTN ReadSize; + + FileHandle = NULL; + NewBuffer = NULL; + Size = 0; + + Status = ShellOpenFileByName (FileName, &FileHandle, + EFI_FILE_MODE_READ, 0); if (EFI_ERROR (Status)) { + goto Done; + } + + Status = FileHandleIsDirectory (FileHandle); if (!EFI_ERROR + (Status)) { + Status = EFI_NOT_FOUND; + goto Done; + } + + Status = FileHandleGetSize (FileHandle, &Size); if (EFI_ERROR + (Status)) { + goto Done; + } + + NewBuffer = AllocatePool ((UINTN) Size); + + ReadSize = (UINTN) Size; + Status = FileHandleRead (FileHandle, &ReadSize, NewBuffer); if + (EFI_ERROR (Status)) { + goto Done; + } else if (ReadSize != (UINTN) Size) { + Status = EFI_INVALID_PARAMETER; + goto Done; + } + +Done: + if (FileHandle != NULL) { + ShellCloseFile (&FileHandle); + } + + if (EFI_ERROR (Status)) { + if (NewBuffer != NULL) { + FreePool (NewBuffer); + } + } else { + *Buffer = NewBuffer; + *BufferSize = (UINT32) Size; + } + + return Status; +} + +/** + Initialize and publish device in ACPI table. + + @param[in] Table The pointer to the ACPI table which will be published. + @param[in] TableSize The size of ACPI table which will be published. + + @retval EFI_SUCCESS The ACPI table is published successfully. + @retval Others The ACPI table is not published. + +**/ +EFI_STATUS +PublishAcpiTable ( + IN UINT8 *Table, + IN UINT32 TableSize + ) +{ + EFI_STATUS Status; + EFI_ACPI_TABLE_PROTOCOL *AcpiTable; + UINTN TableKey; + + // + // Basic check ::TODO: Add check here!!!!!!!!!!!!!!!!! + // + //ASSERT (Table->OemTableId == SIGNATURE_64 ('E', 'v', 'e', 'r', 'T', + 'a', 'b', 'l')); + + // + // Publish the ACPI table + // + Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID + **) &AcpiTable); DEBUG((EFI_D_INFO, " Publish ACPI Table-3\n")); + ASSERT_EFI_ERROR (Status); + + TableKey = 0; + Status = AcpiTable->InstallAcpiTable ( + AcpiTable, + (EFI_ACPI_DESCRIPTION_HEADER*) Table, + TableSize, + &TableKey + ); + DEBUG((EFI_D_INFO, " Publish ACPI Table-4\n")); ASSERT_EFI_ERROR + (Status); + + return Status; +} + +/** + Init device + + @retval EFI_SUCCESS Init Devices successfully + @retval Others Some error occurs + +**/ +EFI_STATUS +InitDevice ( + ) +{ + // + // Add device Init here if needed + // + return EFI_SUCCESS; +} + +/** + UEFI application entry point which has an interface similar to a + standard C main function. + + The ShellCEntryLib library instance wrappers the actual UEFI + application entry point and calls this ShellAppMain function. + + @param[in] Argc The number of items in Argv. + @param[in] Argv Array of pointers to strings. + + @retval +**/ +INTN +EFIAPI + ShellAppMain ( + IN UINTN Argc, + IN CHAR16 **Argv + ) +{ + EFI_STATUS Status; + UINT8 *FileBuffer; + UINT32 TableSize; + + TableSize = 0; + FileBuffer = NULL; + + // + // Necessary device Initialization + // + Status = InitDevice(); + if (EFI_ERROR (Status)) { + return EFI_DEVICE_ERROR; + } + + StrCpy (mInputData.FileName, Argv[1]); Status = ReadFileData + (mInputData.FileName, &FileBuffer, &TableSize); + + // + // Update and publish ACPI table + // + Status = PublishAcpiTable (FileBuffer, TableSize); ASSERT_EFI_ERROR + (Status); + + return Status; + } + diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.h b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.h new file mode 100644 index 0000000..b84807a --- /dev/null +++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.h @@ -0,0 +1,39 @@ +/** @file + The header file for update SSDT table to ACPI table. + + Copyright (c) 2015, 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. + +**/ + +#include <PiDxe.h> +#include <IndustryStandard/Acpi.h> + +#include <Protocol/AcpiTable.h> +#include <Library/BaseLib.h> +#include <Library/BaseMemoryLib.h> +#include <Library/DebugLib.h> +#include <Library/UefiBootServicesTableLib.h> +#include <Library/DxeServicesLib.h> +#include <Library/ShellLib.h> +#include <Library/UefiApplicationEntryPoint.h> +#include <Library/FileHandleLib.h> +#include <Library/UefiLib.h> +#include <Library/UefiBootServicesTableLib.h> +#include <Library/MemoryAllocationLib.h> + +#define INPUT_STRING_LEN 255 +#define INPUT_STRING_SIZE (INPUT_STRING_LEN + 1) + +typedef struct { + BOOLEAN UpdateFromFile; + CHAR16 FileName[INPUT_STRING_SIZE]; +} FV_INPUT_DATA; + diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf new file mode 100644 index 0000000..831f455 --- /dev/null +++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf @@ -0,0 +1,64 @@ +## @file +# This application add SSDT table into ACPI table. +# +# Copyright (c) 2015, 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. +# +## + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = SsdtUpdate + FILE_GUID = 6527d4b8-8f0f-4c02-9e78-8338cb6f0875 + MODULE_TYPE = UEFI_APPLICATION + PI_SPECIFICATION_VERSION = 0x0001000A + VERSION_STRING = 1.0 + ENTRY_POINT = ShellCEntryLib + +[Sources] + SsdtUpdate.h + SsdtUpdate.c + SsdtUpdate.asl + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + ShellPkg/ShellPkg.dec + + +[LibraryClasses] + BaseLib + BaseMemoryLib + UefiBootServicesTableLib + DebugLib + DxeServicesLib + UefiApplicationEntryPoint + FileHandleLib + ShellCEntryLib + ShellLib + UefiBootServicesTableLib + MemoryAllocationLib + +[Guids] + +[Protocols] + gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED + +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision + +##[FeaturePcd] + +[Depex] + gEfiAcpiTableProtocolGuid diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 773f077..680dd5a 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1515,10 +1515,11 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf !endif !endif Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf + Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. # diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 9d88504..bef16a6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1505,10 +1505,11 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf !endif !endif Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf + Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. # diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index d633b1c..7200814 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1505,10 +1505,11 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf !endif !endif Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf + Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. # -- 2.6.2.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
