2 files changed, 20 insertions, 5 deletions

diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 7670919a087a..e7b9570c818b 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -35,7 +35,7 @@
 
 #define SPI_PRINTK(x, l, f, a...)       dev_printk(l, &(x)->dev, f , ##a)
 
-#define SPI_NUM_ATTRS 13        /* increase this if you add attributes */
+#define SPI_NUM_ATTRS 14        /* increase this if you add attributes */
 #define SPI_OTHER_ATTRS 1       /* Increase this if you add "always
                                  * on" attributes */
 #define SPI_HOST_ATTRS  1
@@ -231,6 +231,7 @@ static int spi_setup_transport_attrs(struct device *dev)
         spi_rd_strm(starget) = 0;
         spi_rti(starget) = 0;
         spi_pcomp_en(starget) = 0;
+        spi_hold_mcs(starget) = 0;
         spi_dv_pending(starget) = 0;
         spi_initial_dv(starget) = 0;
         init_MUTEX(&spi_dv_sem(starget));
@@ -347,6 +348,7 @@ spi_transport_rd_attr(wr_flow, "%d\n");
 spi_transport_rd_attr(rd_strm, "%d\n");
 spi_transport_rd_attr(rti, "%d\n");
 spi_transport_rd_attr(pcomp_en, "%d\n");
+spi_transport_rd_attr(hold_mcs, "%d\n");
 
 /* we only care about the first child device so we return 1 */
 static int child_iter(struct device *dev, void *data)
@@ -1028,10 +1030,17 @@ void spi_display_xfer_agreement(struct scsi_target *starget)
                 sprint_frac(tmp, picosec, 1000);
 
                 dev_info(&starget->dev,
-                        "%s %sSCSI %d.%d MB/s %s%s%s (%s ns, offset %d)\n",
-                        scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
-                        tp->dt ? "DT" : "ST", tp->iu ? " IU" : "",
-                        tp->qas  ? " QAS" : "", tmp, tp->offset);
+                         "%s %sSCSI %d.%d MB/s %s%s%s%s%s%s%s%s (%s ns, offset %d)\n",
+                         scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
+                         tp->dt ? "DT" : "ST",
+                         tp->iu ? " IU" : "",
+                         tp->qas  ? " QAS" : "",
+                         tp->rd_strm ? " RDSTRM" : "",
+                         tp->rti ? " RTI" : "",
+                         tp->wr_flow ? " WRFLOW" : "",
+                         tp->pcomp_en ? " PCOMP" : "",
+                         tp->hold_mcs ? " HMCS" : "",
+                         tmp, tp->offset);
         } else {
                 dev_info(&starget->dev, "%sasynchronous.\n",
                                 tp->width ? "wide " : "");
@@ -1154,6 +1163,7 @@ spi_attach_transport(struct spi_function_template *ft)
         SETUP_ATTRIBUTE(rd_strm);
         SETUP_ATTRIBUTE(rti);
         SETUP_ATTRIBUTE(pcomp_en);
+        SETUP_ATTRIBUTE(hold_mcs);
 
         /* if you add an attribute but forget to increase SPI_NUM_ATTRS
          * this bug will trigger */
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index a30d6cd4c0e8..d8ef86006e02 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -39,6 +39,7 @@ struct spi_transport_attrs {
         unsigned int rd_strm:1; /* Read streaming enabled */
         unsigned int rti:1;     /* Retain Training Information */
         unsigned int pcomp_en:1;/* Precompensation enabled */
+        unsigned int hold_mcs:1;/* Hold Margin Control Settings */
         unsigned int initial_dv:1; /* DV done to this target yet  */
         unsigned long flags;    /* flags field for drivers to use */
         /* Device Properties fields */
@@ -78,6 +79,7 @@ struct spi_host_attrs {
 #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)
 #define spi_pcomp_en(x) (((struct spi_transport_attrs *)&(x)->starget_data)->pcomp_en)
+#define spi_hold_mcs(x) (((struct spi_transport_attrs *)&(x)->starget_data)->hold_mcs)
 #define spi_initial_dv(x)       (((struct spi_transport_attrs *)&(x)->starget_data)->initial_dv)
 
 #define spi_support_sync(x)     (((struct spi_transport_attrs *)&(x)->starget_data)->support_sync)
@@ -114,6 +116,8 @@ struct spi_function_template {
         void    (*set_rti)(struct scsi_target *, int);
         void    (*get_pcomp_en)(struct scsi_target *);
         void    (*set_pcomp_en)(struct scsi_target *, int);
+        void    (*get_hold_mcs)(struct scsi_target *);
+        void    (*set_hold_mcs)(struct scsi_target *, int);
         void    (*get_signalling)(struct Scsi_Host *);
         void    (*set_signalling)(struct Scsi_Host *, enum spi_signal_type);
         /* The driver sets these to tell the transport class it
@@ -130,6 +134,7 @@ struct spi_function_template {
         unsigned long   show_rd_strm:1;
         unsigned long   show_rti:1;
         unsigned long   show_pcomp_en:1;
+        unsigned long   show_hold_mcs:1;
 };
 
 struct scsi_transport_template *spi_attach_transport(struct spi_function_template *);