/** @file\r
Helper Library for ACPI\r
\r
- Copyright (c) 2014, ARM Ltd. All rights reserved.\r
+ Copyright (c) 2014-2015, ARM Ltd. All rights reserved.\r
\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
\r
#include <Uefi.h>\r
\r
+#include <IndustryStandard/Acpi10.h>\r
+\r
//\r
// Macros for the Generic Address Space\r
//\r
WatchdogTimerGSIV, WatchdogTimerFlags \\r
}\r
\r
+typedef\r
+BOOLEAN\r
+(EFIAPI *EFI_LOCATE_ACPI_CHECK) (\r
+ IN EFI_ACPI_DESCRIPTION_HEADER *AcpiHeader\r
+ );\r
+\r
+/**\r
+ Locate and Install the ACPI tables from the Firmware Volume if it verifies\r
+ the function condition.\r
+\r
+ @param AcpiFile Guid of the ACPI file into the Firmware Volume\r
+ @param CheckAcpiTableFunction Function that checks if the ACPI table should be installed\r
+\r
+ @return EFI_SUCCESS The function completed successfully.\r
+ @return EFI_NOT_FOUND The protocol could not be located.\r
+ @return EFI_OUT_OF_RESOURCES There are not enough resources to find the protocol.\r
+\r
+**/\r
+EFI_STATUS\r
+LocateAndInstallAcpiFromFvConditional (\r
+ IN CONST EFI_GUID* AcpiFile,\r
+ IN EFI_LOCATE_ACPI_CHECK CheckAcpiTableFunction\r
+ );\r
+\r
/**\r
Locate and Install the ACPI tables from the Firmware Volume\r
\r
/** @file\r
*\r
-* Copyright (c) 2014, ARM Limited. All rights reserved.\r
+* Copyright (c) 2014-2015, ARM Limited. All rights reserved.\r
*\r
* This program and the accompanying materials\r
* are licensed and made available under the terms and conditions of the BSD License\r
#include <IndustryStandard/Acpi.h>\r
\r
/**\r
- Locate and Install the ACPI tables from the Firmware Volume\r
+ Locate and Install the ACPI tables from the Firmware Volume if it verifies\r
+ the function condition.\r
\r
- @param AcpiFile Guid of the ACPI file into the Firmware Volume\r
+ @param AcpiFile Guid of the ACPI file into the Firmware Volume\r
+ @param CheckAcpiTableFunction Function that checks if the ACPI table should be installed\r
\r
- @return EFI_SUCCESS The function completed successfully.\r
- @return EFI_NOT_FOUND The protocol could not be located.\r
- @return EFI_OUT_OF_RESOURCES There are not enough resources to find the protocol.\r
+ @return EFI_SUCCESS The function completed successfully.\r
+ @return EFI_NOT_FOUND The protocol could not be located.\r
+ @return EFI_OUT_OF_RESOURCES There are not enough resources to find the protocol.\r
\r
**/\r
EFI_STATUS\r
-LocateAndInstallAcpiFromFv (\r
- IN CONST EFI_GUID* AcpiFile\r
+LocateAndInstallAcpiFromFvConditional (\r
+ IN CONST EFI_GUID* AcpiFile,\r
+ IN EFI_LOCATE_ACPI_CHECK CheckAcpiTableFunction\r
)\r
{\r
EFI_STATUS Status;\r
EFI_ACPI_COMMON_HEADER *AcpiTable;\r
UINTN AcpiTableSize;\r
UINTN AcpiTableKey;\r
+ BOOLEAN Valid;\r
\r
// Ensure the ACPI Table is present\r
Status = gBS->LocateProtocol (\r
((((EFI_ACPI_DESCRIPTION_HEADER *) AcpiTable)->Signature >> 16) & 0xFF),\r
((((EFI_ACPI_DESCRIPTION_HEADER *) AcpiTable)->Signature >> 24) & 0xFF)));\r
\r
+ // Is the ACPI table valid?\r
+ if (CheckAcpiTableFunction) {\r
+ Valid = CheckAcpiTableFunction ((EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable);\r
+ } else {\r
+ Valid = TRUE;\r
+ }\r
+\r
// Install the ACPI Table\r
- Status = AcpiProtocol->InstallAcpiTable (\r
- AcpiProtocol,\r
- AcpiTable,\r
- AcpiTableSize,\r
- &AcpiTableKey\r
- );\r
+ if (Valid) {\r
+ Status = AcpiProtocol->InstallAcpiTable (\r
+ AcpiProtocol,\r
+ AcpiTable,\r
+ AcpiTableSize,\r
+ &AcpiTableKey\r
+ );\r
+ }\r
+\r
// Free memory allocated by ReadSection\r
gBS->FreePool (AcpiTable);\r
\r
\r
return EFI_SUCCESS;\r
}\r
+\r
+/**\r
+ Locate and Install the ACPI tables from the Firmware Volume\r
+\r
+ @param AcpiFile Guid of the ACPI file into the Firmware Volume\r
+\r
+ @return EFI_SUCCESS The function completed successfully.\r
+ @return EFI_NOT_FOUND The protocol could not be located.\r
+ @return EFI_OUT_OF_RESOURCES There are not enough resources to find the protocol.\r
+\r
+**/\r
+EFI_STATUS\r
+LocateAndInstallAcpiFromFv (\r
+ IN CONST EFI_GUID* AcpiFile\r
+ )\r
+{\r
+ return LocateAndInstallAcpiFromFvConditional (AcpiFile, NULL);\r
+}\r