MdePkg IndustryStandard/Scsi.h: Add Unmap command support

According to the SCSI Block Commands - 4 (SBC-4) spec, the patch add SCSI
unmap command support in IndustryStandard/Scsi.h.

The following changes have been made:
1. Add SCSI unmap command OP Code
2. Update the structure definition for Block Limits VPD page
3. Add structure definitions for UNMAP parameter list header & UNMAP block
descriptor.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index 3c8f31a7613dc3e8570e287f263a02bc23c48cea..0d813147c17cb33944a51df7b3db5adc15424638 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -1,7 +1,7 @@
 /** @file\r
   Support for SCSI-2 standard\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, 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
@@ -72,6 +72,7 @@
 #define EFI_SCSI_OP_WRITE_VERIFY    0x2e\r
 #define EFI_SCSI_OP_WRITE_LONG      0x3f\r
 #define EFI_SCSI_OP_WRITE_SAME      0x41\r
+#define EFI_SCSI_OP_UNMAP           0x42\r
 \r
 //\r
 // Additional commands for Sequential Access Devices\r
@@ -234,9 +235,11 @@ typedef struct {
   UINT8 Peripheral_Type : 5;\r
   UINT8 Peripheral_Qualifier : 3;\r
   UINT8 PageCode;\r
-  UINT8 Reserved_2;\r
-  UINT8 PageLength;\r
-  UINT8 Reserved_4_5[2];\r
+  UINT8 PageLength2;\r
+  UINT8 PageLength1;\r
+  UINT8 WriteSameNonZero : 1;\r
+  UINT8 Reserved_4 : 7;\r
+  UINT8 MaximumCompareAndWriteLength;\r
   UINT8 OptimalTransferLengthGranularity2;\r
   UINT8 OptimalTransferLengthGranularity1;\r
   UINT8 MaximumTransferLength4;\r
@@ -251,6 +254,47 @@ typedef struct {
   UINT8 MaximumPrefetchXdreadXdwriteTransferLength3;\r
   UINT8 MaximumPrefetchXdreadXdwriteTransferLength2;\r
   UINT8 MaximumPrefetchXdreadXdwriteTransferLength1;\r
+  UINT8 MaximumUnmapLbaCount4;\r
+  UINT8 MaximumUnmapLbaCount3;\r
+  UINT8 MaximumUnmapLbaCount2;\r
+  UINT8 MaximumUnmapLbaCount1;\r
+  UINT8 MaximumUnmapBlockDescriptorCount4;\r
+  UINT8 MaximumUnmapBlockDescriptorCount3;\r
+  UINT8 MaximumUnmapBlockDescriptorCount2;\r
+  UINT8 MaximumUnmapBlockDescriptorCount1;\r
+  UINT8 OptimalUnmapGranularity4;\r
+  UINT8 OptimalUnmapGranularity3;\r
+  UINT8 OptimalUnmapGranularity2;\r
+  UINT8 OptimalUnmapGranularity1;\r
+  UINT8 UnmapGranularityAlignment4 : 7;\r
+  UINT8 UnmapGranularityAlignmentValid : 1;\r
+  UINT8 UnmapGranularityAlignment3;\r
+  UINT8 UnmapGranularityAlignment2;\r
+  UINT8 UnmapGranularityAlignment1;\r
+  UINT8 MaximumWriteSameLength4;\r
+  UINT8 MaximumWriteSameLength3;\r
+  UINT8 MaximumWriteSameLength2;\r
+  UINT8 MaximumWriteSameLength1;\r
+  UINT8 MaximumAtomicTransferLength4;\r
+  UINT8 MaximumAtomicTransferLength3;\r
+  UINT8 MaximumAtomicTransferLength2;\r
+  UINT8 MaximumAtomicTransferLength1;\r
+  UINT8 AtomicAlignment4;\r
+  UINT8 AtomicAlignment3;\r
+  UINT8 AtomicAlignment2;\r
+  UINT8 AtomicAlignment1;\r
+  UINT8 AtomicTransferLengthGranularity4;\r
+  UINT8 AtomicTransferLengthGranularity3;\r
+  UINT8 AtomicTransferLengthGranularity2;\r
+  UINT8 AtomicTransferLengthGranularity1;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary4;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary3;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary2;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary1;\r
+  UINT8 MaximumAtomicBoundarySize4;\r
+  UINT8 MaximumAtomicBoundarySize3;\r
+  UINT8 MaximumAtomicBoundarySize2;\r
+  UINT8 MaximumAtomicBoundarySize1;\r
 } EFI_SCSI_BLOCK_LIMITS_VPD_PAGE;\r
 \r
 ///\r
@@ -307,6 +351,18 @@ typedef struct {
   UINT8 Reserved[16];  \r
 } EFI_SCSI_DISK_CAPACITY_DATA16;\r
 \r
+typedef struct {\r
+  UINT16 DataLen;\r
+  UINT16 BlkDespDataLen;\r
+  UINT8  Reserved[4];\r
+} EFI_SCSI_DISK_UNMAP_PARAM_LIST_HEADER;\r
+\r
+typedef struct {\r
+  UINT64 Lba;\r
+  UINT32 BlockNum;\r
+  UINT8  Reserved[4];\r
+} EFI_SCSI_DISK_UNMAP_BLOCK_DESP;\r
+\r
 \r
 #pragma pack()\r
 \r