tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/PvScsiDxe: Reset device on ExitBootServices()

Browse Source 
This causes the device to forget about the request/completion rings.
We allocated said rings in EfiBootServicesData type memory, and code
executing after ExitBootServices() is permitted to overwrite it.

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2567
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Message-Id: <20200328200100.60786-17-liran.alon@oracle.com>
Reviewed-by: Nikita Leshenko <nikita.leshchenko@oracle.com>
This commit is contained in:
Liran Alon 2020-03-28 23:00:59 +03:00 committed by mergify[bot]
parent c4c15b8702
commit 7d8a04e9d2
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
OvmfPkg/PvScsiDxe/PvScsi.c
View File

@ -1221,6 +1221,31 @@ PvScsiUninit (
PvScsiRestorePciAttributes (Dev); PvScsiRestorePciAttributes (Dev);
} }
/**
Event notification called by ExitBootServices()
**/
STATIC
VOID
EFIAPI
PvScsiExitBoot (
IN EFI_EVENT Event,
IN VOID *Context
)
{
PVSCSI_DEV *Dev;
Dev = Context;
DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));
//
// Reset the device to stop device usage of the rings.
//
// We allocated said rings in EfiBootServicesData type memory, and code
// executing after ExitBootServices() is permitted to overwrite it.
//
PvScsiResetAdapter (Dev);
}
// //
// Driver Binding // Driver Binding
// //
@ -1314,6 +1339,17 @@ PvScsiDriverBindingStart (
goto ClosePciIo; goto ClosePciIo;
} }
Status = gBS->CreateEvent (
EVT_SIGNAL_EXIT_BOOT_SERVICES,
TPL_CALLBACK,
&PvScsiExitBoot,
Dev,
&Dev->ExitBoot
);
if (EFI_ERROR (Status)) {
goto UninitDev;
}
// //
// Setup complete, attempt to export the driver instance's PassThru interface // Setup complete, attempt to export the driver instance's PassThru interface
// //
@ -1325,11 +1361,14 @@ PvScsiDriverBindingStart (
&Dev->PassThru &Dev->PassThru
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto UninitDev; goto CloseExitBoot;
} }
return EFI_SUCCESS; return EFI_SUCCESS;
CloseExitBoot:
gBS->CloseEvent (Dev->ExitBoot);
UninitDev: UninitDev:
PvScsiUninit (Dev); PvScsiUninit (Dev);
@ -1384,6 +1423,8 @@ PvScsiDriverBindingStop (
return Status; return Status;
} }
gBS->CloseEvent (Dev->ExitBoot);
PvScsiUninit (Dev); PvScsiUninit (Dev);
gBS->CloseProtocol ( gBS->CloseProtocol (

1
OvmfPkg/PvScsiDxe/PvScsi.h
View File

@ -51,6 +51,7 @@ typedef struct {
typedef struct { typedef struct {
UINT32 Signature; UINT32 Signature;
EFI_PCI_IO_PROTOCOL *PciIo; EFI_PCI_IO_PROTOCOL *PciIo;
EFI_EVENT ExitBoot;
UINT64 OriginalPciAttributes; UINT64 OriginalPciAttributes;
PVSCSI_RING_DESC RingDesc; PVSCSI_RING_DESC RingDesc;
PVSCSI_DMA_BUFFER *DmaBuf; PVSCSI_DMA_BUFFER *DmaBuf;