[edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code

Liming Gao posted 1 patch 6 years, 4 months ago
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Liming Gao 6 years, 4 months ago
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
index c3c094f..dc56dc7 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ;
-; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
 ; This program and the accompanying materials
 ; are licensed and made available under the terms and conditions of the BSD License
 ; which accompanies this distribution.  The full text of the license may be found at
@@ -184,15 +184,15 @@ _SmiHandler:
     add     rsp, -0x20
 
     mov     rcx, rbx
-    mov     rax, CpuSmmDebugEntry
+    mov     rax, ASM_PFX(CpuSmmDebugEntry)
     call    rax
 
     mov     rcx, rbx
-    mov     rax, SmiRendezvous          ; rax <- absolute addr of SmiRedezvous
+    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of SmiRedezvous
     call    rax
 
     mov     rcx, rbx
-    mov     rax, CpuSmmDebugExit
+    mov     rax, ASM_PFX(CpuSmmDebugExit)
     call    rax
 
     add     rsp, 0x20
@@ -220,5 +220,5 @@ _SmiHandler:
 .1:
     rsm
 
-gcSmiHandlerSize    DW      $ - _SmiEntryPoint
+ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
 
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Dong, Eric 6 years, 4 months ago
Reviewed-by: Eric Dong <eric.dong@intel.com>

You'd better add more background for the change when you check in.

Thanks,
Eric
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao
Sent: Thursday, December 7, 2017 10:45 AM
To: edk2-devel@lists.01.org
Cc: Dong, Eric
Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
index c3c094f..dc56dc7 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ; -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+; Copyright (c) 2016 - 2017, Intel Corporation. All rights 
+reserved.<BR>
 ; This program and the accompanying materials  ; are licensed and made available under the terms and conditions of the BSD License  ; which accompanies this distribution.  The full text of the license may be found at @@ -184,15 +184,15 @@ _SmiHandler:
     add     rsp, -0x20
 
     mov     rcx, rbx
-    mov     rax, CpuSmmDebugEntry
+    mov     rax, ASM_PFX(CpuSmmDebugEntry)
     call    rax
 
     mov     rcx, rbx
-    mov     rax, SmiRendezvous          ; rax <- absolute addr of SmiRedezvous
+    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of SmiRedezvous
     call    rax
 
     mov     rcx, rbx
-    mov     rax, CpuSmmDebugExit
+    mov     rax, ASM_PFX(CpuSmmDebugExit)
     call    rax
 
     add     rsp, 0x20
@@ -220,5 +220,5 @@ _SmiHandler:
 .1:
     rsm
 
-gcSmiHandlerSize    DW      $ - _SmiEntryPoint
+ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
 
--
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Yao, Jiewen 6 years, 4 months ago
Hi Liming
Reviewed-by: Jiewen.yao@intel.com

BTW: Do you think we also need update SmmCpuFeaturesLib ?

Thank you
Yao Jiewen


> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming
> Gao
> Sent: Thursday, December 7, 2017 10:45 AM
> To: edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>
> Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> ASM_PFX in nasm code
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> index c3c094f..dc56dc7 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> @@ -1,5 +1,5 @@
>  ;------------------------------------------------------------------------------ ;
> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> +; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>  ; This program and the accompanying materials
>  ; are licensed and made available under the terms and conditions of the BSD
> License
>  ; which accompanies this distribution.  The full text of the license may be found
> at
> @@ -184,15 +184,15 @@ _SmiHandler:
>      add     rsp, -0x20
> 
>      mov     rcx, rbx
> -    mov     rax, CpuSmmDebugEntry
> +    mov     rax, ASM_PFX(CpuSmmDebugEntry)
>      call    rax
> 
>      mov     rcx, rbx
> -    mov     rax, SmiRendezvous          ; rax <- absolute addr of
> SmiRedezvous
> +    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of
> SmiRedezvous
>      call    rax
> 
>      mov     rcx, rbx
> -    mov     rax, CpuSmmDebugExit
> +    mov     rax, ASM_PFX(CpuSmmDebugExit)
>      call    rax
> 
>      add     rsp, 0x20
> @@ -220,5 +220,5 @@ _SmiHandler:
>  .1:
>      rsm
> 
> -gcSmiHandlerSize    DW      $ - _SmiEntryPoint
> +ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
> 
> --
> 2.8.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Gao, Liming 6 years, 4 months ago
Do you mean SmmCpuFeaturesLib also has the similar issue? If yes, I will provide the patch to fix it. 

>-----Original Message-----
>From: Yao, Jiewen
>Sent: Thursday, December 07, 2017 10:52 AM
>To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
>Cc: Dong, Eric <eric.dong@intel.com>
>Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
>ASM_PFX in nasm code
>
>Hi Liming
>Reviewed-by: Jiewen.yao@intel.com
>
>BTW: Do you think we also need update SmmCpuFeaturesLib ?
>
>Thank you
>Yao Jiewen
>
>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Liming
>> Gao
>> Sent: Thursday, December 7, 2017 10:45 AM
>> To: edk2-devel@lists.01.org
>> Cc: Dong, Eric <eric.dong@intel.com>
>> Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
>> ASM_PFX in nasm code
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Liming Gao <liming.gao@intel.com>
>> Cc: Eric Dong <eric.dong@intel.com>
>> ---
>>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> index c3c094f..dc56dc7 100644
>> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> @@ -1,5 +1,5 @@
>>  ;------------------------------------------------------------------------------ ;
>> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>> +; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>>  ; This program and the accompanying materials
>>  ; are licensed and made available under the terms and conditions of the BSD
>> License
>>  ; which accompanies this distribution.  The full text of the license may be
>found
>> at
>> @@ -184,15 +184,15 @@ _SmiHandler:
>>      add     rsp, -0x20
>>
>>      mov     rcx, rbx
>> -    mov     rax, CpuSmmDebugEntry
>> +    mov     rax, ASM_PFX(CpuSmmDebugEntry)
>>      call    rax
>>
>>      mov     rcx, rbx
>> -    mov     rax, SmiRendezvous          ; rax <- absolute addr of
>> SmiRedezvous
>> +    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of
>> SmiRedezvous
>>      call    rax
>>
>>      mov     rcx, rbx
>> -    mov     rax, CpuSmmDebugExit
>> +    mov     rax, ASM_PFX(CpuSmmDebugExit)
>>      call    rax
>>
>>      add     rsp, 0x20
>> @@ -220,5 +220,5 @@ _SmiHandler:
>>  .1:
>>      rsm
>>
>> -gcSmiHandlerSize    DW      $ - _SmiEntryPoint
>> +ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
>>
>> --
>> 2.8.0.windows.1
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Yao, Jiewen 6 years, 4 months ago
I think so.

May I know how this is found? And how this is validated?

I think we need build the whole package to trigger all the failure, and fix all.

Thank you
Yao Jiewen


> -----Original Message-----
> From: Gao, Liming
> Sent: Thursday, December 7, 2017 10:53 AM
> To: Yao, Jiewen <jiewen.yao@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>
> Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> ASM_PFX in nasm code
> 
> Do you mean SmmCpuFeaturesLib also has the similar issue? If yes, I will provide
> the patch to fix it.
> 
> >-----Original Message-----
> >From: Yao, Jiewen
> >Sent: Thursday, December 07, 2017 10:52 AM
> >To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
> >Cc: Dong, Eric <eric.dong@intel.com>
> >Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> >ASM_PFX in nasm code
> >
> >Hi Liming
> >Reviewed-by: Jiewen.yao@intel.com
> >
> >BTW: Do you think we also need update SmmCpuFeaturesLib ?
> >
> >Thank you
> >Yao Jiewen
> >
> >
> >> -----Original Message-----
> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> >Liming
> >> Gao
> >> Sent: Thursday, December 7, 2017 10:45 AM
> >> To: edk2-devel@lists.01.org
> >> Cc: Dong, Eric <eric.dong@intel.com>
> >> Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> >> ASM_PFX in nasm code
> >>
> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> Signed-off-by: Liming Gao <liming.gao@intel.com>
> >> Cc: Eric Dong <eric.dong@intel.com>
> >> ---
> >>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
> >>  1 file changed, 5 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> index c3c094f..dc56dc7 100644
> >> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> @@ -1,5 +1,5 @@
> >>  ;------------------------------------------------------------------------------ ;
> >> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> >> +; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
> >>  ; This program and the accompanying materials
> >>  ; are licensed and made available under the terms and conditions of the BSD
> >> License
> >>  ; which accompanies this distribution.  The full text of the license may be
> >found
> >> at
> >> @@ -184,15 +184,15 @@ _SmiHandler:
> >>      add     rsp, -0x20
> >>
> >>      mov     rcx, rbx
> >> -    mov     rax, CpuSmmDebugEntry
> >> +    mov     rax, ASM_PFX(CpuSmmDebugEntry)
> >>      call    rax
> >>
> >>      mov     rcx, rbx
> >> -    mov     rax, SmiRendezvous          ; rax <- absolute addr of
> >> SmiRedezvous
> >> +    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of
> >> SmiRedezvous
> >>      call    rax
> >>
> >>      mov     rcx, rbx
> >> -    mov     rax, CpuSmmDebugExit
> >> +    mov     rax, ASM_PFX(CpuSmmDebugExit)
> >>      call    rax
> >>
> >>      add     rsp, 0x20
> >> @@ -220,5 +220,5 @@ _SmiHandler:
> >>  .1:
> >>      rsm
> >>
> >> -gcSmiHandlerSize    DW      $ - _SmiEntryPoint
> >> +ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
> >>
> >> --
> >> 2.8.0.windows.1
> >>
> >> _______________________________________________
> >> edk2-devel mailing list
> >> edk2-devel@lists.01.org
> >> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Gao, Liming 6 years, 4 months ago
XCODE5 tool chain reports them.  For this change, I think build pass is enough. 

I send another patch to fix the missing ASM_PFX in SmmCpuFeaturesLib.

Thanks
Liming
>-----Original Message-----
>From: Yao, Jiewen
>Sent: Thursday, December 07, 2017 11:00 AM
>To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
>Cc: Dong, Eric <eric.dong@intel.com>
>Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
>ASM_PFX in nasm code
>
>I think so.
>
>May I know how this is found? And how this is validated?
>
>I think we need build the whole package to trigger all the failure, and fix all.
>
>Thank you
>Yao Jiewen
>
>
>> -----Original Message-----
>> From: Gao, Liming
>> Sent: Thursday, December 7, 2017 10:53 AM
>> To: Yao, Jiewen <jiewen.yao@intel.com>; edk2-devel@lists.01.org
>> Cc: Dong, Eric <eric.dong@intel.com>
>> Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
>> ASM_PFX in nasm code
>>
>> Do you mean SmmCpuFeaturesLib also has the similar issue? If yes, I will
>provide
>> the patch to fix it.
>>
>> >-----Original Message-----
>> >From: Yao, Jiewen
>> >Sent: Thursday, December 07, 2017 10:52 AM
>> >To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
>> >Cc: Dong, Eric <eric.dong@intel.com>
>> >Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the
>missing
>> >ASM_PFX in nasm code
>> >
>> >Hi Liming
>> >Reviewed-by: Jiewen.yao@intel.com
>> >
>> >BTW: Do you think we also need update SmmCpuFeaturesLib ?
>> >
>> >Thank you
>> >Yao Jiewen
>> >
>> >
>> >> -----Original Message-----
>> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
>Of
>> >Liming
>> >> Gao
>> >> Sent: Thursday, December 7, 2017 10:45 AM
>> >> To: edk2-devel@lists.01.org
>> >> Cc: Dong, Eric <eric.dong@intel.com>
>> >> Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
>> >> ASM_PFX in nasm code
>> >>
>> >> Contributed-under: TianoCore Contribution Agreement 1.1
>> >> Signed-off-by: Liming Gao <liming.gao@intel.com>
>> >> Cc: Eric Dong <eric.dong@intel.com>
>> >> ---
>> >>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
>> >>  1 file changed, 5 insertions(+), 5 deletions(-)
>> >>
>> >> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> >> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> >> index c3c094f..dc56dc7 100644
>> >> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> >> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
>> >> @@ -1,5 +1,5 @@
>> >>  ;------------------------------------------------------------------------------ ;
>> >> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
>> >> +; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>> >>  ; This program and the accompanying materials
>> >>  ; are licensed and made available under the terms and conditions of the
>BSD
>> >> License
>> >>  ; which accompanies this distribution.  The full text of the license may be
>> >found
>> >> at
>> >> @@ -184,15 +184,15 @@ _SmiHandler:
>> >>      add     rsp, -0x20
>> >>
>> >>      mov     rcx, rbx
>> >> -    mov     rax, CpuSmmDebugEntry
>> >> +    mov     rax, ASM_PFX(CpuSmmDebugEntry)
>> >>      call    rax
>> >>
>> >>      mov     rcx, rbx
>> >> -    mov     rax, SmiRendezvous          ; rax <- absolute addr of
>> >> SmiRedezvous
>> >> +    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of
>> >> SmiRedezvous
>> >>      call    rax
>> >>
>> >>      mov     rcx, rbx
>> >> -    mov     rax, CpuSmmDebugExit
>> >> +    mov     rax, ASM_PFX(CpuSmmDebugExit)
>> >>      call    rax
>> >>
>> >>      add     rsp, 0x20
>> >> @@ -220,5 +220,5 @@ _SmiHandler:
>> >>  .1:
>> >>      rsm
>> >>
>> >> -gcSmiHandlerSize    DW      $ - _SmiEntryPoint
>> >> +ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
>> >>
>> >> --
>> >> 2.8.0.windows.1
>> >>
>> >> _______________________________________________
>> >> edk2-devel mailing list
>> >> edk2-devel@lists.01.org
>> >> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing ASM_PFX in nasm code
Posted by Yao, Jiewen 6 years, 4 months ago
Yes, build pass is enough. Agree.

Please make sure all NASM related modules are built and linked. :-)

