Commit 29191b92030bc97b05b539ce5ae0543c24a6d7ca

Authored by Boaz Harrosh
Committed by James Bottomley
1 parent feb6118d4e

[SCSI] libosd: OSD2r05: Attribute definitions

Some New revision 5 Attribute definitions.
Some missing definitions of Attributes and pages

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 1 changed file with 72 additions and 2 deletions Side-by-side Diff

include/scsi/osd_attributes.h
... ... @@ -29,6 +29,7 @@
29 29 OSD_APAGE_PARTITION_INFORMATION = OSD_APAGE_PARTITION_FIRST + 1,
30 30 OSD_APAGE_PARTITION_QUOTAS = OSD_APAGE_PARTITION_FIRST + 2,
31 31 OSD_APAGE_PARTITION_TIMESTAMP = OSD_APAGE_PARTITION_FIRST + 3,
  32 + OSD_APAGE_PARTITION_ATTR_ACCESS = OSD_APAGE_PARTITION_FIRST + 4,
32 33 OSD_APAGE_PARTITION_SECURITY = OSD_APAGE_PARTITION_FIRST + 5,
33 34 OSD_APAGE_PARTITION_LAST = 0x5FFFFFFF,
34 35  
35 36  
... ... @@ -51,8 +52,10 @@
51 52 OSD_APAGE_RESERVED_TYPE_LAST = 0xEFFFFFFF,
52 53  
53 54 OSD_APAGE_COMMON_FIRST = 0xF0000000,
54   - OSD_APAGE_COMMON_LAST = 0xFFFFFFFE,
  55 + OSD_APAGE_COMMON_LAST = 0xFFFFFFFD,
55 56  
  57 + OSD_APAGE_CURRENT_COMMAND = 0xFFFFFFFE,
  58 +
56 59 OSD_APAGE_REQUEST_ALL = 0xFFFFFFFF,
57 60 };
58 61  
59 62  
... ... @@ -106,10 +109,30 @@
106 109 OSD_ATTR_RI_PRODUCT_REVISION_LEVEL = 0x7, /* 4 */
107 110 OSD_ATTR_RI_PRODUCT_SERIAL_NUMBER = 0x8, /* variable */
108 111 OSD_ATTR_RI_OSD_NAME = 0x9, /* variable */
  112 + OSD_ATTR_RI_MAX_CDB_CONTINUATION_LEN = 0xA, /* 4 */
109 113 OSD_ATTR_RI_TOTAL_CAPACITY = 0x80, /* 8 */
110 114 OSD_ATTR_RI_USED_CAPACITY = 0x81, /* 8 */
111 115 OSD_ATTR_RI_NUMBER_OF_PARTITIONS = 0xC0, /* 8 */
112 116 OSD_ATTR_RI_CLOCK = 0x100, /* 6 */
  117 + OARI_DEFAULT_ISOLATION_METHOD = 0X110, /* 1 */
  118 + OARI_SUPPORTED_ISOLATION_METHODS = 0X111, /* 32 */
  119 +
  120 + OARI_DATA_ATOMICITY_GUARANTEE = 0X120, /* 8 */
  121 + OARI_DATA_ATOMICITY_ALIGNMENT = 0X121, /* 8 */
  122 + OARI_ATTRIBUTES_ATOMICITY_GUARANTEE = 0X122, /* 8 */
  123 + OARI_DATA_ATTRIBUTES_ATOMICITY_MULTIPLIER = 0X123, /* 1 */
  124 +
  125 + OARI_MAXIMUM_SNAPSHOTS_COUNT = 0X1C1, /* 0 or 4 */
  126 + OARI_MAXIMUM_CLONES_COUNT = 0X1C2, /* 0 or 4 */
  127 + OARI_MAXIMUM_BRANCH_DEPTH = 0X1CC, /* 0 or 4 */
  128 + OARI_SUPPORTED_OBJECT_DUPLICATION_METHOD_FIRST = 0X200, /* 0 or 4 */
  129 + OARI_SUPPORTED_OBJECT_DUPLICATION_METHOD_LAST = 0X2ff, /* 0 or 4 */
  130 + OARI_SUPPORTED_TIME_OF_DUPLICATION_METHOD_FIRST = 0X300, /* 0 or 4 */
  131 + OARI_SUPPORTED_TIME_OF_DUPLICATION_METHOD_LAST = 0X30F, /* 0 or 4 */
  132 + OARI_SUPPORT_FOR_DUPLICATED_OBJECT_FREEZING = 0X310, /* 0 or 4 */
  133 + OARI_SUPPORT_FOR_SNAPSHOT_REFRESHING = 0X311, /* 0 or 1 */
  134 + OARI_SUPPORTED_CDB_CONTINUATION_DESC_TYPE_FIRST = 0X7000001,/* 0 or 4 */
  135 + OARI_SUPPORTED_CDB_CONTINUATION_DESC_TYPE_LAST = 0X700FFFF,/* 0 or 4 */
113 136 };
114 137 /* Root_Information_attributes_page does not have a get_page structure */
115 138  
116 139  
... ... @@ -120,7 +143,15 @@
120 143 OSD_ATTR_PI_PARTITION_ID = 0x1, /* 8 */
121 144 OSD_ATTR_PI_USERNAME = 0x9, /* variable */
122 145 OSD_ATTR_PI_USED_CAPACITY = 0x81, /* 8 */
  146 + OSD_ATTR_PI_USED_CAPACITY_INCREMENT = 0x84, /* 0 or 8 */
