From nobody Sun May 19 14:14:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+99418+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99418+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1675279189; cv=none; d=zohomail.com; s=zohoarc; b=hyHr9L1VaqGv46tWcG00i6uUaO1OScb0HxynauKrpiSVugmmiPlqNQu8H2lZO0MpQT22iggfgGJ1VIOYYtTR5kW4KMwiFbj+3WnD3rKdNtfQ7nI/bb0NMooynpUSmYrI2H0ygfLNHaV9mkvdNFBOan9NjOsGh6I1T5LMdoZXxjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675279189; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=/xCnAnefYyty+ogkdztoVqy9UjOu3G9+JaMRlf7aLeY=; b=Dbc44oWVCRtpjhhWnTOEEFOjQzEhlqviqJYzzuInYwWjEYojEHqqKLhIiUqaABEgE9Vr8tqxGQD596EQj34LW339tiYpgW9pNu4OqdXRS3S5edK/hVvTmH10ACYFb/Il8JHfOpzDwiy7I5bhLgi4efTPTiL5My+xcp25evWc6rs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99418+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1675279189001914.2982154464211; Wed, 1 Feb 2023 11:19:49 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id MT8YYY1788612x4GHHSvG0sF; Wed, 01 Feb 2023 11:19:48 -0800 X-Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web10.19854.1675247244814921309 for ; Wed, 01 Feb 2023 02:27:26 -0800 X-Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id ABCB9CD1FB51 for ; Wed, 1 Feb 2023 18:01:56 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id A7034CD1FB50 for ; Wed, 1 Feb 2023 18:01:56 +0800 (CST) X-Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 73F34CD1FB4F for ; Wed, 1 Feb 2023 18:01:56 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 74ACACD1FB40 for ; Wed, 1 Feb 2023 18:01:53 +0800 (CST) X-Received: from localhost.localdomain ([112.86.218.122]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 01 Feb 2023 18:01:45 +0800 X-WM-Sender: xueshengfeng@byosoft.com.cn X-Originating-IP: 112.86.218.122 X-WM-AuthFlag: YES X-WM-AuthUser: xueshengfeng@byosoft.com.cn From: "xueshengfeng via groups.io" To: devel@edk2.groups.io, jian.j.wang@intel.com, gaoliming@byosoft.com.cn Cc: heinrich.schuchardt@canonical.com, edhaya.chandran@arm.com, samer.el-haj-mahmoud@arm.com, lijun10x , Sunny Wang Subject: =?UTF-8?B?W2VkazItZGV2ZWxdIFtQQVRDSF0gUkVG77yaIGh0dHBzOi8vYnVnemlsbGEudGlhbm9jb3JlLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMzMQ==?= Date: Wed, 1 Feb 2023 18:01:36 +0800 Message-Id: <43b8335a00e024f0fd399b73d91073ad74cc8851.1675238268.git.junx1.li@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xueshengfeng@byosoft.com.cn X-Gm-Message-State: 35Ax8FOrCAY8M9q7YabmHPcUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675279188; bh=WNzV5iLEfNGQDO1ezGfDPxXk581MKURS1cqG9S4PwiM=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ip4sBgMwkDLJ54DqX1bUR3Nx0qNOdJuzBnmkwYwRhIUa/hx7+O6BqTvJPoEvh1U8tCW Liz60P3Hhxs1We29a7Tyn8Hkj3XTup26i5Pq/1Wh6e3+iQDHkxmnecjY8KtG47DoKVc1k h/2muEDYKhDFea3RaHlBoUp3+AfR2Tp9GP8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675279237219100002 Content-Type: text/plain; charset="utf-8" From: lijun10x 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) 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. Root Cause: S3PciSegmentLib call S3BootScriptLib which controlled by PcdAcpiS3Enable. If PcdAcpiS3Enable set as false, S3BootScriptLib will return error status(O= ut of Resources). S3PciSegmentLib will ASSERT if S3BootScriptLib return error. Solution: Make S3BootScriptLib return success if PcdAcpiS3Enable was disabled, which behave as a null S3BootScriptLib instance which just return success f= or no action is required to do. Signed-off-by: junx1.li@intel.com 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(-) diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/M= deModulePkg/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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 r= ead from the register =20 @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table do oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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) + (WidthI= nByte * 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 r= ead from the register. =20 @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table do oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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) + (Width= InByte * 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d as ACPI S3 was disabled. @note A known Limitations in the implementation which is 64bits operati= ons 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 oper= ation. - @retval RETURN__SUCCESS Opcode is added. + @retval RETURN__SUCCESS Opcode is added or no action is requir= ed as ACPI S3 was disabled. @note A known Limitations in the implementation which is 64bits operati= ons 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d as ACPI S3 was disabled. @note A known Limitations in the implementation which is 64bits operati= ons 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d as ACPI S3 was disabled. @note A known Limitations in the implementation which is 64bits operati= ons 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 cod= e to be dispatched. =20 @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table do oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 opera= tion. - @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 opera= tion. - @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 operati= ons 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 opera= tion. - @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 operati= ons 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 require= d 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 oper= ation. - @retval RETURN_SUCCESS Opcode is added. + @retval RETURN_SUCCESS Opcode is added or no action is require= d 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 adde= d into the - specified script table. + @retval EFI_SUCCESS The operation succeeded or no action is re= quired.=20 + A record was added into the specified scri= pt 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 b= ecause 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 com= parison =20 - @retval EFI_SUCCESS The operation succeeded. A record was adde= d into the - specified script table. + @retval EFI_SUCCESS The operation succeeded or no action is re= quired.=20 + A record was added into the specified scri= pt 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 b= ecause 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; } --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99418): https://edk2.groups.io/g/devel/message/99418 Mute This Topic: https://groups.io/mt/96684353/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-