5 files changed, 74 insertions, 123 deletions

diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index c0cf52cb975a..bbbb55eeb73a 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -29,6 +29,12 @@
  *  NV-specific details such as register offsets, SATA phy location,
  *  hotplug info, etc.
  *
+ *  0.10
+ *     - Fixed spurious interrupts issue seen with the Maxtor 6H500F0 500GB
+ *       drive.  Also made the check_hotplug() callbacks return whether there
+ *       was a hotplug interrupt or not.  This was not the source of the
+ *       spurious interrupts, but is the right thing to do anyway.
+ *
  *  0.09
  *     - Fixed bug introduced by 0.08's MCP51 and MCP55 support.
  *
@@ -124,10 +130,10 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void nv_host_stop (struct ata_host_set *host_set);
 static void nv_enable_hotplug(struct ata_probe_ent *probe_ent);
 static void nv_disable_hotplug(struct ata_host_set *host_set);
-static void nv_check_hotplug(struct ata_host_set *host_set);
+static int nv_check_hotplug(struct ata_host_set *host_set);
 static void nv_enable_hotplug_ck804(struct ata_probe_ent *probe_ent);
 static void nv_disable_hotplug_ck804(struct ata_host_set *host_set);
-static void nv_check_hotplug_ck804(struct ata_host_set *host_set);
+static int nv_check_hotplug_ck804(struct ata_host_set *host_set);
 
 enum nv_host_type
 {
@@ -176,7 +182,7 @@ struct nv_host_desc
         enum nv_host_type       host_type;
         void                    (*enable_hotplug)(struct ata_probe_ent *probe_ent);
         void                    (*disable_hotplug)(struct ata_host_set *host_set);
-        void                    (*check_hotplug)(struct ata_host_set *host_set);
+        int                     (*check_hotplug)(struct ata_host_set *host_set);
 
 };
 static struct nv_host_desc nv_device_tbl[] = {
@@ -309,12 +315,16 @@ static irqreturn_t nv_interrupt (int irq, void *dev_instance,
                         qc = ata_qc_from_tag(ap, ap->active_tag);
                         if (qc && (!(qc->tf.ctl & ATA_NIEN)))
                                 handled += ata_host_intr(ap, qc);
+                        else
+                                // No request pending?  Clear interrupt status
+                                // anyway, in case there's one pending.
+                                ap->ops->check_status(ap);
                 }
 
         }
 
         if (host->host_desc->check_hotplug)
-                host->host_desc->check_hotplug(host_set);
+                handled += host->host_desc->check_hotplug(host_set);
 
         spin_unlock_irqrestore(&host_set->lock, flags);
 
@@ -497,7 +507,7 @@ static void nv_disable_hotplug(struct ata_host_set *host_set)
         outb(intr_mask, host_set->ports[0]->ioaddr.scr_addr + NV_INT_ENABLE);
 }
 
-static void nv_check_hotplug(struct ata_host_set *host_set)
+static int nv_check_hotplug(struct ata_host_set *host_set)
 {
         u8 intr_status;
 
@@ -522,7 +532,11 @@ static void nv_check_hotplug(struct ata_host_set *host_set)
                 if (intr_status & NV_INT_STATUS_SDEV_REMOVED)
                         printk(KERN_WARNING "nv_sata: "
                                 "Secondary device removed\n");
+
+                return 1;
         }
+
+        return 0;
 }
 
 static void nv_enable_hotplug_ck804(struct ata_probe_ent *probe_ent)
@@ -560,7 +574,7 @@ static void nv_disable_hotplug_ck804(struct ata_host_set *host_set)
         pci_write_config_byte(pdev, NV_MCP_SATA_CFG_20, regval);
 }
 
-static void nv_check_hotplug_ck804(struct ata_host_set *host_set)
+static int nv_check_hotplug_ck804(struct ata_host_set *host_set)
 {
         u8 intr_status;
 
@@ -585,7 +599,11 @@ static void nv_check_hotplug_ck804(struct ata_host_set *host_set)
                 if (intr_status & NV_INT_STATUS_SDEV_REMOVED)
                         printk(KERN_WARNING "nv_sata: "
                                 "Secondary device removed\n");
+
+                return 1;
         }
+
+        return 0;
 }
 
 static int __init nv_init(void)
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 180676d7115a..ee5f4dfdab14 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -69,7 +69,6 @@
 #include "scsi_logging.h"
 
 static void scsi_done(struct scsi_cmnd *cmd);
