OvmfPkg/Bhyve: detach ResetVector from before the SEV-ES changes

Commits 6995a1b79bab, 8a2732186a53 and 30937f2f98c4 modified all four
regular files under "OvmfPkg/ResetVector" with SEV-ES dependencies.
These are not relevant for Bhyve. Detach the pre-SEV-ES version of
ResetVector for Bhyve.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Message-Id: <20201112053153.22038-2-rebecca@bsdio.com>
Acked-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

3 files changed, 255 insertions, 0 deletions

diff --git a/OvmfPkg/Bhyve/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/Bhyve/ResetVector/Ia32/PageTables64.asm
new file mode 100644
index 0000000000..d60cbfd8a3
--- /dev/null
+++ b/OvmfPkg/Bhyve/ResetVector/Ia32/PageTables64.asm
@@ -0,0 +1,149 @@
+;------------------------------------------------------------------------------

+; @file

+; Sets the CR3 register for 64-bit paging

+;

+; Copyright (c) 2020, Rebecca Cran <rebecca@bsdio.com>

+; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>

+; SPDX-License-Identifier: BSD-2-Clause-Patent

+;

+;------------------------------------------------------------------------------

+

+BITS    32

+

+%define PAGE_PRESENT            0x01

+%define PAGE_READ_WRITE         0x02

+%define PAGE_USER_SUPERVISOR    0x04

+%define PAGE_WRITE_THROUGH      0x08

+%define PAGE_CACHE_DISABLE     0x010

+%define PAGE_ACCESSED          0x020

+%define PAGE_DIRTY             0x040

+%define PAGE_PAT               0x080

+%define PAGE_GLOBAL           0x0100

+%define PAGE_2M_MBO            0x080

+%define PAGE_2M_PAT          0x01000

+

+%define PAGE_2M_PDE_ATTR (PAGE_2M_MBO + \

+                          PAGE_ACCESSED + \

+                          PAGE_DIRTY + \

+                          PAGE_READ_WRITE + \

+                          PAGE_PRESENT)

+

+%define PAGE_PDP_ATTR (PAGE_ACCESSED + \

+                       PAGE_READ_WRITE + \

+                       PAGE_PRESENT)

+

+; Check if Secure Encrypted Virtualization (SEV) feature is enabled

+;

+; If SEV is enabled then EAX will be at least 32

+; If SEV is disabled then EAX will be zero.

+;

+CheckSevFeature:

+    ; Check if we have a valid (0x8000_001F) CPUID leaf

+    mov       eax, 0x80000000

+    cpuid

+

+    ; This check should fail on Intel or Non SEV AMD CPUs. In future if

+    ; Intel CPUs supports this CPUID leaf then we are guranteed to have exact

+    ; same bit definition.

+    cmp       eax, 0x8000001f

+    jl        NoSev

+

+    ; Check for memory encryption feature:

+    ;  CPUID  Fn8000_001F[EAX] - Bit 1

+    ;

+    mov       eax,  0x8000001f

+    cpuid

+    bt        eax, 1

+    jnc       NoSev

+

+    ; Check if memory encryption is enabled

+    ;  MSR_0xC0010131 - Bit 0 (SEV enabled)

+    mov       ecx, 0xc0010131

+    rdmsr

+    bt        eax, 0

+    jnc       NoSev

+

+    ; Get pte bit position to enable memory encryption

+    ; CPUID Fn8000_001F[EBX] - Bits 5:0

+    ;

+    mov       eax, ebx

+    and       eax, 0x3f

+    jmp       SevExit

+

+NoSev:

+    xor       eax, eax

+

+SevExit:

+    OneTimeCallRet CheckSevFeature

+

+;

+; Modified:  EAX, EBX, ECX, EDX

+;

+SetCr3ForPageTables64:

+

+    OneTimeCall   CheckSevFeature

+    xor     edx, edx

+    test    eax, eax

+    jz      SevNotActive

+

+    ; If SEV is enabled, C-bit is always above 31

+    sub     eax, 32

+    bts     edx, eax

+

+SevNotActive:

+

+    ;

+    ; For OVMF, build some initial page tables at

+    ; PcdOvmfSecPageTablesBase - (PcdOvmfSecPageTablesBase + 0x6000).

+    ;

+    ; This range should match with PcdOvmfSecPageTablesSize which is

+    ; declared in the FDF files.

+    ;

+    ; At the end of PEI, the pages tables will be rebuilt into a

+    ; more permanent location by DxeIpl.

+    ;

+

+    mov     ecx, 6 * 0x1000 / 4

+    xor     eax, eax

+clearPageTablesMemoryLoop:

+    mov     dword[ecx * 4 + PT_ADDR (0) - 4], eax

+    loop    clearPageTablesMemoryLoop

+

+    ;

+    ; Top level Page Directory Pointers (1 * 512GB entry)

+    ;

+    mov     dword[PT_ADDR (0)], PT_ADDR (0x1000) + PAGE_PDP_ATTR

+    mov     dword[PT_ADDR (4)], edx

+

+    ;

+    ; Next level Page Directory Pointers (4 * 1GB entries => 4GB)

+    ;

+    mov     dword[PT_ADDR (0x1000)], PT_ADDR (0x2000) + PAGE_PDP_ATTR

+    mov     dword[PT_ADDR (0x1004)], edx

