MdePkg: Add Feature definitions added in pyrite 2.0 spec.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>

diff --git a/MdePkg/Include/IndustryStandard/TcgStorageCore.h b/MdePkg/Include/IndustryStandard/TcgStorageCore.h
index 56ea92f2ebf00cc215c4fd22296022b0733d3f3e..6d80da24011a87ecc002bdf221de850a54f796b0 100644 (file)
--- a/MdePkg/Include/IndustryStandard/TcgStorageCore.h
+++ b/MdePkg/Include/IndustryStandard/TcgStorageCore.h
@@ -228,7 +228,9 @@ typedef enum {
 #define TCG_FEATURE_OPAL_SSC_V2_0_0     (UINT16)0x0203\r
 #define TCG_FEATURE_OPAL_SSC_LITE       (UINT16)0x0301\r
 #define TCG_FEATURE_PYRITE_SSC          (UINT16)0x0302\r
+#define TCG_FEATURE_PYRITE_SSC_V2_0_0   (UINT16)0x0303\r
 #define TCG_FEATURE_BLOCK_SID           (UINT16)0x0402\r
+#define TCG_FEATURE_DATA_REMOVAL        (UINT16)0x0404\r
 \r
 // ACE Expression values\r
 #define TCG_ACE_EXPRESSION_AND 0x0\r

diff --git a/MdePkg/Include/IndustryStandard/TcgStorageOpal.h b/MdePkg/Include/IndustryStandard/TcgStorageOpal.h
index 91d5008c059acbae10fd663bdede4cd5e96018d8..8ff36efe50ed4d87bb9cc2865dcbfad41bbb41ed 100644 (file)
--- a/MdePkg/Include/IndustryStandard/TcgStorageOpal.h
+++ b/MdePkg/Include/IndustryStandard/TcgStorageOpal.h
@@ -34,6 +34,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define OPAL_ADMIN_SP_ACTIVATE_METHOD       TCG_TO_UID(0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x02, 0x03)\r
 #define OPAL_ADMIN_SP_REVERT_METHOD         TCG_TO_UID(0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x02, 0x02)\r
 \r
+// ADMIN_SP\r
+// Data Removal mechanism\r
+#define OPAL_UID_ADMIN_SP_DATA_REMOVAL_MECHANISM  TCG_TO_UID(0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00, 0x01)\r
 \r
 // LOCKING SP\r
 // Authorities\r
@@ -93,6 +96,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define OPAL_LOCKING_SP_C_PIN_TRYLIMIT_COL 5\r
 #define OPAL_RANDOM_METHOD_MAX_COUNT_SIZE 32\r
 \r
+// Data Removal Mechanism column.\r
+#define OPAL_ADMIN_SP_ACTIVE_DATA_REMOVAL_MECHANISM_COL  1\r
+\r
+//\r
+// Supported Data Removal Mechanism.\r
+// Detail see Pyrite SSC v2 spec.\r
+//\r
+typedef enum {\r
+  OverwriteDataErase = 0,\r
+  BlockErase,\r
+  CryptoErase,\r
+  Unmap,\r
+  ResetWritePointers,\r
+  VendorSpecificErase,\r
+  ResearvedMechanism\r
+} SUPPORTED_DATA_REMOVAL_MECHANISM;\r
+\r
 #pragma pack(1)\r
 \r
 typedef struct _OPAL_GEOMETRY_REPORTING_FEATURE {\r
@@ -162,6 +182,38 @@ typedef struct _PYRITE_SSC_FEATURE_DESCRIPTOR {
   UINT8                                Future[5];\r
 } PYRITE_SSC_FEATURE_DESCRIPTOR;\r
 \r
+typedef struct _PYRITE_SSCV2_FEATURE_DESCRIPTOR {\r
+  TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER Header;\r
+  UINT16                               BaseComdIdBE;\r
+  UINT16                               NumComIdsBE;\r
+  UINT8                                Reserved[5];\r
+  UINT8                                InitialCPINSIDPIN;\r
+  UINT8                                CPINSIDPINRevertBehavior;\r
+  UINT8                                Future[5];\r
+} PYRITE_SSCV2_FEATURE_DESCRIPTOR;\r
+\r
+typedef struct _DATA_REMOVAL_FEATURE_DESCRIPTOR {\r
+  TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER Header;\r
+  UINT8                                Reserved;\r
+  UINT8                                OperationProcessing : 1;\r
+  UINT8                                Reserved2 : 7;\r
+  UINT8                                RemovalMechanism;\r
+  UINT8                                FormatBit0 : 1;   // Data Removal Time Format for Bit 0\r
+  UINT8                                FormatBit1 : 1;   // Data Removal Time Format for Bit 1\r
+  UINT8                                FormatBit2 : 1;   // Data Removal Time Format for Bit 2\r
+  UINT8                                FormatBit3 : 1;   // Data Removal Time Format for Bit 3\r
+  UINT8                                FormatBit4 : 1;   // Data Removal Time Format for Bit 4\r
+  UINT8                                FormatBit5 : 1;   // Data Removal Time Format for Bit 5\r
+  UINT8                                Reserved3 : 2;\r
+  UINT16                               TimeBit0;         // Data Removal Time for Supported Data Removal Mechanism Bit 0\r
+  UINT16                               TimeBit1;         // Data Removal Time for Supported Data Removal Mechanism Bit 1\r
+  UINT16                               TimeBit2;         // Data Removal Time for Supported Data Removal Mechanism Bit 2\r
+  UINT16                               TimeBit3;         // Data Removal Time for Supported Data Removal Mechanism Bit 3\r
+  UINT16                               TimeBit4;         // Data Removal Time for Supported Data Removal Mechanism Bit 4\r
+  UINT16                               TimeBit5;         // Data Removal Time for Supported Data Removal Mechanism Bit 5\r
+  UINT8                                Future[16];\r
+} DATA_REMOVAL_FEATURE_DESCRIPTOR;\r
+\r
 typedef union {\r
   TCG_LEVEL0_FEATURE_DESCRIPTOR_HEADER     CommonHeader;\r
   TCG_TPER_FEATURE_DESCRIPTOR              Tper;\r
@@ -173,7 +225,9 @@ typedef union {
   OPAL_SSCV2_FEATURE_DESCRIPTOR            OpalSscV2;\r
   OPAL_SSCLITE_FEATURE_DESCRIPTOR          OpalSscLite;\r
   PYRITE_SSC_FEATURE_DESCRIPTOR            PyriteSsc;\r
+  PYRITE_SSCV2_FEATURE_DESCRIPTOR          PyriteSscV2;\r
   TCG_BLOCK_SID_FEATURE_DESCRIPTOR         BlockSid;\r
+  DATA_REMOVAL_FEATURE_DESCRIPTOR          DataRemoval;\r
 } OPAL_LEVEL0_FEATURE_DESCRIPTOR;\r
 \r
 #pragma pack()\r