-static int scsi_retry_command(struct scsi_cmnd *cmd);
 
 /*
  * Definitions and constants.
@@ -752,7 +751,7 @@ static void scsi_done(struct scsi_cmnd *cmd)
  * isn't running --- used by scsi_times_out */
 void __scsi_done(struct scsi_cmnd *cmd)
 {
-        unsigned long flags;
+        struct request *rq = cmd->request;
 
         /*
          * Set the serial numbers back to zero
@@ -763,71 +762,14 @@ void __scsi_done(struct scsi_cmnd *cmd)
         if (cmd->result)
                 atomic_inc(&cmd->device->ioerr_cnt);
 
+        BUG_ON(!rq);
+
         /*
-         * Next, enqueue the command into the done queue.
-         * It is a per-CPU queue, so we just disable local interrupts
-         * and need no spinlock.
+         * The uptodate/nbytes values don't matter, as we allow partial
+         * completes and thus will check this in the softirq callback
          */
-        local_irq_save(flags);
-        list_add_tail(&cmd->eh_entry, &__get_cpu_var(scsi_done_q));
-        raise_softirq_irqoff(SCSI_SOFTIRQ);
-        local_irq_restore(flags);
-}
-
-/**
- * scsi_softirq - Perform post-interrupt processing of finished SCSI commands.
- *
- * This is the consumer of the done queue.
- *
- * This is called with all interrupts enabled.  This should reduce
- * interrupt latency, stack depth, and reentrancy of the low-level
- * drivers.
- */
-static void scsi_softirq(struct softirq_action *h)
-{
-        int disposition;
-        LIST_HEAD(local_q);
-
-        local_irq_disable();
-        list_splice_init(&__get_cpu_var(scsi_done_q), &local_q);
-        local_irq_enable();
-
-        while (!list_empty(&local_q)) {
-                struct scsi_cmnd *cmd = list_entry(local_q.next,
-                                                   struct scsi_cmnd, eh_entry);
-                /* The longest time any command should be outstanding is the
-                 * per command timeout multiplied by the number of retries.
-                 *
-                 * For a typical command, this is 2.5 minutes */
-                unsigned long wait_for 
-                        = cmd->allowed * cmd->timeout_per_command;
-                list_del_init(&cmd->eh_entry);
-
-                disposition = scsi_decide_disposition(cmd);
-                if (disposition != SUCCESS &&
-                    time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
-                        sdev_printk(KERN_ERR, cmd->device,
-                                    "timing out command, waited %lus\n",
-                                    wait_for/HZ);
-                        disposition = SUCCESS;
-                }
-                        
-                scsi_log_completion(cmd, disposition);
-                switch (disposition) {
-                case SUCCESS:
-                        scsi_finish_command(cmd);
-                        break;
-                case NEEDS_RETRY:
-                        scsi_retry_command(cmd);
-                        break;
-                case ADD_TO_MLQUEUE:
-                        scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);
-                        break;
-                default:
-                        if (!scsi_eh_scmd_add(cmd, 0))
-                                scsi_finish_command(cmd);
-                }
-        }
+        rq->completion_data = cmd;
+        blk_complete_request(rq);
 }
 
 /*
@@ -840,7 +782,7 @@ static void scsi_softirq(struct softirq_action *h)
  *              level drivers should not become re-entrant as a result of
  *              this.
  */
-static int scsi_retry_command(struct scsi_cmnd *cmd)
+int scsi_retry_command(struct scsi_cmnd *cmd)
 {
         /*
          * Restore the SCSI command state.
@@ -1273,38 +1215,6 @@ int scsi_device_cancel(struct scsi_device *sdev, int recovery)
 }
 EXPORT_SYMBOL(scsi_device_cancel);
 
-#ifdef CONFIG_HOTPLUG_CPU
-static int scsi_cpu_notify(struct notifier_block *self,
-                           unsigned long action, void *hcpu)
-{
-        int cpu = (unsigned long)hcpu;
-
-        switch(action) {
-        case CPU_DEAD:
-                /* Drain scsi_done_q. */
-                local_irq_disable();
-                list_splice_init(&per_cpu(scsi_done_q, cpu),
-                                 &__get_cpu_var(scsi_done_q));
-                raise_softirq_irqoff(SCSI_SOFTIRQ);
-                local_irq_enable();
-                break;
-        default:
-                break;
-        }
-        return NOTIFY_OK;
-}
-
-static struct notifier_block __devinitdata scsi_cpu_nb = {
-        .notifier_call  = scsi_cpu_notify,
-};
-
-#define register_scsi_cpu() register_cpu_notifier(&scsi_cpu_nb)
-#define unregister_scsi_cpu() unregister_cpu_notifier(&scsi_cpu_nb)
-#else
-#define register_scsi_cpu()
-#define unregister_scsi_cpu()
-#endif /* CONFIG_HOTPLUG_CPU */
-
 MODULE_DESCRIPTION("SCSI core");
 MODULE_LICENSE("GPL");
 
