Zhiguang,
One additional comment.
There are X86*.c files in BaseLib folder that have C implementation of
functions that are common to IA32 and X64. Should
BaseLib/IA32/CpuFlushTlbGcc.c
be moved to BaseLib/X86CpuFlushTlb.c so it is not longer in an arch specific
directory.
It looks strange to have a file from IA32 directory in [Sources.X64] section.
Thanks,
Mike
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kin...@intel.com>
> Sent: Thursday, December 8, 2022 6:40 PM
> To: Liu, Zhiguang <zhiguang....@intel.com>; devel@edk2.groups.io; Kinney,
> Michael D <michael.d.kin...@intel.com>
> Cc: Gao, Liming <gaolim...@byosoft.com.cn>; Ni, Ray <ray...@intel.com>
> Subject: RE: [edk2-devel] [PATCH] MdePkg/BaseCpuLib: Remove assembly for
> CpuFlushTlb
>
> Did you use git mv to rename CpuFlushTlbGcc,c to CpuFlushTlb.c
> to preserve history?
>
> The log here shows a delete and new.
>
> Mike
>
> > -----Original Message-----
> > From: Liu, Zhiguang <zhiguang....@intel.com>
> > Sent: Thursday, December 8, 2022 5:42 PM
> > To: devel@edk2.groups.io; Liu, Zhiguang <zhiguang....@intel.com>
> > Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Gao, Liming
> > <gaolim...@byosoft.com.cn>; Ni, Ray <ray...@intel.com>
> > Subject: RE: [edk2-devel] [PATCH] MdePkg/BaseCpuLib: Remove assembly for
> > CpuFlushTlb
> >
> > Hi Liming and Mike,
> > Could you help review this patch?
> >
> > Thanks
> > Zhiguang
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> > > Zhiguang Liu
> > > Sent: Friday, December 2, 2022 2:25 PM
> > > To: devel@edk2.groups.io
> > > Cc: Liu, Zhiguang <zhiguang....@intel.com>; Kinney, Michael D
> > > <michael.d.kin...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn>;
> > > Ni, Ray <ray...@intel.com>
> > > Subject: [edk2-devel] [PATCH] MdePkg/BaseCpuLib: Remove assembly for
> > > CpuFlushTlb
> > >
> > > For different compilers, both IA32 and X64 can use Ia32/CpuFlushTlbGcc.c,
> > > which is C code (no inline assembly code).
> > > To simplify, remove other assemly file for CpuFlushTlb, and rename
> > > Ia32/CpuFlushTlbGcc.c to Ia32/CpuFlushTlb.c.
> > >
> > > Cc: Michael D Kinney <michael.d.kin...@intel.com>
> > > Cc: Liming Gao <gaolim...@byosoft.com.cn>
> > > Signed-off-by: Ray Ni <ray...@intel.com>
> > > Signed-off-by: Zhiguang Liu <zhiguang....@intel.com>
> > > ---
> > > MdePkg/Library/BaseCpuLib/BaseCpuLib.inf | 10 ++----
> > > MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.c | 12 +++----
> > > .../Library/BaseCpuLib/Ia32/CpuFlushTlb.nasm | 31 ------------------
> > > .../Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c | 25 ---------------
> > > .../Library/BaseCpuLib/X64/CpuFlushTlb.nasm | 32 -------------------
> > > 5 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644
> > > MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.nasm
> > > delete mode 100644 MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
> > > delete mode 100644 MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.nasm
> > >
> > > diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> > > b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> > > index 6b230f6e6d..0feb592638 100644
> > > --- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> > > +++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> > > @@ -4,7 +4,7 @@
> > > # CPU Library implemented using ASM functions for IA32, X64, ARM,
> > > AARCH64, # PAL CALLs for IPF, and empty functions for EBC.
> > > #
> > > -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> > > +# Copyright (c) 2007 - 2022, Intel Corporation. All rights
> > > +reserved.<BR>
> > > # Portions copyright (c) 2008 - 2009, Apple Inc. All rights
> > > reserved.<BR> #
> > > Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR> #
> > > Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> > > reserved.<BR> @@ -31,16 +31,12 @@
> > >
> > > [Sources.IA32]
> > > Ia32/CpuSleep.c | MSFT
> > > - Ia32/CpuFlushTlb.c | MSFT
> > > -
> > > Ia32/CpuSleep.nasm| INTEL
> > > - Ia32/CpuFlushTlb.nasm| INTEL
> > > -
> > > Ia32/CpuSleepGcc.c | GCC
> > > - Ia32/CpuFlushTlbGcc.c | GCC
> > > + Ia32/CpuFlushTlb.c
> > >
> > > [Sources.X64]
> > > - X64/CpuFlushTlb.nasm
> > > + Ia32/CpuFlushTlb.c
> > > X64/CpuSleep.nasm
> > >
> > >
> > > diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.c
> > > b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.c
> > > index 549f4eb8a0..17a351d054 100644
> > > --- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.c
> > > +++ b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.c
> > > @@ -1,11 +1,14 @@
> > > /** @file
> > > - CpuFlushTlb function.
> > > + CpuFlushTlb function for Ia32/X64.
> > >
> > > - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
> > > + Copyright (c) 2006 - 2022, Intel Corporation. All rights
> > > + reserved.<BR> Portions copyright (c) 2008 - 2009, Apple Inc. All
> > > + rights reserved.<BR>
> > > SPDX-License-Identifier: BSD-2-Clause-Patent
> > >
> > > **/
> > >
> > > +#include <Library/BaseLib.h>
> > > +
> > > /**
> > > Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.
> > >
> > > @@ -18,8 +21,5 @@ CpuFlushTlb (
> > > VOID
> > > )
> > > {
> > > - _asm {
> > > - mov eax, cr3
> > > - mov cr3, eax
> > > - }
> > > + AsmWriteCr3 (AsmReadCr3 ());
> > > }
> > > diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.nasm
> > > b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.nasm
> > > deleted file mode 100644
> > > index bc3b68e3f2..0000000000
> > > --- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlb.nasm
> > > +++ /dev/null
> > > @@ -1,31 +0,0 @@
> > > -;------------------------------------------------------------------------------
> > > ; -;
> > > Copyright (c) 2006, Intel Corporation. All rights reserved.<BR> -; SPDX-
> > > License-Identifier: BSD-2-Clause-Patent -; -; Module Name:
> > > -;
> > > -; CpuFlushTlb.Asm
> > > -;
> > > -; Abstract:
> > > -;
> > > -; CpuFlushTlb function
> > > -;
> > > -; Notes:
> > > -;
> > > -;------------------------------------------------------------------------------
> > > -
> > > - SECTION .text
> > > -
> > > -;------------------------------------------------------------------------------
> > > -; VOID
> > > -; EFIAPI
> > > -; CpuFlushTlb (
> > > -; VOID
> > > -; );
> > > -;------------------------------------------------------------------------------
> > > -global ASM_PFX(CpuFlushTlb)
> > > -ASM_PFX(CpuFlushTlb):
> > > - mov eax, cr3
> > > - mov cr3, eax ; moving to CR3 flushes TLB
> > > - ret
> > > -
> > > diff --git a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
> > > b/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
> > > deleted file mode 100644
> > > index ee44f2ea6e..0000000000
> > > --- a/MdePkg/Library/BaseCpuLib/Ia32/CpuFlushTlbGcc.c
> > > +++ /dev/null
> > > @@ -1,25 +0,0 @@
> > > -/** @file
> > > - CpuFlushTlb function for Ia32/X64 GCC.
> > > -
> > > - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
> > > - Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
> > > - SPDX-License-Identifier: BSD-2-Clause-Patent
> > > -
> > > -**/
> > > -
> > > -#include <Library/BaseLib.h>
> > > -
> > > -/**
> > > - Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.
> > > -
> > > - Flushes all the Translation Lookaside Buffers(TLB) entries in a CPU.
> > > -
> > > -**/
> > > -VOID
> > > -EFIAPI
> > > -CpuFlushTlb (
> > > - VOID
> > > - )
> > > -{
> > > - AsmWriteCr3 (AsmReadCr3 ());
> > > -}
> > > diff --git a/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.nasm
> > > b/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.nasm
> > > deleted file mode 100644
> > > index 8ddf7a2864..0000000000
> > > --- a/MdePkg/Library/BaseCpuLib/X64/CpuFlushTlb.nasm
> > > +++ /dev/null
> > > @@ -1,32 +0,0 @@
> > > -;------------------------------------------------------------------------------
> > > ; -;
> > > Copyright (c) 2006, Intel Corporation. All rights reserved.<BR> -; SPDX-
> > > License-Identifier: BSD-2-Clause-Patent -; -; Module Name:
> > > -;
> > > -; CpuFlushTlb.Asm
> > > -;
> > > -; Abstract:
> > > -;
> > > -; CpuFlushTlb function
> > > -;
> > > -; Notes:
> > > -;
> > > -;------------------------------------------------------------------------------
> > > -
> > > - DEFAULT REL
> > > - SECTION .text
> > > -
> > > -;------------------------------------------------------------------------------
> > > -; VOID
> > > -; EFIAPI
> > > -; CpuFlushTlb (
> > > -; VOID
> > > -; );
> > > -;------------------------------------------------------------------------------
> > > -global ASM_PFX(CpuFlushTlb)
> > > -ASM_PFX(CpuFlushTlb):
> > > - mov rax, cr3
> > > - mov cr3, rax
> > > - ret
> > > -
> > > --
> > > 2.31.1.windows.1
> > >
> > >
> > >
> > >
> > >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97205): https://edk2.groups.io/g/devel/message/97205
Mute This Topic: https://groups.io/mt/95401264/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
