atari_NCR5380: Move static TagAlloc array to host data

The atari_NCR5380.c core driver keeps some per-host data in a static
variable which limits the driver to a single instance. Fix this by moving
TagAlloc to the hostdata struct.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 2fafe1d54fb8de75413d8cbc04df574a3eaf0968..a6946f2d1dc0197b0a28ac6ef47b6bd74f2b3b33 100644 (file)
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -245,6 +245,15 @@
 #define FLAG_TAGGED_QUEUING            64      /* as X3T9.2 spelled it */
 
 #ifndef ASM
+
+#ifdef SUPPORT_TAGS
+struct tag_alloc {
+       DECLARE_BITMAP(allocated, MAX_TAGS);
+       int nr_allocated;
+       int queue_size;
+};
+#endif
+
 struct NCR5380_hostdata {
        NCR5380_implementation_fields;          /* implementation specific */
        struct Scsi_Host *host;                 /* Host backpointer */
@@ -274,6 +283,9 @@ struct NCR5380_hostdata {
        int read_overruns;                /* number of bytes to cut from a
                                           * transfer to handle chip overruns */
        int retain_dma_intr;
+#ifdef SUPPORT_TAGS
+       struct tag_alloc TagAlloc[8][8];        /* 8 targets and 8 LUNs */
+#endif
 #ifdef PSEUDO_DMA
        unsigned spin_max_r;
        unsigned spin_max_w;

diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 74b7c538c3948e5203d4c6f6ee5864e1684e7148..590035f194e33aa43ea879d3d2a3e78d27ea6a8a 100644 (file)
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -274,26 +274,17 @@ static struct scsi_host_template *the_template = NULL;
  * important: the tag bit must be cleared before 'nr_allocated' is decreased.
  */
 
-typedef struct {
-       DECLARE_BITMAP(allocated, MAX_TAGS);
-       int nr_allocated;
-       int queue_size;
-} TAG_ALLOC;
-
-static TAG_ALLOC TagAlloc[8][8];       /* 8 targets and 8 LUNs */
-
-
 static void __init init_tags(struct NCR5380_hostdata *hostdata)
 {
        int target, lun;
-       TAG_ALLOC *ta;
+       struct tag_alloc *ta;
 
        if (!(hostdata->flags & FLAG_TAGGED_QUEUING))
                return;
 
        for (target = 0; target < 8; ++target) {
                for (lun = 0; lun < 8; ++lun) {
-                       ta = &TagAlloc[target][lun];
+                       ta = &hostdata->TagAlloc[target][lun];
                        bitmap_zero(ta->allocated, MAX_TAGS);
                        ta->nr_allocated = 0;
                        /* At the beginning, assume the maximum queue size we could
@@ -324,8 +315,8 @@ static int is_lun_busy(struct scsi_cmnd *cmd, int should_be_tagged)
            !(hostdata->flags & FLAG_TAGGED_QUEUING) ||
            !cmd->device->tagged_supported)
                return 0;
-       if (TagAlloc[cmd->device->id][lun].nr_allocated >=
-           TagAlloc[cmd->device->id][lun].queue_size) {
+       if (hostdata->TagAlloc[scmd_id(cmd)][lun].nr_allocated >=
+           hostdata->TagAlloc[scmd_id(cmd)][lun].queue_size) {
                dprintk(NDEBUG_TAGS, "scsi%d: target %d lun %d: no free tags\n",
                           H_NO(cmd), cmd->device->id, lun);
                return 1;
@@ -355,7 +346,7 @@ static void cmd_get_tag(struct scsi_cmnd *cmd, int should_be_tagged)
                dprintk(NDEBUG_TAGS, "scsi%d: target %d lun %d now allocated by untagged "
                           "command\n", H_NO(cmd), cmd->device->id, lun);
        } else {
-               TAG_ALLOC *ta = &TagAlloc[cmd->device->id][lun];
+               struct tag_alloc *ta = &hostdata->TagAlloc[scmd_id(cmd)][lun];
 
                cmd->tag = find_first_zero_bit(ta->allocated, MAX_TAGS);
                set_bit(cmd->tag, ta->allocated);
@@ -385,7 +376,7 @@ static void cmd_free_tag(struct scsi_cmnd *cmd)
                printk(KERN_NOTICE "scsi%d: trying to free bad tag %d!\n",
                       H_NO(cmd), cmd->tag);
        } else {
-               TAG_ALLOC *ta = &TagAlloc[cmd->device->id][lun];
+               struct tag_alloc *ta = &hostdata->TagAlloc[scmd_id(cmd)][lun];
                clear_bit(cmd->tag, ta->allocated);
                ta->nr_allocated--;
                dprintk(NDEBUG_TAGS, "scsi%d: freed tag %d for target %d lun %d\n",
@@ -397,14 +388,14 @@ static void cmd_free_tag(struct scsi_cmnd *cmd)
 static void free_all_tags(struct NCR5380_hostdata *hostdata)
 {
        int target, lun;
-       TAG_ALLOC *ta;
+       struct tag_alloc *ta;
 
        if (!(hostdata->flags & FLAG_TAGGED_QUEUING))
                return;
 
        for (target = 0; target < 8; ++target) {
                for (lun = 0; lun < 8; ++lun) {
-                       ta = &TagAlloc[target][lun];
+                       ta = &hostdata->TagAlloc[target][lun];
                        bitmap_zero(ta->allocated, MAX_TAGS);
                        ta->nr_allocated = 0;
                }
@@ -2205,7 +2196,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                                 */
                                                /* ++Andreas: the mid level code knows about
                                                   QUEUE_FULL now. */
-                                               TAG_ALLOC *ta = &TagAlloc[cmd->device->id][cmd->device->lun];
+                                               struct tag_alloc *ta = &hostdata->TagAlloc[scmd_id(cmd)][cmd->device->lun];
                                                dprintk(NDEBUG_TAGS, "scsi%d: target %d lun %llu returned "
                                                           "QUEUE_FULL after %d commands\n",
                                                           HOSTNO, cmd->device->id, cmd->device->lun,