Merge HEAD from ../scsi-misc-2.6-tmp

3 files changed, 31 insertions, 7 deletions

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 9957f16dcc5..bed4b7c9be9 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -51,12 +51,16 @@ struct scsi_cmnd {
          * printk's to use ->pid, so that we can kill this field.
          */
         unsigned long serial_number;
+        /*
+         * This is set to jiffies as it was when the command was first
+         * allocated.  It is used to time how long the command has
+         * been outstanding
+         */
+        unsigned long jiffies_at_alloc;
 
         int retries;
         int allowed;
         int timeout_per_command;
-        int timeout_total;
-        int timeout;
 
         unsigned char cmd_len;
         unsigned char old_cmd_len;
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 81d5234f677..ac1b6125e3a 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -429,12 +429,15 @@ struct scsi_host_template {
 };
 
 /*
- * shost states
+ * shost state: If you alter this, you also need to alter scsi_sysfs.c
+ * (for the ascii descriptions) and the state model enforcer:
+ * scsi_host_set_state()
  */
-enum {
-        SHOST_ADD,
-        SHOST_DEL,
+enum scsi_host_state {
+        SHOST_CREATED = 1,
+        SHOST_RUNNING,
         SHOST_CANCEL,
+        SHOST_DEL,
         SHOST_RECOVERY,
 };
 
@@ -575,7 +578,7 @@ struct Scsi_Host {
         unsigned int  irq;
         
 
-        unsigned long shost_state;
+        enum scsi_host_state shost_state;
 
         /* ldm bits */
         struct device           shost_gendev;
@@ -633,6 +636,7 @@ extern void scsi_remove_host(struct Scsi_Host *);
 extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *);
 extern void scsi_host_put(struct Scsi_Host *t);
 extern struct Scsi_Host *scsi_host_lookup(unsigned short);
+extern const char *scsi_host_state_name(enum scsi_host_state);
 
 extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
 
@@ -646,6 +650,15 @@ static inline struct device *scsi_get_device(struct Scsi_Host *shost)
         return shost->shost_gendev.parent;
 }
 
+/**
+ * scsi_host_scan_allowed - Is scanning of this host allowed
+ * @shost:      Pointer to Scsi_Host.
+ **/
+static inline int scsi_host_scan_allowed(struct Scsi_Host *shost)
+{
+        return shost->shost_state == SHOST_RUNNING;
+}
+
 extern void scsi_unblock_requests(struct Scsi_Host *);
 extern void scsi_block_requests(struct Scsi_Host *);
 
@@ -663,5 +676,6 @@ extern struct scsi_device *scsi_get_host_dev(struct Scsi_Host *);
 /* legacy interfaces */
 extern struct Scsi_Host *scsi_register(struct scsi_host_template *, int);
 extern void scsi_unregister(struct Scsi_Host *);
+extern int scsi_host_set_state(struct Scsi_Host *, enum scsi_host_state);
 
 #endif /* _SCSI_SCSI_HOST_H */
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index a30d6cd4c0e..6bdc4afb248 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,8 +116,11 @@ 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);
+        int     (*deny_binding)(struct scsi_target *);
         /* The driver sets these to tell the transport class it
          * wants the attributes displayed in sysfs.  If the show_ flag
          * is not set, the attribute will be private to the transport
@@ -130,6 +135,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 *);