From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.64507.1680507411387318347 for ; Mon, 03 Apr 2023 00:36:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@starlabs-systems.20210112.gappssmtp.com header.s=20210112 header.b=xBwFz8yl; spf=pass (domain: starlabs.systems, ip: 209.85.208.51, mailfrom: sean@starlabs.systems) Received: by mail-ed1-f51.google.com with SMTP id w9so113458233edc.3 for ; Mon, 03 Apr 2023 00:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20210112.gappssmtp.com; s=20210112; t=1680507409; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=8+ZGTOhs8QPpRC5+9kEhLd9Qtu1Kh3dLMtguTJtJ15k=; b=xBwFz8yl/tnGUpnY/gzHaJffpjD+yxHn1WaZioH6AJsSqaBoKTPM/mQJIeXercz9Mq lbU8T3/oAiL6VNNcKIillmnbQApYqu/94jsKLLyZFdZ58HZ87doAMmJkYiGEMxdPQ+pu 7fMjiNyta+p2Ocgy0TSs/clZoXMIvJAF6qADwLGzNYbFpFmAas7WfbVAw1tk8kflVF6w 4NjCQebs1ahTVXRTPBjVghD6zyepzzJcsioUiJow88SoMB8WFZm5ZTmQ2lALGFufs6Ph JrIuOYAJWDHlIcxX0b/xEpjjo0BkF3ThstP47AhYMon57p5oTjyjnaW5gKZ6xkHoAWaD YQ2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680507409; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8+ZGTOhs8QPpRC5+9kEhLd9Qtu1Kh3dLMtguTJtJ15k=; b=hJjnWah3ulkeqD5wsc3yetMdWnNx4U3xVQdLYLurbojs8OMnm6uKXzvpowok+nyd41 nZpKmiMDvNFqHpSVF88aI5Bn//3nnRNz1g1tEtabhwTegSmqQyx2h46q3nId2aqN7FH8 Lscz4BZ1jPWRg7K5vyWfdyOx4rfYWTVriqIlqqLd/aSdYbWypSQTv2pvxuNHL3H8Up2O 8ovrdksl0/wRgKShN4lN2rrBCJJvSAsoC0j1+c7gAvbvmScAEadUBpaElFDsAp3YM04g ft2dTQ5MRrqtudGIJPhHSXX8kUY6EmicKBoBiCZ20BNontImVHWsozZHU1TwwyGR1u6t rsHA== X-Gm-Message-State: AAQBX9fnKGwhmVJtQSP78A0OH0zVE1Nm3Ge8NZabX7GRzoOBI/kUeS5C /qwJQB8Q0J42s7tOPUwMD8OCWMj817CG2PrzEVB0K9O5Fsgnz4yEkfla X-Google-Smtp-Source: AKy350bVQ3+sPYGvNV7d6DLNasQUozkfZB/cyQMp+bbkcVb3AIa3H4EZkSXKso7qweVuue9jGeH8pBEeXPCnTGFirLM= X-Received: by 2002:a17:907:cb86:b0:930:42bd:ef1d with SMTP id un6-20020a170907cb8600b0093042bdef1dmr17789187ejc.11.1680507409657; Mon, 03 Apr 2023 00:36:49 -0700 (PDT) MIME-Version: 1.0 References: <629e75402eb21750d9e536aac6c6b30cd346ae47.1680306925.git.benjamin.doron00@gmail.com> <0634b6da3ba67fe3a52c65db5e3e98a0902d1f85.1680306925.git.benjamin.doron00@gmail.com> In-Reply-To: From: "Sean Rhodes" Date: Mon, 3 Apr 2023 08:36:38 +0100 Message-ID: Subject: Re: [edk2-devel][PATCH v1 2/2] UefiPayloadPkg: Update default memory type information for S4 To: Benjamin Doron Cc: devel@edk2.groups.io, Guo Dong , Ray Ni , James Lu , Gua Guo Content-Type: multipart/alternative; boundary="0000000000003209b305f8699f39" --0000000000003209b305f8699f39 Content-Type: text/plain; charset="UTF-8" PR created at https://github.com/tianocore/edk2/pull/4231 On Mon, 3 Apr 2023 at 08:32, Sean Rhodes wrote: > Reviewed-by: Sean Rhodes > > On Sat, 1 Apr 2023 at 00:58, Benjamin Doron > wrote: > >> Copied values from OVMF, these are sufficient for a debug build. >> >> Now that those are improved, remove >> PcdResetOnMemoryTypeInformationChange override. If the memory map must >> change, reset system so that an S4 resume will succeed. >> >> Requires testing a hibernate resume to OS. >> >> Cc: Guo Dong >> Cc: Ray Ni >> Cc: Sean Rhodes >> Cc: James Lu >> Cc: Gua Guo >> Signed-off-by: Benjamin Doron >> --- >> UefiPayloadPkg/UefiPayloadPkg.dec | 6 +++--- >> UefiPayloadPkg/UefiPayloadPkg.dsc | 1 - >> 2 files changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec >> b/UefiPayloadPkg/UefiPayloadPkg.dec >> index 2ed73513700d..a5004a2b616e 100644 >> --- a/UefiPayloadPkg/UefiPayloadPkg.dec >> +++ b/UefiPayloadPkg/UefiPayloadPkg.dec >> @@ -71,11 +71,11 @@ >> gUefiPayloadPkgTokenSpaceGuid.PcdBootloaderParameter|0|UINT64|0x10000004 >> gUefiPayloadPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, >> 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 >> }|VOID*|0x10000005 >> >> ## Used to help reduce fragmentation in the EFI memory map >> >> -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x08|UINT32|0x10000012 >> >> +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12|UINT32|0x10000012 >> >> gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT32|0x10000013 >> >> gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x04|UINT32|0x00000014 >> >> -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0xC0|UINT32|0x00000015 >> >> -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x80|UINT32|0x00000016 >> >> +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100|UINT32|0x00000015 >> >> +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100|UINT32|0x00000016 >> >> # Size of the region used by UEFI in permanent memory >> >> gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000|UINT32|0x00000017 >> diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc >> b/UefiPayloadPkg/UefiPayloadPkg.dsc >> index 9847f189fff5..ba6cc7e1a4d8 100644 >> --- a/UefiPayloadPkg/UefiPayloadPkg.dsc >> +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc >> @@ -539,7 +539,6 @@ >> !else >> gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE >> !endif >> - >> gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE >> gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 >> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 >> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 >> -- >> 2.39.1 >> >> --0000000000003209b305f8699f39 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
PR created at=C2=A0https://github.com/tianocore/edk2/pull/4231

