From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from cxsh.intel-email.com (cxsh.intel-email.com [121.46.250.151]) by mx.groups.io with SMTP id smtpd.web11.8162.1676433571922153312 for ; Tue, 14 Feb 2023 19:59:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=Ai96ABkf; spf=pass (domain: byosoft.com.cn, ip: 121.46.250.151, mailfrom: gaoliming@byosoft.com.cn) Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 4B7EBDDA78C for ; Wed, 15 Feb 2023 11:59:29 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1676433569; bh=sjtrAacDBRSaOCfCvlC32AwNRvW4dRyz2HxkCy8bw0U=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=Ai96ABkfLdQ576g7gWtmwoCWRDNuFlPWtdS2KnXDoCSmxZNj0QJNGX/Unyuld/SG9 9ZPctSDsseVAO7VuxT1FyvgjB/hV4/UdrbJcAC6YWnzEBOEZgPSq6l4b2lJXvJhGE4 oVB9Gao5UeGPk6W9ZeJPelW+QVTTIZSLIH8bov4o= Received: from localhost (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 46FB7DDA7BF for ; Wed, 15 Feb 2023 11:59:29 +0800 (CST) Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 10BB4DDA814 for ; Wed, 15 Feb 2023 11:59:29 +0800 (CST) Authentication-Results: cxsh.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by cxsh.intel-email.com (Postfix) with SMTP id 9646FDDA78C for ; Wed, 15 Feb 2023 11:59:24 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 15 Feb 2023 11:59:14 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'xueshengfeng'" , , Cc: , , , "'lijun10x'" , "'Sunny Wang'" References: <43b8335a00e024f0fd399b73d91073ad74cc8851.1675238268.git.junx1.li@intel.com> In-Reply-To: <43b8335a00e024f0fd399b73d91073ad74cc8851.1675238268.git.junx1.li@intel.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0hdIE1kZU1vZHVsZVBrZy9MaWJyYXJ5OiBQY2RBY3BpUzNFbmFibGUgc2V0IEZBTFNFIGNhdXNlIEFzc2VydA==?= Date: Wed, 15 Feb 2023 11:59:15 +0800 Message-ID: <047601d940f1$df2748d0$9d75da70$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQJeKd+Iq/zioSpxa86sCQKCyshcxK3Fj6tg Sender: "gaoliming" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Xueshengfeng: This patch is good to me. Reviewed-by: Liming Gao = Does this patch plan to catch this stable tag 202302? Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: xueshengfeng = > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: = 2023=E5=B9=B42=E6=9C=882=E6=97=A5 14:21 > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; = jian.j.wang@intel.com; > gaoliming@byosoft.com.cn > =E6=8A=84=E9=80=81: heinrich.schuchardt@canonical.com; = edhaya.chandran@arm.com; > samer.el-haj-mahmoud@arm.com; lijun10x ; Sunny > Wang > =E4=B8=BB=E9=A2=98: [PATCH] MdeModulePkg/Library: PcdAcpiS3Enable set = FALSE cause > Assert >=20 > From: lijun10x >=20 > Some platforms don't support S3 with PcdAcpiS3Enable set as False. > Debug mode bios will ASSERT at this time as Follows. > ASSERT_RETURN_ERROR (Status =3D Out of Resources) > DXE_ASSERT!: > Edk2\MdePkg\Library\BaseS3PciSegmentLib\S3PciSegmentLib.c > (61): !(((INTN)(RETURN_STATUS)(Status)) < 0) >=20 > Steps to reproduce the issue: > 1.Set PcdAcpiS3Enable to FALSE. > 2.Build the bios in debug mode. > 3.Power on and Check the serial log. > Note: Prerequisite is that S3PciSegmentLib is Called and > the caller's code is run. >=20 > Root Cause: > S3PciSegmentLib call S3BootScriptLib controlled by PcdAcpiS3Enable. > If PcdAcpiS3Enable set as false, S3BootScriptLib will return error > status(Out of Resources). > S3PciSegmentLib will ASSERT if S3BootScriptLib return error. >=20 > Solution: > Make S3BootScriptLib return success if PcdAcpiS3Enable was disabled, > which behave as a null S3BootScriptLib instance which just return = success > for no action is required to do. >=20 > Signed-off-by: JunX1 Li > Cc: Liming Gao > Cc: Sunny Wang > Cc: Heinrich Schuchardt > Cc: G Edhaya Chandran > Cc: Samer El-Haj-Mahmoud > --- > .../PiDxeS3BootScriptLib/BootScriptSave.c | 132 = ++++++++++++++---- > 1 file changed, 108 insertions(+), 24 deletions(-) >=20 > diff --git = a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > index f8d4983d81..b9b8562f14 100644 > --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > @@ -1004,7 +1004,7 @@ S3BootScriptCloseTable ( > @param Buffer The source buffer from which to write data. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1021,6 +1021,10 @@ S3BootScriptSaveIoWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_IO_WRITE ScriptIoWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); >=20 > // > @@ -1064,7 +1068,7 @@ S3BootScriptSaveIoWrite ( > @param DataMask A pointer to the data mask to be AND-ed with the > data read from the register >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1080,6 +1084,10 @@ S3BootScriptSaveIoReadWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_IO_READ_WRITE ScriptIoReadWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE) + > (WidthInByte * 2)); >=20 > @@ -1114,7 +1122,7 @@ S3BootScriptSaveIoReadWrite ( > @param Buffer The source buffer from which to write the data. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1130,6 +1138,10 @@ S3BootScriptSaveMemWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_MEM_WRITE ScriptMemWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); >=20 > // > @@ -1174,7 +1186,7 @@ S3BootScriptSaveMemWrite ( > @param DataMask A pointer to the data mask to be AND-ed with the > data read from the register. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1190,6 +1202,10 @@ S3BootScriptSaveMemReadWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_MEM_READ_WRITE ScriptMemReadWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE) + > (WidthInByte * 2)); >=20 > @@ -1224,7 +1240,7 @@ S3BootScriptSaveMemReadWrite ( > @param Buffer The source buffer from which to write the data. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -1242,6 +1258,10 @@ S3BootScriptSavePciCfgWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE ScriptPciWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -1293,7 +1313,7 @@ S3BootScriptSavePciCfgWrite ( > @param DataMask A pointer to the data mask to be AND-ed. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN__SUCCESS Opcode is added. > + @retval RETURN__SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -1311,6 +1331,10 @@ S3BootScriptSavePciCfgReadWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE ScriptPciReadWrite; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -1357,7 +1381,7 @@ S3BootScriptSavePciCfgReadWrite ( > @param Buffer The source buffer from which to write the data. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -1376,6 +1400,10 @@ S3BootScriptSavePciCfg2Write ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE ScriptPciWrite2; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -1429,7 +1457,7 @@ S3BootScriptSavePciCfg2Write ( > @param DataMask A pointer to the data mask to be AND-ed. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -1448,6 +1476,10 @@ S3BootScriptSavePciCfg2ReadWrite ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE ScriptPciReadWrite2; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -1601,7 +1633,7 @@ CheckParameters ( > @param Buffer Contains the value of data to execute to the > SMBUS slave device. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1618,6 +1650,10 @@ S3BootScriptSaveSmbusExecute ( > UINT8 *Script; > EFI_BOOT_SCRIPT_SMBUS_EXECUTE ScriptSmbusExecute; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if (Length =3D=3D NULL) { > BufferLength =3D 0; > } else { > @@ -1670,7 +1706,7 @@ S3BootScriptSaveSmbusExecute ( > @param Duration Duration in microseconds of the stall >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1682,6 +1718,10 @@ S3BootScriptSaveStall ( > UINT8 *Script; > EFI_BOOT_SCRIPT_STALL ScriptStall; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_STALL)); >=20 > Script =3D S3BootScriptGetEntryAddAddress (Length); > @@ -1710,7 +1750,7 @@ S3BootScriptSaveStall ( > @param Context Argument to be passed into the EntryPoint of = the > code to be dispatched. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1723,6 +1763,10 @@ S3BootScriptSaveDispatch2 ( > UINT8 *Script; > EFI_BOOT_SCRIPT_DISPATCH_2 ScriptDispatch2; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_DISPATCH_2)); >=20 > Script =3D S3BootScriptGetEntryAddAddress (Length); > @@ -1762,7 +1806,7 @@ S3BootScriptSaveDispatch2 ( > @param LoopTimes The times of the register polling. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. >=20 > **/ > RETURN_STATUS > @@ -1781,6 +1825,10 @@ S3BootScriptSaveMemPoll ( > UINT8 WidthInByte; > EFI_BOOT_SCRIPT_MEM_POLL ScriptMemPoll; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); >=20 > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_POLL) + (WidthInByte > * 2)); > @@ -1817,7 +1865,7 @@ S3BootScriptSaveMemPoll ( > @param Information Information to be logged in the boot = scrpit >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. >=20 > **/ > RETURN_STATUS > @@ -1831,6 +1879,10 @@ S3BootScriptSaveInformation ( > UINT8 *Script; > EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > // > // Truncation check > // > @@ -1868,7 +1920,7 @@ S3BootScriptSaveInformation ( > @param String The string to save to boot script table >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. >=20 > **/ > RETURN_STATUS > @@ -1889,7 +1941,7 @@ S3BootScriptSaveInformationAsciiString ( > @param EntryPoint Entry point of the code to be dispatched. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -1901,6 +1953,10 @@ S3BootScriptSaveDispatch ( > UINT8 *Script; > EFI_BOOT_SCRIPT_DISPATCH ScriptDispatch; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_DISPATCH)); >=20 > Script =3D S3BootScriptGetEntryAddAddress (Length); > @@ -1935,7 +1991,7 @@ S3BootScriptSaveDispatch ( > granularity so the delay may be > longer. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. >=20 > **/ > RETURN_STATUS > @@ -1953,6 +2009,10 @@ S3BootScriptSaveIoPoll ( > UINT8 Length; > EFI_BOOT_SCRIPT_IO_POLL ScriptIoPoll; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > WidthInByte =3D (UINT8)(0x01 << (Width & 0x03)); > Length =3D (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_POLL) + > (WidthInByte * 2)); >=20 > @@ -1992,7 +2052,7 @@ S3BootScriptSaveIoPoll ( > granularity so the delay may be > longer. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -2011,6 +2071,10 @@ S3BootScriptSavePciPoll ( > UINT8 Length; > EFI_BOOT_SCRIPT_PCI_CONFIG_POLL ScriptPciPoll; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -2058,7 +2122,7 @@ S3BootScriptSavePciPoll ( > granularity so the delay may be > longer. >=20 > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. > @note A known Limitations in the implementation which is 64bits > operations are not supported. >=20 > **/ > @@ -2078,6 +2142,10 @@ S3BootScriptSavePci2Poll ( > UINT8 Length; > EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL ScriptPci2Poll; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if ((Width =3D=3D S3BootScriptWidthUint64) || > (Width =3D=3D S3BootScriptWidthFifoUint64) || > (Width =3D=3D S3BootScriptWidthFillUint64)) > @@ -2192,7 +2260,7 @@ S3BootScriptCalculateInsertAddress ( >=20 > @retval RETURN_OUT_OF_RESOURCES The table is not available. > @retval RETURN_INVALID_PARAMETER The Position is not a valid > position in the boot script table. > - @retval RETURN_SUCCESS Opcode is inserted. > + @retval RETURN_SUCCESS Opcode is inserted no action is > required as ACPI S3 was disabled. > **/ > RETURN_STATUS > EFIAPI > @@ -2210,6 +2278,10 @@ S3BootScriptMoveLastOpcode ( > UINT8 *LastOpcode; > UINT8 > TempBootScriptEntry[BOOT_SCRIPT_NODE_MAX_LENGTH]; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > ValidatePosition =3D FALSE; > TempPosition =3D (Position =3D=3D NULL) ? NULL : (*Position); >=20 > @@ -2297,7 +2369,7 @@ S3BootScriptMoveLastOpcode ( >=20 > @retval RETURN_INVALID_PARAMETER The Position is not a valid > position in the boot script table. > @retval RETURN_OUT_OF_RESOURCES Not enough memory for the > table do operation. > - @retval RETURN_SUCCESS Opcode is added. > + @retval RETURN_SUCCESS Opcode is added or no action is > required as ACPI S3 was disabled. >=20 > **/ > RETURN_STATUS > @@ -2313,6 +2385,10 @@ S3BootScriptLabelInternal ( > UINT8 *Script; > EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > // > // Truncation check > // > @@ -2357,8 +2433,8 @@ S3BootScriptLabelInternal ( > of the inserted opcode in the boot > script table. > @param Label Points to the label which will be > inserted in the boot script table. >=20 > - @retval EFI_SUCCESS The operation succeeded. A record > was added into the > - specified script table. > + @retval EFI_SUCCESS The operation succeeded or no action > is required. > + A record was added into the > specified script table if ACPI S3 was enabled. > @retval EFI_INVALID_PARAMETER The parameter is illegal or the given > boot script is not supported. > If the opcode is unknow or not > supported because of the PCD > Feature Flags. > @@ -2381,6 +2457,10 @@ S3BootScriptLabel ( > EFI_BOOT_SCRIPT_TABLE_HEADER TableHeader; > UINT32 LabelLength; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > // > // Check NULL Label > // > @@ -2443,8 +2523,8 @@ S3BootScriptLabel ( > @param Position2 The positions in the boot script = table > to compare > @param RelativePosition On return, points to the result of = the > comparison >=20 > - @retval EFI_SUCCESS The operation succeeded. A record > was added into the > - specified script table. > + @retval EFI_SUCCESS The operation succeeded or no action > is required. > + A record was added into the > specified script table if ACPI S3 was enabled. > @retval EFI_INVALID_PARAMETER The parameter is illegal or the given > boot script is not supported. > If the opcode is unknow or not > supported because of the PCD > Feature Flags. > @@ -2462,6 +2542,10 @@ S3BootScriptCompare ( > UINT8 *Script; > UINT32 TableLength; >=20 > + if (!mS3BootScriptAcpiS3Enable) { > + return RETURN_SUCCESS; > + } > + > if (RelativePosition =3D=3D NULL) { > return EFI_INVALID_PARAMETER; > } > -- > 2.26.2.windows.1