123 147 OSD_ATTR_PI_NUMBER_OF_OBJECTS = 0xC1, /* 8 */
  148 +
  149 + OSD_ATTR_PI_ACTUAL_DATA_SPACE = 0xD1, /* 0 or 8 */
  150 + OSD_ATTR_PI_RESERVED_DATA_SPACE = 0xD2, /* 0 or 8 */
  151 + OSD_ATTR_PI_DEFAULT_SNAPSHOT_DUPLICATION_METHOD = 0x200,/* 0 or 4 */
  152 + OSD_ATTR_PI_DEFAULT_CLONE_DUPLICATION_METHOD = 0x201,/* 0 or 4 */
  153 + OSD_ATTR_PI_DEFAULT_SP_TIME_OF_DUPLICATION = 0x300,/* 0 or 4 */
  154 + OSD_ATTR_PI_DEFAULT_CLONE_TIME_OF_DUPLICATION = 0x301,/* 0 or 4 */
124 155 };
125 156 /* Partition Information attributes page does not have a get_page structure */
126 157  
... ... @@ -131,6 +162,7 @@
131 162 OSD_ATTR_CI_PARTITION_ID = 0x1, /* 8 */
132 163 OSD_ATTR_CI_COLLECTION_OBJECT_ID = 0x2, /* 8 */
133 164 OSD_ATTR_CI_USERNAME = 0x9, /* variable */
  165 + OSD_ATTR_CI_COLLECTION_TYPE = 0xA, /* 1 */
134 166 OSD_ATTR_CI_USED_CAPACITY = 0x81, /* 8 */
135 167 };
136 168 /* Collection Information attributes page does not have a get_page structure */
... ... @@ -144,6 +176,8 @@
144 176 OSD_ATTR_OI_USERNAME = 0x9, /* variable */
145 177 OSD_ATTR_OI_USED_CAPACITY = 0x81, /* 8 */
146 178 OSD_ATTR_OI_LOGICAL_LENGTH = 0x82, /* 8 */
  179 + SD_ATTR_OI_ACTUAL_DATA_SPACE = 0XD1, /* 0 OR 8 */
  180 + SD_ATTR_OI_RESERVED_DATA_SPACE = 0XD2, /* 0 OR 8 */
147 181 };
148 182 /* Object Information attributes page does not have a get_page structure */
149 183  
... ... @@ -248,7 +282,18 @@
248 282 struct osd_timestamp data_modified_time;
249 283 } __packed;
250 284  
251   -/* 7.1.2.19 Collections attributes page */
  285 +/* OSD2r05: 7.1.3.19 Attributes Access attributes page
  286 + * (OSD_APAGE_PARTITION_ATTR_ACCESS)
  287 + *
  288 + * each attribute is of the form below. Total array length is deduced
  289 + * from the attribute's length
  290 + * (See allowed_attributes_access of the struct osd_cap_object_descriptor)
  291 + */
  292 +struct attributes_access_attr {
  293 + struct osd_attributes_list_attrid attr_list[0];
  294 +} __packed;
  295 +
  296 +/* OSD2r05: 7.1.2.21 Collections attributes page */
252 297 /* TBD */
253 298  
254 299 /* 7.1.2.20 Root Policy/Security attributes page (OSD_APAGE_ROOT_SECURITY) */
... ... @@ -323,6 +368,31 @@
323 368 struct osd_attr_page_header hdr; /* id=C+5/5, size=4 */
324 369 __be32 policy_access_tag;
325 370 } __packed;
  371 +
  372 +/* OSD2r05: 7.1.3.31 Current Command attributes page
  373 + * (OSD_APAGE_CURRENT_COMMAND)
  374 + */
  375 +enum {
  376 + OSD_ATTR_CC_RESPONSE_INTEGRITY_CHECK_VALUE = 0x1, /* 32 */
  377 + OSD_ATTR_CC_OBJECT_TYPE = 0x2, /* 1 */
  378 + OSD_ATTR_CC_PARTITION_ID = 0x3, /* 8 */
  379 + OSD_ATTR_CC_OBJECT_ID = 0x4, /* 8 */
  380 + OSD_ATTR_CC_STARTING_BYTE_ADDRESS_OF_APPEND = 0x5, /* 8 */
  381 + OSD_ATTR_CC_CHANGE_IN_USED_CAPACITY = 0x6, /* 8 */
  382 +};
  383 +
  384 +/*TBD: osdv1_current_command_attributes_page */
  385 +
  386 +struct osdv2_current_command_attributes_page {
  387 + struct osd_attr_page_header hdr; /* id=0xFFFFFFFE, size=0x44 */
  388 + u8 response_integrity_check_value[OSD_CRYPTO_KEYID_SIZE];
  389 + u8 object_type;
  390 + u8 reserved[3];
  391 + __be64 partition_id;
  392 + __be64 object_id;
  393 + __be64 starting_byte_address_of_append;
  394 + __be64 change_in_used_capacity;
  395 +};
326 396  
327 397 #endif /*ndef __OSD_ATTRIBUTES_H__*/