1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support for X64 Build

Ashraf Ali S posted 1 patch 2 years, 2 months ago
Failed in applying to current master (apply log)
.../BaseFspDebugLibSerialPort.inf             |  8 ++-
.../{Ia32 => }/FspDebug.nasm                  | 50 +++++++++----------
2 files changed, 28 insertions(+), 30 deletions(-)
rename IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/{Ia32 => }/FspDebug.nasm (86%)
[edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support for X64 Build
Posted by Ashraf Ali S 2 years, 2 months ago 
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3833

Move FspDebug to the root of BaseFspDebugLibSerialPort since the current
nasm support for both IA32 and X64 Build, remove IA32 from INF file.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Kuo Ted <ted.kuo@intel.com>
Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Digant H Solanki <digant.h.solanki@intel.com>
Cc: Sangeetha V <sangeetha.v@intel.com>

Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
---
 .../BaseFspDebugLibSerialPort.inf             |  8 ++-
 .../{Ia32 => }/FspDebug.nasm                  | 50 +++++++++----------
 2 files changed, 28 insertions(+), 30 deletions(-)
 rename IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/{Ia32 => }/FspDebug.nasm (86%)

diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
index 14b1899e6c..0024edf2dc 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Instance of BaseFspDebugLib
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -16,14 +16,12 @@
   LIBRARY_CLASS                  = DebugLib
 
 #
-#  VALID_ARCHITECTURES           = IA32
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
   DebugLib.c
-
-[Sources.Ia32]
-  Ia32/FspDebug.nasm
+  FspDebug.nasm
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
similarity index 86%
rename from IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
rename to IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
index 997e375c8c..ffacaa239d 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
@@ -1,25 +1,25 @@
-;------------------------------------------------------------------------------
-;
-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-; SPDX-License-Identifier: BSD-2-Clause-Patent
-;
-; Abstract:
-;
-;   FSP Debug functions
-;
-;------------------------------------------------------------------------------
-
-    SECTION .text
-
-;------------------------------------------------------------------------------
-; UINT32 *
-; EFIAPI
-; GetStackFramePointer (
-;   VOID
-;   );
-;------------------------------------------------------------------------------
-global ASM_PFX(GetStackFramePointer)
-ASM_PFX(GetStackFramePointer):
-    mov     eax, ebp
-    ret
-
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>
+; SPDX-License-Identifier: BSD-2-Clause-Patent
+;
+; Abstract:
+;
+;   FSP Debug functions
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT32 *
+; EFIAPI
+; GetStackFramePointer (
+;   VOID
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(GetStackFramePointer)
+ASM_PFX(GetStackFramePointer):
+    mov     eax, ebp
+    ret
+
-- 
2.30.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86634): https://edk2.groups.io/g/devel/message/86634
Mute This Topic: https://groups.io/mt/89116030/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support for X64 Build
Posted by Ni, Ray 2 years, 2 months ago 
Ashraf,
GetStackFramePointer() only returns the lower 32 bits of RBP. Is that expected?


-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashraf Ali S
Sent: Monday, February 14, 2022 12:27 AM
To: devel@edk2.groups.io
Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; Kuo, Ted <ted.kuo@intel.com>; Duggapu, Chinni B <chinni.b.duggapu@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Solanki, Digant H <digant.h.solanki@intel.com>; V, Sangeetha <sangeetha.v@intel.com>
Subject: [edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support for X64 Build

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3833

Move FspDebug to the root of BaseFspDebugLibSerialPort since the current
nasm support for both IA32 and X64 Build, remove IA32 from INF file.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Kuo Ted <ted.kuo@intel.com>
Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Digant H Solanki <digant.h.solanki@intel.com>
Cc: Sangeetha V <sangeetha.v@intel.com>

Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
---
 .../BaseFspDebugLibSerialPort.inf             |  8 ++-
 .../{Ia32 => }/FspDebug.nasm                  | 50 +++++++++----------
 2 files changed, 28 insertions(+), 30 deletions(-)
 rename IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/{Ia32 => }/FspDebug.nasm (86%)

diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
index 14b1899e6c..0024edf2dc 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Instance of BaseFspDebugLib
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -16,14 +16,12 @@
   LIBRARY_CLASS                  = DebugLib
 
 #
-#  VALID_ARCHITECTURES           = IA32
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
   DebugLib.c
-
-[Sources.Ia32]
-  Ia32/FspDebug.nasm
+  FspDebug.nasm
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
similarity index 86%
rename from IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
rename to IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
index 997e375c8c..ffacaa239d 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
@@ -1,25 +1,25 @@
-;------------------------------------------------------------------------------
-;
-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-; SPDX-License-Identifier: BSD-2-Clause-Patent
-;
-; Abstract:
-;
-;   FSP Debug functions
-;
-;------------------------------------------------------------------------------
-
-    SECTION .text
-
-;------------------------------------------------------------------------------
-; UINT32 *
-; EFIAPI
-; GetStackFramePointer (
-;   VOID
-;   );
-;------------------------------------------------------------------------------
-global ASM_PFX(GetStackFramePointer)
-ASM_PFX(GetStackFramePointer):
-    mov     eax, ebp
-    ret
-
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>
+; SPDX-License-Identifier: BSD-2-Clause-Patent
+;
+; Abstract:
+;
+;   FSP Debug functions
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINT32 *
+; EFIAPI
+; GetStackFramePointer (
+;   VOID
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(GetStackFramePointer)
+ASM_PFX(GetStackFramePointer):
+    mov     eax, ebp
+    ret
+
-- 
2.30.2.windows.1








-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86640): https://edk2.groups.io/g/devel/message/86640
Mute This Topic: https://groups.io/mt/89116030/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support for X64 Build
Posted by Chiu, Chasel 2 years, 2 months ago 
Thanks Ray!
@S, Ashraf Ali I think we need to return 64bit pointer in 64bit build, please help to verify and confirm.

Thanks,
Chasel


> -----Original Message-----
> From: Ni, Ray <ray.ni@intel.com>
> Sent: Monday, February 14, 2022 4:27 PM
> To: devel@edk2.groups.io; S, Ashraf Ali <ashraf.ali.s@intel.com>
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; Kuo, Ted
> <ted.kuo@intel.com>; Duggapu, Chinni B <chinni.b.duggapu@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Solanki, Digant H
> <digant.h.solanki@intel.com>; V, Sangeetha <sangeetha.v@intel.com>
> Subject: RE: [edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort
> Support for X64 Build
> 
> Ashraf,
> GetStackFramePointer() only returns the lower 32 bits of RBP. Is that expected?
> 
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashraf Ali S
> Sent: Monday, February 14, 2022 12:27 AM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star
> <star.zeng@intel.com>; Kuo, Ted <ted.kuo@intel.com>; Duggapu, Chinni B
> <chinni.b.duggapu@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Solanki, Digant H
> <digant.h.solanki@intel.com>; V, Sangeetha <sangeetha.v@intel.com>
> Subject: [edk2-devel] [PATCH] IntelFsp2Pkg: BaseFspDebugLibSerialPort Support
> for X64 Build
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3833
> 
> Move FspDebug to the root of BaseFspDebugLibSerialPort since the current
> nasm support for both IA32 and X64 Build, remove IA32 from INF file.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Kuo Ted <ted.kuo@intel.com>
> Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Digant H Solanki <digant.h.solanki@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
> 
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> ---
>  .../BaseFspDebugLibSerialPort.inf             |  8 ++-
>  .../{Ia32 => }/FspDebug.nasm                  | 50 +++++++++----------
>  2 files changed, 28 insertions(+), 30 deletions(-)  rename
> IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/{Ia32 => }/FspDebug.nasm
> (86%)
> 
> diff --git
> a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.i
> nf
> b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.i
> nf
> index 14b1899e6c..0024edf2dc 100644
> ---
> a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSerialPort.i
> nf
> +++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/BaseFspDebugLibSeri
> +++ alPort.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Instance of BaseFspDebugLib
>  #
> -#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2014 - 2022, Intel Corporation. All rights
> +reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent  # @@ -16,14 +16,12 @@
>    LIBRARY_CLASS                  = DebugLib
> 
>  #
> -#  VALID_ARCHITECTURES           = IA32
> +#  VALID_ARCHITECTURES           = IA32 X64
>  #
> 
>  [Sources]
>    DebugLib.c
> -
> -[Sources.Ia32]
> -  Ia32/FspDebug.nasm
> +  FspDebug.nasm
> 
>  [Packages]
>    MdePkg/MdePkg.dec
> diff --git
> a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
> b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
> similarity index 86%
> rename from
> IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
> rename to IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
> index 997e375c8c..ffacaa239d 100644
> --- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/Ia32/FspDebug.nasm
> +++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/FspDebug.nasm
> @@ -1,25 +1,25 @@
> -;------------------------------------------------------------------------------
> -;
> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> -; SPDX-License-
> Identifier: BSD-2-Clause-Patent -; -; Abstract:
> -;
> -;   FSP Debug functions
> -;
> -;------------------------------------------------------------------------------
> -
> -    SECTION .text
> -
> -;------------------------------------------------------------------------------
> -; UINT32 *
> -; EFIAPI
> -; GetStackFramePointer (
> -;   VOID
> -;   );
> -;------------------------------------------------------------------------------
> -global ASM_PFX(GetStackFramePointer)
> -ASM_PFX(GetStackFramePointer):
> -    mov     eax, ebp
> -    ret
> -
> +;----------------------------------------------------------------------
> +--------
> +;
> +; Copyright (c) 2016 - 2022, Intel Corporation. All rights
> +reserved.<BR> ; SPDX-License-Identifier: BSD-2-Clause-Patent ; ;
> +Abstract:
> +;
> +;   FSP Debug functions
> +;
> +;----------------------------------------------------------------------
> +--------
> +
> +    SECTION .text
> +
> +;----------------------------------------------------------------------
> +--------
> +; UINT32 *
> +; EFIAPI
> +; GetStackFramePointer (
> +;   VOID
> +;   );
> +;----------------------------------------------------------------------
> +--------
> +global ASM_PFX(GetStackFramePointer)
> +ASM_PFX(GetStackFramePointer):
> +    mov     eax, ebp
> +    ret
> +
> --
> 2.30.2.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86846): https://edk2.groups.io/g/devel/message/86846
Mute This Topic: https://groups.io/mt/89116030/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.