* [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library
@ 2017-03-29 16:07 Leo Duran
2017-03-29 16:07 ` Leo Duran
0 siblings, 1 reply; 5+ messages in thread
From: Leo Duran @ 2017-03-29 16:07 UTC (permalink / raw)
To: edk2-devel; +Cc: Leo Duran
This patch adds an SEV-specific .INF and corresponding assembly
files, to unroll REP INSx/OUTSx on IoRead/WriteFifo#() routines
when the SEV feature is enabled under a hypervisor environment.
The new .INF only supports the IA32 and X64 architectures.
This patch follows the series "[PATCH v3 00/10] IoLib class library",
which has already being pushed upstream.
Changes since v2:
- Add .INF entry into MdePkg.dsc
Leo Duran (1):
MdePkg: BaseIoLibIntrinsic (IoLib class) library
.../BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf | 63 +++++
.../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm | 297 +++++++++++++++++++++
.../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm | 293 ++++++++++++++++++++
.../Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm | 282 +++++++++++++++++++
.../Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm | 282 +++++++++++++++++++
MdePkg/MdePkg.dsc | 2 +
6 files changed, 1219 insertions(+)
create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf
create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm
create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm
create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm
create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library 2017-03-29 16:07 [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library Leo Duran @ 2017-03-29 16:07 ` Leo Duran 2017-03-30 4:50 ` Gao, Liming 0 siblings, 1 reply; 5+ messages in thread From: Leo Duran @ 2017-03-29 16:07 UTC (permalink / raw) To: edk2-devel; +Cc: Leo Duran, Michael D Kinney, Liming Gao, Brijesh Singh This patch adds an SEV-specific .INF and corresponding assembly files, to unroll REP INSx/OUTSx on IoRead/WriteFifo#() routines when the SEV feature is enabled under a hypervisor environment. The new .INF only supports the IA32 and X64 architectures. Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Signed-off-by: Leo Duran <leo.duran@amd.com> --- .../BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf | 63 +++++ .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm | 297 +++++++++++++++++++++ .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm | 293 ++++++++++++++++++++ .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm | 282 +++++++++++++++++++ .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm | 282 +++++++++++++++++++ MdePkg/MdePkg.dsc | 2 + 6 files changed, 1219 insertions(+) create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf new file mode 100644 index 0000000..6f14075 --- /dev/null +++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf @@ -0,0 +1,63 @@ +## @file +# Instance of I/O Library using compiler intrinsics. +# +# I/O Library that uses compiler intrinsics to perform IN and OUT instructions +# for IA-32 and x64. On IPF, I/O port requests are translated into MMIO requests. +# MMIO requests are forwarded directly to memory. For EBC, I/O port requests +# ASSERT(). +# +# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR> +# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> +# Copyright (c) 2017, AMD Incorporated. 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 +# http://opensource.org/licenses/bsd-license.php. +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = BaseIoLibIntrinsicSev + MODULE_UNI_FILE = BaseIoLibIntrinsic.uni + FILE_GUID = 93742f95-6e71-4581-b600-8e1da443f95a + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = IoLib + + +# +# VALID_ARCHITECTURES = IA32 X64 +# + +[Sources] + IoLibMmioBuffer.c + BaseIoLibIntrinsicInternal.h + IoHighLevel.c + +[Sources.IA32] + IoLibGcc.c | GCC + IoLibMsc.c | MSFT + IoLibIcc.c | INTEL + IoLib.c + Ia32/IoFifoSev.nasm + Ia32/IoFifoSev.asm + +[Sources.X64] + IoLibGcc.c | GCC + IoLibMsc.c | MSFT + IoLibIcc.c | INTEL + IoLib.c + X64/IoFifoSev.nasm + X64/IoFifoSev.asm + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + DebugLib + BaseLib + diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm new file mode 100644 index 0000000..d81871c --- /dev/null +++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm @@ -0,0 +1,297 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2017, AMD Incorporated. 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 +; http://opensource.org/licenses/bsd-license.php. +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; +;------------------------------------------------------------------------------ + + .586P + .model flat,C + .code + +;------------------------------------------------------------------------------ +; Check whether we need to unroll the String I/O under SEV guest +; +; Return // eax (1 - unroll, 0 - no unroll) +;------------------------------------------------------------------------------ +SevNoRepIo PROC + + ; CPUID clobbers ebx, ecx and edx + push ebx + push ecx + push edx + + ; Check if we are running under hypervisor + ; CPUID(1).ECX Bit 31 + mov eax, 1 + cpuid + bt ecx, 31 + jnc @UseRepIo + + ; Check if we have Memory encryption CPUID leaf + mov eax, 0x80000000 + cpuid + cmp eax, 0x8000001f + jl @UseRepIo + + ; Check for memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 1 + ; + mov eax, 0x8000001f + cpuid + bt eax, 1 + jnc @UseRepIo + + ; Check if memory encryption is enabled + ; MSR_0xC0010131 - Bit 0 (SEV enabled) + ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) + mov ecx, 0xc0010131 + rdmsr + + ; Check for (SevEsEnabled == 0 && SevEnabled == 1) + and eax, 3 + cmp eax, 1 + je @SevNoRepIo_Done + +@UseRepIo: + xor eax, eax + +@SevNoRepIo_Done: + pop edx + pop ecx + pop ebx + ret +SevNoRepIo ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo8 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoReadFifo8 PROC + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo8_NoRep + + cld + rep insb + jmp @IoReadFifo8_Done + +@IoReadFifo8_NoRep: + jecxz @IoReadFifo8_Done + +@IoReadFifo8_Loop: + in al, dx + mov byte [edi], al + inc edi + loop @IoReadFifo8_Loop + +@IoReadFifo8_Done: + pop edi + ret +IoReadFifo8 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo16 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoReadFifo16 PROC + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo16_NoRep + + cld + rep insw + jmp @IoReadFifo16_Done + +@IoReadFifo16_NoRep: + jecxz @IoReadFifo16_Done + +@IoReadFifo16_Loop: + in ax, dx + mov word [edi], ax + add edi, 2 + loop @IoReadFifo16_Loop + +@IoReadFifo16_Done: + pop edi + ret +IoReadFifo16 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo32 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoReadFifo32 PROC + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo32_NoRep + + cld + rep insd + jmp @IoReadFifo32_Done + +@IoReadFifo32_NoRep: + jecxz @IoReadFifo32_Done + +@IoReadFifo32_Loop: + in eax, dx + mov dword [edi], eax + add edi, 4 + loop @IoReadFifo32_Loop + +@IoReadFifo32_Done: + pop edi + ret +IoReadFifo32 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo8 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoWriteFifo8 PROC + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo8_NoRep + + cld + rep outsb + jmp @IoWriteFifo8_Done + +@IoWriteFifo8_NoRep: + jecxz @IoWriteFifo8_Done + +@IoWriteFifo8_Loop: + mov byte [esi], al + out dx, al + inc esi + loop @IoWriteFifo8_Loop + +@IoWriteFifo8_Done: + pop esi + ret +IoWriteFifo8 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo16 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoWriteFifo16 PROC + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo16_NoRep + + cld + rep outsw + jmp @IoWriteFifo16_Done + +@IoWriteFifo16_NoRep: + jecxz @IoWriteFifo16_Done + +@IoWriteFifo16_Loop: + mov word [esi], ax + out dx, ax + add esi, 2 + loop @IoWriteFifo16_Loop + +@IoWriteFifo16_Done: + pop esi + ret +IoWriteFifo16 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo32 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +IoWriteFifo32 PROC + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo32_NoRep + + cld + rep outsd + jmp @IoWriteFifo32_Done + +@IoWriteFifo32_NoRep: + jecxz @IoWriteFifo32_Done + +@IoWriteFifo32_Loop: + mov dword [esi], eax + out dx, eax + add esi, 4 + loop @IoWriteFifo32_Loop + +@IoWriteFifo32_Done: + pop esi + ret +IoWriteFifo32 ENDP + + END + diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm new file mode 100644 index 0000000..9adb972 --- /dev/null +++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm @@ -0,0 +1,293 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2017, AMD Incorporated. 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 +; http://opensource.org/licenses/bsd-license.php. +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; +;------------------------------------------------------------------------------ + + SECTION .text + +;------------------------------------------------------------------------------ +; Check whether we need to unroll the String I/O under SEV guest +; +; Return // eax (1 - unroll, 0 - no unroll) +;------------------------------------------------------------------------------ +global ASM_PFX(SevNoRepIo) +ASM_PFX(SevNoRepIo): + + ; CPUID clobbers ebx, ecx and edx + push ebx + push ecx + push edx + + ; Check if we are running under hypervisor + ; CPUID(1).ECX Bit 31 + mov eax, 1 + cpuid + bt ecx, 31 + jnc @UseRepIo + + ; Check if we have Memory encryption CPUID leaf + mov eax, 0x80000000 + cpuid + cmp eax, 0x8000001f + jl @UseRepIo + + ; Check for memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 1 + ; + mov eax, 0x8000001f + cpuid + bt eax, 1 + jnc @UseRepIo + + ; Check if memory encryption is enabled + ; MSR_0xC0010131 - Bit 0 (SEV enabled) + ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) + mov ecx, 0xc0010131 + rdmsr + + ; Check for (SevEsEnabled == 0 && SevEnabled == 1) + and eax, 3 + cmp eax, 1 + je @SevNoRepIo_Done + +@UseRepIo: + xor eax, eax + +@SevNoRepIo_Done: + pop edx + pop ecx + pop ebx + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo8 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo8) +ASM_PFX(IoReadFifo8): + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo8_NoRep + + cld + rep insb + jmp @IoReadFifo8_Done + +@IoReadFifo8_NoRep: + jecxz @IoReadFifo8_Done + +@IoReadFifo8_Loop: + in al, dx + mov byte [edi], al + inc edi + loop @IoReadFifo8_Loop + +@IoReadFifo8_Done: + pop edi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo16 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo16) +ASM_PFX(IoReadFifo16): + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo16_NoRep + + cld + rep insw + jmp @IoReadFifo16_Done + +@IoReadFifo16_NoRep: + jecxz @IoReadFifo16_Done + +@IoReadFifo16_Loop: + in ax, dx + mov word [edi], ax + add edi, 2 + loop @IoReadFifo16_Loop + +@IoReadFifo16_Done: + pop edi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo32 ( +; IN UINTN Port, +; IN UINTN Size, +; OUT VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo32) +ASM_PFX(IoReadFifo32): + push edi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov edi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll the rep + test eax, eax + jnz @IoReadFifo32_NoRep + + cld + rep insd + jmp @IoReadFifo32_Done + +@IoReadFifo32_NoRep: + jecxz @IoReadFifo32_Done + +@IoReadFifo32_Loop: + in eax, dx + mov dword [edi], eax + add edi, 4 + loop @IoReadFifo32_Loop + +@IoReadFifo32_Done: + pop edi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo8 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo8) +ASM_PFX(IoWriteFifo8): + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo8_NoRep + + cld + rep outsb + jmp @IoWriteFifo8_Done + +@IoWriteFifo8_NoRep: + jecxz @IoWriteFifo8_Done + +@IoWriteFifo8_Loop: + mov byte [esi], al + out dx, al + inc esi + loop @IoWriteFifo8_Loop + +@IoWriteFifo8_Done: + pop esi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo16 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo16) +ASM_PFX(IoWriteFifo16): + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo16_NoRep + + cld + rep outsw + jmp @IoWriteFifo16_Done + +@IoWriteFifo16_NoRep: + jecxz @IoWriteFifo16_Done + +@IoWriteFifo16_Loop: + mov word [esi], ax + out dx, ax + add esi, 2 + loop @IoWriteFifo16_Loop + +@IoWriteFifo16_Done: + pop esi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo32 ( +; IN UINTN Port, +; IN UINTN Size, +; IN VOID *Buffer +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo32) +ASM_PFX(IoWriteFifo32): + push esi + mov dx, [esp + 8] + mov ecx, [esp + 12] + mov esi, [esp + 16] + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo32_NoRep + + cld + rep outsd + jmp @IoWriteFifo32_Done + +@IoWriteFifo32_NoRep: + jecxz @IoWriteFifo32_Done + +@IoWriteFifo32_Loop: + mov dword [esi], eax + out dx, eax + add esi, 4 + loop @IoWriteFifo32_Loop + +@IoWriteFifo32_Done: + pop esi + ret + diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm new file mode 100644 index 0000000..fe9e171 --- /dev/null +++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm @@ -0,0 +1,282 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2017, AMD Incorporated. 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 +; http://opensource.org/licenses/bsd-license.php. +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; +;------------------------------------------------------------------------------ + + .code + +;------------------------------------------------------------------------------ +; Check whether we need to unroll the String I/O in SEV guest +; +; Return // eax (1 - unroll, 0 - no unroll) +;------------------------------------------------------------------------------ +SevNoRepIo PROC + ; CPUID clobbers ebx, ecx and edx + push rbx + push rcx + push rdx + + ; Check if we are runing under hypervisor + ; CPUID(1).ECX Bit 31 + mov eax, 1 + cpuid + bt ecx, 31 + jnc @UseRepIo + + ; Check if we have Memory encryption CPUID leaf + mov eax, 0x80000000 + cpuid + cmp eax, 0x8000001f + jl @UseRepIo + + ; Check for memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 1 + ; + mov eax, 0x8000001f + cpuid + bt eax, 1 + jnc @UseRepIo + + ; Check if memory encryption is enabled + ; MSR_0xC0010131 - Bit 0 (SEV enabled) + ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) + mov ecx, 0xc0010131 + rdmsr + + ; Check for (SevEsEnabled == 0 && SevEnabled == 1) + and eax, 3 + cmp eax, 1 + je @SevNoRepIo_Done + +@UseRepIo: + xor eax, eax + +@SevNoRepIo_Done: + pop rdx + pop rcx + pop rbx + ret +SevNoRepIo ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoReadFifo8 PROC + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo8_NoRep + + cld + rep insb + jmp @IoReadFifo8_Done + +@IoReadFifo8_NoRep: + jrcxz @IoReadFifo8_Done + +@IoReadFifo8_Loop: + in al, dx + mov byte [rdi], al + inc rdi + loop @IoReadFifo8_Loop + +@IoReadFifo8_Done: + mov rdi, r8 ; restore rdi + ret +IoReadFifo8 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo16 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoReadFifo16 PROC + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo16_NoRep + + cld + rep insw + jmp @IoReadFifo16_Done + +@IoReadFifo16_NoRep: + jrcxz @IoReadFifo16_Done + +@IoReadFifo16_Loop: + in ax, dx + mov word [rdi], ax + add rdi, 2 + loop @IoReadFifo16_Loop + +@IoReadFifo16_Done: + mov rdi, r8 ; restore rdi + ret +IoReadFifo16 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo32 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoReadFifo32 PROC + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo32_NoRep + + cld + rep insd + jmp @IoReadFifo32_Done + +@IoReadFifo32_NoRep: + jrcxz @IoReadFifo32_Done + +@IoReadFifo32_Loop: + in eax, dx + mov dword [rdi], eax + add rdi, 4 + loop @IoReadFifo32_Loop + +@IoReadFifo32_Done: + mov rdi, r8 ; restore rdi + ret +IoReadFifo32 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoWriteFifo8 PROC + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo8_NoRep + + cld + rep outsb + jmp @IoWriteFifo8_Done + +@IoWriteFifo8_NoRep: + jrcxz @IoWriteFifo8_Done + +@IoWriteFifo8_Loop: + mov byte [rsi], al + out dx, al + inc rsi + loop @IoWriteFifo8_Loop + +@IoWriteFifo8_Done: + mov rsi, r8 ; restore rsi + ret +IoWriteFifo8 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo16 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoWriteFifo16 PROC + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo16_NoRep + + cld + rep outsw + jmp @IoWriteFifo16_Done + +@IoWriteFifo16_NoRep: + jrcxz @IoWriteFifo16_Done + +@IoWriteFifo16_Loop: + mov word [rsi], ax + out dx, ax + add rsi, 2 + loop @IoWriteFifo16_Loop + +@IoWriteFifo16_Done: + mov rsi, r8 ; restore rsi + ret +IoWriteFifo16 ENDP + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo32 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +IoWriteFifo32 PROC + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo32_NoRep + + cld + rep outsd + jmp @IoWriteFifo32_Done + +@IoWriteFifo32_NoRep: + jrcxz @IoWriteFifo32_Done + +@IoWriteFifo32_Loop: + mov dword [rsi], eax + out dx, eax + add rsi, 4 + loop @IoWriteFifo32_Loop + +@IoWriteFifo32_Done: + mov rsi, r8 ; restore rsi + ret +IoWriteFifo32 ENDP + + END + diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm new file mode 100644 index 0000000..20e3e64 --- /dev/null +++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm @@ -0,0 +1,282 @@ +;------------------------------------------------------------------------------ +; +; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2017, AMD Incorporated. 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 +; http://opensource.org/licenses/bsd-license.php. +; +; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +; +;------------------------------------------------------------------------------ + + DEFAULT REL + SECTION .text + +;------------------------------------------------------------------------------ +; Check whether we need to unroll the String I/O in SEV guest +; +; Return // eax (1 - unroll, 0 - no unroll) +;------------------------------------------------------------------------------ +global ASM_PFX(SevNoRepIo) +ASM_PFX(SevNoRepIo): + + ; CPUID clobbers ebx, ecx and edx + push rbx + push rcx + push rdx + + ; Check if we are runing under hypervisor + ; CPUID(1).ECX Bit 31 + mov eax, 1 + cpuid + bt ecx, 31 + jnc @UseRepIo + + ; Check if we have Memory encryption CPUID leaf + mov eax, 0x80000000 + cpuid + cmp eax, 0x8000001f + jl @UseRepIo + + ; Check for memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 1 + ; + mov eax, 0x8000001f + cpuid + bt eax, 1 + jnc @UseRepIo + + ; Check if memory encryption is enabled + ; MSR_0xC0010131 - Bit 0 (SEV enabled) + ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) + mov ecx, 0xc0010131 + rdmsr + + ; Check for (SevEsEnabled == 0 && SevEnabled == 1) + and eax, 3 + cmp eax, 1 + je @SevNoRepIo_Done + +@UseRepIo: + xor eax, eax + +@SevNoRepIo_Done: + pop rdx + pop rcx + pop rbx + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo8) +ASM_PFX(IoReadFifo8): + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo8_NoRep + + cld + rep insb + jmp @IoReadFifo8_Done + +@IoReadFifo8_NoRep: + jrcxz @IoReadFifo8_Done + +@IoReadFifo8_Loop: + in al, dx + mov byte [rdi], al + inc rdi + loop @IoReadFifo8_Loop + +@IoReadFifo8_Done: + mov rdi, r8 ; restore rdi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo16 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo16) +ASM_PFX(IoReadFifo16): + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo16_NoRep + + cld + rep insw + jmp @IoReadFifo16_Done + +@IoReadFifo16_NoRep: + jrcxz @IoReadFifo16_Done + +@IoReadFifo16_Loop: + in ax, dx + mov word [rdi], ax + add rdi, 2 + loop @IoReadFifo16_Loop + +@IoReadFifo16_Done: + mov rdi, r8 ; restore rdi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoReadFifo32 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; OUT VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoReadFifo32) +ASM_PFX(IoReadFifo32): + xchg rcx, rdx + xchg rdi, r8 ; rdi: buffer address; r8: save rdi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoReadFifo32_NoRep + + cld + rep insd + jmp @IoReadFifo32_Done + +@IoReadFifo32_NoRep: + jrcxz @IoReadFifo32_Done + +@IoReadFifo32_Loop: + in eax, dx + mov dword [rdi], eax + add rdi, 4 + loop @IoReadFifo32_Loop + +@IoReadFifo32_Done: + mov rdi, r8 ; restore rdi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo8 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo8) +ASM_PFX(IoWriteFifo8): + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo8_NoRep + + cld + rep outsb + jmp @IoWriteFifo8_Done + +@IoWriteFifo8_NoRep: + jrcxz @IoWriteFifo8_Done + +@IoWriteFifo8_Loop: + mov byte [rsi], al + out dx, al + inc rsi + loop @IoWriteFifo8_Loop + +@IoWriteFifo8_Done: + mov rsi, r8 ; restore rsi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo16 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo16) +ASM_PFX(IoWriteFifo16): + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo16_NoRep + + cld + rep outsw + jmp @IoWriteFifo16_Done + +@IoWriteFifo16_NoRep: + jrcxz @IoWriteFifo16_Done + +@IoWriteFifo16_Loop: + mov word [rsi], ax + out dx, ax + add rsi, 2 + loop @IoWriteFifo16_Loop + +@IoWriteFifo16_Done: + mov rsi, r8 ; restore rsi + ret + +;------------------------------------------------------------------------------ +; VOID +; EFIAPI +; IoWriteFifo32 ( +; IN UINTN Port, // rcx +; IN UINTN Size, // rdx +; IN VOID *Buffer // r8 +; ); +;------------------------------------------------------------------------------ +global ASM_PFX(IoWriteFifo32) +ASM_PFX(IoWriteFifo32): + xchg rcx, rdx + xchg rsi, r8 ; rsi: buffer address; r8: save rsi + + call SevNoRepIo ; Check if we need to unroll String I/O + test eax, eax + jnz @IoWriteFifo32_NoRep + + cld + rep outsd + jmp @IoWriteFifo32_Done + +@IoWriteFifo32_NoRep: + jrcxz @IoWriteFifo32_Done + +@IoWriteFifo32_Loop: + mov dword [rsi], eax + out dx, eax + add rsi, 4 + loop @IoWriteFifo32_Loop + +@IoWriteFifo32_Done: + mov rsi, r8 ; restore rsi + ret + diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index 2144979..56fb4cf 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -3,6 +3,7 @@ # # Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> +# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR> # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -134,6 +135,7 @@ [Components.IA32, Components.X64] MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library 2017-03-29 16:07 ` Leo Duran @ 2017-03-30 4:50 ` Gao, Liming 2017-03-30 12:30 ` Duran, Leo 0 siblings, 1 reply; 5+ messages in thread From: Gao, Liming @ 2017-03-30 4:50 UTC (permalink / raw) To: Leo Duran, edk2-devel@ml01.01.org; +Cc: Kinney, Michael D, Brijesh Singh Leo: Your change is good. My comment is not to add asm code. Nasm is enough. For new added features, nasm is only required. Thanks Liming >-----Original Message----- >From: Leo Duran [mailto:leo.duran@amd.com] >Sent: Thursday, March 30, 2017 12:07 AM >To: edk2-devel@ml01.01.org >Cc: Leo Duran <leo.duran@amd.com>; Kinney, Michael D ><michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; Brijesh >Singh <brijesh.singh@amd.com> >Subject: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > >This patch adds an SEV-specific .INF and corresponding assembly >files, to unroll REP INSx/OUTSx on IoRead/WriteFifo#() routines >when the SEV feature is enabled under a hypervisor environment. > >The new .INF only supports the IA32 and X64 architectures. > >Cc: Michael D Kinney <michael.d.kinney@intel.com> >Cc: Liming Gao <liming.gao@intel.com> >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> >Signed-off-by: Leo Duran <leo.duran@amd.com> >--- > .../BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf | 63 +++++ > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm | 297 >+++++++++++++++++++++ > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm | 293 >++++++++++++++++++++ > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm | 282 >+++++++++++++++++++ > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm | 282 >+++++++++++++++++++ > MdePkg/MdePkg.dsc | 2 + > 6 files changed, 1219 insertions(+) > create mode 100644 >MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf >b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf >new file mode 100644 >index 0000000..6f14075 >--- /dev/null >+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf >@@ -0,0 +1,63 @@ >+## @file >+# Instance of I/O Library using compiler intrinsics. >+# >+# I/O Library that uses compiler intrinsics to perform IN and OUT instructions >+# for IA-32 and x64. On IPF, I/O port requests are translated into MMIO >requests. >+# MMIO requests are forwarded directly to memory. For EBC, I/O port >requests >+# ASSERT(). >+# >+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR> >+# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> >+# Copyright (c) 2017, AMD Incorporated. 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 >+# http://opensource.org/licenses/bsd-license.php. >+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+# >+## >+ >+[Defines] >+ INF_VERSION = 0x00010005 >+ BASE_NAME = BaseIoLibIntrinsicSev >+ MODULE_UNI_FILE = BaseIoLibIntrinsic.uni >+ FILE_GUID = 93742f95-6e71-4581-b600-8e1da443f95a >+ MODULE_TYPE = BASE >+ VERSION_STRING = 1.0 >+ LIBRARY_CLASS = IoLib >+ >+ >+# >+# VALID_ARCHITECTURES = IA32 X64 >+# >+ >+[Sources] >+ IoLibMmioBuffer.c >+ BaseIoLibIntrinsicInternal.h >+ IoHighLevel.c >+ >+[Sources.IA32] >+ IoLibGcc.c | GCC >+ IoLibMsc.c | MSFT >+ IoLibIcc.c | INTEL >+ IoLib.c >+ Ia32/IoFifoSev.nasm >+ Ia32/IoFifoSev.asm >+ >+[Sources.X64] >+ IoLibGcc.c | GCC >+ IoLibMsc.c | MSFT >+ IoLibIcc.c | INTEL >+ IoLib.c >+ X64/IoFifoSev.nasm >+ X64/IoFifoSev.asm >+ >+[Packages] >+ MdePkg/MdePkg.dec >+ >+[LibraryClasses] >+ DebugLib >+ BaseLib >+ >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm >new file mode 100644 >index 0000000..d81871c >--- /dev/null >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm >@@ -0,0 +1,297 @@ >+;------------------------------------------------------------------------------ >+; >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> >+; Copyright (c) 2017, AMD Incorporated. 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 >+; http://opensource.org/licenses/bsd-license.php. >+; >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+; >+;------------------------------------------------------------------------------ >+ >+ .586P >+ .model flat,C >+ .code >+ >+;------------------------------------------------------------------------------ >+; Check whether we need to unroll the String I/O under SEV guest >+; >+; Return // eax (1 - unroll, 0 - no unroll) >+;------------------------------------------------------------------------------ >+SevNoRepIo PROC >+ >+ ; CPUID clobbers ebx, ecx and edx >+ push ebx >+ push ecx >+ push edx >+ >+ ; Check if we are running under hypervisor >+ ; CPUID(1).ECX Bit 31 >+ mov eax, 1 >+ cpuid >+ bt ecx, 31 >+ jnc @UseRepIo >+ >+ ; Check if we have Memory encryption CPUID leaf >+ mov eax, 0x80000000 >+ cpuid >+ cmp eax, 0x8000001f >+ jl @UseRepIo >+ >+ ; Check for memory encryption feature: >+ ; CPUID Fn8000_001F[EAX] - Bit 1 >+ ; >+ mov eax, 0x8000001f >+ cpuid >+ bt eax, 1 >+ jnc @UseRepIo >+ >+ ; Check if memory encryption is enabled >+ ; MSR_0xC0010131 - Bit 0 (SEV enabled) >+ ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) >+ mov ecx, 0xc0010131 >+ rdmsr >+ >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) >+ and eax, 3 >+ cmp eax, 1 >+ je @SevNoRepIo_Done >+ >+@UseRepIo: >+ xor eax, eax >+ >+@SevNoRepIo_Done: >+ pop edx >+ pop ecx >+ pop ebx >+ ret >+SevNoRepIo ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo8 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo8 PROC >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo8_NoRep >+ >+ cld >+ rep insb >+ jmp @IoReadFifo8_Done >+ >+@IoReadFifo8_NoRep: >+ jecxz @IoReadFifo8_Done >+ >+@IoReadFifo8_Loop: >+ in al, dx >+ mov byte [edi], al >+ inc edi >+ loop @IoReadFifo8_Loop >+ >+@IoReadFifo8_Done: >+ pop edi >+ ret >+IoReadFifo8 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo16 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo16 PROC >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo16_NoRep >+ >+ cld >+ rep insw >+ jmp @IoReadFifo16_Done >+ >+@IoReadFifo16_NoRep: >+ jecxz @IoReadFifo16_Done >+ >+@IoReadFifo16_Loop: >+ in ax, dx >+ mov word [edi], ax >+ add edi, 2 >+ loop @IoReadFifo16_Loop >+ >+@IoReadFifo16_Done: >+ pop edi >+ ret >+IoReadFifo16 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo32 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo32 PROC >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo32_NoRep >+ >+ cld >+ rep insd >+ jmp @IoReadFifo32_Done >+ >+@IoReadFifo32_NoRep: >+ jecxz @IoReadFifo32_Done >+ >+@IoReadFifo32_Loop: >+ in eax, dx >+ mov dword [edi], eax >+ add edi, 4 >+ loop @IoReadFifo32_Loop >+ >+@IoReadFifo32_Done: >+ pop edi >+ ret >+IoReadFifo32 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo8 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo8 PROC >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo8_NoRep >+ >+ cld >+ rep outsb >+ jmp @IoWriteFifo8_Done >+ >+@IoWriteFifo8_NoRep: >+ jecxz @IoWriteFifo8_Done >+ >+@IoWriteFifo8_Loop: >+ mov byte [esi], al >+ out dx, al >+ inc esi >+ loop @IoWriteFifo8_Loop >+ >+@IoWriteFifo8_Done: >+ pop esi >+ ret >+IoWriteFifo8 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo16 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo16 PROC >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo16_NoRep >+ >+ cld >+ rep outsw >+ jmp @IoWriteFifo16_Done >+ >+@IoWriteFifo16_NoRep: >+ jecxz @IoWriteFifo16_Done >+ >+@IoWriteFifo16_Loop: >+ mov word [esi], ax >+ out dx, ax >+ add esi, 2 >+ loop @IoWriteFifo16_Loop >+ >+@IoWriteFifo16_Done: >+ pop esi >+ ret >+IoWriteFifo16 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo32 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo32 PROC >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo32_NoRep >+ >+ cld >+ rep outsd >+ jmp @IoWriteFifo32_Done >+ >+@IoWriteFifo32_NoRep: >+ jecxz @IoWriteFifo32_Done >+ >+@IoWriteFifo32_Loop: >+ mov dword [esi], eax >+ out dx, eax >+ add esi, 4 >+ loop @IoWriteFifo32_Loop >+ >+@IoWriteFifo32_Done: >+ pop esi >+ ret >+IoWriteFifo32 ENDP >+ >+ END >+ >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm >new file mode 100644 >index 0000000..9adb972 >--- /dev/null >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm >@@ -0,0 +1,293 @@ >+;------------------------------------------------------------------------------ >+; >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> >+; Copyright (c) 2017, AMD Incorporated. 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 >+; http://opensource.org/licenses/bsd-license.php. >+; >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+; >+;------------------------------------------------------------------------------ >+ >+ SECTION .text >+ >+;------------------------------------------------------------------------------ >+; Check whether we need to unroll the String I/O under SEV guest >+; >+; Return // eax (1 - unroll, 0 - no unroll) >+;------------------------------------------------------------------------------ >+global ASM_PFX(SevNoRepIo) >+ASM_PFX(SevNoRepIo): >+ >+ ; CPUID clobbers ebx, ecx and edx >+ push ebx >+ push ecx >+ push edx >+ >+ ; Check if we are running under hypervisor >+ ; CPUID(1).ECX Bit 31 >+ mov eax, 1 >+ cpuid >+ bt ecx, 31 >+ jnc @UseRepIo >+ >+ ; Check if we have Memory encryption CPUID leaf >+ mov eax, 0x80000000 >+ cpuid >+ cmp eax, 0x8000001f >+ jl @UseRepIo >+ >+ ; Check for memory encryption feature: >+ ; CPUID Fn8000_001F[EAX] - Bit 1 >+ ; >+ mov eax, 0x8000001f >+ cpuid >+ bt eax, 1 >+ jnc @UseRepIo >+ >+ ; Check if memory encryption is enabled >+ ; MSR_0xC0010131 - Bit 0 (SEV enabled) >+ ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) >+ mov ecx, 0xc0010131 >+ rdmsr >+ >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) >+ and eax, 3 >+ cmp eax, 1 >+ je @SevNoRepIo_Done >+ >+@UseRepIo: >+ xor eax, eax >+ >+@SevNoRepIo_Done: >+ pop edx >+ pop ecx >+ pop ebx >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo8 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo8) >+ASM_PFX(IoReadFifo8): >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo8_NoRep >+ >+ cld >+ rep insb >+ jmp @IoReadFifo8_Done >+ >+@IoReadFifo8_NoRep: >+ jecxz @IoReadFifo8_Done >+ >+@IoReadFifo8_Loop: >+ in al, dx >+ mov byte [edi], al >+ inc edi >+ loop @IoReadFifo8_Loop >+ >+@IoReadFifo8_Done: >+ pop edi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo16 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo16) >+ASM_PFX(IoReadFifo16): >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo16_NoRep >+ >+ cld >+ rep insw >+ jmp @IoReadFifo16_Done >+ >+@IoReadFifo16_NoRep: >+ jecxz @IoReadFifo16_Done >+ >+@IoReadFifo16_Loop: >+ in ax, dx >+ mov word [edi], ax >+ add edi, 2 >+ loop @IoReadFifo16_Loop >+ >+@IoReadFifo16_Done: >+ pop edi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo32 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; OUT VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo32) >+ASM_PFX(IoReadFifo32): >+ push edi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov edi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll the rep >+ test eax, eax >+ jnz @IoReadFifo32_NoRep >+ >+ cld >+ rep insd >+ jmp @IoReadFifo32_Done >+ >+@IoReadFifo32_NoRep: >+ jecxz @IoReadFifo32_Done >+ >+@IoReadFifo32_Loop: >+ in eax, dx >+ mov dword [edi], eax >+ add edi, 4 >+ loop @IoReadFifo32_Loop >+ >+@IoReadFifo32_Done: >+ pop edi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo8 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo8) >+ASM_PFX(IoWriteFifo8): >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo8_NoRep >+ >+ cld >+ rep outsb >+ jmp @IoWriteFifo8_Done >+ >+@IoWriteFifo8_NoRep: >+ jecxz @IoWriteFifo8_Done >+ >+@IoWriteFifo8_Loop: >+ mov byte [esi], al >+ out dx, al >+ inc esi >+ loop @IoWriteFifo8_Loop >+ >+@IoWriteFifo8_Done: >+ pop esi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo16 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo16) >+ASM_PFX(IoWriteFifo16): >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo16_NoRep >+ >+ cld >+ rep outsw >+ jmp @IoWriteFifo16_Done >+ >+@IoWriteFifo16_NoRep: >+ jecxz @IoWriteFifo16_Done >+ >+@IoWriteFifo16_Loop: >+ mov word [esi], ax >+ out dx, ax >+ add esi, 2 >+ loop @IoWriteFifo16_Loop >+ >+@IoWriteFifo16_Done: >+ pop esi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo32 ( >+; IN UINTN Port, >+; IN UINTN Size, >+; IN VOID *Buffer >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo32) >+ASM_PFX(IoWriteFifo32): >+ push esi >+ mov dx, [esp + 8] >+ mov ecx, [esp + 12] >+ mov esi, [esp + 16] >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo32_NoRep >+ >+ cld >+ rep outsd >+ jmp @IoWriteFifo32_Done >+ >+@IoWriteFifo32_NoRep: >+ jecxz @IoWriteFifo32_Done >+ >+@IoWriteFifo32_Loop: >+ mov dword [esi], eax >+ out dx, eax >+ add esi, 4 >+ loop @IoWriteFifo32_Loop >+ >+@IoWriteFifo32_Done: >+ pop esi >+ ret >+ >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm >new file mode 100644 >index 0000000..fe9e171 >--- /dev/null >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm >@@ -0,0 +1,282 @@ >+;------------------------------------------------------------------------------ >+; >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> >+; Copyright (c) 2017, AMD Incorporated. 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 >+; http://opensource.org/licenses/bsd-license.php. >+; >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+; >+;------------------------------------------------------------------------------ >+ >+ .code >+ >+;------------------------------------------------------------------------------ >+; Check whether we need to unroll the String I/O in SEV guest >+; >+; Return // eax (1 - unroll, 0 - no unroll) >+;------------------------------------------------------------------------------ >+SevNoRepIo PROC >+ ; CPUID clobbers ebx, ecx and edx >+ push rbx >+ push rcx >+ push rdx >+ >+ ; Check if we are runing under hypervisor >+ ; CPUID(1).ECX Bit 31 >+ mov eax, 1 >+ cpuid >+ bt ecx, 31 >+ jnc @UseRepIo >+ >+ ; Check if we have Memory encryption CPUID leaf >+ mov eax, 0x80000000 >+ cpuid >+ cmp eax, 0x8000001f >+ jl @UseRepIo >+ >+ ; Check for memory encryption feature: >+ ; CPUID Fn8000_001F[EAX] - Bit 1 >+ ; >+ mov eax, 0x8000001f >+ cpuid >+ bt eax, 1 >+ jnc @UseRepIo >+ >+ ; Check if memory encryption is enabled >+ ; MSR_0xC0010131 - Bit 0 (SEV enabled) >+ ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) >+ mov ecx, 0xc0010131 >+ rdmsr >+ >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) >+ and eax, 3 >+ cmp eax, 1 >+ je @SevNoRepIo_Done >+ >+@UseRepIo: >+ xor eax, eax >+ >+@SevNoRepIo_Done: >+ pop rdx >+ pop rcx >+ pop rbx >+ ret >+SevNoRepIo ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo8 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo8 PROC >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo8_NoRep >+ >+ cld >+ rep insb >+ jmp @IoReadFifo8_Done >+ >+@IoReadFifo8_NoRep: >+ jrcxz @IoReadFifo8_Done >+ >+@IoReadFifo8_Loop: >+ in al, dx >+ mov byte [rdi], al >+ inc rdi >+ loop @IoReadFifo8_Loop >+ >+@IoReadFifo8_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+IoReadFifo8 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo16 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo16 PROC >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo16_NoRep >+ >+ cld >+ rep insw >+ jmp @IoReadFifo16_Done >+ >+@IoReadFifo16_NoRep: >+ jrcxz @IoReadFifo16_Done >+ >+@IoReadFifo16_Loop: >+ in ax, dx >+ mov word [rdi], ax >+ add rdi, 2 >+ loop @IoReadFifo16_Loop >+ >+@IoReadFifo16_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+IoReadFifo16 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo32 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoReadFifo32 PROC >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo32_NoRep >+ >+ cld >+ rep insd >+ jmp @IoReadFifo32_Done >+ >+@IoReadFifo32_NoRep: >+ jrcxz @IoReadFifo32_Done >+ >+@IoReadFifo32_Loop: >+ in eax, dx >+ mov dword [rdi], eax >+ add rdi, 4 >+ loop @IoReadFifo32_Loop >+ >+@IoReadFifo32_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+IoReadFifo32 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo8 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo8 PROC >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo8_NoRep >+ >+ cld >+ rep outsb >+ jmp @IoWriteFifo8_Done >+ >+@IoWriteFifo8_NoRep: >+ jrcxz @IoWriteFifo8_Done >+ >+@IoWriteFifo8_Loop: >+ mov byte [rsi], al >+ out dx, al >+ inc rsi >+ loop @IoWriteFifo8_Loop >+ >+@IoWriteFifo8_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+IoWriteFifo8 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo16 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo16 PROC >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo16_NoRep >+ >+ cld >+ rep outsw >+ jmp @IoWriteFifo16_Done >+ >+@IoWriteFifo16_NoRep: >+ jrcxz @IoWriteFifo16_Done >+ >+@IoWriteFifo16_Loop: >+ mov word [rsi], ax >+ out dx, ax >+ add rsi, 2 >+ loop @IoWriteFifo16_Loop >+ >+@IoWriteFifo16_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+IoWriteFifo16 ENDP >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo32 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+IoWriteFifo32 PROC >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo32_NoRep >+ >+ cld >+ rep outsd >+ jmp @IoWriteFifo32_Done >+ >+@IoWriteFifo32_NoRep: >+ jrcxz @IoWriteFifo32_Done >+ >+@IoWriteFifo32_Loop: >+ mov dword [rsi], eax >+ out dx, eax >+ add rsi, 4 >+ loop @IoWriteFifo32_Loop >+ >+@IoWriteFifo32_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+IoWriteFifo32 ENDP >+ >+ END >+ >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm >new file mode 100644 >index 0000000..20e3e64 >--- /dev/null >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm >@@ -0,0 +1,282 @@ >+;------------------------------------------------------------------------------ >+; >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> >+; Copyright (c) 2017, AMD Incorporated. 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 >+; http://opensource.org/licenses/bsd-license.php. >+; >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+; >+;------------------------------------------------------------------------------ >+ >+ DEFAULT REL >+ SECTION .text >+ >+;------------------------------------------------------------------------------ >+; Check whether we need to unroll the String I/O in SEV guest >+; >+; Return // eax (1 - unroll, 0 - no unroll) >+;------------------------------------------------------------------------------ >+global ASM_PFX(SevNoRepIo) >+ASM_PFX(SevNoRepIo): >+ >+ ; CPUID clobbers ebx, ecx and edx >+ push rbx >+ push rcx >+ push rdx >+ >+ ; Check if we are runing under hypervisor >+ ; CPUID(1).ECX Bit 31 >+ mov eax, 1 >+ cpuid >+ bt ecx, 31 >+ jnc @UseRepIo >+ >+ ; Check if we have Memory encryption CPUID leaf >+ mov eax, 0x80000000 >+ cpuid >+ cmp eax, 0x8000001f >+ jl @UseRepIo >+ >+ ; Check for memory encryption feature: >+ ; CPUID Fn8000_001F[EAX] - Bit 1 >+ ; >+ mov eax, 0x8000001f >+ cpuid >+ bt eax, 1 >+ jnc @UseRepIo >+ >+ ; Check if memory encryption is enabled >+ ; MSR_0xC0010131 - Bit 0 (SEV enabled) >+ ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) >+ mov ecx, 0xc0010131 >+ rdmsr >+ >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) >+ and eax, 3 >+ cmp eax, 1 >+ je @SevNoRepIo_Done >+ >+@UseRepIo: >+ xor eax, eax >+ >+@SevNoRepIo_Done: >+ pop rdx >+ pop rcx >+ pop rbx >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo8 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo8) >+ASM_PFX(IoReadFifo8): >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo8_NoRep >+ >+ cld >+ rep insb >+ jmp @IoReadFifo8_Done >+ >+@IoReadFifo8_NoRep: >+ jrcxz @IoReadFifo8_Done >+ >+@IoReadFifo8_Loop: >+ in al, dx >+ mov byte [rdi], al >+ inc rdi >+ loop @IoReadFifo8_Loop >+ >+@IoReadFifo8_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo16 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo16) >+ASM_PFX(IoReadFifo16): >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo16_NoRep >+ >+ cld >+ rep insw >+ jmp @IoReadFifo16_Done >+ >+@IoReadFifo16_NoRep: >+ jrcxz @IoReadFifo16_Done >+ >+@IoReadFifo16_Loop: >+ in ax, dx >+ mov word [rdi], ax >+ add rdi, 2 >+ loop @IoReadFifo16_Loop >+ >+@IoReadFifo16_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoReadFifo32 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; OUT VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoReadFifo32) >+ASM_PFX(IoReadFifo32): >+ xchg rcx, rdx >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoReadFifo32_NoRep >+ >+ cld >+ rep insd >+ jmp @IoReadFifo32_Done >+ >+@IoReadFifo32_NoRep: >+ jrcxz @IoReadFifo32_Done >+ >+@IoReadFifo32_Loop: >+ in eax, dx >+ mov dword [rdi], eax >+ add rdi, 4 >+ loop @IoReadFifo32_Loop >+ >+@IoReadFifo32_Done: >+ mov rdi, r8 ; restore rdi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo8 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo8) >+ASM_PFX(IoWriteFifo8): >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo8_NoRep >+ >+ cld >+ rep outsb >+ jmp @IoWriteFifo8_Done >+ >+@IoWriteFifo8_NoRep: >+ jrcxz @IoWriteFifo8_Done >+ >+@IoWriteFifo8_Loop: >+ mov byte [rsi], al >+ out dx, al >+ inc rsi >+ loop @IoWriteFifo8_Loop >+ >+@IoWriteFifo8_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo16 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo16) >+ASM_PFX(IoWriteFifo16): >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo16_NoRep >+ >+ cld >+ rep outsw >+ jmp @IoWriteFifo16_Done >+ >+@IoWriteFifo16_NoRep: >+ jrcxz @IoWriteFifo16_Done >+ >+@IoWriteFifo16_Loop: >+ mov word [rsi], ax >+ out dx, ax >+ add rsi, 2 >+ loop @IoWriteFifo16_Loop >+ >+@IoWriteFifo16_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+ >+;------------------------------------------------------------------------------ >+; VOID >+; EFIAPI >+; IoWriteFifo32 ( >+; IN UINTN Port, // rcx >+; IN UINTN Size, // rdx >+; IN VOID *Buffer // r8 >+; ); >+;------------------------------------------------------------------------------ >+global ASM_PFX(IoWriteFifo32) >+ASM_PFX(IoWriteFifo32): >+ xchg rcx, rdx >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi >+ >+ call SevNoRepIo ; Check if we need to unroll String I/O >+ test eax, eax >+ jnz @IoWriteFifo32_NoRep >+ >+ cld >+ rep outsd >+ jmp @IoWriteFifo32_Done >+ >+@IoWriteFifo32_NoRep: >+ jrcxz @IoWriteFifo32_Done >+ >+@IoWriteFifo32_Loop: >+ mov dword [rsi], eax >+ out dx, eax >+ add rsi, 4 >+ loop @IoWriteFifo32_Loop >+ >+@IoWriteFifo32_Done: >+ mov rsi, r8 ; restore rsi >+ ret >+ >diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc >index 2144979..56fb4cf 100644 >--- a/MdePkg/MdePkg.dsc >+++ b/MdePkg/MdePkg.dsc >@@ -3,6 +3,7 @@ > # > # Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR> > # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> >+# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR> > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the >BSD License >@@ -134,6 +135,7 @@ > > [Components.IA32, Components.X64] > MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf >+ MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf > MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf > MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf >-- >2.7.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library 2017-03-30 4:50 ` Gao, Liming @ 2017-03-30 12:30 ` Duran, Leo 2017-03-31 6:34 ` Gao, Liming 0 siblings, 1 reply; 5+ messages in thread From: Duran, Leo @ 2017-03-30 12:30 UTC (permalink / raw) To: Gao, Liming, edk2-devel@ml01.01.org; +Cc: Kinney, Michael D, Singh, Brijesh Liming, Should we remove the .asm code from the standard BaseIoLibIntrinsic.inf as well? (I'd prefer being consistent in both .INF instances: .ASM included or not) Thanks, Leo > -----Original Message----- > From: Gao, Liming [mailto:liming.gao@intel.com] > Sent: Wednesday, March 29, 2017 11:51 PM > To: Duran, Leo <leo.duran@amd.com>; edk2-devel@ml01.01.org > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Singh, Brijesh > <brijesh.singh@amd.com> > Subject: RE: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > > Leo: > Your change is good. My comment is not to add asm code. Nasm is enough. > For new added features, nasm is only required. > > Thanks > Liming > >-----Original Message----- > >From: Leo Duran [mailto:leo.duran@amd.com] > >Sent: Thursday, March 30, 2017 12:07 AM > >To: edk2-devel@ml01.01.org > >Cc: Leo Duran <leo.duran@amd.com>; Kinney, Michael D > ><michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; > >Brijesh Singh <brijesh.singh@amd.com> > >Subject: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > > > >This patch adds an SEV-specific .INF and corresponding assembly files, > >to unroll REP INSx/OUTSx on IoRead/WriteFifo#() routines when the SEV > >feature is enabled under a hypervisor environment. > > > >The new .INF only supports the IA32 and X64 architectures. > > > >Cc: Michael D Kinney <michael.d.kinney@intel.com> > >Cc: Liming Gao <liming.gao@intel.com> > >Contributed-under: TianoCore Contribution Agreement 1.0 > >Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> > >Signed-off-by: Leo Duran <leo.duran@amd.com> > >--- > > .../BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf | 63 +++++ > > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm | 297 > >+++++++++++++++++++++ > > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm | 293 > >++++++++++++++++++++ > > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm | 282 > >+++++++++++++++++++ > > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm | 282 > >+++++++++++++++++++ > > MdePkg/MdePkg.dsc | 2 + > > 6 files changed, 1219 insertions(+) > > create mode 100644 > >MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > create mode 100644 > >MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > > create mode 100644 > >MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > > create mode 100644 > >MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > > > >diff --git > >a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > >b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > >new file mode 100644 > >index 0000000..6f14075 > >--- /dev/null > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > >@@ -0,0 +1,63 @@ > >+## @file > >+# Instance of I/O Library using compiler intrinsics. > >+# > >+# I/O Library that uses compiler intrinsics to perform IN and OUT > >+instructions # for IA-32 and x64. On IPF, I/O port requests are > >+translated into MMIO > >requests. > >+# MMIO requests are forwarded directly to memory. For EBC, I/O port > >requests > >+# ASSERT(). > >+# > >+# Copyright (c) 2007 - 2015, Intel Corporation. All rights > >+reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All > >+rights reserved.<BR> # Copyright (c) 2017, AMD Incorporated. 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 > >+# http://opensource.org/licenses/bsd-license.php. > >+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >BASIS, > >+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > >EXPRESS OR IMPLIED. > >+# > >+## > >+ > >+[Defines] > >+ INF_VERSION = 0x00010005 > >+ BASE_NAME = BaseIoLibIntrinsicSev > >+ MODULE_UNI_FILE = BaseIoLibIntrinsic.uni > >+ FILE_GUID = 93742f95-6e71-4581-b600-8e1da443f95a > >+ MODULE_TYPE = BASE > >+ VERSION_STRING = 1.0 > >+ LIBRARY_CLASS = IoLib > >+ > >+ > >+# > >+# VALID_ARCHITECTURES = IA32 X64 > >+# > >+ > >+[Sources] > >+ IoLibMmioBuffer.c > >+ BaseIoLibIntrinsicInternal.h > >+ IoHighLevel.c > >+ > >+[Sources.IA32] > >+ IoLibGcc.c | GCC > >+ IoLibMsc.c | MSFT > >+ IoLibIcc.c | INTEL > >+ IoLib.c > >+ Ia32/IoFifoSev.nasm > >+ Ia32/IoFifoSev.asm > >+ > >+[Sources.X64] > >+ IoLibGcc.c | GCC > >+ IoLibMsc.c | MSFT > >+ IoLibIcc.c | INTEL > >+ IoLib.c > >+ X64/IoFifoSev.nasm > >+ X64/IoFifoSev.asm > >+ > >+[Packages] > >+ MdePkg/MdePkg.dec > >+ > >+[LibraryClasses] > >+ DebugLib > >+ BaseLib > >+ > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > >new file mode 100644 > >index 0000000..d81871c > >--- /dev/null > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > >@@ -0,0 +1,297 @@ > >+;--------------------------------------------------------------------- > >+--------- > >+; > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > >+http://opensource.org/licenses/bsd-license.php. > >+; > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >BASIS, > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > >EXPRESS OR IMPLIED. > >+; > >+;--------------------------------------------------------------------- > >+--------- > >+ > >+ .586P > >+ .model flat,C > >+ .code > >+ > >+;--------------------------------------------------------------------- > >+--------- ; Check whether we need to unroll the String I/O under SEV > >+guest ; > >+; Return // eax (1 - unroll, 0 - no unroll) > >+;--------------------------------------------------------------------- > >+--------- > >+SevNoRepIo PROC > >+ > >+ ; CPUID clobbers ebx, ecx and edx > >+ push ebx > >+ push ecx > >+ push edx > >+ > >+ ; Check if we are running under hypervisor ; CPUID(1).ECX Bit 31 > >+ mov eax, 1 > >+ cpuid > >+ bt ecx, 31 > >+ jnc @UseRepIo > >+ > >+ ; Check if we have Memory encryption CPUID leaf > >+ mov eax, 0x80000000 > >+ cpuid > >+ cmp eax, 0x8000001f > >+ jl @UseRepIo > >+ > >+ ; Check for memory encryption feature: > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > >+ ; > >+ mov eax, 0x8000001f > >+ cpuid > >+ bt eax, 1 > >+ jnc @UseRepIo > >+ > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > >+ mov ecx, 0xc0010131 > >+ rdmsr > >+ > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > >+ and eax, 3 > >+ cmp eax, 1 > >+ je @SevNoRepIo_Done > >+ > >+@UseRepIo: > >+ xor eax, eax > >+ > >+@SevNoRepIo_Done: > >+ pop edx > >+ pop ecx > >+ pop ebx > >+ ret > >+SevNoRepIo ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo8 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo8 PROC > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo8_NoRep > >+ > >+ cld > >+ rep insb > >+ jmp @IoReadFifo8_Done > >+ > >+@IoReadFifo8_NoRep: > >+ jecxz @IoReadFifo8_Done > >+ > >+@IoReadFifo8_Loop: > >+ in al, dx > >+ mov byte [edi], al > >+ inc edi > >+ loop @IoReadFifo8_Loop > >+ > >+@IoReadFifo8_Done: > >+ pop edi > >+ ret > >+IoReadFifo8 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo16 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo16 PROC > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo16_NoRep > >+ > >+ cld > >+ rep insw > >+ jmp @IoReadFifo16_Done > >+ > >+@IoReadFifo16_NoRep: > >+ jecxz @IoReadFifo16_Done > >+ > >+@IoReadFifo16_Loop: > >+ in ax, dx > >+ mov word [edi], ax > >+ add edi, 2 > >+ loop @IoReadFifo16_Loop > >+ > >+@IoReadFifo16_Done: > >+ pop edi > >+ ret > >+IoReadFifo16 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo32 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo32 PROC > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo32_NoRep > >+ > >+ cld > >+ rep insd > >+ jmp @IoReadFifo32_Done > >+ > >+@IoReadFifo32_NoRep: > >+ jecxz @IoReadFifo32_Done > >+ > >+@IoReadFifo32_Loop: > >+ in eax, dx > >+ mov dword [edi], eax > >+ add edi, 4 > >+ loop @IoReadFifo32_Loop > >+ > >+@IoReadFifo32_Done: > >+ pop edi > >+ ret > >+IoReadFifo32 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo8 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo8 PROC > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo8_NoRep > >+ > >+ cld > >+ rep outsb > >+ jmp @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_NoRep: > >+ jecxz @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_Loop: > >+ mov byte [esi], al > >+ out dx, al > >+ inc esi > >+ loop @IoWriteFifo8_Loop > >+ > >+@IoWriteFifo8_Done: > >+ pop esi > >+ ret > >+IoWriteFifo8 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo16 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo16 PROC > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo16_NoRep > >+ > >+ cld > >+ rep outsw > >+ jmp @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_NoRep: > >+ jecxz @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_Loop: > >+ mov word [esi], ax > >+ out dx, ax > >+ add esi, 2 > >+ loop @IoWriteFifo16_Loop > >+ > >+@IoWriteFifo16_Done: > >+ pop esi > >+ ret > >+IoWriteFifo16 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo32 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo32 PROC > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo32_NoRep > >+ > >+ cld > >+ rep outsd > >+ jmp @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_NoRep: > >+ jecxz @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_Loop: > >+ mov dword [esi], eax > >+ out dx, eax > >+ add esi, 4 > >+ loop @IoWriteFifo32_Loop > >+ > >+@IoWriteFifo32_Done: > >+ pop esi > >+ ret > >+IoWriteFifo32 ENDP > >+ > >+ END > >+ > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > >new file mode 100644 > >index 0000000..9adb972 > >--- /dev/null > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > >@@ -0,0 +1,293 @@ > >+;--------------------------------------------------------------------- > >+--------- > >+; > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > >+http://opensource.org/licenses/bsd-license.php. > >+; > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >BASIS, > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > >EXPRESS OR IMPLIED. > >+; > >+;--------------------------------------------------------------------- > >+--------- > >+ > >+ SECTION .text > >+ > >+;--------------------------------------------------------------------- > >+--------- ; Check whether we need to unroll the String I/O under SEV > >+guest ; > >+; Return // eax (1 - unroll, 0 - no unroll) > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(SevNoRepIo) > >+ASM_PFX(SevNoRepIo): > >+ > >+ ; CPUID clobbers ebx, ecx and edx > >+ push ebx > >+ push ecx > >+ push edx > >+ > >+ ; Check if we are running under hypervisor ; CPUID(1).ECX Bit 31 > >+ mov eax, 1 > >+ cpuid > >+ bt ecx, 31 > >+ jnc @UseRepIo > >+ > >+ ; Check if we have Memory encryption CPUID leaf > >+ mov eax, 0x80000000 > >+ cpuid > >+ cmp eax, 0x8000001f > >+ jl @UseRepIo > >+ > >+ ; Check for memory encryption feature: > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > >+ ; > >+ mov eax, 0x8000001f > >+ cpuid > >+ bt eax, 1 > >+ jnc @UseRepIo > >+ > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > >+ mov ecx, 0xc0010131 > >+ rdmsr > >+ > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > >+ and eax, 3 > >+ cmp eax, 1 > >+ je @SevNoRepIo_Done > >+ > >+@UseRepIo: > >+ xor eax, eax > >+ > >+@SevNoRepIo_Done: > >+ pop edx > >+ pop ecx > >+ pop ebx > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo8 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo8) > >+ASM_PFX(IoReadFifo8): > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo8_NoRep > >+ > >+ cld > >+ rep insb > >+ jmp @IoReadFifo8_Done > >+ > >+@IoReadFifo8_NoRep: > >+ jecxz @IoReadFifo8_Done > >+ > >+@IoReadFifo8_Loop: > >+ in al, dx > >+ mov byte [edi], al > >+ inc edi > >+ loop @IoReadFifo8_Loop > >+ > >+@IoReadFifo8_Done: > >+ pop edi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo16 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo16) > >+ASM_PFX(IoReadFifo16): > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo16_NoRep > >+ > >+ cld > >+ rep insw > >+ jmp @IoReadFifo16_Done > >+ > >+@IoReadFifo16_NoRep: > >+ jecxz @IoReadFifo16_Done > >+ > >+@IoReadFifo16_Loop: > >+ in ax, dx > >+ mov word [edi], ax > >+ add edi, 2 > >+ loop @IoReadFifo16_Loop > >+ > >+@IoReadFifo16_Done: > >+ pop edi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo32 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; OUT VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo32) > >+ASM_PFX(IoReadFifo32): > >+ push edi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov edi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll the rep > >+ test eax, eax > >+ jnz @IoReadFifo32_NoRep > >+ > >+ cld > >+ rep insd > >+ jmp @IoReadFifo32_Done > >+ > >+@IoReadFifo32_NoRep: > >+ jecxz @IoReadFifo32_Done > >+ > >+@IoReadFifo32_Loop: > >+ in eax, dx > >+ mov dword [edi], eax > >+ add edi, 4 > >+ loop @IoReadFifo32_Loop > >+ > >+@IoReadFifo32_Done: > >+ pop edi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo8 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo8) > >+ASM_PFX(IoWriteFifo8): > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo8_NoRep > >+ > >+ cld > >+ rep outsb > >+ jmp @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_NoRep: > >+ jecxz @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_Loop: > >+ mov byte [esi], al > >+ out dx, al > >+ inc esi > >+ loop @IoWriteFifo8_Loop > >+ > >+@IoWriteFifo8_Done: > >+ pop esi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo16 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo16) > >+ASM_PFX(IoWriteFifo16): > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo16_NoRep > >+ > >+ cld > >+ rep outsw > >+ jmp @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_NoRep: > >+ jecxz @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_Loop: > >+ mov word [esi], ax > >+ out dx, ax > >+ add esi, 2 > >+ loop @IoWriteFifo16_Loop > >+ > >+@IoWriteFifo16_Done: > >+ pop esi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo32 ( > >+; IN UINTN Port, > >+; IN UINTN Size, > >+; IN VOID *Buffer > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo32) > >+ASM_PFX(IoWriteFifo32): > >+ push esi > >+ mov dx, [esp + 8] > >+ mov ecx, [esp + 12] > >+ mov esi, [esp + 16] > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo32_NoRep > >+ > >+ cld > >+ rep outsd > >+ jmp @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_NoRep: > >+ jecxz @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_Loop: > >+ mov dword [esi], eax > >+ out dx, eax > >+ add esi, 4 > >+ loop @IoWriteFifo32_Loop > >+ > >+@IoWriteFifo32_Done: > >+ pop esi > >+ ret > >+ > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > >new file mode 100644 > >index 0000000..fe9e171 > >--- /dev/null > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > >@@ -0,0 +1,282 @@ > >+;--------------------------------------------------------------------- > >+--------- > >+; > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > >+http://opensource.org/licenses/bsd-license.php. > >+; > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >BASIS, > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > >EXPRESS OR IMPLIED. > >+; > >+;--------------------------------------------------------------------- > >+--------- > >+ > >+ .code > >+ > >+;--------------------------------------------------------------------- > >+--------- ; Check whether we need to unroll the String I/O in SEV > >+guest ; > >+; Return // eax (1 - unroll, 0 - no unroll) > >+;--------------------------------------------------------------------- > >+--------- > >+SevNoRepIo PROC > >+ ; CPUID clobbers ebx, ecx and edx > >+ push rbx > >+ push rcx > >+ push rdx > >+ > >+ ; Check if we are runing under hypervisor ; CPUID(1).ECX Bit 31 > >+ mov eax, 1 > >+ cpuid > >+ bt ecx, 31 > >+ jnc @UseRepIo > >+ > >+ ; Check if we have Memory encryption CPUID leaf > >+ mov eax, 0x80000000 > >+ cpuid > >+ cmp eax, 0x8000001f > >+ jl @UseRepIo > >+ > >+ ; Check for memory encryption feature: > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > >+ ; > >+ mov eax, 0x8000001f > >+ cpuid > >+ bt eax, 1 > >+ jnc @UseRepIo > >+ > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > >+ mov ecx, 0xc0010131 > >+ rdmsr > >+ > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > >+ and eax, 3 > >+ cmp eax, 1 > >+ je @SevNoRepIo_Done > >+ > >+@UseRepIo: > >+ xor eax, eax > >+ > >+@SevNoRepIo_Done: > >+ pop rdx > >+ pop rcx > >+ pop rbx > >+ ret > >+SevNoRepIo ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo8 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo8 PROC > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo8_NoRep > >+ > >+ cld > >+ rep insb > >+ jmp @IoReadFifo8_Done > >+ > >+@IoReadFifo8_NoRep: > >+ jrcxz @IoReadFifo8_Done > >+ > >+@IoReadFifo8_Loop: > >+ in al, dx > >+ mov byte [rdi], al > >+ inc rdi > >+ loop @IoReadFifo8_Loop > >+ > >+@IoReadFifo8_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+IoReadFifo8 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo16 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo16 PROC > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo16_NoRep > >+ > >+ cld > >+ rep insw > >+ jmp @IoReadFifo16_Done > >+ > >+@IoReadFifo16_NoRep: > >+ jrcxz @IoReadFifo16_Done > >+ > >+@IoReadFifo16_Loop: > >+ in ax, dx > >+ mov word [rdi], ax > >+ add rdi, 2 > >+ loop @IoReadFifo16_Loop > >+ > >+@IoReadFifo16_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+IoReadFifo16 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo32 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoReadFifo32 PROC > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo32_NoRep > >+ > >+ cld > >+ rep insd > >+ jmp @IoReadFifo32_Done > >+ > >+@IoReadFifo32_NoRep: > >+ jrcxz @IoReadFifo32_Done > >+ > >+@IoReadFifo32_Loop: > >+ in eax, dx > >+ mov dword [rdi], eax > >+ add rdi, 4 > >+ loop @IoReadFifo32_Loop > >+ > >+@IoReadFifo32_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+IoReadFifo32 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo8 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo8 PROC > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo8_NoRep > >+ > >+ cld > >+ rep outsb > >+ jmp @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_NoRep: > >+ jrcxz @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_Loop: > >+ mov byte [rsi], al > >+ out dx, al > >+ inc rsi > >+ loop @IoWriteFifo8_Loop > >+ > >+@IoWriteFifo8_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+IoWriteFifo8 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo16 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo16 PROC > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo16_NoRep > >+ > >+ cld > >+ rep outsw > >+ jmp @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_NoRep: > >+ jrcxz @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_Loop: > >+ mov word [rsi], ax > >+ out dx, ax > >+ add rsi, 2 > >+ loop @IoWriteFifo16_Loop > >+ > >+@IoWriteFifo16_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+IoWriteFifo16 ENDP > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo32 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+IoWriteFifo32 PROC > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo32_NoRep > >+ > >+ cld > >+ rep outsd > >+ jmp @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_NoRep: > >+ jrcxz @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_Loop: > >+ mov dword [rsi], eax > >+ out dx, eax > >+ add rsi, 4 > >+ loop @IoWriteFifo32_Loop > >+ > >+@IoWriteFifo32_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+IoWriteFifo32 ENDP > >+ > >+ END > >+ > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > >new file mode 100644 > >index 0000000..20e3e64 > >--- /dev/null > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > >@@ -0,0 +1,282 @@ > >+;--------------------------------------------------------------------- > >+--------- > >+; > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > >+http://opensource.org/licenses/bsd-license.php. > >+; > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > >BASIS, > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > >EXPRESS OR IMPLIED. > >+; > >+;--------------------------------------------------------------------- > >+--------- > >+ > >+ DEFAULT REL > >+ SECTION .text > >+ > >+;--------------------------------------------------------------------- > >+--------- ; Check whether we need to unroll the String I/O in SEV > >+guest ; > >+; Return // eax (1 - unroll, 0 - no unroll) > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(SevNoRepIo) > >+ASM_PFX(SevNoRepIo): > >+ > >+ ; CPUID clobbers ebx, ecx and edx > >+ push rbx > >+ push rcx > >+ push rdx > >+ > >+ ; Check if we are runing under hypervisor ; CPUID(1).ECX Bit 31 > >+ mov eax, 1 > >+ cpuid > >+ bt ecx, 31 > >+ jnc @UseRepIo > >+ > >+ ; Check if we have Memory encryption CPUID leaf > >+ mov eax, 0x80000000 > >+ cpuid > >+ cmp eax, 0x8000001f > >+ jl @UseRepIo > >+ > >+ ; Check for memory encryption feature: > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > >+ ; > >+ mov eax, 0x8000001f > >+ cpuid > >+ bt eax, 1 > >+ jnc @UseRepIo > >+ > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > >+ mov ecx, 0xc0010131 > >+ rdmsr > >+ > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > >+ and eax, 3 > >+ cmp eax, 1 > >+ je @SevNoRepIo_Done > >+ > >+@UseRepIo: > >+ xor eax, eax > >+ > >+@SevNoRepIo_Done: > >+ pop rdx > >+ pop rcx > >+ pop rbx > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo8 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo8) > >+ASM_PFX(IoReadFifo8): > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo8_NoRep > >+ > >+ cld > >+ rep insb > >+ jmp @IoReadFifo8_Done > >+ > >+@IoReadFifo8_NoRep: > >+ jrcxz @IoReadFifo8_Done > >+ > >+@IoReadFifo8_Loop: > >+ in al, dx > >+ mov byte [rdi], al > >+ inc rdi > >+ loop @IoReadFifo8_Loop > >+ > >+@IoReadFifo8_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo16 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo16) > >+ASM_PFX(IoReadFifo16): > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo16_NoRep > >+ > >+ cld > >+ rep insw > >+ jmp @IoReadFifo16_Done > >+ > >+@IoReadFifo16_NoRep: > >+ jrcxz @IoReadFifo16_Done > >+ > >+@IoReadFifo16_Loop: > >+ in ax, dx > >+ mov word [rdi], ax > >+ add rdi, 2 > >+ loop @IoReadFifo16_Loop > >+ > >+@IoReadFifo16_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoReadFifo32 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; OUT VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoReadFifo32) > >+ASM_PFX(IoReadFifo32): > >+ xchg rcx, rdx > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoReadFifo32_NoRep > >+ > >+ cld > >+ rep insd > >+ jmp @IoReadFifo32_Done > >+ > >+@IoReadFifo32_NoRep: > >+ jrcxz @IoReadFifo32_Done > >+ > >+@IoReadFifo32_Loop: > >+ in eax, dx > >+ mov dword [rdi], eax > >+ add rdi, 4 > >+ loop @IoReadFifo32_Loop > >+ > >+@IoReadFifo32_Done: > >+ mov rdi, r8 ; restore rdi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo8 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo8) > >+ASM_PFX(IoWriteFifo8): > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo8_NoRep > >+ > >+ cld > >+ rep outsb > >+ jmp @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_NoRep: > >+ jrcxz @IoWriteFifo8_Done > >+ > >+@IoWriteFifo8_Loop: > >+ mov byte [rsi], al > >+ out dx, al > >+ inc rsi > >+ loop @IoWriteFifo8_Loop > >+ > >+@IoWriteFifo8_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo16 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo16) > >+ASM_PFX(IoWriteFifo16): > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo16_NoRep > >+ > >+ cld > >+ rep outsw > >+ jmp @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_NoRep: > >+ jrcxz @IoWriteFifo16_Done > >+ > >+@IoWriteFifo16_Loop: > >+ mov word [rsi], ax > >+ out dx, ax > >+ add rsi, 2 > >+ loop @IoWriteFifo16_Loop > >+ > >+@IoWriteFifo16_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+ > >+;--------------------------------------------------------------------- > >+--------- > >+; VOID > >+; EFIAPI > >+; IoWriteFifo32 ( > >+; IN UINTN Port, // rcx > >+; IN UINTN Size, // rdx > >+; IN VOID *Buffer // r8 > >+; ); > >+;--------------------------------------------------------------------- > >+--------- > >+global ASM_PFX(IoWriteFifo32) > >+ASM_PFX(IoWriteFifo32): > >+ xchg rcx, rdx > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > >+ > >+ call SevNoRepIo ; Check if we need to unroll String I/O > >+ test eax, eax > >+ jnz @IoWriteFifo32_NoRep > >+ > >+ cld > >+ rep outsd > >+ jmp @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_NoRep: > >+ jrcxz @IoWriteFifo32_Done > >+ > >+@IoWriteFifo32_Loop: > >+ mov dword [rsi], eax > >+ out dx, eax > >+ add rsi, 4 > >+ loop @IoWriteFifo32_Loop > >+ > >+@IoWriteFifo32_Done: > >+ mov rsi, r8 ; restore rsi > >+ ret > >+ > >diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index > >2144979..56fb4cf 100644 > >--- a/MdePkg/MdePkg.dsc > >+++ b/MdePkg/MdePkg.dsc > >@@ -3,6 +3,7 @@ > > # > > # Copyright (c) 2007 - 2017, Intel Corporation. All rights > >reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All > >rights reserved.<BR> > >+# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR> > > # > > # This program and the accompanying materials > > # are licensed and made available under the terms and conditions of the > >BSD License > >@@ -134,6 +135,7 @@ > > > > [Components.IA32, Components.X64] > > MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > >+ MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf > > MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf > > MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf > >-- > >2.7.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library 2017-03-30 12:30 ` Duran, Leo @ 2017-03-31 6:34 ` Gao, Liming 0 siblings, 0 replies; 5+ messages in thread From: Gao, Liming @ 2017-03-31 6:34 UTC (permalink / raw) To: 'Duran, Leo', edk2-devel@ml01.01.org Cc: Kinney, Michael D, Singh, Brijesh, Gao, Liming Leo: There is no change for the existing ones. For new features, only nasm will be added. Thanks Liming > -----Original Message----- > From: Duran, Leo [mailto:leo.duran@amd.com] > Sent: Thursday, March 30, 2017 8:31 PM > To: Gao, Liming <liming.gao@intel.com>; edk2-devel@ml01.01.org > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Singh, Brijesh <brijesh.singh@amd.com> > Subject: RE: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > > Liming, > > Should we remove the .asm code from the standard BaseIoLibIntrinsic.inf as well? > (I'd prefer being consistent in both .INF instances: .ASM included or not) > > Thanks, > Leo > > > -----Original Message----- > > From: Gao, Liming [mailto:liming.gao@intel.com] > > Sent: Wednesday, March 29, 2017 11:51 PM > > To: Duran, Leo <leo.duran@amd.com>; edk2-devel@ml01.01.org > > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Singh, Brijesh > > <brijesh.singh@amd.com> > > Subject: RE: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > > > > Leo: > > Your change is good. My comment is not to add asm code. Nasm is enough. > > For new added features, nasm is only required. > > > > Thanks > > Liming > > >-----Original Message----- > > >From: Leo Duran [mailto:leo.duran@amd.com] > > >Sent: Thursday, March 30, 2017 12:07 AM > > >To: edk2-devel@ml01.01.org > > >Cc: Leo Duran <leo.duran@amd.com>; Kinney, Michael D > > ><michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>; > > >Brijesh Singh <brijesh.singh@amd.com> > > >Subject: [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library > > > > > >This patch adds an SEV-specific .INF and corresponding assembly files, > > >to unroll REP INSx/OUTSx on IoRead/WriteFifo#() routines when the SEV > > >feature is enabled under a hypervisor environment. > > > > > >The new .INF only supports the IA32 and X64 architectures. > > > > > >Cc: Michael D Kinney <michael.d.kinney@intel.com> > > >Cc: Liming Gao <liming.gao@intel.com> > > >Contributed-under: TianoCore Contribution Agreement 1.0 > > >Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> > > >Signed-off-by: Leo Duran <leo.duran@amd.com> > > >--- > > > .../BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf | 63 +++++ > > > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm | 297 > > >+++++++++++++++++++++ > > > .../Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm | 293 > > >++++++++++++++++++++ > > > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm | 282 > > >+++++++++++++++++++ > > > .../Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm | 282 > > >+++++++++++++++++++ > > > MdePkg/MdePkg.dsc | 2 + > > > 6 files changed, 1219 insertions(+) > > > create mode 100644 > > >MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > > create mode 100644 > > >MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > > > create mode 100644 > > >MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > > > create mode 100644 MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > > > create mode 100644 > > >MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > > > > > >diff --git > > >a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > >b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > >new file mode 100644 > > >index 0000000..6f14075 > > >--- /dev/null > > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > >@@ -0,0 +1,63 @@ > > >+## @file > > >+# Instance of I/O Library using compiler intrinsics. > > >+# > > >+# I/O Library that uses compiler intrinsics to perform IN and OUT > > >+instructions # for IA-32 and x64. On IPF, I/O port requests are > > >+translated into MMIO > > >requests. > > >+# MMIO requests are forwarded directly to memory. For EBC, I/O port > > >requests > > >+# ASSERT(). > > >+# > > >+# Copyright (c) 2007 - 2015, Intel Corporation. All rights > > >+reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All > > >+rights reserved.<BR> # Copyright (c) 2017, AMD Incorporated. 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 > > >+# http://opensource.org/licenses/bsd-license.php. > > >+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > >BASIS, > > >+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > >EXPRESS OR IMPLIED. > > >+# > > >+## > > >+ > > >+[Defines] > > >+ INF_VERSION = 0x00010005 > > >+ BASE_NAME = BaseIoLibIntrinsicSev > > >+ MODULE_UNI_FILE = BaseIoLibIntrinsic.uni > > >+ FILE_GUID = 93742f95-6e71-4581-b600-8e1da443f95a > > >+ MODULE_TYPE = BASE > > >+ VERSION_STRING = 1.0 > > >+ LIBRARY_CLASS = IoLib > > >+ > > >+ > > >+# > > >+# VALID_ARCHITECTURES = IA32 X64 > > >+# > > >+ > > >+[Sources] > > >+ IoLibMmioBuffer.c > > >+ BaseIoLibIntrinsicInternal.h > > >+ IoHighLevel.c > > >+ > > >+[Sources.IA32] > > >+ IoLibGcc.c | GCC > > >+ IoLibMsc.c | MSFT > > >+ IoLibIcc.c | INTEL > > >+ IoLib.c > > >+ Ia32/IoFifoSev.nasm > > >+ Ia32/IoFifoSev.asm > > >+ > > >+[Sources.X64] > > >+ IoLibGcc.c | GCC > > >+ IoLibMsc.c | MSFT > > >+ IoLibIcc.c | INTEL > > >+ IoLib.c > > >+ X64/IoFifoSev.nasm > > >+ X64/IoFifoSev.asm > > >+ > > >+[Packages] > > >+ MdePkg/MdePkg.dec > > >+ > > >+[LibraryClasses] > > >+ DebugLib > > >+ BaseLib > > >+ > > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > > >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > > >new file mode 100644 > > >index 0000000..d81871c > > >--- /dev/null > > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.asm > > >@@ -0,0 +1,297 @@ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; > > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > > >+http://opensource.org/licenses/bsd-license.php. > > >+; > > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > >BASIS, > > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > >EXPRESS OR IMPLIED. > > >+; > > >+;--------------------------------------------------------------------- > > >+--------- > > >+ > > >+ .586P > > >+ .model flat,C > > >+ .code > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- ; Check whether we need to unroll the String I/O under SEV > > >+guest ; > > >+; Return // eax (1 - unroll, 0 - no unroll) > > >+;--------------------------------------------------------------------- > > >+--------- > > >+SevNoRepIo PROC > > >+ > > >+ ; CPUID clobbers ebx, ecx and edx > > >+ push ebx > > >+ push ecx > > >+ push edx > > >+ > > >+ ; Check if we are running under hypervisor ; CPUID(1).ECX Bit 31 > > >+ mov eax, 1 > > >+ cpuid > > >+ bt ecx, 31 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if we have Memory encryption CPUID leaf > > >+ mov eax, 0x80000000 > > >+ cpuid > > >+ cmp eax, 0x8000001f > > >+ jl @UseRepIo > > >+ > > >+ ; Check for memory encryption feature: > > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > > >+ ; > > >+ mov eax, 0x8000001f > > >+ cpuid > > >+ bt eax, 1 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > > >+ mov ecx, 0xc0010131 > > >+ rdmsr > > >+ > > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > > >+ and eax, 3 > > >+ cmp eax, 1 > > >+ je @SevNoRepIo_Done > > >+ > > >+@UseRepIo: > > >+ xor eax, eax > > >+ > > >+@SevNoRepIo_Done: > > >+ pop edx > > >+ pop ecx > > >+ pop ebx > > >+ ret > > >+SevNoRepIo ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo8 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo8 PROC > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo8_NoRep > > >+ > > >+ cld > > >+ rep insb > > >+ jmp @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_NoRep: > > >+ jecxz @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_Loop: > > >+ in al, dx > > >+ mov byte [edi], al > > >+ inc edi > > >+ loop @IoReadFifo8_Loop > > >+ > > >+@IoReadFifo8_Done: > > >+ pop edi > > >+ ret > > >+IoReadFifo8 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo16 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo16 PROC > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo16_NoRep > > >+ > > >+ cld > > >+ rep insw > > >+ jmp @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_NoRep: > > >+ jecxz @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_Loop: > > >+ in ax, dx > > >+ mov word [edi], ax > > >+ add edi, 2 > > >+ loop @IoReadFifo16_Loop > > >+ > > >+@IoReadFifo16_Done: > > >+ pop edi > > >+ ret > > >+IoReadFifo16 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo32 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo32 PROC > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo32_NoRep > > >+ > > >+ cld > > >+ rep insd > > >+ jmp @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_NoRep: > > >+ jecxz @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_Loop: > > >+ in eax, dx > > >+ mov dword [edi], eax > > >+ add edi, 4 > > >+ loop @IoReadFifo32_Loop > > >+ > > >+@IoReadFifo32_Done: > > >+ pop edi > > >+ ret > > >+IoReadFifo32 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo8 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo8 PROC > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo8_NoRep > > >+ > > >+ cld > > >+ rep outsb > > >+ jmp @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_NoRep: > > >+ jecxz @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_Loop: > > >+ mov byte [esi], al > > >+ out dx, al > > >+ inc esi > > >+ loop @IoWriteFifo8_Loop > > >+ > > >+@IoWriteFifo8_Done: > > >+ pop esi > > >+ ret > > >+IoWriteFifo8 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo16 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo16 PROC > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo16_NoRep > > >+ > > >+ cld > > >+ rep outsw > > >+ jmp @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_NoRep: > > >+ jecxz @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_Loop: > > >+ mov word [esi], ax > > >+ out dx, ax > > >+ add esi, 2 > > >+ loop @IoWriteFifo16_Loop > > >+ > > >+@IoWriteFifo16_Done: > > >+ pop esi > > >+ ret > > >+IoWriteFifo16 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo32 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo32 PROC > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo32_NoRep > > >+ > > >+ cld > > >+ rep outsd > > >+ jmp @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_NoRep: > > >+ jecxz @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_Loop: > > >+ mov dword [esi], eax > > >+ out dx, eax > > >+ add esi, 4 > > >+ loop @IoWriteFifo32_Loop > > >+ > > >+@IoWriteFifo32_Done: > > >+ pop esi > > >+ ret > > >+IoWriteFifo32 ENDP > > >+ > > >+ END > > >+ > > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > > >b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > > >new file mode 100644 > > >index 0000000..9adb972 > > >--- /dev/null > > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/Ia32/IoFifoSev.nasm > > >@@ -0,0 +1,293 @@ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; > > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > > >+http://opensource.org/licenses/bsd-license.php. > > >+; > > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > >BASIS, > > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > >EXPRESS OR IMPLIED. > > >+; > > >+;--------------------------------------------------------------------- > > >+--------- > > >+ > > >+ SECTION .text > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- ; Check whether we need to unroll the String I/O under SEV > > >+guest ; > > >+; Return // eax (1 - unroll, 0 - no unroll) > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(SevNoRepIo) > > >+ASM_PFX(SevNoRepIo): > > >+ > > >+ ; CPUID clobbers ebx, ecx and edx > > >+ push ebx > > >+ push ecx > > >+ push edx > > >+ > > >+ ; Check if we are running under hypervisor ; CPUID(1).ECX Bit 31 > > >+ mov eax, 1 > > >+ cpuid > > >+ bt ecx, 31 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if we have Memory encryption CPUID leaf > > >+ mov eax, 0x80000000 > > >+ cpuid > > >+ cmp eax, 0x8000001f > > >+ jl @UseRepIo > > >+ > > >+ ; Check for memory encryption feature: > > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > > >+ ; > > >+ mov eax, 0x8000001f > > >+ cpuid > > >+ bt eax, 1 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > > >+ mov ecx, 0xc0010131 > > >+ rdmsr > > >+ > > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > > >+ and eax, 3 > > >+ cmp eax, 1 > > >+ je @SevNoRepIo_Done > > >+ > > >+@UseRepIo: > > >+ xor eax, eax > > >+ > > >+@SevNoRepIo_Done: > > >+ pop edx > > >+ pop ecx > > >+ pop ebx > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo8 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo8) > > >+ASM_PFX(IoReadFifo8): > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo8_NoRep > > >+ > > >+ cld > > >+ rep insb > > >+ jmp @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_NoRep: > > >+ jecxz @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_Loop: > > >+ in al, dx > > >+ mov byte [edi], al > > >+ inc edi > > >+ loop @IoReadFifo8_Loop > > >+ > > >+@IoReadFifo8_Done: > > >+ pop edi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo16 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo16) > > >+ASM_PFX(IoReadFifo16): > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo16_NoRep > > >+ > > >+ cld > > >+ rep insw > > >+ jmp @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_NoRep: > > >+ jecxz @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_Loop: > > >+ in ax, dx > > >+ mov word [edi], ax > > >+ add edi, 2 > > >+ loop @IoReadFifo16_Loop > > >+ > > >+@IoReadFifo16_Done: > > >+ pop edi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo32 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; OUT VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo32) > > >+ASM_PFX(IoReadFifo32): > > >+ push edi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov edi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll the rep > > >+ test eax, eax > > >+ jnz @IoReadFifo32_NoRep > > >+ > > >+ cld > > >+ rep insd > > >+ jmp @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_NoRep: > > >+ jecxz @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_Loop: > > >+ in eax, dx > > >+ mov dword [edi], eax > > >+ add edi, 4 > > >+ loop @IoReadFifo32_Loop > > >+ > > >+@IoReadFifo32_Done: > > >+ pop edi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo8 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo8) > > >+ASM_PFX(IoWriteFifo8): > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo8_NoRep > > >+ > > >+ cld > > >+ rep outsb > > >+ jmp @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_NoRep: > > >+ jecxz @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_Loop: > > >+ mov byte [esi], al > > >+ out dx, al > > >+ inc esi > > >+ loop @IoWriteFifo8_Loop > > >+ > > >+@IoWriteFifo8_Done: > > >+ pop esi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo16 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo16) > > >+ASM_PFX(IoWriteFifo16): > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo16_NoRep > > >+ > > >+ cld > > >+ rep outsw > > >+ jmp @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_NoRep: > > >+ jecxz @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_Loop: > > >+ mov word [esi], ax > > >+ out dx, ax > > >+ add esi, 2 > > >+ loop @IoWriteFifo16_Loop > > >+ > > >+@IoWriteFifo16_Done: > > >+ pop esi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo32 ( > > >+; IN UINTN Port, > > >+; IN UINTN Size, > > >+; IN VOID *Buffer > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo32) > > >+ASM_PFX(IoWriteFifo32): > > >+ push esi > > >+ mov dx, [esp + 8] > > >+ mov ecx, [esp + 12] > > >+ mov esi, [esp + 16] > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo32_NoRep > > >+ > > >+ cld > > >+ rep outsd > > >+ jmp @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_NoRep: > > >+ jecxz @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_Loop: > > >+ mov dword [esi], eax > > >+ out dx, eax > > >+ add esi, 4 > > >+ loop @IoWriteFifo32_Loop > > >+ > > >+@IoWriteFifo32_Done: > > >+ pop esi > > >+ ret > > >+ > > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > > >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > > >new file mode 100644 > > >index 0000000..fe9e171 > > >--- /dev/null > > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.asm > > >@@ -0,0 +1,282 @@ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; > > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > > >+http://opensource.org/licenses/bsd-license.php. > > >+; > > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > >BASIS, > > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > >EXPRESS OR IMPLIED. > > >+; > > >+;--------------------------------------------------------------------- > > >+--------- > > >+ > > >+ .code > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- ; Check whether we need to unroll the String I/O in SEV > > >+guest ; > > >+; Return // eax (1 - unroll, 0 - no unroll) > > >+;--------------------------------------------------------------------- > > >+--------- > > >+SevNoRepIo PROC > > >+ ; CPUID clobbers ebx, ecx and edx > > >+ push rbx > > >+ push rcx > > >+ push rdx > > >+ > > >+ ; Check if we are runing under hypervisor ; CPUID(1).ECX Bit 31 > > >+ mov eax, 1 > > >+ cpuid > > >+ bt ecx, 31 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if we have Memory encryption CPUID leaf > > >+ mov eax, 0x80000000 > > >+ cpuid > > >+ cmp eax, 0x8000001f > > >+ jl @UseRepIo > > >+ > > >+ ; Check for memory encryption feature: > > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > > >+ ; > > >+ mov eax, 0x8000001f > > >+ cpuid > > >+ bt eax, 1 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > > >+ mov ecx, 0xc0010131 > > >+ rdmsr > > >+ > > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > > >+ and eax, 3 > > >+ cmp eax, 1 > > >+ je @SevNoRepIo_Done > > >+ > > >+@UseRepIo: > > >+ xor eax, eax > > >+ > > >+@SevNoRepIo_Done: > > >+ pop rdx > > >+ pop rcx > > >+ pop rbx > > >+ ret > > >+SevNoRepIo ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo8 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo8 PROC > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo8_NoRep > > >+ > > >+ cld > > >+ rep insb > > >+ jmp @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_NoRep: > > >+ jrcxz @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_Loop: > > >+ in al, dx > > >+ mov byte [rdi], al > > >+ inc rdi > > >+ loop @IoReadFifo8_Loop > > >+ > > >+@IoReadFifo8_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+IoReadFifo8 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo16 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo16 PROC > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo16_NoRep > > >+ > > >+ cld > > >+ rep insw > > >+ jmp @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_NoRep: > > >+ jrcxz @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_Loop: > > >+ in ax, dx > > >+ mov word [rdi], ax > > >+ add rdi, 2 > > >+ loop @IoReadFifo16_Loop > > >+ > > >+@IoReadFifo16_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+IoReadFifo16 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo32 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoReadFifo32 PROC > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo32_NoRep > > >+ > > >+ cld > > >+ rep insd > > >+ jmp @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_NoRep: > > >+ jrcxz @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_Loop: > > >+ in eax, dx > > >+ mov dword [rdi], eax > > >+ add rdi, 4 > > >+ loop @IoReadFifo32_Loop > > >+ > > >+@IoReadFifo32_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+IoReadFifo32 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo8 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo8 PROC > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo8_NoRep > > >+ > > >+ cld > > >+ rep outsb > > >+ jmp @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_NoRep: > > >+ jrcxz @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_Loop: > > >+ mov byte [rsi], al > > >+ out dx, al > > >+ inc rsi > > >+ loop @IoWriteFifo8_Loop > > >+ > > >+@IoWriteFifo8_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+IoWriteFifo8 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo16 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo16 PROC > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo16_NoRep > > >+ > > >+ cld > > >+ rep outsw > > >+ jmp @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_NoRep: > > >+ jrcxz @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_Loop: > > >+ mov word [rsi], ax > > >+ out dx, ax > > >+ add rsi, 2 > > >+ loop @IoWriteFifo16_Loop > > >+ > > >+@IoWriteFifo16_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+IoWriteFifo16 ENDP > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo32 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+IoWriteFifo32 PROC > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo32_NoRep > > >+ > > >+ cld > > >+ rep outsd > > >+ jmp @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_NoRep: > > >+ jrcxz @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_Loop: > > >+ mov dword [rsi], eax > > >+ out dx, eax > > >+ add rsi, 4 > > >+ loop @IoWriteFifo32_Loop > > >+ > > >+@IoWriteFifo32_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+IoWriteFifo32 ENDP > > >+ > > >+ END > > >+ > > >diff --git a/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > > >b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > > >new file mode 100644 > > >index 0000000..20e3e64 > > >--- /dev/null > > >+++ b/MdePkg/Library/BaseIoLibIntrinsic/X64/IoFifoSev.nasm > > >@@ -0,0 +1,282 @@ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; > > >+; Copyright (c) 2006 - 2012, Intel Corporation. All rights > > >+reserved.<BR> ; Copyright (c) 2017, AMD Incorporated. 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 ; > > >+http://opensource.org/licenses/bsd-license.php. > > >+; > > >+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > >BASIS, > > >+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > >EXPRESS OR IMPLIED. > > >+; > > >+;--------------------------------------------------------------------- > > >+--------- > > >+ > > >+ DEFAULT REL > > >+ SECTION .text > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- ; Check whether we need to unroll the String I/O in SEV > > >+guest ; > > >+; Return // eax (1 - unroll, 0 - no unroll) > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(SevNoRepIo) > > >+ASM_PFX(SevNoRepIo): > > >+ > > >+ ; CPUID clobbers ebx, ecx and edx > > >+ push rbx > > >+ push rcx > > >+ push rdx > > >+ > > >+ ; Check if we are runing under hypervisor ; CPUID(1).ECX Bit 31 > > >+ mov eax, 1 > > >+ cpuid > > >+ bt ecx, 31 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if we have Memory encryption CPUID leaf > > >+ mov eax, 0x80000000 > > >+ cpuid > > >+ cmp eax, 0x8000001f > > >+ jl @UseRepIo > > >+ > > >+ ; Check for memory encryption feature: > > >+ ; CPUID Fn8000_001F[EAX] - Bit 1 > > >+ ; > > >+ mov eax, 0x8000001f > > >+ cpuid > > >+ bt eax, 1 > > >+ jnc @UseRepIo > > >+ > > >+ ; Check if memory encryption is enabled ; MSR_0xC0010131 - Bit 0 > > >+ (SEV enabled) ; MSR_0xC0010131 - Bit 1 (SEV-ES enabled) > > >+ mov ecx, 0xc0010131 > > >+ rdmsr > > >+ > > >+ ; Check for (SevEsEnabled == 0 && SevEnabled == 1) > > >+ and eax, 3 > > >+ cmp eax, 1 > > >+ je @SevNoRepIo_Done > > >+ > > >+@UseRepIo: > > >+ xor eax, eax > > >+ > > >+@SevNoRepIo_Done: > > >+ pop rdx > > >+ pop rcx > > >+ pop rbx > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo8 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo8) > > >+ASM_PFX(IoReadFifo8): > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo8_NoRep > > >+ > > >+ cld > > >+ rep insb > > >+ jmp @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_NoRep: > > >+ jrcxz @IoReadFifo8_Done > > >+ > > >+@IoReadFifo8_Loop: > > >+ in al, dx > > >+ mov byte [rdi], al > > >+ inc rdi > > >+ loop @IoReadFifo8_Loop > > >+ > > >+@IoReadFifo8_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo16 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo16) > > >+ASM_PFX(IoReadFifo16): > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo16_NoRep > > >+ > > >+ cld > > >+ rep insw > > >+ jmp @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_NoRep: > > >+ jrcxz @IoReadFifo16_Done > > >+ > > >+@IoReadFifo16_Loop: > > >+ in ax, dx > > >+ mov word [rdi], ax > > >+ add rdi, 2 > > >+ loop @IoReadFifo16_Loop > > >+ > > >+@IoReadFifo16_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoReadFifo32 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; OUT VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoReadFifo32) > > >+ASM_PFX(IoReadFifo32): > > >+ xchg rcx, rdx > > >+ xchg rdi, r8 ; rdi: buffer address; r8: save rdi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoReadFifo32_NoRep > > >+ > > >+ cld > > >+ rep insd > > >+ jmp @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_NoRep: > > >+ jrcxz @IoReadFifo32_Done > > >+ > > >+@IoReadFifo32_Loop: > > >+ in eax, dx > > >+ mov dword [rdi], eax > > >+ add rdi, 4 > > >+ loop @IoReadFifo32_Loop > > >+ > > >+@IoReadFifo32_Done: > > >+ mov rdi, r8 ; restore rdi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo8 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo8) > > >+ASM_PFX(IoWriteFifo8): > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo8_NoRep > > >+ > > >+ cld > > >+ rep outsb > > >+ jmp @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_NoRep: > > >+ jrcxz @IoWriteFifo8_Done > > >+ > > >+@IoWriteFifo8_Loop: > > >+ mov byte [rsi], al > > >+ out dx, al > > >+ inc rsi > > >+ loop @IoWriteFifo8_Loop > > >+ > > >+@IoWriteFifo8_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo16 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo16) > > >+ASM_PFX(IoWriteFifo16): > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo16_NoRep > > >+ > > >+ cld > > >+ rep outsw > > >+ jmp @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_NoRep: > > >+ jrcxz @IoWriteFifo16_Done > > >+ > > >+@IoWriteFifo16_Loop: > > >+ mov word [rsi], ax > > >+ out dx, ax > > >+ add rsi, 2 > > >+ loop @IoWriteFifo16_Loop > > >+ > > >+@IoWriteFifo16_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+ > > >+;--------------------------------------------------------------------- > > >+--------- > > >+; VOID > > >+; EFIAPI > > >+; IoWriteFifo32 ( > > >+; IN UINTN Port, // rcx > > >+; IN UINTN Size, // rdx > > >+; IN VOID *Buffer // r8 > > >+; ); > > >+;--------------------------------------------------------------------- > > >+--------- > > >+global ASM_PFX(IoWriteFifo32) > > >+ASM_PFX(IoWriteFifo32): > > >+ xchg rcx, rdx > > >+ xchg rsi, r8 ; rsi: buffer address; r8: save rsi > > >+ > > >+ call SevNoRepIo ; Check if we need to unroll String I/O > > >+ test eax, eax > > >+ jnz @IoWriteFifo32_NoRep > > >+ > > >+ cld > > >+ rep outsd > > >+ jmp @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_NoRep: > > >+ jrcxz @IoWriteFifo32_Done > > >+ > > >+@IoWriteFifo32_Loop: > > >+ mov dword [rsi], eax > > >+ out dx, eax > > >+ add rsi, 4 > > >+ loop @IoWriteFifo32_Loop > > >+ > > >+@IoWriteFifo32_Done: > > >+ mov rsi, r8 ; restore rsi > > >+ ret > > >+ > > >diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index > > >2144979..56fb4cf 100644 > > >--- a/MdePkg/MdePkg.dsc > > >+++ b/MdePkg/MdePkg.dsc > > >@@ -3,6 +3,7 @@ > > > # > > > # Copyright (c) 2007 - 2017, Intel Corporation. All rights > > >reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All > > >rights reserved.<BR> > > >+# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR> > > > # > > > # This program and the accompanying materials > > > # are licensed and made available under the terms and conditions of the > > >BSD License > > >@@ -134,6 +135,7 @@ > > > > > > [Components.IA32, Components.X64] > > > MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > > >+ MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > > MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf > > > MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf > > > MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf > > >-- > > >2.7.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-31 6:34 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-29 16:07 [PATCH v3] MdePkg: BaseIoLibIntrinsic (IoLib class) library Leo Duran 2017-03-29 16:07 ` Leo Duran 2017-03-30 4:50 ` Gao, Liming 2017-03-30 12:30 ` Duran, Leo 2017-03-31 6:34 ` Gao, Liming
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox