diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-14 11:01:20 +0000 |
|---|---|---|
| committer | Sami Mujawar <sami.mujawar@arm.com> | 2019-03-20 11:00:44 +0000 |
| commit | e12bdeb1c2ad6e3354e16309284aae6313a1fb43 (patch) | |
| tree | 5d1cb078ec491e0ebe291557f05e0a37e1283931 /DynamicTablesPkg/Library/Common/TableHelperLib | |
| parent | 98a4a7a99bf588dffac031bb300d9aba4adcdea5 (diff) | |
| download | edk2-e12bdeb1c2ad6e3354e16309284aae6313a1fb43.zip edk2-e12bdeb1c2ad6e3354e16309284aae6313a1fb43.tar.gz edk2-e12bdeb1c2ad6e3354e16309284aae6313a1fb43.tar.bz2 | |
DynamicTablesPkg: Add OEM Info
This patch originally merged in edk2 master at
c788bdaba47536447ae37518a96d92e0da54aad7. However, this was
later reverted at bdbbedea949eb4b10d24110c0e559b03c7a6bce4
as it was merged during the Soft Feature Freeze for
edk2-stable201903.
Resubmitting this patch as the edk2 merge window is now open.
Added option for OEMs to provide OEM Table ID and
OEM Revision for ACPI tables.
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>
Diffstat (limited to 'DynamicTablesPkg/Library/Common/TableHelperLib')
| -rw-r--r-- | DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c index 02860dd..203207b 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c @@ -100,7 +100,7 @@ GetCgfMgrInfo ( @param [in] Generator Pointer to the ACPI table Generator.
@param [in,out] AcpiHeader Pointer to the ACPI table header to be
updated.
- @param [in] Revision Revision of the ACPI table.
+ @param [in] AcpiTableInfo Pointer to the ACPI table info structure.
@param [in] Length Length of the ACPI table.
@retval EFI_SUCCESS The ACPI table is updated successfully.
@@ -116,7 +116,7 @@ AddAcpiHeader ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,
IN CONST ACPI_TABLE_GENERATOR * CONST Generator,
IN OUT EFI_ACPI_DESCRIPTION_HEADER * CONST AcpiHeader,
- IN CONST UINT32 Revision,
+ IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo,
IN CONST UINT32 Length
)
{
@@ -151,7 +151,7 @@ AddAcpiHeader ( // UINT32 Length
AcpiHeader->Length = Length;
// UINT8 Revision
- AcpiHeader->Revision = Revision;
+ AcpiHeader->Revision = AcpiTableInfo->AcpiTableRevision;
// UINT8 Checksum
AcpiHeader->Checksum = 0;
@@ -159,12 +159,24 @@ AddAcpiHeader ( CopyMem (AcpiHeader->OemId, CfgMfrInfo->OemId, sizeof (AcpiHeader->OemId));
// UINT64 OemTableId
- AcpiHeader->OemTableId = Generator->CreatorId;
- AcpiHeader->OemTableId <<= 32;
- AcpiHeader->OemTableId |= Generator->AcpiTableSignature;
+ if (AcpiTableInfo->OemTableId != 0) {
+ AcpiHeader->OemTableId = AcpiTableInfo->OemTableId;
+ } else {
+ AcpiHeader->OemTableId = SIGNATURE_32 (
+ CfgMfrInfo->OemId[0],
+ CfgMfrInfo->OemId[1],
+ CfgMfrInfo->OemId[2],
+ CfgMfrInfo->OemId[3]
+ ) |
+ ((UINT64)Generator->AcpiTableSignature << 32);
+ }
// UINT32 OemRevision
- AcpiHeader->OemRevision = CfgMfrInfo->Revision;
+ if (AcpiTableInfo->OemRevision != 0) {
+ AcpiHeader->OemRevision = AcpiTableInfo->OemRevision;
+ } else {
+ AcpiHeader->OemRevision = CfgMfrInfo->Revision;
+ }
// UINT32 CreatorId
AcpiHeader->CreatorId = Generator->CreatorId;
|