From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.3701.1616467864809902497 for ; Mon, 22 Mar 2021 19:51:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: zhiguang.liu@intel.com) IronPort-SDR: cD+oGepdo1P8nM0TylwZspn977fdOxAkjt5fcvEcyUg1P5kFpgyy9k2pKs0JdcriZAeNnPus5q jvu035DSJe0w== X-IronPort-AV: E=McAfee;i="6000,8403,9931"; a="210466826" X-IronPort-AV: E=Sophos;i="5.81,270,1610438400"; d="scan'208";a="210466826" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2021 19:51:03 -0700 IronPort-SDR: 7AVNAUu5XOWs6bGdnWGMlnR1YzXWJGm6tMXaL8FeB8OUhRHJehbNfHoVfEzJcuG/u9/pjs5lGR slNedzBEOMnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,270,1610438400"; d="scan'208";a="414757691" Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by orsmga008.jf.intel.com with ESMTP; 22 Mar 2021 19:50:00 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Dandan Bi , Liming Gao , Ray Ni Subject: [PATCH 1/2] MdeModulePkg/ACPI: Install ACPI table from HOB. Date: Tue, 23 Mar 2021 10:49:33 +0800 Message-Id: <20210323024934.853-2-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20210323024934.853-1-zhiguang.liu@intel.com> References: <20210323024934.853-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If HOB contains APCI table information, entry point of AcpiTableDxe.inf should parse the APCI table from HOB, and install these tables. We assume the whole ACPI table (starting with EFI_ACPI_2_0_ROOT_SYSTEM_DESC= RIPTION_POINTER) is contained by a single gEfiAcpiTableGuid HOB. Cc: Jian J Wang Cc: Hao A Wu Cc: Dandan Bi Cc: Liming Gao Cc: Ray Ni Signed-off-by: Zhiguang Liu --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf | 3 ++- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 134 +++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 128 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf b/Md= eModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf index d341df439e..473127368d 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf @@ -4,7 +4,7 @@ # This driver initializes ACPI tables (Rsdp, Rsdt and Xsdt) and produces = UEFI/PI=0D # services to install/uninstall/manage ACPI tables.=0D #=0D -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
= =0D +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
= =0D # Copyright (c) 2016, Linaro Ltd. All rights reserved.
=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -51,6 +51,7 @@ DebugLib=0D BaseLib=0D PcdLib=0D + HobLib=0D =0D [Guids]=0D gEfiAcpi10TableGuid ## PRODUCES ## SystemTable= =0D diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index 5a2afdff27..6b58759620 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -1,7 +1,7 @@ /** @file=0D ACPI Table Protocol Implementation=0D =0D - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
=0D Copyright (c) 2016, Linaro Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D @@ -11,6 +11,8 @@ // Includes=0D //=0D #include "AcpiTable.h"=0D +#include =0D +=0D //=0D // The maximum number of tables that pre-allocated.=0D //=0D @@ -30,6 +32,7 @@ STATIC EFI_ALLOCATE_TYPE mAcpiTableAllocType; @param Table Table to add.=0D @param Checksum Does the table require checksumming.=0D @param Version The version of the list to add the tab= le to.=0D + @param IsFromHob True, if add Apci Table from Hob List.= =0D @param Handle Pointer for returning the handle.=0D =0D @return EFI_SUCCESS The function completed successfully.=0D @@ -44,6 +47,7 @@ AddTableToList ( IN VOID *Table,=0D IN BOOLEAN Checksum,=0D IN EFI_ACPI_TABLE_VERSION Version,=0D + IN BOOLEAN IsFromHob,=0D OUT UINTN *Handle=0D );=0D =0D @@ -238,6 +242,7 @@ InstallAcpiTable ( AcpiTableBufferConst,=0D TRUE,=0D Version,=0D + FALSE,=0D TableKey=0D );=0D if (!EFI_ERROR (Status)) {=0D @@ -472,6 +477,7 @@ FreeTableMemory ( @param Table Table to add.=0D @param Checksum Does the table require checksumming.=0D @param Version The version of the list to add the tab= le to.=0D + @param IsFromHob True, if add Apci Table from Hob List.= =0D @param Handle Pointer for returning the handle.=0D =0D @return EFI_SUCCESS The function completed successfully.=0D @@ -487,6 +493,7 @@ AddTableToList ( IN VOID *Table,=0D IN BOOLEAN Checksum,=0D IN EFI_ACPI_TABLE_VERSION Version,=0D + IN BOOLEAN IsFromHob,=0D OUT UINTN *Handle=0D )=0D {=0D @@ -552,13 +559,17 @@ AddTableToList ( // could be updated by OS present agent. For example, BufferPtrAddress= in=0D // SMM communication ACPI table.=0D //=0D - ASSERT ((EFI_PAGE_SIZE % 64) =3D=3D 0);=0D - Status =3D gBS->AllocatePages (=0D - AllocateMaxAddress,=0D - EfiACPIMemoryNVS,=0D - EFI_SIZE_TO_PAGES (CurrentTableList->TableSize),=0D - &AllocPhysAddress=0D - );=0D + if (IsFromHob){=0D + AllocPhysAddress =3D (UINTN)Table;=0D + } else {=0D + ASSERT ((EFI_PAGE_SIZE % 64) =3D=3D 0);=0D + Status =3D gBS->AllocatePages (=0D + AllocateMaxAddress,=0D + EfiACPIMemoryNVS,=0D + EFI_SIZE_TO_PAGES (CurrentTableList->TableSize),=0D + &AllocPhysAddress=0D + );=0D + }=0D } else if (mAcpiTableAllocType =3D=3D AllocateAnyPages) {=0D //=0D // If there is no allocation limit, there is also no need to use page= =0D @@ -1689,6 +1700,111 @@ ChecksumCommonTables ( return EFI_SUCCESS;=0D }=0D =0D +/**=0D + This function will find Guid Hob gEfiAcpiTableGuid, and install Acpi tab= le from it.=0D +=0D + @param AcpiTableInstance Protocol instance private data.=0D +=0D + @return EFI_SUCCESS The function completed successfully.=0D + @return EFI_NOT_FOUND The function doesn't find the gEfiAcpiTableGu= id Guid Hob.=0D + @return EFI_ABORTED The function could not complete successfully.= =0D +=0D +**/=0D +EFI_STATUS=0D +InstallAcpiTableFromHob (=0D + EFI_ACPI_TABLE_INSTANCE *AcpiTableInstance=0D + )=0D +{=0D + EFI_HOB_GUID_TYPE *GuidHob;=0D + EFI_ACPI_TABLE_VERSION Version;=0D + EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp;=0D + EFI_ACPI_DESCRIPTION_HEADER *Rsdt;=0D + EFI_ACPI_DESCRIPTION_HEADER *ChildTable;=0D + UINT64 ChildTableAddress;=0D + UINTN Count;=0D + UINTN Index;=0D + UINTN TableKey;=0D + EFI_STATUS Status;=0D + UINTN EntrySize;=0D +=0D + TableKey =3D 0;=0D + Version =3D PcdGet32 (PcdAcpiExposedTableVersions);=0D +=0D + //=0D + // HOB only contains the ACPI table in 2.0+ format.=0D + //=0D + GuidHob =3D GetFirstGuidHob (&gEfiAcpiTableGuid);=0D + if (GuidHob =3D=3D NULL) {=0D + return EFI_NOT_FOUND;=0D + }=0D + Rsdp =3D (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER*) (UINTN)(*((UINT= 64*)GET_GUID_HOB_DATA (GuidHob)));=0D +=0D + //=0D + // An ACPI-compatible OS must use the XSDT if present.=0D + // It shouldn't happen that XsdtAddress points beyond 4G range in 32-bit= environment.=0D + //=0D + ASSERT ((UINTN) Rsdp->XsdtAddress =3D=3D Rsdp->XsdtAddress);=0D +=0D + EntrySize =3D sizeof (UINT64);=0D + Rsdt =3D (EFI_ACPI_DESCRIPTION_HEADER*) (UINTN) Rsdp->XsdtAddress;=0D + if (Rsdt =3D=3D NULL) {=0D + //=0D + // XsdtAddress is zero, then we use Rsdt which has 32 bit entry=0D + //=0D + Rsdt =3D (EFI_ACPI_DESCRIPTION_HEADER*) (UINTN) Rsdp->RsdtAddress;=0D + EntrySize =3D sizeof (UINT32);=0D + }=0D + Count =3D (Rsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER))/EntrySiz= e;=0D +=0D + for (Index =3D 0; Index < Count; Index++){=0D + ChildTableAddress =3D 0;=0D + CopyMem(&ChildTableAddress, (VOID*)((UINTN) Rsdt + EntrySize * Index += sizeof (EFI_ACPI_DESCRIPTION_HEADER)), EntrySize);=0D + //=0D + // If the address is of UINT64 while this module runs at 32 bits,=0D + // make sure the upper bits are all-zeros.=0D + //=0D + ASSERT (ChildTableAddress =3D=3D (UINTN) ChildTableAddress);=0D +=0D + ChildTable =3D (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) ChildTableAddre= ss;=0D + Status =3D AddTableToList (=0D + AcpiTableInstance,=0D + ChildTable,=0D + TRUE,=0D + Version,=0D + TRUE,=0D + &TableKey=0D + );=0D + if (ChildTable->Signature =3D=3D EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_T= ABLE_SIGNATURE){=0D + //=0D + // Add the FACS and DSDT tables.=0D + //=0D + Status =3D AddTableToList (=0D + AcpiTableInstance,=0D + (VOID *) (UINTN)((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABL= E*)ChildTable)->FirmwareCtrl,=0D + TRUE,=0D + Version,=0D + TRUE,=0D + &TableKey=0D + );=0D + Status =3D AddTableToList (=0D + AcpiTableInstance,=0D + (VOID *) (UINTN)((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABL= E*)ChildTable)->Dsdt,=0D + TRUE,=0D + Version,=0D + TRUE,=0D + &TableKey=0D + );=0D + }=0D + }=0D + if (!EFI_ERROR (Status)) {=0D + Status =3D PublishTables (=0D + AcpiTableInstance,=0D + Version=0D + );=0D + }=0D + ASSERT_EFI_ERROR (Status);=0D + return Status;=0D +}=0D =0D /**=0D Constructor for the ACPI table protocol. Initializes instance=0D @@ -1918,6 +2034,8 @@ AcpiTableAcpiTableConstructor ( =0D ChecksumCommonTables (AcpiTableInstance);=0D =0D + InstallAcpiTableFromHob (AcpiTableInstance);=0D +=0D //=0D // Completed successfully=0D //=0D --=20 2.30.0.windows.2