From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.20666.1633405208299274124 for ; Mon, 04 Oct 2021 20:40:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: min.m.xu@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10127"; a="225958025" X-IronPort-AV: E=Sophos;i="5.85,347,1624345200"; d="scan'208";a="225958025" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2021 20:40:07 -0700 X-IronPort-AV: E=Sophos;i="5.85,347,1624345200"; d="scan'208";a="487828428" Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.29.239]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2021 20:40:06 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Min Xu Subject: [PATCH V2 03/28] OvmfPkg: Merge TEMP_MEM entries in Tdx metadata Date: Tue, 5 Oct 2021 11:39:14 +0800 Message-Id: <7cdee1fdfeef9c154b64d7834cfdec724985252a.1633401643.git.min.m.xu@intel.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Min Xu --- 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