MdeModulePkg/NvmExpressDxe: Add SecurityStorageProtocol support

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressDxe / NvmExpressPassthru.c

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
index d37194a91043afa42e48a6bf4502ebe0eaec326f..f9871527dd889405dcae061ce94e002c9e67dab0 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
@@ -433,7 +433,7 @@ NvmExpressPassThru (
   // these two cmds are special which requires their data buffer must support simultaneous access by both the\r
   // processor and a PCI Bus Master. It's caller's responsbility to ensure this.\r
   //\r
-  if (((Sq->Opc & (BIT0 | BIT1)) != 0) && (Sq->Opc != NVME_ADMIN_CRIOCQ_OPC) && (Sq->Opc != NVME_ADMIN_CRIOSQ_OPC)) {\r
+  if (((Sq->Opc & (BIT0 | BIT1)) != 0) && (Sq->Opc != NVME_ADMIN_CRIOCQ_CMD) && (Sq->Opc != NVME_ADMIN_CRIOSQ_CMD)) {\r
     if ((Sq->Opc & BIT0) != 0) {\r
       Flag = EfiPciIoOperationBusMasterRead;\r
     } else {\r
@@ -567,21 +567,31 @@ NvmExpressPassThru (
     }\r
   }\r
 \r
-  if ((Private->CqHdbl[QueueType].Cqh ^= 1) == 0) {\r
-    Private->Pt[QueueType] ^= 1;\r
-  }\r
-\r
   //\r
-  // Copy the Respose Queue entry for this command to the callers response buffer\r
+  // Check the NVMe cmd execution result\r
   //\r
-  CopyMem(Packet->NvmeCompletion, Cq, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+  if (Status != EFI_TIMEOUT) {\r
+    if ((Cq->Sct == 0) && (Cq->Sc == 0)) {\r
+      Status = EFI_SUCCESS;\r
+    } else {\r
+      Status = EFI_DEVICE_ERROR;\r
+      //\r
+      // Copy the Respose Queue entry for this command to the callers response buffer\r
+      //\r
+      CopyMem(Packet->NvmeCompletion, Cq, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
+    \r
+      //\r
+      // Dump every completion entry status for debugging.\r
+      //\r
+      DEBUG_CODE_BEGIN();\r
+        NvmeDumpStatus(Cq);\r
+      DEBUG_CODE_END();\r
+    }\r
+  }\r
 \r
-  //\r
-  // Dump every completion entry status for debugging.\r
-  //\r
-  DEBUG_CODE_BEGIN();\r
-    NvmeDumpStatus(Cq);\r
-  DEBUG_CODE_END();\r
+  if ((Private->CqHdbl[QueueType].Cqh ^= 1) == 0) {\r
+    Private->Pt[QueueType] ^= 1;\r
+  }\r
 \r
   Data = ReadUnaligned32 ((UINT32*)&Private->CqHdbl[QueueType]);\r
   PciIo->Mem.Write (\r