MdeModulePkg/NvmExpressDxe: Expose EFI_NVM_EXPRESS_PASS_THRU protocol

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

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index c1aad6b8138e304f1831631354f24fd6b0c28e9c..0b17ebd4b7c58e385500f6e57d22cf4bdd9c1db2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -2,7 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r
-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -37,9 +37,9 @@ ReadSectors (
 {\r
   NVME_CONTROLLER_PRIVATE_DATA             *Controller;\r
   UINT32                                   Bytes;\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                  Command;\r
+  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
   EFI_STATUS                               Status;\r
   UINT32                                   BlockSize;\r
 \r
@@ -47,21 +47,20 @@ ReadSectors (
   BlockSize  = Device->Media.BlockSize;\r
   Bytes      = Blocks * BlockSize;\r
 \r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
+  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
 \r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
+  CommandPacket.NvmeCmd        = &Command;\r
+  CommandPacket.NvmeCompletion = &Completion;\r
 \r
   CommandPacket.NvmeCmd->Cdw0.Opcode = NVME_IO_READ_OPC;\r
-  CommandPacket.NvmeCmd->Cdw0.Cid    = Controller->Cid[1]++;\r
   CommandPacket.NvmeCmd->Nsid        = Device->NamespaceId;\r
   CommandPacket.TransferBuffer       = (VOID *)(UINTN)Buffer;\r
 \r
   CommandPacket.TransferLength = Bytes;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_IO_QUEUE;\r
+  CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
   CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
@@ -72,7 +71,6 @@ ReadSectors (
   Status = Controller->Passthru.PassThru (\r
                                   &Controller->Passthru,\r
                                   Device->NamespaceId,\r
-                                  0,\r
                                   &CommandPacket,\r
                                   NULL\r
                                   );\r
@@ -101,9 +99,9 @@ WriteSectors (
   )\r
 {\r
   NVME_CONTROLLER_PRIVATE_DATA             *Controller;\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                  Command;\r
+  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
   EFI_STATUS                               Status;\r
   UINT32                                   Bytes;\r
   UINT32                                   BlockSize;\r
@@ -112,21 +110,20 @@ WriteSectors (
   BlockSize  = Device->Media.BlockSize;\r
   Bytes      = Blocks * BlockSize;\r
 \r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
+  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
 \r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
+  CommandPacket.NvmeCmd        = &Command;\r
+  CommandPacket.NvmeCompletion = &Completion;\r
 \r
   CommandPacket.NvmeCmd->Cdw0.Opcode = NVME_IO_WRITE_OPC;\r
-  CommandPacket.NvmeCmd->Cdw0.Cid    = Controller->Cid[1]++;\r
   CommandPacket.NvmeCmd->Nsid  = Device->NamespaceId;\r
   CommandPacket.TransferBuffer = (VOID *)(UINTN)Buffer;\r
 \r
   CommandPacket.TransferLength = Bytes;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_IO_QUEUE;\r
+  CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
   CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
@@ -140,7 +137,6 @@ WriteSectors (
   Status = Controller->Passthru.PassThru (\r
                                   &Controller->Passthru,\r
                                   Device->NamespaceId,\r
-                                  0,\r
                                   &CommandPacket,\r
                                   NULL\r
                                   );\r
@@ -281,30 +277,28 @@ NvmeFlush (
   )\r
 {\r
   NVME_CONTROLLER_PRIVATE_DATA             *Controller;\r
-  NVM_EXPRESS_PASS_THRU_COMMAND_PACKET     CommandPacket;\r
-  NVM_EXPRESS_COMMAND                      Command;\r
-  NVM_EXPRESS_RESPONSE                     Response;\r
+  EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET CommandPacket;\r
+  EFI_NVM_EXPRESS_COMMAND                  Command;\r
+  EFI_NVM_EXPRESS_COMPLETION               Completion;\r
   EFI_STATUS                               Status;\r
 \r
   Controller = Device->Controller;\r
 \r
-  ZeroMem (&CommandPacket, sizeof(NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
-  ZeroMem (&Command, sizeof(NVM_EXPRESS_COMMAND));\r
-  ZeroMem (&Response, sizeof(NVM_EXPRESS_RESPONSE));\r
+  ZeroMem (&CommandPacket, sizeof(EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET));\r
+  ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
+  ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
 \r
-  CommandPacket.NvmeCmd      = &Command;\r
-  CommandPacket.NvmeResponse = &Response;\r
+  CommandPacket.NvmeCmd        = &Command;\r
+  CommandPacket.NvmeCompletion = &Completion;\r
 \r
   CommandPacket.NvmeCmd->Cdw0.Opcode = NVME_IO_FLUSH_OPC;\r
-  CommandPacket.NvmeCmd->Cdw0.Cid    = Controller->Cid[1]++;\r
   CommandPacket.NvmeCmd->Nsid  = Device->NamespaceId;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
-  CommandPacket.QueueId        = NVME_IO_QUEUE;\r
+  CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   Status = Controller->Passthru.PassThru (\r
                                   &Controller->Passthru,\r
                                   Device->NamespaceId,\r
-                                  0,\r
                                   &CommandPacket,\r
                                   NULL\r
                                   );\r