From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by mx.groups.io with SMTP id smtpd.web11.10796.1680307089097611358 for ; Fri, 31 Mar 2023 16:58:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G0Oe4oWx; spf=pass (domain: gmail.com, ip: 209.85.160.181, mailfrom: benjamin.doron00@gmail.com) Received: by mail-qt1-f181.google.com with SMTP id n14so23202526qta.10 for ; Fri, 31 Mar 2023 16:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680307089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LjgUZ9QzpyBrn8kbGHpKk9e5oBd4Y8TOBzectQTlZGs=; b=G0Oe4oWxYrgD7gGi5L/BSbNDyULkr85ntUBK6as5LhpFlHCueaLTk3RNi0WcGY+/2T W/q3uC1+ctCXTrSxLEYyftq3eQ7QTozTfAmWX48uMSQSYtrpuCF7tTyJj3bgUVqYSG2U KM7eQr9AUEt0zP33WEgyFQplIwzmr+Gz/mhEQ5CourbqrzC78EKQ7CDomuwnmb05lkWJ XASUs+3ZnRPsiah1ShlmdtQtaeoEMhtz1iurbvrkzsa9Rs9sd3mYwf703vxLt5V8kBO3 xxLCCIoSK/jgQ7K8MYQXzrbTsusWF3aHAvT/iGlWnk2GxTt7fk2qfCmic8EX2IMA5q/b Mr0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680307089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LjgUZ9QzpyBrn8kbGHpKk9e5oBd4Y8TOBzectQTlZGs=; b=2MKYEF09Gqldk/+NbapBJOpBM+mHpuvbprt4Jifu+IhPUS+smmmT1jrk9nQf5ojCWU SmPYOjDrQtpeXhT6v6iQLGwa6Wvygo4T6zxMtjzSBZDTQas6Q4TDDHedDhBH7SkZ84mi TiuX6oPDacJsfTj8HKyYHALhFU99f+fFnX6t+vw28SdtMF25F7KMJM9Q2U14oTImFbOs 3rGoLX++e0ZphtaWZ16ojWmRYK42KYPyBtoe4D96Y2fQ3N7WCph+dtbJFstk1o4RBNqf Os10R4C4+5V0o5dibue6t9JxIfjHt2mUqxH6XAMH6SvnwOI3O/yUJK5szEM2jidkDTfv Izzg== X-Gm-Message-State: AO0yUKUFHe+omfAYWMo7W8T+xj+QCR061kwwpONv3PN4kwLLq00OFE+Q 0wp1MJg7SfvVVb6C58Qlec1tS9ZEk9k= X-Google-Smtp-Source: AK7set+sZt6iILYMlh8pLlij18YJjb29noqQ8uQO4lh7ZBXlXB2O9wRLq3tA8HUewqUgWkWTydP+fw== X-Received: by 2002:ac8:7f10:0:b0:3b8:525e:15ec with SMTP id f16-20020ac87f10000000b003b8525e15ecmr46222159qtk.27.1680307088892; Fri, 31 Mar 2023 16:58:08 -0700 (PDT) Return-Path: Received: from aturtleortwo-benjamindomain.sec.9e.network ([2607:f2c0:e98c:e:d426:a305:cfa6:a510]) by smtp.gmail.com with ESMTPSA id y3-20020a37f603000000b007468733cd1fsm1013243qkj.58.2023.03.31.16.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 16:58:08 -0700 (PDT) From: "Benjamin Doron" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel][PATCH v1 2/2] UefiPayloadPkg: Update default memory type information for S4 Date: Fri, 31 Mar 2023 19:57:36 -0400 Message-Id: <0634b6da3ba67fe3a52c65db5e3e98a0902d1f85.1680306925.git.benjamin.doron00@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <629e75402eb21750d9e536aac6c6b30cd346ae47.1680306925.git.benjamin.doron00@gmail.com> References: <629e75402eb21750d9e536aac6c6b30cd346ae47.1680306925.git.benjamin.doron00@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/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