Re: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V3 07/34] OvmfPkg/ResetSystemLib: Refactor to allow other architectures.

["Chang, Abner" <abner.chang@amd.com>]

[AMD Official Use Only - General]

No problem with this change. Just we will use Ia32X64 for the arch folder (no "_" in between) as the discussions we had in another thread.
We will have to wait until the File Naming and Directory naming sections are firmed and published in edk2 coding standard spec.

Thanks
Abner

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sunil V L
> via groups.io
> Sent: Thursday, October 13, 2022 5:58 PM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Jiewen Yao
> <jiewen.yao@intel.com>; Jordan Justen <jordan.l.justen@intel.com>; Gerd
> Hoffmann <kraxel@redhat.com>; Rebecca Cran <rebecca@bsdio.com>;
> Peter Grehan <grehan@freebsd.org>
> Subject: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V3 07/34]
> OvmfPkg/ResetSystemLib: Refactor to allow other architectures.
> 
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
> 
> 
> REF:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugz
> illa.tianocore.org%2Fshow_bug.cgi%3Fid%3D4076&amp;data=05%7C01%7Ca
> bner.chang%40amd.com%7Cf3b4febea58c4b8b687808daad019ecd%7C3dd89
> 61fe4884e608e11a82d994e183d%7C0%7C0%7C638012519730564286%7CUnkn
> own%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik
> 1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=CyEnJZ4m72W1
> 6%2BmggVcGw%2BsFSwgbybCRQJZFAFCiPvA%3D&amp;reserved=0
> 
> Currently, the ResetSystemLib library supports only X86 architecture.
> Refactor it to allow adding other CPU architectures like RISC-V.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Cc: Peter Grehan <grehan@freebsd.org>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> ---
>  OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf       | 6 +++---
>  OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf  | 4 ++--
>  .../Library/ResetSystemLib/BaseResetSystemLibMicrovm.inf    | 2 +-
>  OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf        | 6 +++---
>  OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.inf | 4 ++--
>  .../ResetSystemLib/{ => Ia32_X64}/BaseResetShutdown.c       | 0
>  .../ResetSystemLib/{ => Ia32_X64}/BaseResetShutdownBhyve.c  | 0
>  .../ResetSystemLib/{ => Ia32_X64}/DxeResetShutdown.c        | 0
>  .../{ => Ia32_X64}/DxeResetSystemLibMicrovm.c               | 0
>  .../Library/ResetSystemLib/{ => Ia32_X64}/ResetSystemLib.c  | 0
>  .../ResetSystemLib/{ => Ia32_X64}/ResetSystemLibMicrovm.c   | 0
>  11 files changed, 11 insertions(+), 11 deletions(-)  rename
> OvmfPkg/Library/ResetSystemLib/{ => Ia32_X64}/BaseResetShutdown.c
> (100%)  rename OvmfPkg/Library/ResetSystemLib/{ =>
> Ia32_X64}/BaseResetShutdownBhyve.c (100%)  rename
> OvmfPkg/Library/ResetSystemLib/{ => Ia32_X64}/DxeResetShutdown.c
> (100%)  rename OvmfPkg/Library/ResetSystemLib/{ =>
> Ia32_X64}/DxeResetSystemLibMicrovm.c (100%)  rename
> OvmfPkg/Library/ResetSystemLib/{ => Ia32_X64}/ResetSystemLib.c (100%)
> rename OvmfPkg/Library/ResetSystemLib/{ =>
> Ia32_X64}/ResetSystemLibMicrovm.c (100%)
> 
> diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
> b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
> index 35d317f1e0b3..4397f90a24dd 100644
> --- a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
> +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
> @@ -21,9 +21,9 @@ [Defines]
>  #  VALID_ARCHITECTURES           = IA32 X64
>  #
> 
> -[Sources]
> -  BaseResetShutdown.c
> -  ResetSystemLib.c
> +[Sources.IA32, Sources.X64]
> +  Ia32_X64/BaseResetShutdown.c
> +  Ia32_X64/ResetSystemLib.c
> 
>  [Packages]
>    MdeModulePkg/MdeModulePkg.dec
> diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf
> b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf
> index 74124aed38e8..3e52a9e3d7f9 100644
> --- a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf
> +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibBhyve.inf
> @@ -25,8 +25,8 @@ [Defines]
>  #
> 
>  [Sources]
> -  BaseResetShutdownBhyve.c
> -  ResetSystemLib.c
> +  Ia32_X64/BaseResetShutdownBhyve.c
> +  Ia32_X64/ResetSystemLib.c
> 
>  [Packages]
>    MdeModulePkg/MdeModulePkg.dec
> diff --git
> a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibMicrovm.inf
> b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibMicrovm.inf
> index 564b1d3022a6..c66720771d82 100644
> --- a/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibMicrovm.inf
> +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLibMicrovm.inf
> @@ -23,7 +23,7 @@ [Defines]
>  #
> 
>  [Sources]
> -  ResetSystemLibMicrovm.c
> +  Ia32_X64/ResetSystemLibMicrovm.c
> 
>  [Packages]
>    MdeModulePkg/MdeModulePkg.dec
> diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf
> b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf
> index a9b4ce90000a..79478453d7cb 100644
> --- a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf
> +++ b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf
> @@ -23,9 +23,9 @@ [Defines]
>  #  VALID_ARCHITECTURES           = IA32 X64
>  #
> 
> -[Sources]
> -  DxeResetShutdown.c
> -  ResetSystemLib.c
> +[Sources.IA32, Sources.X64]
> +  Ia32_X64/DxeResetShutdown.c
> +  Ia32_X64/ResetSystemLib.c
> 
>  [Packages]
>    MdeModulePkg/MdeModulePkg.dec
> diff --git
> a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.inf
> b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.inf
> index ac9c2599642c..6c79492f816b 100644
> --- a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.inf
> +++ b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.inf
> @@ -24,8 +24,8 @@ [Defines]
>  #
> 
>  [Sources]
> -  ResetSystemLibMicrovm.c
> -  DxeResetSystemLibMicrovm.c
> +  Ia32_X64/ResetSystemLibMicrovm.c
> +  Ia32_X64/DxeResetSystemLibMicrovm.c
> 
>  [Packages]
>    MdeModulePkg/MdeModulePkg.dec
> diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/BaseResetShutdown.c
> similarity index 100%
> rename from OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
> rename to
> OvmfPkg/Library/ResetSystemLib/Ia32_X64/BaseResetShutdown.c
> diff --git a/OvmfPkg/Library/ResetSystemLib/BaseResetShutdownBhyve.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/BaseResetShutdownBhyve.c
> similarity index 100%
> rename from
> OvmfPkg/Library/ResetSystemLib/BaseResetShutdownBhyve.c
> rename to
> OvmfPkg/Library/ResetSystemLib/Ia32_X64/BaseResetShutdownBhyve.c
> diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetShutdown.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/DxeResetShutdown.c
> similarity index 100%
> rename from OvmfPkg/Library/ResetSystemLib/DxeResetShutdown.c
> rename to
> OvmfPkg/Library/ResetSystemLib/Ia32_X64/DxeResetShutdown.c
> diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/DxeResetSystemLibMicrovm.
> c
> similarity index 100%
> rename from
> OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c
> rename to
> OvmfPkg/Library/ResetSystemLib/Ia32_X64/DxeResetSystemLibMicrovm.c
> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/ResetSystemLib.c
> similarity index 100%
> rename from OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
> rename to OvmfPkg/Library/ResetSystemLib/Ia32_X64/ResetSystemLib.c
> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c
> b/OvmfPkg/Library/ResetSystemLib/Ia32_X64/ResetSystemLibMicrovm.c
> similarity index 100%
> rename from OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c
> rename to
> OvmfPkg/Library/ResetSystemLib/Ia32_X64/ResetSystemLibMicrovm.c
> --
> 2.25.1
> 
> 
> 
> 
>