Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/ak4642', 'asoc...

[sfrench/cifs-2.6.git] / include / linux / virtio_scsi.h

diff --git a/include/linux/virtio_scsi.h b/include/linux/virtio_scsi.h
index 4195b97a3def6a84574519da4a6fe37b7e954406..de429d1f4357a89d2a6a9506611a93a6c201fdc6 100644 (file)
--- a/include/linux/virtio_scsi.h
+++ b/include/linux/virtio_scsi.h
@@ -35,11 +35,23 @@ struct virtio_scsi_cmd_req {
        u8 lun[8];              /* Logical Unit Number */
        u64 tag;                /* Command identifier */
        u8 task_attr;           /* Task attribute */
-       u8 prio;
+       u8 prio;                /* SAM command priority field */
        u8 crn;
        u8 cdb[VIRTIO_SCSI_CDB_SIZE];
 } __packed;
 
+/* SCSI command request, followed by protection information */
+struct virtio_scsi_cmd_req_pi {
+       u8 lun[8];              /* Logical Unit Number */
+       u64 tag;                /* Command identifier */
+       u8 task_attr;           /* Task attribute */
+       u8 prio;                /* SAM command priority field */
+       u8 crn;
+       u32 pi_bytesout;        /* DataOUT PI Number of bytes */
+       u32 pi_bytesin;         /* DataIN PI Number of bytes */
+       u8 cdb[VIRTIO_SCSI_CDB_SIZE];
+} __packed;
+
 /* Response, followed by sense data and data-in */
 struct virtio_scsi_cmd_resp {
        u32 sense_len;          /* Sense data length */
@@ -97,6 +109,7 @@ struct virtio_scsi_config {
 #define VIRTIO_SCSI_F_INOUT                    0
 #define VIRTIO_SCSI_F_HOTPLUG                  1
 #define VIRTIO_SCSI_F_CHANGE                   2
+#define VIRTIO_SCSI_F_T10_PI                   3
 
 /* Response codes */
 #define VIRTIO_SCSI_S_OK                       0