devel@edk2.groups.io | [PATCH v1 2/2] UefiPayloadPkg: Update default memory type information for S4

Home Messages Hashtags Subgroups Calendar

Date Date 1 - 3 of 3

[PATCH v1 2/2] UefiPayloadPkg: Update default memory type information for S4

Benjamin Doron #102342 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 <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: Benjamin Doron <benjamin.doron00@...> --- UefiPayloadPkg/UefiPayloadPkg.dec \| 6 +++--- UefiPayloadPkg/UefiPayloadPkg.dsc \| 1 - 2 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 gUefiPayloadPkgTokenSpaceGuid.PcdShellFile\|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E,= 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\|VOID*\|0= x10000005=0D =0D ## Used to help reduce fragmentation in the EFI memory map=0D -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\|0x08\|UINT3= 2\|0x10000012=0D +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\|0x12\|UINT3= 2\|0x10000012=0D gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS\|0x04\|UINT32\|0x= 10000013=0D gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType\|0x04\|UINT= 32\|0x00000014=0D -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData\|0xC0\|UIN= T32\|0x00000015=0D -gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode\|0x80\|UIN= T32\|0x00000016=0D +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData\|0x100\|UI= NT32\|0x00000015=0D +gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode\|0x100\|UI= NT32\|0x00000016=0D =0D # Size of the region used by UEFI in permanent memory=0D gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize\|0x04000000\|UIN= T32\|0x00000017=0D 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 @@ !else=0D gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\|FALSE=0D !endif=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange\|FAL= SE=0D gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved\|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64\|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase\|0=0D --=20 2.39.1
More All Messages By This Member
Sean Rhodes #102374 Reviewed-by: Sean Rhodes <sean@...> toggle quoted message Show quoted text On Sat, 1 Apr 2023 at 00:58, Benjamin Doron <benjamin.doron00@...> 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 <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: Benjamin Doron <benjamin.doron00@...> --- 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
More All Messages By This Member
Sean Rhodes #102375 PR created at https://github.com/tianocore/edk2/pull/4231 toggle quoted message Show quoted text On Mon, 3 Apr 2023 at 08:32, Sean Rhodes <sean@...> wrote: Reviewed-by: Sean Rhodes <sean@...> On Sat, 1 Apr 2023 at 00:58, Benjamin Doron <benjamin.doron00@...> 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 <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: Benjamin Doron <benjamin.doron00@...> --- 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
More All Messages By This Member

1 - 3 of 3

1

Previous Topic Next Topic

Home Hashtags Subgroups Calendar About Features Pricing Updates Terms Help Twitter