Merge remote-tracking branch 'lsk/v3.10/topic/juno' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / scsi / scsi_transport_spi.h

diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 286e9628ed8ba077f997e4105f6954e10d0d6c13..7497a383b1a4da6264abdd3892bddada0c34c75e 100644 (file)
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -36,8 +36,10 @@ struct spi_transport_attrs {
        unsigned int width:1;   /* 0 - narrow, 1 - wide */
        unsigned int max_width:1;
        unsigned int iu:1;      /* Information Units enabled */
+       unsigned int max_iu:1;
        unsigned int dt:1;      /* DT clocking enabled */
        unsigned int qas:1;     /* Quick Arbitration and Selection enabled */
+       unsigned int max_qas:1;
        unsigned int wr_flow:1; /* Write Flow control enabled */
        unsigned int rd_strm:1; /* Read streaming enabled */
        unsigned int rti:1;     /* Retain Training Information */
@@ -77,8 +79,10 @@ struct spi_host_attrs {
 #define spi_width(x)   (((struct spi_transport_attrs *)&(x)->starget_data)->width)
 #define spi_max_width(x) (((struct spi_transport_attrs *)&(x)->starget_data)->max_width)
 #define spi_iu(x)      (((struct spi_transport_attrs *)&(x)->starget_data)->iu)
+#define spi_max_iu(x)  (((struct spi_transport_attrs *)&(x)->starget_data)->max_iu)
 #define spi_dt(x)      (((struct spi_transport_attrs *)&(x)->starget_data)->dt)
 #define spi_qas(x)     (((struct spi_transport_attrs *)&(x)->starget_data)->qas)
+#define spi_max_qas(x) (((struct spi_transport_attrs *)&(x)->starget_data)->max_qas)
 #define spi_wr_flow(x) (((struct spi_transport_attrs *)&(x)->starget_data)->wr_flow)
 #define spi_rd_strm(x) (((struct spi_transport_attrs *)&(x)->starget_data)->rd_strm)
 #define spi_rti(x)     (((struct spi_transport_attrs *)&(x)->starget_data)->rti)