Thank you
Yao Jiewen

> -----Original Message-----
> From: Gao, Liming
> Sent: Thursday, December 7, 2017 11:44 AM
> To: Yao, Jiewen <jiewen.yao@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>
> Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> ASM_PFX in nasm code
> 
> XCODE5 tool chain reports them.  For this change, I think build pass is enough.
> 
> I send another patch to fix the missing ASM_PFX in SmmCpuFeaturesLib.
> 
> Thanks
> Liming
> >-----Original Message-----
> >From: Yao, Jiewen
> >Sent: Thursday, December 07, 2017 11:00 AM
> >To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
> >Cc: Dong, Eric <eric.dong@intel.com>
> >Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> >ASM_PFX in nasm code
> >
> >I think so.
> >
> >May I know how this is found? And how this is validated?
> >
> >I think we need build the whole package to trigger all the failure, and fix all.
> >
> >Thank you
> >Yao Jiewen
> >
> >
> >> -----Original Message-----
> >> From: Gao, Liming
> >> Sent: Thursday, December 7, 2017 10:53 AM
> >> To: Yao, Jiewen <jiewen.yao@intel.com>; edk2-devel@lists.01.org
> >> Cc: Dong, Eric <eric.dong@intel.com>
> >> Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> >> ASM_PFX in nasm code
> >>
> >> Do you mean SmmCpuFeaturesLib also has the similar issue? If yes, I will
> >provide
> >> the patch to fix it.
> >>
> >> >-----Original Message-----
> >> >From: Yao, Jiewen
> >> >Sent: Thursday, December 07, 2017 10:52 AM
> >> >To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
> >> >Cc: Dong, Eric <eric.dong@intel.com>
> >> >Subject: RE: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the
> >missing
> >> >ASM_PFX in nasm code
> >> >
> >> >Hi Liming
> >> >Reviewed-by: Jiewen.yao@intel.com
> >> >
> >> >BTW: Do you think we also need update SmmCpuFeaturesLib ?
> >> >
> >> >Thank you
> >> >Yao Jiewen
> >> >
> >> >
> >> >> -----Original Message-----
> >> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> >Of
> >> >Liming
> >> >> Gao
> >> >> Sent: Thursday, December 7, 2017 10:45 AM
> >> >> To: edk2-devel@lists.01.org
> >> >> Cc: Dong, Eric <eric.dong@intel.com>
> >> >> Subject: [edk2] [Patch] UefiCpuPkg: PiSmmCpuDxeSmm Add the missing
> >> >> ASM_PFX in nasm code
> >> >>
> >> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> >> Signed-off-by: Liming Gao <liming.gao@intel.com>
> >> >> Cc: Eric Dong <eric.dong@intel.com>
> >> >> ---
> >> >>  UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++-----
> >> >>  1 file changed, 5 insertions(+), 5 deletions(-)
> >> >>
> >> >> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> >> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> >> index c3c094f..dc56dc7 100644
> >> >> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> >> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> >> >> @@ -1,5 +1,5 @@
> >> >>  ;------------------------------------------------------------------------------ ;
> >> >> -; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> >> >> +; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
> >> >>  ; This program and the accompanying materials
> >> >>  ; are licensed and made available under the terms and conditions of the
> >BSD
> >> >> License
> >> >>  ; which accompanies this distribution.  The full text of the license may
> be
> >> >found
> >> >> at
> >> >> @@ -184,15 +184,15 @@ _SmiHandler:
> >> >>      add     rsp, -0x20
> >> >>
> >> >>      mov     rcx, rbx
> >> >> -    mov     rax, CpuSmmDebugEntry
> >> >> +    mov     rax, ASM_PFX(CpuSmmDebugEntry)
> >> >>      call    rax
> >> >>
> >> >>      mov     rcx, rbx
> >> >> -    mov     rax, SmiRendezvous          ; rax <- absolute addr of
> >> >> SmiRedezvous
> >> >> +    mov     rax, ASM_PFX(SmiRendezvous)  ; rax <- absolute addr of
> >> >> SmiRedezvous
> >> >>      call    rax
> >> >>
> >> >>      mov     rcx, rbx
> >> >> -    mov     rax, CpuSmmDebugExit
> >> >> +    mov     rax, ASM_PFX(CpuSmmDebugExit)
> >> >>      call    rax
> >> >>
> >> >>      add     rsp, 0x20
> >> >> @@ -220,5 +220,5 @@ _SmiHandler:
> >> >>  .1:
> >> >>      rsm
> >> >>
> >> >> -gcSmiHandlerSize    DW      $ - _SmiEntryPoint
> >> >> +ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint
> >> >>
> >> >> --
> >> >> 2.8.0.windows.1
> >> >>
> >> >> _______________________________________________
> >> >> edk2-devel mailing list
> >> >> edk2-devel@lists.01.org
> >> >> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel