jazz/08-12-16: scsi_cmnd.h.diff

include/scsi/scsi_cmnd.h

@@ -2 +2 @@
 #define _SCSI_SCSI_CMND_H
 
 #include <linux/dma-mapping.h>
+#include <linux/blkdev.h>
 #include <linux/list.h>
 #include <linux/types.h>
 #include <linux/timer.h>
+#include <linux/scatterlist.h>
+#include <linux/blkdev.h>
 
-struct request;
-struct scatterlist;
+struct Scsi_Host;
 struct scsi_device;
 
+/*
+ * MAX_COMMAND_SIZE is:
+ * The longest fixed-length SCSI CDB as per the SCSI standard.
+ * fixed-length means: commands that their size can be determined
+ * by their opcode and the CDB does not carry a length specifier, (unlike
+ * the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly
+ * true and the SCSI standard also defines extended commands and
+ * vendor specific commands that can be bigger than 16 bytes. The kernel
+ * will support these using the same infrastructure used for VARLEN CDB's.
+ * So in effect MAX_COMMAND_SIZE means the maximum size command scsi-ml
+ * supports without specifying a cmd_len by ULD's
+ */
+#define MAX_COMMAND_SIZE 16
+#if (MAX_COMMAND_SIZE > BLK_MAX_CDB)
+# error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB
+#endif
+
+struct scsi_data_buffer {
+  struct sg_table table;
+  unsigned length;
+  int resid;
+};
 
 /* embedded in scsi_cmnd */
 struct scsi_pointer {
@@ -32 +56 @@
   struct list_head list;  /* scsi_cmnd participates in queue lists */
   struct list_head eh_entry; /* entry for the host eh_cmd_q */
   int eh_eflags;    /* Used by error handlr */
-  void (*done) (struct scsi_cmnd *);  /* Mid-level done function */
 
   /*
    * A SCSI Command is assigned a nonzero serial_number before passed
    * to the driver's queue command function.  The serial_number is
    * cleared when scsi_done is entered indicating that the command
-   * has been completed.  It currently doesn't have much use other
-   * than printk's.  Some lldd's use this number for other purposes.
-   * It's almost certain that such usages are either incorrect or
-   * meaningless.  Please kill all usages other than printk's.  Also,
-   * as this number is always identical to ->pid, please convert
-   * printk's to use ->pid, so that we can kill this field.
+   * has been completed.  It is a bug for LLDDs to use this number
+   * for purposes other than printk (and even that is only useful
+   * for debugging).
    */
   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
@@ -57 +78 @@
   int allowed;
   int timeout_per_command;
 
-  unsigned char cmd_len;
+  unsigned short cmd_len;
   enum dma_data_direction sc_data_direction;
 
   /* These elements define the operation we are about to perform */
-#define MAX_COMMAND_SIZE  16
-  unsigned char cmnd[MAX_COMMAND_SIZE];
-  unsigned request_bufflen; /* Actual request size */
+  unsigned char *cmnd;
 
   struct timer_list eh_timeout; /* Used to time out the command. */
-  void *request_buffer;   /* Actual requested buffer */
 
   /* These elements define the operation we ultimately want to perform */
-  unsigned short use_sg;  /* Number of pieces of scatter-gather */
-  unsigned short sglist_len;  /* size of malloc'd scatter-gather list */
-
+  struct scsi_data_buffer sdb;
   unsigned underflow; /* Return error if less than
            this amount is transferred */
 
@@ -81 +97 @@
            reconnects.   Probably == sector
            size */
 
-  int resid;    /* Number of bytes requested to be
-           transferred less actual number
-           transferred (0 if not supported) */
-
   struct request *request;  /* The command we are
                working on */
 
 #define SCSI_SENSE_BUFFERSIZE   96
-  unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];
+  unsigned char *sense_buffer;
         /* obtained by REQUEST SENSE when
          * CHECK CONDITION is received on original
          * command (auto-sense) */
@@ -115 +127 @@
   int result;   /* Status code from lower level driver */
 
   unsigned char tag;  /* SCSI-II queued command tag */
-  unsigned long pid;  /* Process ID, starts at 0. Unique per host. */
 };
 
-/*
- * These are the values that scsi_cmd->state can take.
- */
-#define SCSI_STATE_TIMEOUT         0x1000
-#define SCSI_STATE_FINISHED        0x1001
-#define SCSI_STATE_FAILED          0x1002
-#define SCSI_STATE_QUEUED          0x1003
-#define SCSI_STATE_UNUSED          0x1006
-#define SCSI_STATE_DISCONNECTING   0x1008
-#define SCSI_STATE_INITIALIZING    0x1009
-#define SCSI_STATE_BHQUEUE         0x100a
-#define SCSI_STATE_MLQUEUE         0x100b
-
-
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
+extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
-extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
+extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *,
+             struct device *);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
 extern void scsi_req_abort_cmd(struct scsi_cmnd *cmd);
 
@@ -142 +141 @@
          size_t *offset, size_t *len);
 extern void scsi_kunmap_atomic_sg(void *virt);
 
+extern int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask);
+extern void scsi_release_buffers(struct scsi_cmnd *cmd);
+
+extern int scsi_dma_map(struct scsi_cmnd *cmd);
+extern void scsi_dma_unmap(struct scsi_cmnd *cmd);
+
+struct scsi_cmnd *scsi_allocate_command(gfp_t gfp_mask);
+void scsi_free_command(gfp_t gfp_mask, struct scsi_cmnd *cmd);
+
+static inline unsigned scsi_sg_count(struct scsi_cmnd *cmd)
+{
+  return cmd->sdb.table.nents;
+}
+
+static inline struct scatterlist *scsi_sglist(struct scsi_cmnd *cmd)
+{
+  return cmd->sdb.table.sgl;
+}
+
+static inline unsigned scsi_bufflen(struct scsi_cmnd *cmd)
+{
+  return cmd->sdb.length;
+}
+
+static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid)
+{
+  cmd->sdb.resid = resid;
+}
+
+static inline int scsi_get_resid(struct scsi_cmnd *cmd)
+{
+  return cmd->sdb.resid;
+}
+
+#define scsi_for_each_sg(cmd, sg, nseg, __i)      \
+  for_each_sg(scsi_sglist(cmd), sg, nseg, __i)
+
+static inline int scsi_bidi_cmnd(struct scsi_cmnd *cmd)
+{
+  return blk_bidi_rq(cmd->request) &&
+    (cmd->request->next_rq->special != NULL);
+}
+
+static inline struct scsi_data_buffer *scsi_in(struct scsi_cmnd *cmd)
+{
+  return scsi_bidi_cmnd(cmd) ?
+    cmd->request->next_rq->special : &cmd->sdb;
+}
+
+static inline struct scsi_data_buffer *scsi_out(struct scsi_cmnd *cmd)
+{
+  return &cmd->sdb;
+}
+
+static inline int scsi_sg_copy_from_buffer(struct scsi_cmnd *cmd,
+             void *buf, int buflen)
+{
+  return sg_copy_from_buffer(scsi_sglist(cmd), scsi_sg_count(cmd),
+           buf, buflen);
+}
+
+static inline int scsi_sg_copy_to_buffer(struct scsi_cmnd *cmd,
+           void *buf, int buflen)
+{
+  return sg_copy_to_buffer(scsi_sglist(cmd), scsi_sg_count(cmd),
+         buf, buflen);
+}
+
 #endif /* _SCSI_SCSI_CMND_H */