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.web09.3886.1611885581084839509 for ; Thu, 28 Jan 2021 17:59:41 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: aiden.park@intel.com) IronPort-SDR: +lN4r8ISv0qNc/Z7nzXv+DFA41TOsbT09bpeneJTecj2a1+IEgCfVY9umm4Yw2DEc51n20CkO/ 8VFqQ2tznfXA== X-IronPort-AV: E=McAfee;i="6000,8403,9878"; a="179565278" X-IronPort-AV: E=Sophos;i="5.79,384,1602572400"; d="scan'208";a="179565278" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2021 17:59:39 -0800 IronPort-SDR: JP5gJ8zS6EvtJ6+jidBcY7yDg8Cl5GI31Jl5HtR5m9KHu/xQnFw2JMDEN9WBz1Wegsczv9Tqhg U9p343bbSRwg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,384,1602572400"; d="scan'208";a="430804620" Received: from plxs0284.pdx.intel.com ([10.38.240.7]) by orsmga001.jf.intel.com with ESMTP; 28 Jan 2021 17:59:39 -0800 Received: from younghyu-desk1.jf.intel.com (younghyu-desk1.jf.intel.com [134.134.154.164]) by plxs0284.pdx.intel.com with ESMTP id 10T1xdLv006836; Thu, 28 Jan 2021 17:59:39 -0800 From: "Park, Aiden" To: guo.dong@intel.com, maurice.ma@intel.com, devel@edk2.groups.io Cc: aiden.park@intel.com Subject: [PATCH] UefiPayloadPkg: Update EFI Memory Service conditions Date: Thu, 28 Jan 2021 17:59:37 -0800 Message-Id: <20210129015937.1983-1-aiden.park@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Aiden Park The CoreInitializeMemoryServices() looks for a suitable memory region for EFI Memory Service from the ResourceDescriptor Hob. This patch does not allow legacy memory region for the Memory Service and provides default memory type information to calculate minimal required memory size properly for the Memory Service. Signed-off-by: Aiden Park --- .../UefiPayloadEntry/UefiPayloadEntry.c | 20 +++++++++++++++++++ .../UefiPayloadEntry/UefiPayloadEntry.inf | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c index 805f5448d9..d2e6f962cd 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -6,6 +6,16 @@ **/ #include "UefiPayloadEntry.h" +#include + +EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = { + { EfiACPIReclaimMemory, FixedPcdGet32 (PcdMemoryTypeEfiACPIReclaimMemory) }, + { EfiACPIMemoryNVS, FixedPcdGet32 (PcdMemoryTypeEfiACPIMemoryNVS) }, + { EfiReservedMemoryType, FixedPcdGet32 (PcdMemoryTypeEfiReservedMemoryType) }, + { EfiRuntimeServicesData, FixedPcdGet32 (PcdMemoryTypeEfiRuntimeServicesData) }, + { EfiRuntimeServicesCode, FixedPcdGet32 (PcdMemoryTypeEfiRuntimeServicesCode) }, + { EfiMaxMemoryType, 0 } +}; /** Callback function to build resource descriptor HOB @@ -44,6 +54,9 @@ MemInfoCallback ( // Remove tested attribute to avoid DXE core to dispatch driver to memory above 4GB Attribue &= ~EFI_RESOURCE_ATTRIBUTE_TESTED; } + if (Base == 0x00) { + Attribue &= ~EFI_RESOURCE_ATTRIBUTE_TESTED; + } BuildResourceDescriptorHob (Type, Attribue, (EFI_PHYSICAL_ADDRESS)Base, Size); DEBUG ((DEBUG_INFO , "buildhob: base = 0x%lx, size = 0x%lx, type = 0x%x\n", Base, Size, Type)); @@ -315,6 +328,13 @@ BuildGenericHob ( UINT8 PhysicalAddressBits; EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute; + // + // Create Memory Type Information HOB + // + BuildGuidDataHob (&gEfiMemoryTypeInformationGuid, + mDefaultMemoryTypeInformation, + sizeof (mDefaultMemoryTypeInformation)); + // The UEFI payload FV BuildMemoryAllocationHob (PcdGet32 (PcdPayloadFdMemBase), PcdGet32 (PcdPayloadFdMemSize), EfiBootServicesData); diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf index cc59f1903b..5cb084ca51 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf @@ -86,6 +86,11 @@ gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize gUefiPayloadPkgTokenSpaceGuid.PcdPayloadStackTop gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIMES_CONSUMES -- 2.20.1