[SCSI] aacraid: respond to enclosure service events

[linux.git] / drivers / scsi / eata.c

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 2d38025861a50ee7aaf33e5f68ce346f1274fff5..7ead5210de968dfb0ece36e1d81058a018875d14 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -523,7 +523,8 @@ static struct scsi_host_template driver_template = {
        .slave_configure = eata2x_slave_configure,
        .this_id = 7,
        .unchecked_isa_dma = 1,
        .slave_configure = eata2x_slave_configure,
        .this_id = 7,
        .unchecked_isa_dma = 1,

-       .use_clustering = ENABLE_CLUSTERING
+       .use_clustering = ENABLE_CLUSTERING,
+       .use_sg_chaining = ENABLE_SG_CHAINING,

 };
 
 #if !defined(__BIG_ENDIAN_BITFIELD) && !defined(__LITTLE_ENDIAN_BITFIELD)
 };
 
 #if !defined(__BIG_ENDIAN_BITFIELD) && !defined(__LITTLE_ENDIAN_BITFIELD)


@@ -1609,8 +1610,9 @@ static int eata2x_detect(struct scsi_host_template *tpnt)
 
 static void map_dma(unsigned int i, struct hostdata *ha)
 {
 
 static void map_dma(unsigned int i, struct hostdata *ha)
 {

-       unsigned int k, count, pci_dir;
-       struct scatterlist *sgpnt;
+       unsigned int k, pci_dir;
+       int count;
+       struct scatterlist *sg;

        struct mscp *cpp;
        struct scsi_cmnd *SCpnt;
 
        struct mscp *cpp;
        struct scsi_cmnd *SCpnt;
 


@@ -1625,38 +1627,19 @@ static void map_dma(unsigned int i, struct hostdata *ha)
 
        cpp->sense_len = sizeof SCpnt->sense_buffer;
 
 
        cpp->sense_len = sizeof SCpnt->sense_buffer;
 

-       if (!SCpnt->use_sg) {
-
-               /* If we get here with PCI_DMA_NONE, pci_map_single triggers a BUG() */
-               if (!SCpnt->request_bufflen)
-                       pci_dir = PCI_DMA_BIDIRECTIONAL;
-
-               if (SCpnt->request_buffer)
-                       cpp->data_address = H2DEV(pci_map_single(ha->pdev,
-                                                                SCpnt->
-                                                                request_buffer,
-                                                                SCpnt->
-                                                                request_bufflen,
-                                                                pci_dir));
-
-               cpp->data_len = H2DEV(SCpnt->request_bufflen);
-               return;
-       }
-
-       sgpnt = (struct scatterlist *)SCpnt->request_buffer;
-       count = pci_map_sg(ha->pdev, sgpnt, SCpnt->use_sg, pci_dir);
-
-       for (k = 0; k < count; k++) {
-               cpp->sglist[k].address = H2DEV(sg_dma_address(&sgpnt[k]));
-               cpp->sglist[k].num_bytes = H2DEV(sg_dma_len(&sgpnt[k]));
+       count = scsi_dma_map(SCpnt);
+       BUG_ON(count < 0);
+       scsi_for_each_sg(SCpnt, sg, count, k) {
+               cpp->sglist[k].address = H2DEV(sg_dma_address(sg));
+               cpp->sglist[k].num_bytes = H2DEV(sg_dma_len(sg));

        }
 
        cpp->sg = 1;
        cpp->data_address = H2DEV(pci_map_single(ha->pdev, cpp->sglist,
        }
 
        cpp->sg = 1;
        cpp->data_address = H2DEV(pci_map_single(ha->pdev, cpp->sglist,

-                                                SCpnt->use_sg *
+                                                scsi_sg_count(SCpnt) *

                                                 sizeof(struct sg_list),
                                                 pci_dir));
                                                 sizeof(struct sg_list),
                                                 pci_dir));

-       cpp->data_len = H2DEV((SCpnt->use_sg * sizeof(struct sg_list)));
+       cpp->data_len = H2DEV((scsi_sg_count(SCpnt) * sizeof(struct sg_list)));

 }
 
 static void unmap_dma(unsigned int i, struct hostdata *ha)
 }
 
 static void unmap_dma(unsigned int i, struct hostdata *ha)


@@ -1673,9 +1656,7 @@ static void unmap_dma(unsigned int i, struct hostdata *ha)
                pci_unmap_single(ha->pdev, DEV2H(cpp->sense_addr),
                                 DEV2H(cpp->sense_len), PCI_DMA_FROMDEVICE);
 
                pci_unmap_single(ha->pdev, DEV2H(cpp->sense_addr),
                                 DEV2H(cpp->sense_len), PCI_DMA_FROMDEVICE);
 