+    mov     dword[PT_ADDR (0x1008)], PT_ADDR (0x3000) + PAGE_PDP_ATTR

+    mov     dword[PT_ADDR (0x100C)], edx

+    mov     dword[PT_ADDR (0x1010)], PT_ADDR (0x4000) + PAGE_PDP_ATTR

+    mov     dword[PT_ADDR (0x1014)], edx

+    mov     dword[PT_ADDR (0x1018)], PT_ADDR (0x5000) + PAGE_PDP_ATTR

+    mov     dword[PT_ADDR (0x101C)], edx

+

+    ;

+    ; Page Table Entries (2048 * 2MB entries => 4GB)

+    ;

+    mov     ecx, 0x800

+pageTableEntriesLoop:

+    mov     eax, ecx

+    dec     eax

+    shl     eax, 21

+    add     eax, PAGE_2M_PDE_ATTR

+    mov     [ecx * 8 + PT_ADDR (0x2000 - 8)], eax

+    mov     [(ecx * 8 + PT_ADDR (0x2000 - 8)) + 4], edx

+    loop    pageTableEntriesLoop

+

+    ;

+    ; Set CR3 now that the paging structures are available

+    ;

+    mov     eax, PT_ADDR (0)

+    mov     cr3, eax

+

+    OneTimeCallRet SetCr3ForPageTables64

diff --git a/OvmfPkg/Bhyve/ResetVector/ResetVector.inf b/OvmfPkg/Bhyve/ResetVector/ResetVector.inf
new file mode 100644
index 0000000000..772dda5404
--- /dev/null
+++ b/OvmfPkg/Bhyve/ResetVector/ResetVector.inf
@@ -0,0 +1,38 @@
+## @file

+#  Reset Vector

+#

+#  Copyright (c) 2020, Rebecca Cran <rebecca@bsdio.com>

+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+##

+

+[Defines]

+  INF_VERSION                    = 1.29

+  BASE_NAME                      = ResetVector

+  FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09

+  MODULE_TYPE                    = SEC

+  VERSION_STRING                 = 1.1

+

+#

+# The following information is for reference only and not required by the build tools.

+#

+#  VALID_ARCHITECTURES           = IA32 X64

+#

+

+[Sources]

+  ResetVector.nasmb

+

+[Packages]

+  OvmfPkg/OvmfPkg.dec

+  MdePkg/MdePkg.dec

+  UefiCpuPkg/UefiCpuPkg.dec

+

+[BuildOptions]

+   *_*_IA32_NASMB_FLAGS = -I$(WORKSPACE)/UefiCpuPkg/ResetVector/Vtf0/

+   *_*_X64_NASMB_FLAGS = -I$(WORKSPACE)/UefiCpuPkg/ResetVector/Vtf0/

+

+[Pcd]

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize

diff --git a/OvmfPkg/Bhyve/ResetVector/ResetVector.nasmb b/OvmfPkg/Bhyve/ResetVector/ResetVector.nasmb
new file mode 100644
index 0000000000..ec869e8409
--- /dev/null
+++ b/OvmfPkg/Bhyve/ResetVector/ResetVector.nasmb
@@ -0,0 +1,68 @@
+;------------------------------------------------------------------------------

+; @file

+; This file includes all other code files to assemble the reset vector code

+;

+; Copyright (c) 2020, Rebecca Cran <rebecca@bsdio.com>.

+; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>

+; SPDX-License-Identifier: BSD-2-Clause-Patent

+;

+;------------------------------------------------------------------------------

+

+;

+; If neither ARCH_IA32 nor ARCH_X64 are defined, then try to include

+; Base.h to use the C pre-processor to determine the architecture.

+;

+%ifndef ARCH_IA32

+  %ifndef ARCH_X64

+    #include <Base.h>

+    #if defined (MDE_CPU_IA32)

+      %define ARCH_IA32

+    #elif defined (MDE_CPU_X64)

+      %define ARCH_X64

+    #endif

+  %endif

+%endif

+

+%ifdef ARCH_IA32

+  %ifdef ARCH_X64

+    %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."

+  %endif

+%elifdef ARCH_X64

+%else

+  %error "Either ARCH_IA32 or ARCH_X64 must be defined."

+%endif

+

+%include "CommonMacros.inc"

+

+%include "PostCodes.inc"

+

+%ifdef DEBUG_PORT80

+  %include "Port80Debug.asm"

+%elifdef DEBUG_SERIAL

+  %include "SerialDebug.asm"

+%else

+  %include "DebugDisabled.asm"

+%endif

+

+%include "Ia32/SearchForBfvBase.asm"

+%include "Ia32/SearchForSecEntry.asm"

+

+%ifdef ARCH_X64

+  #include <AutoGen.h>

+

+  %if (FixedPcdGet32 (PcdOvmfSecPageTablesSize) != 0x6000)

+    %error "This implementation inherently depends on PcdOvmfSecPageTablesSize"

+  %endif

+

+  %define PT_ADDR(Offset) (FixedPcdGet32 (PcdOvmfSecPageTablesBase) + (Offset))

+%include "Ia32/Flat32ToFlat64.asm"

+%include "Ia32/PageTables64.asm"

+%endif

+

+%include "Ia16/Real16ToFlat32.asm"

+%include "Ia16/Init16.asm"

+

+%include "Main.asm"

+

+%include "Ia16/ResetVectorVtf0.asm"

+