[PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

[PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

[Chiu, Chasel]

FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing
on the build and this patch series extended the support for 64bit build.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>

Chasel Chiu (2):
  MinPlatformPkg/FspWrapper: FspResetType support for X64 build.
  WhitleySiliconPkg: FspResetType support for X64 build.

 Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c | 4 ++--
 Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c | 4 ++--
 Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--
2.35.0.windows.1

[PATCH 1/2] MinPlatformPkg/FspWrapper: FspResetType support for X64 build.

[Chiu, Chasel]

FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing
on the build and this patch extended the support for 64bit build.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c | 4 ++--
 Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
index b4d509db85..e5e09eb762 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
@@ -1,7 +1,7 @@
 /** @file
   Dxe library function to reset the system from FSP wrapper.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -22,7 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID
 EFIAPI
 CallFspWrapperResetSystem (
-  UINT32    ResetType
+  UINTN    ResetType
   )
 {
   EFI_RESET_TYPE             EfiResetType;
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
index 191bcb2fbb..75fd5a6ea2 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
@@ -1,7 +1,7 @@
 /** @file
   Pei library function to reset the system from FSP wrapper.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -21,7 +21,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 VOID
 EFIAPI
 CallFspWrapperResetSystem (
-  UINT32    ResetType
+  UINTN    ResetType
   )
 {
   EFI_RESET_TYPE             EfiResetType;
-- 
2.35.0.windows.1

[PATCH 2/2] WhitleySiliconPkg: FspResetType support for X64 build.

[Chiu, Chasel]

FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing
on the build and this patch extended the support for 64bit build.

Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
index 95a1f2a33c..94b98ef2df 100644
--- a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
+++ b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
@@ -2,7 +2,7 @@
   Sample to provide FSP wrapper related function.
 
   @copyright
-  Copyright 2014 - 2021 Intel Corporation. <BR>
+  Copyright 2014 - 2022 Intel Corporation. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -190,7 +190,7 @@ GetS3MemoryInfo (
 VOID
 EFIAPI
 CallFspWrapperResetSystem (
-  IN UINT32    FspStatusResetType
+  IN UINTN    FspStatusResetType
   )
 {
   //
-- 
2.35.0.windows.1

Re: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

[Oram, Isaac W]

Series Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>

-----Original Message-----
From: Chiu, Chasel <chasel.chiu@intel.com> 
Sent: Monday, July 18, 2022 3:13 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
Subject: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing on the build and this patch series extended the support for 64bit build.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>

Chasel Chiu (2):
  MinPlatformPkg/FspWrapper: FspResetType support for X64 build.
  WhitleySiliconPkg: FspResetType support for X64 build.

 Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c | 4 ++--  Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c | 4 ++--
 Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--
2.35.0.windows.1

Re: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

[Nate DeSimone]

Hi Chasel,

Please change the function signature for CallFspWrapperResetSystem() to take a EFI_STATUS as input. UINTN is certainly better than UINT32, but the actual data type defined in the FSP specification is EFI_STATUS. Also, that is the data type that FspmWrapperPeim.c and FspsWrapperPeim.c is passing in. Using EFI_STATUS instead of UINTN would prevent us from having to do CallFspWrapperResetSystem ((UINTN)Status); in those 2 files.

Thanks,
Nate

> -----Original Message-----
> From: Chiu, Chasel <chasel.chiu@intel.com>
> Sent: Monday, July 18, 2022 3:13 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>;
> Dong, Eric <eric.dong@intel.com>
> Subject: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.
> 
> FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing on the
> build and this patch series extended the support for 64bit build.
> 
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Isaac Oram <isaac.w.oram@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Eric Dong <eric.dong@intel.com>
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> 
> Chasel Chiu (2):
>   MinPlatformPkg/FspWrapper: FspResetType support for X64 build.
>   WhitleySiliconPkg: FspResetType support for X64 build.
> 
> 
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformResetLib.c | 4 ++--
> Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformResetLib.c | 4 ++--
> 
> Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapper
> PlatformLib.c                     | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> --
> 2.35.0.windows.1

Re: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.

[Chiu, Chasel]

Thanks Nate! I have sent V2 accordingly, please help to review again.

> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Monday, July 18, 2022 4:53 PM
> To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> Cc: Oram, Isaac W <isaac.w.oram@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
> Subject: RE: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.
> 
> Hi Chasel,
> 
> Please change the function signature for CallFspWrapperResetSystem() to take a
> EFI_STATUS as input. UINTN is certainly better than UINT32, but the actual data
> type defined in the FSP specification is EFI_STATUS. Also, that is the data type
> that FspmWrapperPeim.c and FspsWrapperPeim.c is passing in. Using
> EFI_STATUS instead of UINTN would prevent us from having to do
> CallFspWrapperResetSystem ((UINTN)Status); in those 2 files.
> 
> Thanks,
> Nate
> 
> > -----Original Message-----
> > From: Chiu, Chasel <chasel.chiu@intel.com>
> > Sent: Monday, July 18, 2022 3:13 PM
> > To: devel@edk2.groups.io
> > Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> > <nathaniel.l.desimone@intel.com>; Oram, Isaac W
> > <isaac.w.oram@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>;
> > Dong, Eric <eric.dong@intel.com>
> > Subject: [PATCH 0/2] MinPlatformPkg: FspResetType support for X64 build.
> >
> > FSP_STATUS_RESET_REQUIRED_* will be either 32bit or 64bit basing on
> > the build and this patch series extended the support for 64bit build.
> >
> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > Cc: Isaac Oram <isaac.w.oram@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Eric Dong <eric.dong@intel.com>
> > Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> >
> > Chasel Chiu (2):
> >   MinPlatformPkg/FspWrapper: FspResetType support for X64 build.
> >   WhitleySiliconPkg: FspResetType support for X64 build.
> >
> >
> > Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> > mLib/DxeFspWrapperPlatformResetLib.c | 4 ++--
> > Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> > mLib/PeiFspWrapperPlatformResetLib.c | 4 ++--
> >
> > Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapper
> > PlatformLib.c                     | 4 ++--
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > --
> > 2.35.0.windows.1