]> git.proxmox.com Git - mirror_edk2.git/commit
OvmfPkg: Make an Ia32/X64 hybrid build work with SEV
authorTom Lendacky <thomas.lendacky@amd.com>
Mon, 16 May 2022 20:24:02 +0000 (15:24 -0500)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 20 May 2022 06:29:34 +0000 (06:29 +0000)
commita21a3438f795deecb24e1843c1636f95c485017c
tree92d35e9a3d7fd86a385245bfa41b36e9d0ba8668
parenta72d552f197b9b5cc3afdf22891b27ecf4067037
OvmfPkg: Make an Ia32/X64 hybrid build work with SEV

The BaseMemEncryptSevLib functionality was updated to rely on the use of
the OVMF/SEV workarea to check for SEV guests. However, this area is only
updated when running the X64 OVMF build, not the hybrid Ia32/X64 build.
Base SEV support is allowed under the Ia32/X64 build, but it now fails
to boot as a result of the change.

Update the ResetVector code to check for SEV features when built for
32-bit mode, not just 64-bit mode (requiring updates to both the Ia32
and Ia32X64 fdf files).

Fixes: f1d1c337e7c0575da7fd248b2dd9cffc755940df
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Michael Roth <michael.roth@amd.com>
Cc: Min Xu <min.m.xu@intel.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
OvmfPkg/OvmfPkgIa32.fdf
OvmfPkg/OvmfPkgIa32X64.fdf
OvmfPkg/OvmfPkgX64.fdf
OvmfPkg/ResetVector/Ia32/AmdSev.asm
OvmfPkg/ResetVector/Main.asm
OvmfPkg/ResetVector/ResetVector.nasmb