From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mx.groups.io with SMTP id smtpd.web10.64330.1680507145321564351 for ; Mon, 03 Apr 2023 00:32:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@starlabs-systems.20210112.gappssmtp.com header.s=20210112 header.b=37Rwi+k7; spf=pass (domain: starlabs.systems, ip: 209.85.208.41, mailfrom: sean@starlabs.systems) Received: by mail-ed1-f41.google.com with SMTP id ew6so113327303edb.7 for ; Mon, 03 Apr 2023 00:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20210112.gappssmtp.com; s=20210112; t=1680507144; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ysGfjVEgBHqNXoP+g7gZXGOelx9gjVWmfZ9QPRSCTC8=; b=37Rwi+k7Ra9gB7ApAAStF2t7Z6v8GHC1H8JLHecoyU/rO4tfMB2cfEss0vCPZWz7F6 vQGPKkp2i8AGAFgn8issAqe2ltOw8GsYEr6PvdFGpOSXM714xZK2NQC25hnPJl9lO864 3l4Gey2Za9U12QwzFCuox65lwh8rUDa+2GIySxXNNPBgvgljZy8KWSXvU1p6IyJcu2J3 7tQyLm3HCN4x8sX2ZnyR31qT4CUDIaDA0o1xH9Y7YVdIO0Fk32unk8t3+BG0PgUqOnNL jJr3c7jT0DIVqHDLTQw2Ktd1mtSRA6yARaL4yNIs7PlDKvFMiuBmwAaugDqhStzpKMBs E66w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680507144; 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=ysGfjVEgBHqNXoP+g7gZXGOelx9gjVWmfZ9QPRSCTC8=; b=e2GZDiHo8EDUmgtA69oQMw3FD+p8JL6FLs52oISy9UMPs+pQ4XL5nl9a9tcmvch5ve OXIhSCNG5FLEG/55zURdMZDRF5TzHjRXdXWhJzGydCK9eJu4QWpEFDnXd1ckyVzr0yQI JW8MkR0fMC4lxY34lExwjIRW4FX8KI/N63HAl61S4dkXy0idND13YH0H1/zljQEetgoG G4nICjV4+7sZ4IaWGckq+DWe9XMCedOh4PqsaZ7jjg5iUUkEsZowQJJBpYKCHtem/OU6 mwrOIJyoRufo7MeUxrSzGgt/D0OSMOsu5eu28umoT/Hi7LLEn2WqG6dYu+W8348MVNRP oqQg== X-Gm-Message-State: AAQBX9cdEfbg5n6oaiSvoyJoPMTkBjN7IV2okS8fuMSK2o6tR+4E5YGv Ai9e86FFtA6nfiehkg5q1lSqcWelogUYotBdB1BM X-Google-Smtp-Source: AKy350Y9WCk78kYRwwO0xCa9hB3rw6wLG2eZ5vszcp/dMUX9a/k+b+QrKZNvfF7IsT8EYoJuHnlpiS0ycHohQN8H/cU= X-Received: by 2002:a50:8d12:0:b0:4af:70a5:5609 with SMTP id s18-20020a508d12000000b004af70a55609mr8926606eds.1.1680507143777; Mon, 03 Apr 2023 00:32:23 -0700 (PDT) MIME-Version: 1.0 References: <629e75402eb21750d9e536aac6c6b30cd346ae47.1680306925.git.benjamin.doron00@gmail.com> <0634b6da3ba67fe3a52c65db5e3e98a0902d1f85.1680306925.git.benjamin.doron00@gmail.com> In-Reply-To: <0634b6da3ba67fe3a52c65db5e3e98a0902d1f85.1680306925.git.benjamin.doron00@gmail.com> From: "Sean Rhodes" Date: Mon, 3 Apr 2023 08:32:13 +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="00000000000058fc4105f8698ff0" --00000000000058fc4105f8698ff0 Content-Type: text/plain; charset="UTF-8" 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 > > --00000000000058fc4105f8698ff0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
=

On Sat, 1 Apr 2023 at 00:58, Benjamin Doron <benjamin.doron00@gmail.com> 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 <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

--00000000000058fc4105f8698ff0--