From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.1145.1648597670632172204 for ; Tue, 29 Mar 2022 16:48:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=IuXuUweA; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648597697; x=1680133697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ixazbVenfyTPIDPv7tGrIwFD6d1I227/jADlDKi+YsA=; b=IuXuUweAAZJHiU1SaR+YuvCEnLw6XCmrZNzInFV8KT69BRR4ZVO9DMcT CscSTgOVhuIF4tpIoKyWtCDGS+CIljaOa8AVnFPTrbfTcUJI+HZ8funWV xlsYM2npTclgR6GbxN9UNcJqiIDdSpks0hrORe/UTHbYdFt2oIkRROicg UEelDX5YM+3pL7VBeW5IDRdGNa45h0ZwPiWHHSeLMfYyL3RP8TUu6gq8i Tmcxb9bMigkZ1K3b2l+3fXPLOOQJbyxw+u6vH1lxC/mxPdkXDkyimeFza JkOSwsTsHe8X0wSyofF0Ur1MJ0udh5G3HnaGGYCZKEc78lxC4KNX3ld1l Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10301"; a="259375414" X-IronPort-AV: E=Sophos;i="5.90,220,1643702400"; d="scan'208";a="259375414" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2022 16:48:17 -0700 X-IronPort-AV: E=Sophos;i="5.90,220,1643702400"; d="scan'208";a="521658972" Received: from zhangpen-mobl.ccr.corp.intel.com (HELO mxu9-mobl1.ccr.corp.intel.com) ([10.255.29.230]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2022 16:48:14 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Jordan Justen , Brijesh Singh , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Gerd Hoffmann , Sebastien Boeuf Subject: [PATCH V12 25/47] OvmfPkg/PlatformPei: Refactor InitializeRamRegions Date: Wed, 30 Mar 2022 07:46:18 +0800 Message-Id: X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3863 InitializeRamRegions is refactored into 3 calls: - PlatformQemuInitializeRam - SevInitializeRam - PlatformQemuInitializeRamForS3 SevInitializeRam is not in PlatformInitLib. Because in the first stage PlatformInitLib only support the basic platform featues. PlatformQemuInitializeRamForS3 wraps the code which was previously in InitializeRamRegions (many code in 2 if-checks). Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Gerd Hoffmann Cc: Sebastien Boeuf Acked-by: Gerd Hoffmann Signed-off-by: Min Xu --- OvmfPkg/PlatformPei/MemDetect.c | 40 ++++++++++++++++++++------------- OvmfPkg/PlatformPei/Platform.c | 2 +- OvmfPkg/PlatformPei/Platform.h | 3 ++- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c index 45f7eba65d04..23a583ed3386 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -161,7 +161,7 @@ PlatformQemuUc32BaseInitialization ( // variable MTRR suffices by truncating the size to a whole power of two, // while keeping the end affixed to 4GB. This will round the base up. // - LowerMemorySize = GetSystemMemorySizeBelow4gb (PlatformInfoHob); + LowerMemorySize = PlatformGetSystemMemorySizeBelow4gb (PlatformInfoHob); PlatformInfoHob->Uc32Size = GetPowerOfTwo32 ((UINT32)(SIZE_4GB - LowerMemorySize)); PlatformInfoHob->Uc32Base = (UINT32)(SIZE_4GB - PlatformInfoHob->Uc32Size); // @@ -372,7 +372,8 @@ GetHighestSystemMemoryAddressFromPvhMemmap ( } UINT32 -GetSystemMemorySizeBelow4gb ( +EFIAPI +PlatformGetSystemMemorySizeBelow4gb ( IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { @@ -761,7 +762,7 @@ PublishPeiMemory ( UINT32 S3AcpiReservedMemoryBase; UINT32 S3AcpiReservedMemorySize; - LowerMemorySize = GetSystemMemorySizeBelow4gb (&mPlatformInfoHob); + LowerMemorySize = PlatformGetSystemMemorySizeBelow4gb (&mPlatformInfoHob); if (mPlatformInfoHob.SmmSmramRequire) { // // TSEG is chipped from the end of low RAM @@ -871,7 +872,7 @@ QemuInitializeRamBelow1gb ( **/ STATIC VOID -QemuInitializeRam ( +PlatformQemuInitializeRam ( IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { @@ -885,7 +886,7 @@ QemuInitializeRam ( // // Determine total memory size available // - LowerMemorySize = GetSystemMemorySizeBelow4gb (PlatformInfoHob); + LowerMemorySize = PlatformGetSystemMemorySizeBelow4gb (PlatformInfoHob); if (PlatformInfoHob->BootMode == BOOT_ON_S3_RESUME) { // @@ -995,19 +996,12 @@ QemuInitializeRam ( } } -/** - Publish system RAM and reserve memory regions - -**/ +STATIC VOID -InitializeRamRegions ( +PlatformQemuInitializeRamForS3 ( IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { - QemuInitializeRam (PlatformInfoHob); - - SevInitializeRam (); - if (PlatformInfoHob->S3Supported && (PlatformInfoHob->BootMode != BOOT_ON_S3_RESUME)) { // // This is the memory range that will be used for PEI on S3 resume @@ -1113,7 +1107,7 @@ InitializeRamRegions ( // TsegSize = PlatformInfoHob->Q35TsegMbytes * SIZE_1MB; BuildMemoryAllocationHob ( - GetSystemMemorySizeBelow4gb (PlatformInfoHob) - TsegSize, + PlatformGetSystemMemorySizeBelow4gb (PlatformInfoHob) - TsegSize, TsegSize, EfiReservedMemoryType ); @@ -1152,3 +1146,19 @@ InitializeRamRegions ( #endif } } + +/** + Publish system RAM and reserve memory regions + +**/ +VOID +InitializeRamRegions ( + IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob + ) +{ + PlatformQemuInitializeRam (PlatformInfoHob); + + SevInitializeRam (); + + PlatformQemuInitializeRamForS3 (PlatformInfoHob); +} diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 1275c9187e86..f89d14493ecf 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -79,7 +79,7 @@ MemMapInitialization ( return; } - TopOfLowRam = GetSystemMemorySizeBelow4gb (PlatformInfoHob); + TopOfLowRam = PlatformGetSystemMemorySizeBelow4gb (PlatformInfoHob); PciExBarBase = 0; if (PlatformInfoHob->HostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) { // diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 038a806a1e1b..635d58379a24 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -35,7 +35,8 @@ PublishPeiMemory ( ); UINT32 -GetSystemMemorySizeBelow4gb ( +EFIAPI +PlatformGetSystemMemorySizeBelow4gb ( IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ); -- 2.29.2.windows.2