-       if (SCpnt->use_sg)
-               pci_unmap_sg(ha->pdev, SCpnt->request_buffer, SCpnt->use_sg,
-                            pci_dir);
+       scsi_dma_unmap(SCpnt);

 
        if (!DEV2H(cpp->data_len))
                pci_dir = PCI_DMA_BIDIRECTIONAL;
 
        if (!DEV2H(cpp->data_len))
                pci_dir = PCI_DMA_BIDIRECTIONAL;


@@ -1700,9 +1681,9 @@ static void sync_dma(unsigned int i, struct hostdata *ha)
                                            DEV2H(cpp->sense_len),
                                            PCI_DMA_FROMDEVICE);
 
                                            DEV2H(cpp->sense_len),
                                            PCI_DMA_FROMDEVICE);
 

-       if (SCpnt->use_sg)
-               pci_dma_sync_sg_for_cpu(ha->pdev, SCpnt->request_buffer,
-                                       SCpnt->use_sg, pci_dir);
+       if (scsi_sg_count(SCpnt))
+               pci_dma_sync_sg_for_cpu(ha->pdev, scsi_sglist(SCpnt),
+                                       scsi_sg_count(SCpnt), pci_dir);

 
        if (!DEV2H(cpp->data_len))
                pci_dir = PCI_DMA_BIDIRECTIONAL;
 
        if (!DEV2H(cpp->data_len))
                pci_dir = PCI_DMA_BIDIRECTIONAL;


@@ -1778,7 +1759,7 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,
 
        if (SCpnt->host_scribble)
                panic("%s: qcomm, pid %ld, SCpnt %p already active.\n",
 
        if (SCpnt->host_scribble)
                panic("%s: qcomm, pid %ld, SCpnt %p already active.\n",

-                     ha->board_name, SCpnt->pid, SCpnt);
+                     ha->board_name, SCpnt->serial_number, SCpnt);

 
        /* i is the mailbox number, look for the first free mailbox
           starting from last_cp_used */
 
        /* i is the mailbox number, look for the first free mailbox
           starting from last_cp_used */


@@ -1812,7 +1793,7 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,
 
        if (do_trace)
                scmd_printk(KERN_INFO, SCpnt,
 
        if (do_trace)
                scmd_printk(KERN_INFO, SCpnt,

-                       "qcomm, mbox %d, pid %ld.\n", i, SCpnt->pid);
+                       "qcomm, mbox %d, pid %ld.\n", i, SCpnt->serial_number);

 
        cpp->reqsen = 1;
        cpp->dispri = 1;
 
        cpp->reqsen = 1;
        cpp->dispri = 1;


@@ -1845,7 +1826,7 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,
                unmap_dma(i, ha);
                SCpnt->host_scribble = NULL;
                scmd_printk(KERN_INFO, SCpnt,
                unmap_dma(i, ha);
                SCpnt->host_scribble = NULL;
                scmd_printk(KERN_INFO, SCpnt,

-                       "qcomm, pid %ld, adapter busy.\n", SCpnt->pid);
+                       "qcomm, pid %ld, adapter busy.\n", SCpnt->serial_number);

                return 1;
        }
 
                return 1;
        }
 


@@ -1861,13 +1842,13 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg)
 
        if (SCarg->host_scribble == NULL) {
                scmd_printk(KERN_INFO, SCarg,
 
        if (SCarg->host_scribble == NULL) {
                scmd_printk(KERN_INFO, SCarg,

-                       "abort, pid %ld inactive.\n", SCarg->pid);
+                       "abort, pid %ld inactive.\n", SCarg->serial_number);

                return SUCCESS;
        }
 
        i = *(unsigned int *)SCarg->host_scribble;
        scmd_printk(KERN_WARNING, SCarg,
                return SUCCESS;
        }
 
        i = *(unsigned int *)SCarg->host_scribble;
        scmd_printk(KERN_WARNING, SCarg,

-               "abort, mbox %d, pid %ld.\n", i, SCarg->pid);
+               "abort, mbox %d, pid %ld.\n", i, SCarg->serial_number);

 
        if (i >= shost->can_queue)
                panic("%s: abort, invalid SCarg->host_scribble.\n", ha->board_name);
 
        if (i >= shost->can_queue)
                panic("%s: abort, invalid SCarg->host_scribble.\n", ha->board_name);


@@ -1912,7 +1893,7 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg)
                SCarg->host_scribble = NULL;
                ha->cp_stat[i] = FREE;
                printk("%s, abort, mbox %d ready, DID_ABORT, pid %ld done.\n",
                SCarg->host_scribble = NULL;
                ha->cp_stat[i] = FREE;
                printk("%s, abort, mbox %d ready, DID_ABORT, pid %ld done.\n",

-                      ha->board_name, i, SCarg->pid);
+                      ha->board_name, i, SCarg->serial_number);

                SCarg->scsi_done(SCarg);
                return SUCCESS;
        }
                SCarg->scsi_done(SCarg);
                return SUCCESS;
        }


