diff options
| author | Suman Prakash <suman.p@samsung.com> | 2017-04-20 18:01:42 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2017-07-12 11:24:25 +0800 |
| commit | a5deb79bf742609ebc1193b96090d2c94c01f777 (patch) | |
| tree | d8421b7ca3cd0e3d6d67182993109c62cfec42bc | |
| parent | 01677e9ac75a50263b836025ca2e58dbefdc97ed (diff) | |
| download | edk2-platforms-a5deb79bf742609ebc1193b96090d2c94c01f777.tar.xz | |
MdeModulePkg/NvmExpressDxe: Handling return of write to sq and cq db
In case of an async command if updating the submission queue tail
doorbell fails then the command will not be picked up by device and
no completion response will be created. This scenario has to be handled.
Also if we create an AsyncRequest element and insert in the async queue,
it will never receive a completion so in the timer routine this element
won't be freed, resulting in memory leak. Also in case of blocking calls
we should capture the status of updating completion queue head doorbell
register and return it to caller of PassThru.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Suman Prakash <suman.p@samsung.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
(cherry picked from commit f6b139bde7e0a39f83ffad30af58136d5b0738a7)
| -rw-r--r-- | Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c index ef3d772cc2..fb80f39ce8 100644 --- a/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c +++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c @@ -603,7 +603,7 @@ NvmExpressPassThru ( Private->SqTdbl[QueueId].Sqt ^= 1;
}
Data = ReadUnaligned32 ((UINT32*)&Private->SqTdbl[QueueId]);
- PciIo->Mem.Write (
+ Status = PciIo->Mem.Write (
PciIo,
EfiPciIoWidthUint32,
NVME_BAR,
@@ -612,6 +612,10 @@ NvmExpressPassThru ( &Data
);
+ if (EFI_ERROR (Status)) {
+ goto EXIT;
+ }
+
//
// For non-blocking requests, return directly if the command is placed
// in the submission queue.
@@ -695,7 +699,7 @@ NvmExpressPassThru ( }
Data = ReadUnaligned32 ((UINT32*)&Private->CqHdbl[QueueId]);
- PciIo->Mem.Write (
+ Status = PciIo->Mem.Write (
PciIo,
EfiPciIoWidthUint32,
NVME_BAR,
|