/** @file\r
ACPI Table Protocol Implementation\r
\r
- Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
- All rights reserved. This program and the accompanying materials\r
+ Copyright (c) 2006 - 2014, 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
// Includes\r
//\r
#include "AcpiTable.h"\r
-\r
+//\r
+// The maximum number of tables that pre-allocated. \r
+//\r
+UINTN mEfiAcpiMaxNumTables = EFI_ACPI_MAX_NUM_TABLES; \r
\r
/**\r
This function adds an ACPI table to the table list. It will detect FACS and\r
@param ChecksumOffset Offset to place the checksum result in\r
\r
@return EFI_SUCCESS The function completed successfully.\r
-\r
**/\r
EFI_STATUS\r
AcpiPlatformChecksum (\r
// Protocol function implementations.\r
//\r
\r
-/**\r
- This function adds, removes, or updates ACPI tables. If the address is not\r
- null and the handle value is null, the table is added. If both the address and \r
- handle are not null, the table at handle is updated with the table at address.\r
- If the address is null and the handle is not, the table at handle is deleted.\r
-\r
- @param AcpiTableInstance Instance of the protocol.\r
- @param Table Pointer to a table.\r
- @param Checksum Boolean indicating if the checksum should be calculated.\r
- @param Version Version(s) to set.\r
- @param Handle Handle of the table.\r
-\r
- @return EFI_SUCCESS The function completed successfully.\r
- @return EFI_INVALID_PARAMETER Both the Table and *Handle were NULL.\r
- @return EFI_ABORTED Could not complete the desired request.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-SetAcpiTable (\r
- IN EFI_ACPI_TABLE_INSTANCE *AcpiTableInstance,\r
- IN VOID *Table OPTIONAL,\r
- IN BOOLEAN Checksum,\r
- IN EFI_ACPI_TABLE_VERSION Version,\r
- IN OUT UINTN *Handle\r
- )\r
-{\r
- UINTN SavedHandle;\r
- EFI_STATUS Status;\r
-\r
- //\r
- // Check for invalid input parameters\r
- //\r
- ASSERT (Handle);\r
-\r
- //\r
- // Initialize locals\r
- //\r
- //\r
- // Determine desired action\r
- //\r
- if (*Handle == 0) {\r
- if (Table == NULL) {\r
- //\r
- // Invalid parameter combination\r
- //\r
- return EFI_INVALID_PARAMETER;\r
- } else {\r
- //\r
- // Add table\r
- //\r
- Status = AddTableToList (AcpiTableInstance, Table, Checksum, Version, Handle);\r
- }\r
- } else {\r
- if (Table != NULL) {\r
- //\r
- // Update table\r
- //\r
- //\r
- // Delete the table list entry\r
- //\r
- Status = RemoveTableFromList (AcpiTableInstance, Version, *Handle);\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Should not get an error here ever, but abort if we do.\r
- //\r
- return EFI_ABORTED;\r
- }\r
- //\r
- // Set the handle to replace the table at the same handle\r
- //\r
- SavedHandle = AcpiTableInstance->CurrentHandle;\r
- AcpiTableInstance->CurrentHandle = *Handle;\r
-\r
- //\r
- // Add the table\r
- //\r
- Status = AddTableToList (AcpiTableInstance, Table, Checksum, Version, Handle);\r
-\r
- //\r
- // Restore the saved current handle\r
- //\r
- AcpiTableInstance->CurrentHandle = SavedHandle;\r
- } else {\r
- //\r
- // Delete table\r
- //\r
- Status = RemoveTableFromList (AcpiTableInstance, Version, *Handle);\r
- }\r
- }\r
-\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Should not get an error here ever, but abort if we do.\r
- //\r
- return EFI_ABORTED;\r
- }\r
- //\r
- // Done\r
- //\r
- return EFI_SUCCESS;\r
-}\r
-\r
/**\r
This function publishes the specified versions of the ACPI tables by\r
installing EFI configuration table entries for them. Any combination of\r
and the size field embedded in the ACPI table pointed to by AcpiTableBuffer\r
are not in sync.\r
@return EFI_OUT_OF_RESOURCES Insufficient resources exist to complete the request.\r
+ @retval EFI_ACCESS_DENIED The table signature matches a table already\r
+ present in the system and platform policy\r
+ does not allow duplicate tables of this type.\r
\r
**/\r
EFI_STATUS\r
EFIAPI\r
InstallAcpiTable (\r
- IN CONST EFI_ACPI_TABLE_PROTOCOL *This,\r
- IN CONST VOID *AcpiTableBuffer,\r
- IN UINTN AcpiTableBufferSize,\r
- OUT UINTN *TableKey\r
+ IN EFI_ACPI_TABLE_PROTOCOL *This,\r
+ IN VOID *AcpiTableBuffer,\r
+ IN UINTN AcpiTableBufferSize,\r
+ OUT UINTN *TableKey\r
)\r
{\r
EFI_ACPI_TABLE_INSTANCE *AcpiTableInstance;\r
EFI_STATUS Status;\r
VOID *AcpiTableBufferConst;\r
- UINT32 Length;\r
- UINT8 Checksum;\r
\r
//\r
// Check for invalid input parameters\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Length = ((EFI_ACPI_COMMON_HEADER *) AcpiTableBuffer)->Length;\r
- Checksum = CalculateCheckSum8 ((UINT8 *)AcpiTableBuffer, Length);\r
- ASSERT (Checksum == 0);\r
-\r
//\r
// Get the instance of the ACPI table protocol\r
//\r
//\r
AcpiTableBufferConst = AllocateCopyPool (AcpiTableBufferSize,AcpiTableBuffer);\r
*TableKey = 0;\r
- Status = SetAcpiTable (\r
+ Status = AddTableToList (\r
AcpiTableInstance,\r
AcpiTableBufferConst,\r
TRUE,\r
}\r
FreePool (AcpiTableBufferConst);\r
\r
+ //\r
+ // Add a new table successfully, notify registed callback\r
+ //\r
+ if (FeaturePcdGet (PcdInstallAcpiSdtProtocol)) {\r
+ if (!EFI_ERROR (Status)) {\r
+ SdtNotifyAcpiList (\r
+ AcpiTableInstance,\r
+ EFI_ACPI_TABLE_VERSION_1_0B | EFI_ACPI_TABLE_VERSION_2_0 | EFI_ACPI_TABLE_VERSION_3_0,\r
+ *TableKey\r
+ );\r
+ }\r
+ }\r
+\r
return Status;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
UninstallAcpiTable (\r
- IN CONST EFI_ACPI_TABLE_PROTOCOL *This,\r
- IN UINTN TableKey\r
+ IN EFI_ACPI_TABLE_PROTOCOL *This,\r
+ IN UINTN TableKey\r
)\r
{\r
EFI_ACPI_TABLE_INSTANCE *AcpiTableInstance;\r
//\r
// Uninstall the ACPI table\r
//\r
- Status = SetAcpiTable (\r
+ Status = RemoveTableFromList (\r
AcpiTableInstance,\r
- NULL,\r
- FALSE,\r
EFI_ACPI_TABLE_VERSION_1_0B | EFI_ACPI_TABLE_VERSION_2_0 | EFI_ACPI_TABLE_VERSION_3_0,\r
- &TableKey\r
+ TableKey\r
);\r
if (!EFI_ERROR (Status)) {\r
Status = PublishTables (\r
}\r
}\r
\r
+/**\r
+ If the number of APCI tables exceeds the preallocated max table number, enlarge the table buffer.\r
+\r
+ @param AcpiTableInstance ACPI table protocol instance data structure.\r
+\r
+ @return EFI_SUCCESS reallocate the table beffer successfully.\r
+ @return EFI_OUT_OF_RESOURCES Unable to allocate required resources.\r
+\r
+**/\r
+EFI_STATUS\r
+ReallocateAcpiTableBuffer (\r
+ IN EFI_ACPI_TABLE_INSTANCE *AcpiTableInstance\r
+ )\r
+{\r
+ UINTN NewMaxTableNumber;\r
+ UINTN TotalSize;\r
+ UINT8 *Pointer;\r
+ EFI_PHYSICAL_ADDRESS PageAddress;\r
+ EFI_ACPI_TABLE_INSTANCE TempPrivateData;\r
+ EFI_STATUS Status;\r
+ UINT64 CurrentData;\r
+ \r
+ CopyMem (&TempPrivateData, AcpiTableInstance, sizeof (EFI_ACPI_TABLE_INSTANCE)); \r
+ //\r
+ // Enlarge the max table number from mEfiAcpiMaxNumTables to mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES\r
+ //\r
+ NewMaxTableNumber = mEfiAcpiMaxNumTables + EFI_ACPI_MAX_NUM_TABLES;\r
+ //\r
+ // Create RSDT, XSDT structures and allocate buffers.\r
+ //\r
+ TotalSize = sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 1.0 RSDT\r
+ NewMaxTableNumber * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 RSDT\r
+ NewMaxTableNumber * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 XSDT\r
+ NewMaxTableNumber * sizeof (UINT64);\r
+\r
+ //\r
+ // Allocate memory in the lower 32 bit of address range for\r
+ // compatibility with ACPI 1.0 OS.\r
+ //\r
+ // This is done because ACPI 1.0 pointers are 32 bit values.\r
+ // ACPI 2.0 OS and all 64 bit OS must use the 64 bit ACPI table addresses.\r
+ // There is no architectural reason these should be below 4GB, it is purely\r
+ // for convenience of implementation that we force memory below 4GB.\r
+ //\r
+ PageAddress = 0xFFFFFFFF;\r
+ Status = gBS->AllocatePages (\r
+ AllocateMaxAddress,\r
+ EfiACPIReclaimMemory,\r
+ EFI_SIZE_TO_PAGES (TotalSize),\r
+ &PageAddress\r
+ );\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ Pointer = (UINT8 *) (UINTN) PageAddress;\r
+ ZeroMem (Pointer, TotalSize);\r
+ \r
+ AcpiTableInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
+ Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32));\r
+ AcpiTableInstance->Rsdt3 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
+ Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + NewMaxTableNumber * sizeof (UINT32));\r
+ AcpiTableInstance->Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
\r
+ //\r
+ // Update RSDP to point to the new Rsdt and Xsdt address.\r
+ //\r
+ AcpiTableInstance->Rsdp1->RsdtAddress = (UINT32) (UINTN) AcpiTableInstance->Rsdt1;\r
+ AcpiTableInstance->Rsdp3->RsdtAddress = (UINT32) (UINTN) AcpiTableInstance->Rsdt3;\r
+ CurrentData = (UINT64) (UINTN) AcpiTableInstance->Xsdt;\r
+ CopyMem (&AcpiTableInstance->Rsdp3->XsdtAddress, &CurrentData, sizeof (UINT64));\r
+\r
+ //\r
+ // copy the original Rsdt1, Rsdt3 and Xsdt structure to new buffer \r
+ //\r
+ CopyMem (AcpiTableInstance->Rsdt1, TempPrivateData.Rsdt1, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); \r
+ CopyMem (AcpiTableInstance->Rsdt3, TempPrivateData.Rsdt3, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT32))); \r
+ CopyMem (AcpiTableInstance->Xsdt, TempPrivateData.Xsdt, (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + mEfiAcpiMaxNumTables * sizeof (UINT64)));\r
+ \r
+ //\r
+ // Calculate orignal ACPI table buffer size\r
+ //\r
+ TotalSize = sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 1.0 RSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 RSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 XSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT64);\r
+ gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)TempPrivateData.Rsdt1, EFI_SIZE_TO_PAGES (TotalSize));\r
+ \r
+ //\r
+ // Update the Max ACPI table number\r
+ // \r
+ mEfiAcpiMaxNumTables = NewMaxTableNumber;\r
+ return EFI_SUCCESS;\r
+}\r
/**\r
This function adds an ACPI table to the table list. It will detect FACS and\r
allocate the correct type of memory and properly align the table.\r
\r
@return EFI_SUCCESS The function completed successfully.\r
@return EFI_OUT_OF_RESOURCES Could not allocate a required resource.\r
- @return EFI_ABORTED The table is a duplicate of a table that is required\r
- to be unique.\r
+ @retval EFI_ACCESS_DENIED The table signature matches a table already\r
+ present in the system and platform policy\r
+ does not allow duplicate tables of this type.\r
\r
**/\r
EFI_STATUS\r
//\r
// Allocation memory type depends on the type of the table\r
//\r
- if (CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE || \r
- CurrentTableSignature == EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {\r
+ if ((CurrentTableSignature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) || \r
+ (CurrentTableSignature == EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE)) {\r
//\r
// Allocate memory for the FACS. This structure must be aligned\r
// on a 64 byte boundary and must be ACPI NVS memory.\r
// Using AllocatePages should ensure that it is always aligned.\r
+ // Do not change signature for new ACPI version because they are same.\r
+ //\r
+ // UEFI table also need to be in ACPI NVS memory, because some data field\r
+ // could be updated by OS present agent. For example, BufferPtrAddress in\r
+ // SMM communication ACPI table.\r
//\r
ASSERT ((EFI_PAGE_SIZE % 64) == 0);\r
Status = gBS->AllocatePages (\r
) {\r
gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->NumberOfPages);\r
gBS->FreePool (CurrentTableList);\r
- return EFI_ABORTED;\r
+ return EFI_ACCESS_DENIED;\r
}\r
//\r
// Add the table to the appropriate table version\r
\r
//\r
// Update pointers in FADT. If tables don't exist this will put NULL pointers there.\r
+ // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and \r
+ // vice-versa.\r
//\r
- if (AcpiTableInstance->Fadt3 != NULL) {\r
+ if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r
AcpiTableInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiTableInstance->Facs3;\r
+ } else {\r
Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;\r
CopyMem (\r
&AcpiTableInstance->Fadt3->XFirmwareCtrl,\r
&Buffer64,\r
sizeof (UINT64)\r
);\r
- AcpiTableInstance->Fadt3->Dsdt = (UINT32) (UINTN) AcpiTableInstance->Dsdt3;\r
- Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Dsdt3;\r
- CopyMem (\r
- &AcpiTableInstance->Fadt3->XDsdt,\r
- &Buffer64,\r
- sizeof (UINT64)\r
- );\r
-\r
- //\r
- // RSDP OEM information is updated to match the FADT OEM information\r
- //\r
- CopyMem (\r
- &AcpiTableInstance->Rsdp3->OemId,\r
- &AcpiTableInstance->Fadt3->Header.OemId,\r
- 6\r
- );\r
- \r
- //\r
- // RSDT OEM information is updated to match FADT OEM information.\r
- //\r
- CopyMem (\r
- &AcpiTableInstance->Rsdt3->OemId,\r
- &AcpiTableInstance->Fadt3->Header.OemId,\r
- 6\r
- );\r
- CopyMem (\r
- &AcpiTableInstance->Rsdt3->OemTableId,\r
- &AcpiTableInstance->Fadt3->Header.OemTableId,\r
- sizeof (UINT64)\r
- );\r
- AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
- \r
- //\r
- // XSDT OEM information is updated to match FADT OEM information.\r
- //\r
- CopyMem (\r
- &AcpiTableInstance->Xsdt->OemId,\r
- &AcpiTableInstance->Fadt3->Header.OemId,\r
- 6\r
- );\r
- CopyMem (\r
- &AcpiTableInstance->Xsdt->OemTableId,\r
- &AcpiTableInstance->Fadt3->Header.OemTableId,\r
- sizeof (UINT64)\r
- );\r
- AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
}\r
+ AcpiTableInstance->Fadt3->Dsdt = (UINT32) (UINTN) AcpiTableInstance->Dsdt3;\r
+ Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Dsdt3;\r
+ CopyMem (\r
+ &AcpiTableInstance->Fadt3->XDsdt,\r
+ &Buffer64,\r
+ sizeof (UINT64)\r
+ );\r
+\r
+ //\r
+ // RSDP OEM information is updated to match the FADT OEM information\r
+ //\r
+ CopyMem (\r
+ &AcpiTableInstance->Rsdp3->OemId,\r
+ &AcpiTableInstance->Fadt3->Header.OemId,\r
+ 6\r
+ );\r
+ \r
+ //\r
+ // RSDT OEM information is updated to match FADT OEM information.\r
+ //\r
+ CopyMem (\r
+ &AcpiTableInstance->Rsdt3->OemId,\r
+ &AcpiTableInstance->Fadt3->Header.OemId,\r
+ 6\r
+ );\r
+ CopyMem (\r
+ &AcpiTableInstance->Rsdt3->OemTableId,\r
+ &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+ sizeof (UINT64)\r
+ );\r
+ AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
+ \r
+ //\r
+ // XSDT OEM information is updated to match FADT OEM information.\r
+ //\r
+ CopyMem (\r
+ &AcpiTableInstance->Xsdt->OemId,\r
+ &AcpiTableInstance->Fadt3->Header.OemId,\r
+ 6\r
+ );\r
+ CopyMem (\r
+ &AcpiTableInstance->Xsdt->OemTableId,\r
+ &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+ sizeof (UINT64)\r
+ );\r
+ AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
} \r
//\r
// Checksum the table\r
) {\r
gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->NumberOfPages);\r
gBS->FreePool (CurrentTableList);\r
- return EFI_ABORTED;\r
+ return EFI_ACCESS_DENIED;\r
}\r
//\r
// FACS is referenced by FADT and is not part of RSDT\r
// If FADT already exists, update table pointers.\r
//\r
if (AcpiTableInstance->Fadt3 != NULL) {\r
- AcpiTableInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiTableInstance->Facs3;\r
- Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;\r
- CopyMem (\r
- &AcpiTableInstance->Fadt3->XFirmwareCtrl,\r
- &Buffer64,\r
- sizeof (UINT64)\r
- );\r
+ //\r
+ // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and \r
+ // vice-versa.\r
+ //\r
+ if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {\r
+ AcpiTableInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiTableInstance->Facs3;\r
+ } else {\r
+ Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;\r
+ CopyMem (\r
+ &AcpiTableInstance->Fadt3->XFirmwareCtrl,\r
+ &Buffer64,\r
+ sizeof (UINT64)\r
+ );\r
+ }\r
\r
//\r
// Checksum FADT table\r
) {\r
gBS->FreePages (CurrentTableList->PageAddress, CurrentTableList->NumberOfPages);\r
gBS->FreePool (CurrentTableList);\r
- return EFI_ABORTED;\r
+ return EFI_ACCESS_DENIED;\r
}\r
//\r
// DSDT is referenced by FADT and is not part of RSDT\r
// Add to ACPI 1.0b table tree\r
//\r
if ((Version & EFI_ACPI_TABLE_VERSION_1_0B) != 0) {\r
- CurrentRsdtEntry = (UINT32 *)\r
- (\r
- (UINT8 *) AcpiTableInstance->Rsdt1 +\r
- sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
- AcpiTableInstance->NumberOfTableEntries1 *\r
- sizeof (UINT32)\r
- );\r
-\r
- //\r
- // Add entry to the RSDT unless its the FACS or DSDT\r
- //\r
if (AddToRsdt) {\r
- *CurrentRsdtEntry = (UINT32) (UINTN) CurrentTableList->Table;\r
-\r
//\r
- // Update RSDT length\r
- //\r
- AcpiTableInstance->Rsdt1->Length = AcpiTableInstance->Rsdt1->Length + sizeof (UINT32);\r
-\r
- AcpiTableInstance->NumberOfTableEntries1++;\r
- }\r
-\r
- ASSERT (AcpiTableInstance->NumberOfTableEntries1 <= EFI_ACPI_MAX_NUM_TABLES);\r
- }\r
- //\r
- // Add to ACPI 2.0/3.0 table tree\r
- //\r
- if ((Version & EFI_ACPI_TABLE_VERSION_2_0) != 0 ||\r
- (Version & EFI_ACPI_TABLE_VERSION_3_0) != 0) {\r
- if (AddToRsdt) {\r
- //\r
- // At this time, it is assumed that RSDT and XSDT maintain parallel lists of tables.\r
- // If it becomes necessary to maintain separate table lists, changes will be required.\r
+ // If the table number exceed the gEfiAcpiMaxNumTables, enlarge the table buffer\r
//\r
+ if (AcpiTableInstance->NumberOfTableEntries1 >= mEfiAcpiMaxNumTables) {\r
+ Status = ReallocateAcpiTableBuffer (AcpiTableInstance);\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
CurrentRsdtEntry = (UINT32 *)\r
(\r
- (UINT8 *) AcpiTableInstance->Rsdt3 +\r
+ (UINT8 *) AcpiTableInstance->Rsdt1 +\r
sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
- AcpiTableInstance->NumberOfTableEntries3 *\r
+ AcpiTableInstance->NumberOfTableEntries1 *\r
sizeof (UINT32)\r
);\r
\r
//\r
- // This pointer must not be directly dereferenced as the XSDT entries may not\r
- // be 64 bit aligned resulting in a possible fault. Use CopyMem to update.\r
- //\r
- CurrentXsdtEntry = (VOID *)\r
- (\r
- (UINT8 *) AcpiTableInstance->Xsdt +\r
- sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
- AcpiTableInstance->NumberOfTableEntries3 *\r
- sizeof (UINT64)\r
- );\r
-\r
- //\r
- // Add entry to the RSDT\r
+ // Add entry to the RSDT unless its the FACS or DSDT\r
//\r
*CurrentRsdtEntry = (UINT32) (UINTN) CurrentTableList->Table;\r
\r
//\r
// Update RSDT length\r
//\r
- AcpiTableInstance->Rsdt3->Length = AcpiTableInstance->Rsdt3->Length + sizeof (UINT32);\r
-\r
- //\r
- // Add entry to XSDT, XSDT expects 64 bit pointers, but\r
- // the table pointers in XSDT are not aligned on 8 byte boundary.\r
- //\r
- Buffer64 = (UINT64) (UINTN) CurrentTableList->Table;\r
- CopyMem (\r
- CurrentXsdtEntry,\r
- &Buffer64,\r
- sizeof (UINT64)\r
- );\r
-\r
- //\r
- // Update length\r
- //\r
- AcpiTableInstance->Xsdt->Length = AcpiTableInstance->Xsdt->Length + sizeof (UINT64);\r
+ AcpiTableInstance->Rsdt1->Length = AcpiTableInstance->Rsdt1->Length + sizeof (UINT32);\r
\r
- AcpiTableInstance->NumberOfTableEntries3++;\r
+ AcpiTableInstance->NumberOfTableEntries1++;\r
+ }\r
+ }\r
+ //\r
+ // Add to ACPI 2.0/3.0 table tree\r
+ //\r
+ if ((Version & EFI_ACPI_TABLE_VERSION_2_0) != 0 ||\r
+ (Version & EFI_ACPI_TABLE_VERSION_3_0) != 0) {\r
+ if (AddToRsdt) {\r
+ //\r
+ // If the table number exceed the gEfiAcpiMaxNumTables, enlarge the table buffer\r
+ //\r
+ if (AcpiTableInstance->NumberOfTableEntries3 >= mEfiAcpiMaxNumTables) {\r
+ Status = ReallocateAcpiTableBuffer (AcpiTableInstance);\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
+ //\r
+ // At this time, it is assumed that RSDT and XSDT maintain parallel lists of tables.\r
+ // If it becomes necessary to maintain separate table lists, changes will be required.\r
+ //\r
+ CurrentRsdtEntry = (UINT32 *)\r
+ (\r
+ (UINT8 *) AcpiTableInstance->Rsdt3 +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
+ AcpiTableInstance->NumberOfTableEntries3 *\r
+ sizeof (UINT32)\r
+ );\r
+\r
+ //\r
+ // This pointer must not be directly dereferenced as the XSDT entries may not\r
+ // be 64 bit aligned resulting in a possible fault. Use CopyMem to update.\r
+ //\r
+ CurrentXsdtEntry = (VOID *)\r
+ (\r
+ (UINT8 *) AcpiTableInstance->Xsdt +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) +\r
+ AcpiTableInstance->NumberOfTableEntries3 *\r
+ sizeof (UINT64)\r
+ );\r
+\r
+ //\r
+ // Add entry to the RSDT\r
+ //\r
+ *CurrentRsdtEntry = (UINT32) (UINTN) CurrentTableList->Table;\r
+\r
+ //\r
+ // Update RSDT length\r
+ //\r
+ AcpiTableInstance->Rsdt3->Length = AcpiTableInstance->Rsdt3->Length + sizeof (UINT32);\r
+\r
+ //\r
+ // Add entry to XSDT, XSDT expects 64 bit pointers, but\r
+ // the table pointers in XSDT are not aligned on 8 byte boundary.\r
+ //\r
+ Buffer64 = (UINT64) (UINTN) CurrentTableList->Table;\r
+ CopyMem (\r
+ CurrentXsdtEntry,\r
+ &Buffer64,\r
+ sizeof (UINT64)\r
+ );\r
+\r
+ //\r
+ // Update length\r
+ //\r
+ AcpiTableInstance->Xsdt->Length = AcpiTableInstance->Xsdt->Length + sizeof (UINT64);\r
+\r
+ AcpiTableInstance->NumberOfTableEntries3++;\r
}\r
-\r
- ASSERT (AcpiTableInstance->NumberOfTableEntries3 <= EFI_ACPI_MAX_NUM_TABLES);\r
}\r
\r
ChecksumCommonTables (AcpiTableInstance);\r
EFI_ACPI_TABLE_LIST *Table;\r
EFI_STATUS Status;\r
\r
+ Table = (EFI_ACPI_TABLE_LIST*) NULL;\r
+\r
//\r
// Check for invalid input parameters\r
//\r
EFI_STATUS Status;\r
UINT64 CurrentData;\r
UINTN TotalSize;\r
+ UINTN RsdpTableSize;\r
UINT8 *Pointer;\r
EFI_PHYSICAL_ADDRESS PageAddress;\r
\r
\r
AcpiTableInstance->AcpiTableProtocol.InstallAcpiTable = InstallAcpiTable;\r
AcpiTableInstance->AcpiTableProtocol.UninstallAcpiTable = UninstallAcpiTable;\r
+\r
+ if (FeaturePcdGet (PcdInstallAcpiSdtProtocol)) {\r
+ SdtAcpiTableAcpiSdtConstructor (AcpiTableInstance);\r
+ }\r
+\r
//\r
- // Create RSDP, RSDT, XSDT structures\r
- // Allocate all buffers\r
+ // Create RSDP table\r
//\r
- TotalSize = sizeof (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER) +\r
- sizeof (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER) +\r
- sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 1.0 RSDT\r
- EFI_ACPI_MAX_NUM_TABLES * sizeof (UINT32) +\r
- sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 RSDT\r
- EFI_ACPI_MAX_NUM_TABLES * sizeof (UINT32) +\r
- sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 XSDT\r
- EFI_ACPI_MAX_NUM_TABLES * sizeof (UINT64);\r
+ RsdpTableSize = sizeof (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER) +\r
+ sizeof (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER);\r
+\r
+ PageAddress = 0xFFFFFFFF;\r
+ Status = gBS->AllocatePages (\r
+ AllocateMaxAddress,\r
+ EfiACPIReclaimMemory,\r
+ EFI_SIZE_TO_PAGES (RsdpTableSize),\r
+ &PageAddress\r
+ );\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
+\r
+ Pointer = (UINT8 *) (UINTN) PageAddress;\r
+ ZeroMem (Pointer, RsdpTableSize);\r
+\r
+ AcpiTableInstance->Rsdp1 = (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER *) Pointer;\r
+ Pointer += sizeof (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER);\r
+ AcpiTableInstance->Rsdp3 = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *) Pointer;\r
+\r
+ //\r
+ // Create RSDT, XSDT structures\r
+ //\r
+ TotalSize = sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 1.0 RSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 RSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT32) +\r
+ sizeof (EFI_ACPI_DESCRIPTION_HEADER) + // for ACPI 2.0/3.0 XSDT\r
+ mEfiAcpiMaxNumTables * sizeof (UINT64);\r
\r
//\r
// Allocate memory in the lower 32 bit of address range for\r
);\r
\r
if (EFI_ERROR (Status)) {\r
+ gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)AcpiTableInstance->Rsdp1, EFI_SIZE_TO_PAGES (RsdpTableSize));\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
Pointer = (UINT8 *) (UINTN) PageAddress;\r
ZeroMem (Pointer, TotalSize);\r
\r
- AcpiTableInstance->Rsdp1 = (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER *) Pointer;\r
- Pointer += sizeof (EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER);\r
- AcpiTableInstance->Rsdp3 = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *) Pointer;\r
- Pointer += sizeof (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER);\r
-\r
AcpiTableInstance->Rsdt1 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + EFI_ACPI_MAX_NUM_TABLES * sizeof (UINT32));\r
AcpiTableInstance->Rsdt3 = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
Pointer += (sizeof (EFI_ACPI_DESCRIPTION_HEADER) + EFI_ACPI_MAX_NUM_TABLES * sizeof (UINT32));\r
-\r
AcpiTableInstance->Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *) Pointer;\r
\r
//\r
//\r
CurrentData = EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;\r
CopyMem (&AcpiTableInstance->Rsdp1->Signature, &CurrentData, sizeof (UINT64));\r
- CopyMem (AcpiTableInstance->Rsdp1->OemId, EFI_ACPI_OEM_ID, 6);\r
+ CopyMem (AcpiTableInstance->Rsdp1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (AcpiTableInstance->Rsdp1->OemId));\r
AcpiTableInstance->Rsdp1->Reserved = EFI_ACPI_RESERVED_BYTE;\r
AcpiTableInstance->Rsdp1->RsdtAddress = (UINT32) (UINTN) AcpiTableInstance->Rsdt1;\r
\r
CurrentData = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE;\r
CopyMem (&AcpiTableInstance->Rsdp3->Signature, &CurrentData, sizeof (UINT64));\r
- CopyMem (AcpiTableInstance->Rsdp3->OemId, EFI_ACPI_OEM_ID, 6);\r
+ CopyMem (AcpiTableInstance->Rsdp3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (AcpiTableInstance->Rsdp3->OemId));\r
AcpiTableInstance->Rsdp3->Revision = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION;\r
AcpiTableInstance->Rsdp3->RsdtAddress = (UINT32) (UINTN) AcpiTableInstance->Rsdt3;\r
AcpiTableInstance->Rsdp3->Length = sizeof (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER);\r
AcpiTableInstance->Rsdt1->Signature = EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;\r
AcpiTableInstance->Rsdt1->Length = sizeof (EFI_ACPI_DESCRIPTION_HEADER);\r
AcpiTableInstance->Rsdt1->Revision = EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;\r
- CopyMem (AcpiTableInstance->Rsdt1->OemId, EFI_ACPI_OEM_ID, 6);\r
- CurrentData = EFI_ACPI_OEM_TABLE_ID;\r
+ CopyMem (AcpiTableInstance->Rsdt1->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (AcpiTableInstance->Rsdt1->OemId));\r
+ CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);\r
CopyMem (&AcpiTableInstance->Rsdt1->OemTableId, &CurrentData, sizeof (UINT64));\r
- AcpiTableInstance->Rsdt1->OemRevision = EFI_ACPI_OEM_REVISION;\r
- AcpiTableInstance->Rsdt1->CreatorId = EFI_ACPI_CREATOR_ID;\r
- AcpiTableInstance->Rsdt1->CreatorRevision = EFI_ACPI_CREATOR_REVISION;\r
+ AcpiTableInstance->Rsdt1->OemRevision = PcdGet32 (PcdAcpiDefaultOemRevision);\r
+ AcpiTableInstance->Rsdt1->CreatorId = PcdGet32 (PcdAcpiDefaultCreatorId);\r
+ AcpiTableInstance->Rsdt1->CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
//\r
// We always reserve first one for FADT\r
//\r
AcpiTableInstance->Rsdt3->Signature = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;\r
AcpiTableInstance->Rsdt3->Length = sizeof (EFI_ACPI_DESCRIPTION_HEADER);\r
AcpiTableInstance->Rsdt3->Revision = EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_TABLE_REVISION;\r
- CopyMem (AcpiTableInstance->Rsdt3->OemId, EFI_ACPI_OEM_ID, 6);\r
- CurrentData = EFI_ACPI_OEM_TABLE_ID;\r
+ CopyMem (AcpiTableInstance->Rsdt3->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (AcpiTableInstance->Rsdt3->OemId));\r
+ CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);\r
CopyMem (&AcpiTableInstance->Rsdt3->OemTableId, &CurrentData, sizeof (UINT64));\r
- AcpiTableInstance->Rsdt3->OemRevision = EFI_ACPI_OEM_REVISION;\r
- AcpiTableInstance->Rsdt3->CreatorId = EFI_ACPI_CREATOR_ID;\r
- AcpiTableInstance->Rsdt3->CreatorRevision = EFI_ACPI_CREATOR_REVISION;\r
+ AcpiTableInstance->Rsdt3->OemRevision = PcdGet32 (PcdAcpiDefaultOemRevision);\r
+ AcpiTableInstance->Rsdt3->CreatorId = PcdGet32 (PcdAcpiDefaultCreatorId);\r
+ AcpiTableInstance->Rsdt3->CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
//\r
// We always reserve first one for FADT\r
//\r
AcpiTableInstance->Xsdt->Signature = EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE;\r
AcpiTableInstance->Xsdt->Length = sizeof (EFI_ACPI_DESCRIPTION_HEADER);\r
AcpiTableInstance->Xsdt->Revision = EFI_ACPI_3_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_REVISION;\r
- CopyMem (AcpiTableInstance->Xsdt->OemId, EFI_ACPI_OEM_ID, 6);\r
- CurrentData = EFI_ACPI_OEM_TABLE_ID;\r
+ CopyMem (AcpiTableInstance->Xsdt->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (AcpiTableInstance->Xsdt->OemId));\r
+ CurrentData = PcdGet64 (PcdAcpiDefaultOemTableId);\r
CopyMem (&AcpiTableInstance->Xsdt->OemTableId, &CurrentData, sizeof (UINT64));\r
- AcpiTableInstance->Xsdt->OemRevision = EFI_ACPI_OEM_REVISION;\r
- AcpiTableInstance->Xsdt->CreatorId = EFI_ACPI_CREATOR_ID;\r
- AcpiTableInstance->Xsdt->CreatorRevision = EFI_ACPI_CREATOR_REVISION;\r
+ AcpiTableInstance->Xsdt->OemRevision = PcdGet32 (PcdAcpiDefaultOemRevision);\r
+ AcpiTableInstance->Xsdt->CreatorId = PcdGet32 (PcdAcpiDefaultCreatorId);\r
+ AcpiTableInstance->Xsdt->CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);\r
//\r
// We always reserve first one for FADT\r
//\r
projects / mirror_edk2.git / blobdiff