1. Patchew
  2. EDK2
  3. [edk2-devel] [edk2-platforms Patch V3 00/12] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences
  4. View patch

[edk2-devel] [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH

Michael D Kinney posted 12 patches 6 years, 6 months ago
[edk2-devel] [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH
Posted by Michael D Kinney 6 years, 6 months ago 
Update calls to S3BootScriptxxx() services to use type
S3_BOOT_SCRIPT_LIB_WIDTH instead of EFI_BOOT_SCRIPT_WIDTH.
Fixes XCODE5 build failures.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../Library/EfiRegTableLib/EfiRegTableLib.c                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
index d698f3ada9..8b16585337 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
@@ -55,7 +55,7 @@ PciWrite (
 
   if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
     Status = S3BootScriptSavePciCfgWrite (
-              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
               (UINT64) Entry->PciAddress,
               1,
               &Entry->Data
@@ -111,7 +111,7 @@ PciReadModifyWrite (
 
   if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
     Status = S3BootScriptSavePciCfgReadWrite (
-              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
               (UINT64) Entry->PciAddress,
               &Entry->OrMask,
               &Entry->AndMask
@@ -167,7 +167,7 @@ MemReadModifyWrite (
 
   if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
     Status = S3BootScriptSaveMemReadWrite (
-              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
               Entry->MemAddress,
               &Entry->OrMask,
               &Entry->AndMask
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44174): https://edk2.groups.io/g/devel/message/44174
Mute This Topic: https://groups.io/mt/32564742/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH
Posted by Sun, Zailiang 6 years, 6 months ago 
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Tuesday, July 23, 2019 6:59 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib:
> Use S3_BOOT_SCRIPT_LIB_WIDTH
> 
> Update calls to S3BootScriptxxx() services to use type
> S3_BOOT_SCRIPT_LIB_WIDTH instead of EFI_BOOT_SCRIPT_WIDTH.
> Fixes XCODE5 build failures.
> 
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../Library/EfiRegTableLib/EfiRegTableLib.c                 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> index d698f3ada9..8b16585337 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTabl
> +++ eLib.c
> @@ -55,7 +55,7 @@ PciWrite (
> 
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSavePciCfgWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry-
> >OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA
> + (Entry->OpCode)),
>                (UINT64) Entry->PciAddress,
>                1,
>                &Entry->Data
> @@ -111,7 +111,7 @@ PciReadModifyWrite (
> 
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSavePciCfgReadWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry-
> >OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA
> + (Entry->OpCode)),
>                (UINT64) Entry->PciAddress,
>                &Entry->OrMask,
>                &Entry->AndMask
> @@ -167,7 +167,7 @@ MemReadModifyWrite (
> 
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSaveMemReadWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry-
> >OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA
> + (Entry->OpCode)),
>                Entry->MemAddress,
>                &Entry->OrMask,
>                &Entry->AndMask
> --
> 2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44190): https://edk2.groups.io/g/devel/message/44190
Mute This Topic: https://groups.io/mt/32564742/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH
Posted by Gary Lin 6 years, 6 months ago 
On Mon, Jul 22, 2019 at 03:58:54PM -0700, Michael D Kinney wrote:
> Update calls to S3BootScriptxxx() services to use type
> S3_BOOT_SCRIPT_LIB_WIDTH instead of EFI_BOOT_SCRIPT_WIDTH.
> Fixes XCODE5 build failures.
> 
Reviewed-by: Gary Lin <glin@suse.com>

> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../Library/EfiRegTableLib/EfiRegTableLib.c                 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> index d698f3ada9..8b16585337 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
> @@ -55,7 +55,7 @@ PciWrite (
>  
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSavePciCfgWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
>                (UINT64) Entry->PciAddress,
>                1,
>                &Entry->Data
> @@ -111,7 +111,7 @@ PciReadModifyWrite (
>  
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSavePciCfgReadWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
>                (UINT64) Entry->PciAddress,
>                &Entry->OrMask,
>                &Entry->AndMask
> @@ -167,7 +167,7 @@ MemReadModifyWrite (
>  
>    if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
>      Status = S3BootScriptSaveMemReadWrite (
> -              (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
> +              (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
>                Entry->MemAddress,
>                &Entry->OrMask,
>                &Entry->AndMask
> -- 
> 2.21.0.windows.1
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44229): https://edk2.groups.io/g/devel/message/44229
Mute This Topic: https://groups.io/mt/32564742/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.