tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/IoMmuDxe: propagate errors from AmdSevInstallIoMmuProtocol() 

If we cannot install the IOMMU protocol for whatever reason, exit the
driver with an error. The same is already done for the IOMMU Absent
protocol.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
This commit is contained in:
Laszlo Ersek 2017-08-02 12:20:14 +02:00
parent 5e365a97ec
commit db1250792c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
View File

@ -499,7 +499,7 @@ EDKII_IOMMU_PROTOCOL mAmdSev = {
Initialize Iommu Protocol.
**/
VOID
EFI_STATUS
EFIAPI
AmdSevInstallIoMmuProtocol (
VOID
@ -514,5 +514,5 @@ AmdSevInstallIoMmuProtocol (
&gEdkiiIoMmuProtocolGuid, &mAmdSev,
NULL
);
ASSERT_EFI_ERROR (Status);
return Status;
}

2
OvmfPkg/IoMmuDxe/AmdSevIoMmu.h
View File

@ -35,7 +35,7 @@
MemEncryptSevLib.
**/
VOID
EFI_STATUS
EFIAPI
AmdSevInstallIoMmuProtocol (
VOID

4
OvmfPkg/IoMmuDxe/IoMmuDxe.c
View File

@ -36,14 +36,12 @@ IoMmuDxeEntryPoint (
EFI_STATUS Status;
EFI_HANDLE Handle;
Status = EFI_SUCCESS;
//
// When SEV is enabled, install IoMmu protocol otherwise install the
// placeholder protocol so that other dependent module can run.
//
if (MemEncryptSevIsEnabled ()) {
AmdSevInstallIoMmuProtocol ();
Status = AmdSevInstallIoMmuProtocol ();
} else {
Handle = NULL;