@@ -1338,8 +1248,6 @@ static int __init init_scsi(void)
                 INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
         devfs_mk_dir("scsi");
-        open_softirq(SCSI_SOFTIRQ, scsi_softirq, NULL);
-        register_scsi_cpu();
         printk(KERN_NOTICE "SCSI subsystem initialized\n");
         return 0;
 
@@ -1367,7 +1275,6 @@ static void __exit exit_scsi(void)
         devfs_remove("scsi");
         scsi_exit_procfs();
         scsi_exit_queue();
-        unregister_scsi_cpu();
 }
 
 subsys_initcall(init_scsi);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ba93d6e66d48..00c9bf383e23 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1493,6 +1493,41 @@ static void scsi_kill_request(struct request *req, request_queue_t *q)
         __scsi_done(cmd);
 }
 
+static void scsi_softirq_done(struct request *rq)
+{
+        struct scsi_cmnd *cmd = rq->completion_data;
+        unsigned long wait_for = cmd->allowed * cmd->timeout_per_command;
+        int disposition;
+
+        INIT_LIST_HEAD(&cmd->eh_entry);
+
+        disposition = scsi_decide_disposition(cmd);
+        if (disposition != SUCCESS &&
+            time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
+                sdev_printk(KERN_ERR, cmd->device,
+                            "timing out command, waited %lus\n",
+                            wait_for/HZ);
+                disposition = SUCCESS;
+        }
+                        
+        scsi_log_completion(cmd, disposition);
+
+        switch (disposition) {
+                case SUCCESS:
+                        scsi_finish_command(cmd);
+                        break;
+                case NEEDS_RETRY:
+                        scsi_retry_command(cmd);
+                        break;
+                case ADD_TO_MLQUEUE:
+                        scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);
+                        break;
+                default:
+                        if (!scsi_eh_scmd_add(cmd, 0))
+                                scsi_finish_command(cmd);
+        }
+}
+
 /*
  * Function:    scsi_request_fn()
  *
@@ -1667,6 +1702,7 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
         blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
         blk_queue_segment_boundary(q, shost->dma_boundary);
         blk_queue_issue_flush_fn(q, scsi_issue_flush_fn);
+        blk_queue_softirq_done(q, scsi_softirq_done);
 
         if (!shost->use_clustering)
                 clear_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index f04e7e11f57a..14a6198cb8d2 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -44,6 +44,7 @@ extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd,
                 struct scsi_request *sreq);
 extern void __scsi_release_request(struct scsi_request *sreq);
 extern void __scsi_done(struct scsi_cmnd *cmd);
+extern int scsi_retry_command(struct scsi_cmnd *cmd);
 #ifdef CONFIG_SCSI_LOGGING
 void scsi_log_send(struct scsi_cmnd *cmd);
 void scsi_log_completion(struct scsi_cmnd *cmd, int disposition);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 32d4d8d7b9f3..4c5127ed379c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -527,7 +527,7 @@ static int sd_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
-static int sd_hdio_getgeo(struct block_device *bdev, struct hd_geometry __user *loc)
+static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
         struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
         struct scsi_device *sdp = sdkp->device;
@@ -545,15 +545,9 @@ static int sd_hdio_getgeo(struct block_device *bdev, struct hd_geometry __user *
         else
                 scsicam_bios_param(bdev, sdkp->capacity, diskinfo);
 
-        if (put_user(diskinfo[0], &loc->heads))
-                return -EFAULT;
-        if (put_user(diskinfo[1], &loc->sectors))
-                return -EFAULT;
-        if (put_user(diskinfo[2], &loc->cylinders))
-                return -EFAULT;
-        if (put_user((unsigned)get_start_sect(bdev),
-                     (unsigned long __user *)&loc->start))
-                return -EFAULT;
+        geo->heads = diskinfo[0];
+        geo->sectors = diskinfo[1];
+        geo->cylinders = diskinfo[2];
         return 0;
 }
 
@@ -593,12 +587,6 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
         if (!scsi_block_when_processing_errors(sdp) || !error)
                 return error;
 
-        if (cmd == HDIO_GETGEO) {
-                if (!arg)
-                        return -EINVAL;
-                return sd_hdio_getgeo(bdev, p);
-        }
-
         /*
          * Send SCSI addressing ioctls directly to mid level, send other
          * ioctls to block level and then onto mid level if they can't be
@@ -800,6 +788,7 @@ static struct block_device_operations sd_fops = {
         .open                   = sd_open,
         .release                = sd_release,
         .ioctl                  = sd_ioctl,
+        .getgeo                 = sd_getgeo,
 #ifdef CONFIG_COMPAT
         .compat_ioctl           = sd_compat_ioctl,
 #endif