1 files changed, 29 insertions, 3 deletions

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index b7bdecb7b76e..f1f2644137b8 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -46,7 +46,7 @@ struct blk_queue_tags;
 enum {
         SCSI_QDEPTH_DEFAULT,    /* default requested change, e.g. from sysfs */
         SCSI_QDEPTH_QFULL,      /* scsi-ml requested due to queue full */
-        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshhold event */
+        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshold event */
 };
 
 struct scsi_host_template {
@@ -127,8 +127,7 @@ struct scsi_host_template {
          *
          * STATUS: REQUIRED
          */
-        int (* queuecommand)(struct scsi_cmnd *,
-                             void (*done)(struct scsi_cmnd *));
+        int (* queuecommand)(struct Scsi_Host *, struct scsi_cmnd *);
 
         /*
          * The transfer functions are used to queue a scsi command to
@@ -388,6 +387,7 @@ struct scsi_host_template {
          * of scatter-gather.
          */
         unsigned short sg_tablesize;
+        unsigned short sg_prot_tablesize;
 
         /*
          * Set this if the host adapter has limitations beside segment count.
@@ -504,6 +504,25 @@ struct scsi_host_template {
 };
 
 /*
+ * Temporary #define for host lock push down. Can be removed when all
+ * drivers have been updated to take advantage of unlocked
+ * queuecommand.
+ *
+ */
+#define DEF_SCSI_QCMD(func_name) \
+        int func_name(struct Scsi_Host *shost, struct scsi_cmnd *cmd)   \
+        {                                                               \
+                unsigned long irq_flags;                                \
+                int rc;                                                 \
+                spin_lock_irqsave(shost->host_lock, irq_flags);         \
+                scsi_cmd_get_serial(shost, cmd);                        \
+                rc = func_name##_lck (cmd, cmd->scsi_done);                     \
+                spin_unlock_irqrestore(shost->host_lock, irq_flags);    \
+                return rc;                                              \
+        }
+
+
+/*
  * 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()
@@ -599,6 +618,7 @@ struct Scsi_Host {
         int can_queue;
         short cmd_per_lun;
         short unsigned int sg_tablesize;
+        short unsigned int sg_prot_tablesize;
         short unsigned int max_sectors;
         unsigned long dma_boundary;
         /* 
@@ -750,6 +770,7 @@ 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 void scsi_cmd_get_serial(struct Scsi_Host *, struct scsi_cmnd *);
 
 extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
 
@@ -823,6 +844,11 @@ static inline unsigned int scsi_host_get_prot(struct Scsi_Host *shost)
         return shost->prot_capabilities;
 }
 
+static inline int scsi_host_prot_dma(struct Scsi_Host *shost)
+{
+        return shost->prot_capabilities >= SHOST_DIX_TYPE0_PROTECTION;
+}
+
 static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsigned int target_type)
 {
         static unsigned char cap[] = { 0,