Signed-off-by: Min Xu <min.m...@intel.com> --- OvmfPkg/ResetVector/ResetVector.nasmb | 13 ++++----- OvmfPkg/ResetVector/X64/IntelTdxMetadata.asm | 28 +++++--------------- 2 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/ResetVector.nasmb index 5f30d099a7f1..bf1ed8228133 100644 --- a/OvmfPkg/ResetVector/ResetVector.nasmb +++ b/OvmfPkg/ResetVector/ResetVector.nasmb @@ -77,21 +77,18 @@ %define TDX_CFV_MEMORY_BASE FixedPcdGet32 (PcdCfvBase), %define TDX_CFV_MEMORY_SIZE FixedPcdGet32 (PcdCfvRawDataSize), - %define TDX_HEAP_MEMORY_BASE FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) - %define TDX_HEAP_MEMORY_SIZE FixedPcdGet32 (PcdOvmfSecPeiTempRamSize) / 2 - - %define TDX_STACK_MEMORY_BASE (TDX_HEAP_MEMORY_BASE + TDX_HEAP_MEMORY_SIZE) - %define TDX_STACK_MEMORY_SIZE FixedPcdGet32 (PcdOvmfSecPeiTempRamSize) / 2 + %define TDX_HEAP_STACK_BASE FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + %define TDX_HEAP_STACK_SIZE FixedPcdGet32 (PcdOvmfSecPeiTempRamSize) %define TDX_HOB_MEMORY_BASE FixedPcdGet32 (PcdOvmfSecGhcbBase) %define TDX_HOB_MEMORY_SIZE FixedPcdGet32 (PcdOvmfSecGhcbSize) - %define TDX_MAILBOX_MEMORY_BASE FixedPcdGet32 (PcdOvmfSecGhcbBackupBase) - %define TDX_MAILBOX_MEMORY_SIZE FixedPcdGet32 (PcdOvmfSecGhcbBackupSize) - %define OVMF_PAGE_TABLE_BASE FixedPcdGet32 (PcdOvmfSecPageTablesBase) %define OVMF_PAGE_TABLE_SIZE FixedPcdGet32 (PcdOvmfSecPageTablesSize) + %define TDX_INIT_MEMORY_BASE FixedPcdGet32 (PcdOvmfWorkAreaBase) + %define TDX_INIT_MEMORY_SIZE (FixedPcdGet32 (PcdOvmfWorkAreaSize) + FixedPcdGet32 (PcdOvmfSecGhcbBackupSize)) + %define TDX_WORK_AREA_PGTBL_READY (FixedPcdGet32 (PcdOvmfWorkAreaBase) + 4) %define TDX_WORK_AREA_GPAW (FixedPcdGet32 (PcdOvmfWorkAreaBase) + 8) diff --git a/OvmfPkg/ResetVector/X64/IntelTdxMetadata.asm b/OvmfPkg/ResetVector/X64/IntelTdxMetadata.asm index 18e10931bbc2..dd66b468c5c6 100644 --- a/OvmfPkg/ResetVector/X64/IntelTdxMetadata.asm +++ b/OvmfPkg/ResetVector/X64/IntelTdxMetadata.asm @@ -50,35 +50,19 @@ _Cfv: DD TDX_METADATA_SECTION_TYPE_CFV DD 0 -_Stack: +_TdxHeapStack: DD 0 DD 0 - DQ TDX_STACK_MEMORY_BASE - DQ TDX_STACK_MEMORY_SIZE + DQ TDX_HEAP_STACK_BASE + DQ TDX_HEAP_STACK_SIZE DD TDX_METADATA_SECTION_TYPE_TEMP_MEM DD 0 -_Heap: +_TdxInitMem: DD 0 DD 0 - DQ TDX_HEAP_MEMORY_BASE - DQ TDX_HEAP_MEMORY_SIZE - DD TDX_METADATA_SECTION_TYPE_TEMP_MEM - DD 0 - -_MailBox: - DD 0 - DD 0 - DQ TDX_MAILBOX_MEMORY_BASE - DQ TDX_MAILBOX_MEMORY_SIZE - DD TDX_METADATA_SECTION_TYPE_TEMP_MEM - DD 0 - -_OvmfWorkarea: - DD 0 - DD 0 - DQ OVMF_WORK_AREA_BASE - DQ OVMF_WORK_AREA_SIZE + DQ TDX_INIT_MEMORY_BASE + DQ TDX_INIT_MEMORY_SIZE DD TDX_METADATA_SECTION_TYPE_TEMP_MEM DD 0 -- 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81475): https://edk2.groups.io/g/devel/message/81475 Mute This Topic: https://groups.io/mt/86085724/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
