DynamicTablesPkg: Add OEM Info
This patch originally merged in edk2 master atc788bdaba4
. However, this was later reverted atbdbbedea94
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>
This commit is contained in:
@@ -342,7 +342,7 @@ BuildDbg2Table (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
(EFI_ACPI_DESCRIPTION_HEADER*)&AcpiDbg2,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
sizeof (DBG2_TABLE)
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -537,7 +537,7 @@ BuildFadtTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
(EFI_ACPI_DESCRIPTION_HEADER*)&AcpiFadt,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
sizeof (EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE)
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -518,7 +518,7 @@ BuildGtdtTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
&Gtdt->Header,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
TableSize
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -1798,7 +1798,7 @@ BuildIortTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
&Iort->Header,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
TableSize
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -569,7 +569,7 @@ BuildMadtTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
&Madt->Header,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
TableSize
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -220,7 +220,7 @@ BuildMcfgTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
&Mcfg->Header,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
TableSize
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -211,7 +211,7 @@ BuildSpcrTable (
|
||||
CfgMgrProtocol,
|
||||
This,
|
||||
(EFI_ACPI_DESCRIPTION_HEADER*)&AcpiSpcr,
|
||||
AcpiTableInfo->AcpiTableRevision,
|
||||
AcpiTableInfo,
|
||||
sizeof (EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE)
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user