Add DiskIo2 protocol definition to MdePkg.

Change DiskIoDxe to produce DiskIo2 protocol when the BlockIo2 protocol is available.
Change PartitionDxe to produce BlockIo2 protocol based on DiskIo2 protocol instead of BlockIo2 protocol.

Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Kinney Michael <michael.d.kinney@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14570 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 182 insertions, 3 deletions

diff --git a/MdePkg/Include/Protocol/DiskIo2.h b/MdePkg/Include/Protocol/DiskIo2.h
new file mode 100644
index 0000000000..a6badf231a
--- /dev/null
+++ b/MdePkg/Include/Protocol/DiskIo2.h
@@ -0,0 +1,173 @@
+/** @file

+  Disk IO protocol as defined in the UEFI 2.0 specification.

+

+  The Disk IO2 protocol is used to convert block oriented devices into byte

+  oriented devices. The Disk IO protocol is intended to layer on top of the

+  Block IO protocol.

+

+  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>

+  This program and the accompanying materials                          

+  are licensed and made available under the terms and conditions of the BSD License         

+  which accompanies this distribution.  The full text of the license may be found at        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+**/

+

+#ifndef __DISK_IO2_H__

+#define __DISK_IO2_H__

+

+#define EFI_DISK_IO2_PROTOCOL_GUID \

+  { \

+    0x151c8eae, 0x7f2c, 0x472c, 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 \

+  }

+

+typedef struct _EFI_DISK_IO2_PROTOCOL EFI_DISK_IO2_PROTOCOL;

+

+/**

+  The struct of Disk IO2 Token.

+**/

+typedef struct {

+  //

+  // If Event is NULL, then blocking I/O is performed.

+  // If Event is not NULL and non-blocking I/O is supported, then non-blocking I/O is performed,

+  // and Event will be signaled when the I/O request is completed.

+  // The caller must be prepared to handle the case where the callback associated with Event occurs

+  // before the original asynchronous I/O request call returns.

+  //

+  EFI_EVENT  Event;

+

+  //

+  // Defines whether or not the signaled event encountered an error.

+  //

+  EFI_STATUS TransactionStatus;

+} EFI_DISK_IO2_TOKEN;

+

