1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH v2 00/16] OvmfPkg: support VCPU hotplug with -D SMM_REQUIRE
  4. View patch

[edk2-devel] [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups

Laszlo Ersek posted 16 patches 5 years, 11 months ago
[edk2-devel] [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups
Posted by Laszlo Ersek 5 years, 11 months ago 
Sort the [Packages], [LibraryClasses], and [Pcd] sections in the INF file.
Pad the usage notes (CONSUMES, PRODUCES) in the [Pcd] section.

Sort the Library #includes in the C file.

This patch is functionally a no-op.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1512
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---

Notes:
    v2:
    
    - Pick up Ard's Acked-by, which is conditional on approval from Intel
      reviewers on Cc. (I'd like to save Ard the churn of re-acking
      unmodified patches.)

 OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 16 ++++++++--------
 OvmfPkg/CpuS3DataDxe/CpuS3Data.c      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
index 0ad8a0b35d25..f9679e0c33b3 100644
--- a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
+++ b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
@@ -14,48 +14,48 @@
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
 [Defines]
   INF_VERSION                    = 1.29
   BASE_NAME                      = CpuS3DataDxe
   FILE_GUID                      = 229B7EFD-DA02-46B9-93F4-E20C009F94E9
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = CpuS3DataInitialize
 
 # The following information is for reference only and not required by the build
 # tools.
 #
 #  VALID_ARCHITECTURES           = IA32 X64
 
 [Sources]
   CpuS3Data.c
 
 [Packages]
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
 
 [LibraryClasses]
-  UefiDriverEntryPoint
-  UefiBootServicesTableLib
+  BaseLib
   BaseMemoryLib
   DebugLib
-  BaseLib
-  MtrrLib
   MemoryAllocationLib
+  MtrrLib
+  UefiBootServicesTableLib
+  UefiDriverEntryPoint
 
 [Guids]
   gEfiEndOfDxeEventGroupGuid         ## CONSUMES   ## Event
 
 [Protocols]
   gEfiMpServiceProtocolGuid          ## CONSUMES
 
 [Pcd]
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize    ## CONSUMES
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress  ## PRODUCES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                    ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                       ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress                     ## PRODUCES
 
 [Depex]
   gEfiMpServiceProtocolGuid
diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
index 2bb60d591b1e..8bb9807cd501 100644
--- a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
+++ b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
@@ -3,48 +3,48 @@ ACPI CPU Data initialization module
 
 This module initializes the ACPI_CPU_DATA structure and registers the address
 of this structure in the PcdCpuS3DataAddress PCD.  This is a generic/simple
 version of this module.  It does not provide a machine check handler or CPU
 register initialization tables for ACPI S3 resume.  It also only supports the
 number of CPUs reported by the MP Services Protocol, so this module does not
 support hot plug CPUs.  This module can be copied into a CPU specific package
 and customized if these additional features are required.
 
 Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 2015 - 2020, Red Hat, Inc.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include <PiDxe.h>
 
 #include <AcpiCpuData.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
-#include <Library/MtrrLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/MtrrLib.h>
+#include <Library/UefiBootServicesTableLib.h>
 
 #include <Protocol/MpService.h>
 #include <Guid/EventGroup.h>
 
 //
 // Data structure used to allocate ACPI_CPU_DATA and its supporting structures
 //
 typedef struct {
   ACPI_CPU_DATA             AcpiCpuData;
   MTRR_SETTINGS             MtrrTable;
   IA32_DESCRIPTOR           GdtrProfile;
   IA32_DESCRIPTOR           IdtrProfile;
 } ACPI_CPU_DATA_EX;
 
 /**
   Allocate EfiACPIMemoryNVS memory.
 
   @param[in] Size   Size of memory to allocate.
 
   @return       Allocated address for output.
 
 **/
-- 
2.19.1.3.g30247aa5d201



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

View/Reply Online (#54956): https://edk2.groups.io/g/devel/message/54956
Mute This Topic: https://groups.io/mt/71575190/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups
Posted by Philippe Mathieu-Daudé 5 years, 11 months ago 
On 2/26/20 11:11 PM, Laszlo Ersek wrote:
> Sort the [Packages], [LibraryClasses], and [Pcd] sections in the INF file.
> Pad the usage notes (CONSUMES, PRODUCES) in the [Pcd] section.
> 
> Sort the Library #includes in the C file.
> 
> This patch is functionally a no-op.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1512
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> 
> Notes:
>      v2:
>      
>      - Pick up Ard's Acked-by, which is conditional on approval from Intel
>        reviewers on Cc. (I'd like to save Ard the churn of re-acking
>        unmodified patches.)
> 
>   OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 16 ++++++++--------
>   OvmfPkg/CpuS3DataDxe/CpuS3Data.c      |  4 ++--
>   2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> index 0ad8a0b35d25..f9679e0c33b3 100644
> --- a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> +++ b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> @@ -14,48 +14,48 @@
>   #
>   #  SPDX-License-Identifier: BSD-2-Clause-Patent
>   #
>   ##
>   
>   [Defines]
>     INF_VERSION                    = 1.29
>     BASE_NAME                      = CpuS3DataDxe
>     FILE_GUID                      = 229B7EFD-DA02-46B9-93F4-E20C009F94E9
>     MODULE_TYPE                    = DXE_DRIVER
>     VERSION_STRING                 = 1.0
>     ENTRY_POINT                    = CpuS3DataInitialize
>   
>   # The following information is for reference only and not required by the build
>   # tools.
>   #
>   #  VALID_ARCHITECTURES           = IA32 X64
>   
>   [Sources]
>     CpuS3Data.c
>   
>   [Packages]
> -  MdePkg/MdePkg.dec
>     MdeModulePkg/MdeModulePkg.dec
> +  MdePkg/MdePkg.dec
>     UefiCpuPkg/UefiCpuPkg.dec
>   
>   [LibraryClasses]
> -  UefiDriverEntryPoint
> -  UefiBootServicesTableLib
> +  BaseLib
>     BaseMemoryLib
>     DebugLib
> -  BaseLib
> -  MtrrLib
>     MemoryAllocationLib
> +  MtrrLib
> +  UefiBootServicesTableLib
> +  UefiDriverEntryPoint
>   
>   [Guids]
>     gEfiEndOfDxeEventGroupGuid         ## CONSUMES   ## Event
>   
>   [Protocols]
>     gEfiMpServiceProtocolGuid          ## CONSUMES
>   
>   [Pcd]
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize    ## CONSUMES
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress  ## PRODUCES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                    ## CONSUMES
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                       ## CONSUMES
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress                     ## PRODUCES
>   
>   [Depex]
>     gEfiMpServiceProtocolGuid
> diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> index 2bb60d591b1e..8bb9807cd501 100644
> --- a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> +++ b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> @@ -3,48 +3,48 @@ ACPI CPU Data initialization module
>   
>   This module initializes the ACPI_CPU_DATA structure and registers the address
>   of this structure in the PcdCpuS3DataAddress PCD.  This is a generic/simple
>   version of this module.  It does not provide a machine check handler or CPU
>   register initialization tables for ACPI S3 resume.  It also only supports the
>   number of CPUs reported by the MP Services Protocol, so this module does not
>   support hot plug CPUs.  This module can be copied into a CPU specific package
>   and customized if these additional features are required.
>   
>   Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
>   Copyright (c) 2015 - 2020, Red Hat, Inc.
>   
>   SPDX-License-Identifier: BSD-2-Clause-Patent
>   
>   **/
>   
>   #include <PiDxe.h>
>   
>   #include <AcpiCpuData.h>
>   
>   #include <Library/BaseLib.h>
>   #include <Library/BaseMemoryLib.h>
> -#include <Library/UefiBootServicesTableLib.h>
>   #include <Library/DebugLib.h>
> -#include <Library/MtrrLib.h>
>   #include <Library/MemoryAllocationLib.h>
> +#include <Library/MtrrLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
>   
>   #include <Protocol/MpService.h>
>   #include <Guid/EventGroup.h>
>   
>   //
>   // Data structure used to allocate ACPI_CPU_DATA and its supporting structures
>   //
>   typedef struct {
>     ACPI_CPU_DATA             AcpiCpuData;
>     MTRR_SETTINGS             MtrrTable;
>     IA32_DESCRIPTOR           GdtrProfile;
>     IA32_DESCRIPTOR           IdtrProfile;
>   } ACPI_CPU_DATA_EX;
>   
>   /**
>     Allocate EfiACPIMemoryNVS memory.
>   
>     @param[in] Size   Size of memory to allocate.
>   
>     @return       Allocated address for output.
>   
>   **/
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>


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

View/Reply Online (#55189): https://edk2.groups.io/g/devel/message/55189
Mute This Topic: https://groups.io/mt/71575190/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups
Posted by Ard Biesheuvel 5 years, 11 months ago 
On Wed, 26 Feb 2020 at 23:12, Laszlo Ersek <lersek@redhat.com> wrote:
>
> Sort the [Packages], [LibraryClasses], and [Pcd] sections in the INF file.
> Pad the usage notes (CONSUMES, PRODUCES) in the [Pcd] section.
>
> Sort the Library #includes in the C file.
>
> This patch is functionally a no-op.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1512
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>
> Notes:
>     v2:
>
>     - Pick up Ard's Acked-by, which is conditional on approval from Intel
>       reviewers on Cc. (I'd like to save Ard the churn of re-acking
>       unmodified patches.)
>
>  OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 16 ++++++++--------
>  OvmfPkg/CpuS3DataDxe/CpuS3Data.c      |  4 ++--
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> index 0ad8a0b35d25..f9679e0c33b3 100644
> --- a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> +++ b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
> @@ -14,48 +14,48 @@
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>
>  [Defines]
>    INF_VERSION                    = 1.29
>    BASE_NAME                      = CpuS3DataDxe
>    FILE_GUID                      = 229B7EFD-DA02-46B9-93F4-E20C009F94E9
>    MODULE_TYPE                    = DXE_DRIVER
>    VERSION_STRING                 = 1.0
>    ENTRY_POINT                    = CpuS3DataInitialize
>
>  # The following information is for reference only and not required by the build
>  # tools.
>  #
>  #  VALID_ARCHITECTURES           = IA32 X64
>
>  [Sources]
>    CpuS3Data.c
>
>  [Packages]
> -  MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
> +  MdePkg/MdePkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
>
>  [LibraryClasses]
> -  UefiDriverEntryPoint
> -  UefiBootServicesTableLib
> +  BaseLib
>    BaseMemoryLib
>    DebugLib
> -  BaseLib
> -  MtrrLib
>    MemoryAllocationLib
> +  MtrrLib
> +  UefiBootServicesTableLib
> +  UefiDriverEntryPoint
>
>  [Guids]
>    gEfiEndOfDxeEventGroupGuid         ## CONSUMES   ## Event
>
>  [Protocols]
>    gEfiMpServiceProtocolGuid          ## CONSUMES
>
>  [Pcd]
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize    ## CONSUMES
> -  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress  ## PRODUCES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                    ## CONSUMES
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                       ## CONSUMES
> +  gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress                     ## PRODUCES
>
>  [Depex]
>    gEfiMpServiceProtocolGuid
> diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> index 2bb60d591b1e..8bb9807cd501 100644
> --- a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> +++ b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c
> @@ -3,48 +3,48 @@ ACPI CPU Data initialization module
>
>  This module initializes the ACPI_CPU_DATA structure and registers the address
>  of this structure in the PcdCpuS3DataAddress PCD.  This is a generic/simple
>  version of this module.  It does not provide a machine check handler or CPU
>  register initialization tables for ACPI S3 resume.  It also only supports the
>  number of CPUs reported by the MP Services Protocol, so this module does not
>  support hot plug CPUs.  This module can be copied into a CPU specific package
>  and customized if these additional features are required.
>
>  Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
>  Copyright (c) 2015 - 2020, Red Hat, Inc.
>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
>
>  **/
>
>  #include <PiDxe.h>
>
>  #include <AcpiCpuData.h>
>
>  #include <Library/BaseLib.h>
>  #include <Library/BaseMemoryLib.h>
> -#include <Library/UefiBootServicesTableLib.h>
>  #include <Library/DebugLib.h>
> -#include <Library/MtrrLib.h>
>  #include <Library/MemoryAllocationLib.h>
> +#include <Library/MtrrLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
>
>  #include <Protocol/MpService.h>
>  #include <Guid/EventGroup.h>
>
>  //
>  // Data structure used to allocate ACPI_CPU_DATA and its supporting structures
>  //
>  typedef struct {
>    ACPI_CPU_DATA             AcpiCpuData;
>    MTRR_SETTINGS             MtrrTable;
>    IA32_DESCRIPTOR           GdtrProfile;
>    IA32_DESCRIPTOR           IdtrProfile;
>  } ACPI_CPU_DATA_EX;
>
>  /**
>    Allocate EfiACPIMemoryNVS memory.
>
>    @param[in] Size   Size of memory to allocate.
>
>    @return       Allocated address for output.
>
>  **/
> --
> 2.19.1.3.g30247aa5d201
>
>

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

View/Reply Online (#55208): https://edk2.groups.io/g/devel/message/55208
Mute This Topic: https://groups.io/mt/71575190/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.