@@ -1929,12 +1910,12 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
        struct hostdata *ha = (struct hostdata *)shost->hostdata;
 
        scmd_printk(KERN_INFO, SCarg,
        struct hostdata *ha = (struct hostdata *)shost->hostdata;
 
        scmd_printk(KERN_INFO, SCarg,

-               "reset, enter, pid %ld.\n", SCarg->pid);
+               "reset, enter, pid %ld.\n", SCarg->serial_number);

 
        spin_lock_irq(shost->host_lock);
 
        if (SCarg->host_scribble == NULL)
 
        spin_lock_irq(shost->host_lock);
 
        if (SCarg->host_scribble == NULL)

-               printk("%s: reset, pid %ld inactive.\n", ha->board_name, SCarg->pid);
+               printk("%s: reset, pid %ld inactive.\n", ha->board_name, SCarg->serial_number);

 
        if (ha->in_reset) {
                printk("%s: reset, exit, already in reset.\n", ha->board_name);
 
        if (ha->in_reset) {
                printk("%s: reset, exit, already in reset.\n", ha->board_name);


@@ -1974,13 +1955,13 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
                if (ha->cp_stat[i] == READY || ha->cp_stat[i] == ABORTING) {
                        ha->cp_stat[i] = ABORTING;
                        printk("%s: reset, mbox %d aborting, pid %ld.\n",
                if (ha->cp_stat[i] == READY || ha->cp_stat[i] == ABORTING) {
                        ha->cp_stat[i] = ABORTING;
                        printk("%s: reset, mbox %d aborting, pid %ld.\n",

-                              ha->board_name, i, SCpnt->pid);
+                              ha->board_name, i, SCpnt->serial_number);

                }
 
                else {
                        ha->cp_stat[i] = IN_RESET;
                        printk("%s: reset, mbox %d in reset, pid %ld.\n",
                }
 
                else {
                        ha->cp_stat[i] = IN_RESET;
                        printk("%s: reset, mbox %d in reset, pid %ld.\n",

-                              ha->board_name, i, SCpnt->pid);
+                              ha->board_name, i, SCpnt->serial_number);

                }
 
                if (SCpnt->host_scribble == NULL)
                }
 
                if (SCpnt->host_scribble == NULL)


@@ -2035,7 +2016,7 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
 
                        printk
                            ("%s, reset, mbox %d locked, DID_RESET, pid %ld done.\n",
 
                        printk
                            ("%s, reset, mbox %d locked, DID_RESET, pid %ld done.\n",

-                            ha->board_name, i, SCpnt->pid);
+                            ha->board_name, i, SCpnt->serial_number);

                }
 
                else if (ha->cp_stat[i] == ABORTING) {
                }
 
                else if (ha->cp_stat[i] == ABORTING) {


@@ -2049,7 +2030,7 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
 
                        printk
                            ("%s, reset, mbox %d aborting, DID_RESET, pid %ld done.\n",
 
                        printk
                            ("%s, reset, mbox %d aborting, DID_RESET, pid %ld done.\n",

-                            ha->board_name, i, SCpnt->pid);
+                            ha->board_name, i, SCpnt->serial_number);

                }
 
                else
                }
 
                else


@@ -2063,7 +2044,7 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
        do_trace = 0;
 
        if (arg_done)
        do_trace = 0;
 
        if (arg_done)

-               printk("%s: reset, exit, pid %ld done.\n", ha->board_name, SCarg->pid);
+               printk("%s: reset, exit, pid %ld done.\n", ha->board_name, SCarg->serial_number);

        else
                printk("%s: reset, exit.\n", ha->board_name);
 
        else
                printk("%s: reset, exit.\n", ha->board_name);
 