On Mo= n, 3 Apr 2023 at 08:32, Sean Rhodes <sean@starlabs.systems> wrote:
<= div class=3D"gmail_default" style=3D"font-family:"trebuchet ms",s= ans-serif">Reviewed-by: Sean Rhodes <sean@starlabs.systems>
=

= On Sat, 1 Apr 2023 at 00:58, Benjamin Doron <benjamin.doron00@gmail.com> wro= te:
Copied value= s from OVMF, these are sufficient for a debug build.

Now that those are improved, remove
PcdResetOnMemoryTypeInformationChange override. If the memory map must
change, reset system so that an S4 resume will succeed.

Requires testing a hibernate resume to OS.

Cc: Guo Dong <gu= o.dong@intel.com>
Cc: Ray Ni <ray.ni= @intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: James Lu <ja= mes.lu@intel.com>
Cc: Gua Guo <gua.= guo@intel.com>
Signed-off-by: Benjamin Doron <benjamin.doron00@gmail.com>
---
=C2=A0UefiPayloadPkg/UefiPayloadPkg.dec | 6 +++---
=C2=A0UefiPayloadPkg/UefiPayloadPkg.dsc | 1 -
=C2=A02 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec
index 2ed73513700d..a5004a2b616e 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dec
+++ b/UefiPayloadPkg/UefiPayloadPkg.dec
@@ -71,11 +71,11 @@ gUefiPayloadPkgTokenSpaceGuid.PcdBootloaderParameter|0|= UINT64|0x10000004
=C2=A0gUefiPayloadPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, = 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VO= ID*|0x10000005

=C2=A0## Used to help reduce fragmentation in the EFI memory map
-gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x08|UINT3= 2|0x10000012
+gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12|UINT3= 2|0x10000012
=C2=A0gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT= 32|0x10000013
=C2=A0gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x04= |UINT32|0x00000014
-gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0xC0|UIN= T32|0x00000015
-gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x80|UIN= T32|0x00000016
+gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100|UI= NT32|0x00000015
+gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100|UI= NT32|0x00000016

=C2=A0# Size of the region used by UEFI in permanent memory
=C2=A0gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x0400000= 0|UINT32|0x00000017
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc
index 9847f189fff5..ba6cc7e1a4d8 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -539,7 +539,6 @@
=C2=A0!else
=C2=A0 =C2=A0gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE =C2=A0!endif
-=C2=A0 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChang= e|FALSE
=C2=A0 =C2=A0gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0=
=C2=A0 =C2=A0gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64= |0
=C2=A0 =C2=A0gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase= |0
--
2.39.1

--0000000000003209b305f8699f39--