+/**

+  Terminate outstanding asynchronous requests to a device.

+

+  @param This                   Indicates a pointer to the calling context.

+

+  @retval EFI_SUCCESS           All outstanding requests were successfully terminated.

+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the cancel

+                                operation.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_DISK_CANCEL_EX) (

+  IN EFI_DISK_IO2_PROTOCOL *This

+  );

+

+/**

+  Reads a specified number of bytes from a device.

+

+  @param This                   Indicates a pointer to the calling context.

+  @param MediaId                ID of the medium to be read.

+  @param Offset                 The starting byte offset on the logical block I/O device to read from.

+  @param Token                  A pointer to the token associated with the transaction.

+                                If this field is NULL, synchronous/blocking IO is performed.

+  @param  BufferSize            The size in bytes of Buffer. The number of bytes to read from the device.

+  @param  Buffer                A pointer to the destination buffer for the data.

+                                The caller is responsible either having implicit or explicit ownership of the buffer.

+

+  @retval EFI_SUCCESS           If Event is NULL (blocking I/O): The data was read correctly from the device.

+                                If Event is not NULL (asynchronous I/O): The request was successfully queued for processing.

+                                                                         Event will be signaled upon completion.

+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.

+  @retval EFI_NO_MEDIA          There is no medium in the device.

+  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.

+  @retval EFI_INVALID_PARAMETER The read request contains device addresses that are not valid for the device.

+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.

+

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_DISK_READ_EX) (

+  IN EFI_DISK_IO2_PROTOCOL        *This,

+  IN UINT32                       MediaId,

+  IN UINT64                       Offset,

+  IN OUT EFI_DISK_IO2_TOKEN       *Token,

+  IN UINTN                        BufferSize,

+  OUT VOID                        *Buffer

+  );

+

+/**

+  Writes a specified number of bytes to a device.

+

+  @param This        Indicates a pointer to the calling context.

+  @param MediaId     ID of the medium to be written.

+  @param Offset      The starting byte offset on the logical block I/O device to write to.

+  @param Token       A pointer to the token associated with the transaction.

+                     If this field is NULL, synchronous/blocking IO is performed.

+  @param BufferSize  The size in bytes of Buffer. The number of bytes to write to the device.

+  @param Buffer      A pointer to the buffer containing the data to be written.

+

+  @retval EFI_SUCCESS           If Event is NULL (blocking I/O): The data was written correctly to the device.

+                                If Event is not NULL (asynchronous I/O): The request was successfully queued for processing.

+                                                                         Event will be signaled upon completion.

+  @retval EFI_WRITE_PROTECTED   The device cannot be written to.

+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write operation.

+  @retval EFI_NO_MEDIA          There is no medium in the device.

+  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.

+  @retval EFI_INVALID_PARAMETER The write request contains device addresses that are not valid for the device.

+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.

+

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_DISK_WRITE_EX) (

+  IN EFI_DISK_IO2_PROTOCOL        *This,

+  IN UINT32                       MediaId,

+  IN UINT64                       Offset,

+  IN OUT EFI_DISK_IO2_TOKEN       *Token,

+  IN UINTN                        BufferSize,

+  IN VOID                         *Buffer

+  );

+

+/**

+  Flushes all modified data to the physical device.

+

+  @param This        Indicates a pointer to the calling context.

+  @param MediaId     ID of the medium to be written.

+  @param Token       A pointer to the token associated with the transaction.

+                     If this field is NULL, synchronous/blocking IO is performed.

+

+  @retval EFI_SUCCESS           If Event is NULL (blocking I/O): The data was flushed successfully to the device.

+                                If Event is not NULL (asynchronous I/O): The request was successfully queued for processing.

+                                                                         Event will be signaled upon completion.

+  @retval EFI_WRITE_PROTECTED   The device cannot be written to.

+  @retval EFI_DEVICE_ERROR      The device reported an error while performing the write operation.

+  @retval EFI_NO_MEDIA          There is no medium in the device.

+  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.

+  @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_DISK_FLUSH_EX) (

+  IN EFI_DISK_IO2_PROTOCOL        *This,

+  IN OUT EFI_DISK_IO2_TOKEN       *Token

+  );

+

+#define EFI_DISK_IO2_PROTOCOL_REVISION 0x00020000

+

+///

+/// This protocol is used to abstract Block I/O interfaces.

+///

+struct _EFI_DISK_IO2_PROTOCOL {

+  ///

+  /// The revision to which the disk I/O interface adheres. All future

+  /// revisions must be backwards compatible. If a future version is not

+  /// backwards compatible, it is not the same GUID.

+  ///

+  UINT64             Revision;

+  EFI_DISK_CANCEL_EX Cancel;

+  EFI_DISK_READ_EX   ReadDiskEx;

+  EFI_DISK_WRITE_EX  WriteDiskEx;

+  EFI_DISK_FLUSH_EX  FlushDiskEx;

+};

+

+extern EFI_GUID gEfiDiskIo2ProtocolGuid;

+

+#endif

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 6ff7ae66f6..16c278aec3 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -5,7 +5,7 @@
 # It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of

 # EFI1.10/UEFI2.3.1/PI1.2 and some Industry Standards.

 #

-# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>

 # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

 #

 # This program and the accompanying materials are licensed and made available under

@@ -1290,10 +1290,16 @@
   gEfiBlockIo2ProtocolGuid             = { 0xa77b2472, 0xe282, 0x4e9f, {0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}

 

   ## Include/Protocol/StorageSecurityCommand.h

-  gEfiStorageSecurityCommandProtocolGuid    = { 0xc88b0b6d, 0x0dfc, 0x49a7, {0x9c, 0xb4, 0x49, 0x7, 0x4b, 0x4c, 0x3a, 0x78 }}

+  gEfiStorageSecurityCommandProtocolGuid = { 0xc88b0b6d, 0x0dfc, 0x49a7, {0x9c, 0xb4, 0x49, 0x7, 0x4b, 0x4c, 0x3a, 0x78 }}

 

   ## Include/Protocol/UserCredential2.h

-  gEfiUserCredential2ProtocolGuid       = { 0xe98adb03, 0xb8b9, 0x4af8, {0xba, 0x20, 0x26, 0xe9, 0x11, 0x4c, 0xbc, 0xe5 }}

+  gEfiUserCredential2ProtocolGuid      = { 0xe98adb03, 0xb8b9, 0x4af8, {0xba, 0x20, 0x26, 0xe9, 0x11, 0x4c, 0xbc, 0xe5 }}

+

+  #

+  # Protocols defined in UEFI2.4

+  #

+  ## Include/Protocol/DiskIo2.h

+  gEfiDiskIo2ProtocolGuid              = { 0x151c8eae, 0x7f2c, 0x472c, { 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }}

 

 [PcdsFeatureFlag]

   ## If TRUE, the component name protocol will not be installed.