@@ -2202,7 +2183,7 @@ static int reorder(struct hostdata *ha, unsigned long cursec,
                        cpp = &ha->cp[k];
                        SCpnt = cpp->SCpnt;
                        ll[n] = SCpnt->request->nr_sectors;
                        cpp = &ha->cp[k];
                        SCpnt = cpp->SCpnt;
                        ll[n] = SCpnt->request->nr_sectors;

-                       pl[n] = SCpnt->pid;
+                       pl[n] = SCpnt->serial_number;

 
                        if (!n)
                                continue;
 
                        if (!n)
                                continue;


@@ -2250,7 +2231,7 @@ static int reorder(struct hostdata *ha, unsigned long cursec,
                            "%s pid %ld mb %d fc %d nr %d sec %ld ns %ld"
                             " cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n",
                             (ihdlr ? "ihdlr" : "qcomm"),
                            "%s pid %ld mb %d fc %d nr %d sec %ld ns %ld"
                             " cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n",
                             (ihdlr ? "ihdlr" : "qcomm"),

-                            SCpnt->pid, k, flushcount,
+                            SCpnt->serial_number, k, flushcount,

                             n_ready, SCpnt->request->sector,
                             SCpnt->request->nr_sectors, cursec, YESNO(s),
                             YESNO(r), YESNO(rev), YESNO(input_only),
                             n_ready, SCpnt->request->sector,
                             SCpnt->request->nr_sectors, cursec, YESNO(s),
                             YESNO(r), YESNO(rev), YESNO(input_only),


@@ -2297,7 +2278,7 @@ static void flush_dev(struct scsi_device *dev, unsigned long cursec,
                            "%s, pid %ld, mbox %d, adapter"
                             " busy, will abort.\n",
                             (ihdlr ? "ihdlr" : "qcomm"),
                            "%s, pid %ld, mbox %d, adapter"
                             " busy, will abort.\n",
                             (ihdlr ? "ihdlr" : "qcomm"),

-                            SCpnt->pid, k);
+                            SCpnt->serial_number, k);

                        ha->cp_stat[k] = ABORTING;
                        continue;
                }
                        ha->cp_stat[k] = ABORTING;
                        continue;
                }


@@ -2411,11 +2392,11 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
 
        if (SCpnt->host_scribble == NULL)
                panic("%s: ihdlr, mbox %d, pid %ld, SCpnt %p garbled.\n", ha->board_name,
 
        if (SCpnt->host_scribble == NULL)
                panic("%s: ihdlr, mbox %d, pid %ld, SCpnt %p garbled.\n", ha->board_name,

-                     i, SCpnt->pid, SCpnt);
+                     i, SCpnt->serial_number, SCpnt);

 
        if (*(unsigned int *)SCpnt->host_scribble != i)
                panic("%s: ihdlr, mbox %d, pid %ld, index mismatch %d.\n",
 
        if (*(unsigned int *)SCpnt->host_scribble != i)
                panic("%s: ihdlr, mbox %d, pid %ld, index mismatch %d.\n",

-                     ha->board_name, i, SCpnt->pid,
+                     ha->board_name, i, SCpnt->serial_number,

                      *(unsigned int *)SCpnt->host_scribble);
 
        sync_dma(i, ha);
                      *(unsigned int *)SCpnt->host_scribble);
 
        sync_dma(i, ha);


@@ -2465,12 +2446,12 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
                               "target_status 0x%x, sense key 0x%x.\n",
                               ha->board_name,
                               SCpnt->device->channel, SCpnt->device->id,
                               "target_status 0x%x, sense key 0x%x.\n",
                               ha->board_name,
                               SCpnt->device->channel, SCpnt->device->id,

-                              SCpnt->device->lun, SCpnt->pid,
+                              SCpnt->device->lun, SCpnt->serial_number,

                               spp->target_status, SCpnt->sense_buffer[2]);
 
                ha->target_to[SCpnt->device->id][SCpnt->device->channel] = 0;
 
                               spp->target_status, SCpnt->sense_buffer[2]);
 
                ha->target_to[SCpnt->device->id][SCpnt->device->channel] = 0;
 

-               if (ha->last_retried_pid == SCpnt->pid)
+               if (ha->last_retried_pid == SCpnt->serial_number)

                        ha->retries = 0;
 
                break;
                        ha->retries = 0;
 
                break;


@@ -2505,7 +2486,7 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
 #endif
 
                        ha->retries++;
 #endif
 
                        ha->retries++;

-                       ha->last_retried_pid = SCpnt->pid;
+                       ha->last_retried_pid = SCpnt->serial_number;

                } else
                        status = DID_ERROR << 16;
 
                } else
                        status = DID_ERROR << 16;
 


@@ -2536,7 +2517,7 @@ static irqreturn_t ihdlr(int irq, struct Scsi_Host *shost)
                scmd_printk(KERN_INFO, SCpnt, "ihdlr, mbox %2d, err 0x%x:%x,"
                       " pid %ld, reg 0x%x, count %d.\n",
                       i, spp->adapter_status, spp->target_status,
                scmd_printk(KERN_INFO, SCpnt, "ihdlr, mbox %2d, err 0x%x:%x,"
                       " pid %ld, reg 0x%x, count %d.\n",
                       i, spp->adapter_status, spp->target_status,

-                      SCpnt->pid, reg, ha->iocount);
+                      SCpnt->serial_number, reg, ha->iocount);

 
        unmap_dma(i, ha);
 
 
        unmap_dma(i, ha);