1 files changed, 75 insertions, 13 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 8f4ef656a1af..587cce57adae 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -68,6 +69,10 @@ static int cciss_tape_cmds = 6;
 module_param(cciss_tape_cmds, int, 0644);
 MODULE_PARM_DESC(cciss_tape_cmds,
         "number of commands to allocate for tape devices (default: 6)");
+static int cciss_simple_mode;
+module_param(cciss_simple_mode, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(cciss_simple_mode,
+        "Use 'simple mode' rather than 'performant mode'");
 
 static DEFINE_MUTEX(cciss_mutex);
 static struct proc_dir_entry *proc_cciss;
@@ -176,6 +181,7 @@ static void cciss_geometry_inquiry(ctlr_info_t *h, int logvol,
                         unsigned int block_size, InquiryData_struct *inq_buff,
                                    drive_info_struct *drv);
 static void __devinit cciss_interrupt_mode(ctlr_info_t *);
+static int __devinit cciss_enter_simple_mode(struct ctlr_info *h);
 static void start_io(ctlr_info_t *h);
 static int sendcmd_withirq(ctlr_info_t *h, __u8 cmd, void *buff, size_t size,
                         __u8 page_code, unsigned char scsi3addr[],
@@ -388,7 +394,7 @@ static void cciss_seq_show_header(struct seq_file *seq)
                 h->product_name,
                 (unsigned long)h->board_id,
                 h->firm_ver[0], h->firm_ver[1], h->firm_ver[2],
-                h->firm_ver[3], (unsigned int)h->intr[PERF_MODE_INT],
+                h->firm_ver[3], (unsigned int)h->intr[h->intr_mode],
                 h->num_luns,
                 h->Qdepth, h->commands_outstanding,
                 h->maxQsinceinit, h->max_outstanding, h->maxSG);
@@ -636,6 +642,18 @@ static ssize_t host_store_rescan(struct device *dev,
 }
 static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan);
 
+static ssize_t host_show_transport_mode(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct ctlr_info *h = to_hba(dev);
+
+        return snprintf(buf, 20, "%s\n",
+                h->transMethod & CFGTBL_Trans_Performant ?
+                        "performant" : "simple");
+}
+static DEVICE_ATTR(transport_mode, S_IRUGO, host_show_transport_mode, NULL);
+
 static ssize_t dev_show_unique_id(struct device *dev,
                                  struct device_attribute *attr,
                                  char *buf)
@@ -808,6 +826,7 @@ static DEVICE_ATTR(usage_count, S_IRUGO, cciss_show_usage_count, NULL);
 static struct attribute *cciss_host_attrs[] = {
         &dev_attr_rescan.attr,
         &dev_attr_resettable.attr,
+        &dev_attr_transport_mode.attr,
         NULL
 };
 
@@ -2582,6 +2601,8 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
                         c->Request.Timeout = 0;
                         c->Request.CDB[0] = BMIC_WRITE;
                         c->Request.CDB[6] = BMIC_CACHE_FLUSH;
+                        c->Request.CDB[7] = (size >> 8) & 0xFF;
+                        c->Request.CDB[8] = size & 0xFF;
                         break;
                 case TEST_UNIT_READY:
                         c->Request.CDBLen = 6;
@@ -3984,6 +4005,9 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
 {
         __u32 trans_support;
 
+        if (cciss_simple_mode)
+                return;
+
         dev_dbg(&h->pdev->dev, "Trying to put board into Performant mode\n");
         /* Attempt to put controller into performant mode if supported */
         /* Does board support performant mode? */
@@ -4081,7 +4105,7 @@ static void __devinit cciss_interrupt_mode(ctlr_info_t *h)
 default_int_mode:
 #endif                          /* CONFIG_PCI_MSI */
         /* if we get here we're going to use the default interrupt mode */
-        h->intr[PERF_MODE_INT] = h->pdev->irq;
+        h->intr[h->intr_mode] = h->pdev->irq;
         return;
 }
 
@@ -4298,6 +4322,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
                 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
                 return -ENODEV;
         }
+
+        pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
+                                PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+
         err = pci_enable_device(h->pdev);
         if (err) {
                 dev_warn(&h->pdev->dev, "Unable to Enable PCI device\n");
@@ -4341,6 +4369,9 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
         }
         cciss_enable_scsi_prefetch(h);
         cciss_p600_dma_prefetch_quirk(h);
+        err = cciss_enter_simple_mode(h);
+        if (err)
+                goto err_out_free_res;
         cciss_put_controller_into_performant_mode(h);
         return 0;
 
@@ -4533,6 +4564,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev,
                 pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
                 pmcsr |= PCI_D0;
                 pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
+
+                /*
+                 * The P600 requires a small delay when changing states.
+                 * Otherwise we may think the board did not reset and we bail.
+                 * This for kdump only and is particular to the P600.
+                 */
+                msleep(500);
         }
         return 0;
 }
@@ -4843,20 +4881,20 @@ static int cciss_request_irq(ctlr_info_t *h,
         irqreturn_t (*intxhandler)(int, void *))
 {
         if (h->msix_vector || h->msi_vector) {
-                if (!request_irq(h->intr[PERF_MODE_INT], msixhandler,
-                                IRQF_DISABLED, h->devname, h))
+                if (!request_irq(h->intr[h->intr_mode], msixhandler,
+                                0, h->devname, h))
                         return 0;
                 dev_err(&h->pdev->dev, "Unable to get msi irq %d"
-                        " for %s\n", h->intr[PERF_MODE_INT],
+                        " for %s\n", h->intr[h->intr_mode],
                         h->devname);
                 return -1;
         }
 
-        if (!request_irq(h->intr[PERF_MODE_INT], intxhandler,
-                        IRQF_DISABLED, h->devname, h))
+        if (!request_irq(h->intr[h->intr_mode], intxhandler,
+                        IRQF_SHARED, h->devname, h))
                 return 0;
         dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n",
-                h->intr[PERF_MODE_INT], h->devname);
+                h->intr[h->intr_mode], h->devname);
         return -1;
 }
 
@@ -4887,7 +4925,7 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h)
 {
         int ctlr = h->ctlr;
 
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
 #ifdef CONFIG_PCI_MSI
         if (h->msix_vector)
                 pci_disable_msix(h->pdev);
@@ -4953,6 +4991,7 @@ reinit_after_soft_reset:
         h = hba[i];
         h->pdev = pdev;
         h->busy_initializing = 1;
+        h->intr_mode = cciss_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT;
         INIT_LIST_HEAD(&h->cmpQ);
         INIT_LIST_HEAD(&h->reqQ);
         mutex_init(&h->busy_shutting_down);
@@ -5009,7 +5048,7 @@ reinit_after_soft_reset:
 
         dev_info(&h->pdev->dev, "%s: <0x%x> at PCI %s IRQ %d%s using DAC\n",
                h->devname, pdev->device, pci_name(pdev),
-               h->intr[PERF_MODE_INT], dac ? "" : " not");
+               h->intr[h->intr_mode], dac ? "" : " not");
 
         if (cciss_allocate_cmd_pool(h))
                 goto clean4;
@@ -5056,7 +5095,7 @@ reinit_after_soft_reset:
                 spin_lock_irqsave(&h->lock, flags);
                 h->access.set_intr_mask(h, CCISS_INTR_OFF);
                 spin_unlock_irqrestore(&h->lock, flags);
-                free_irq(h->intr[PERF_MODE_INT], h);
+                free_irq(h->intr[h->intr_mode], h);
                 rc = cciss_request_irq(h, cciss_msix_discard_completions,
                                         cciss_intx_discard_completions);
                 if (rc) {
@@ -5126,6 +5165,7 @@ reinit_after_soft_reset:
         h->cciss_max_sectors = 8192;
 
         rebuild_lun_table(h, 1, 0);
+        cciss_engage_scsi(h);
         h->busy_initializing = 0;
         return 1;
 
@@ -5133,7 +5173,7 @@ clean4:
         cciss_free_cmd_pool(h);
         cciss_free_scatterlists(h);
         cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds);
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
 clean2:
         unregister_blkdev(h->major, h->devname);
 clean1:
@@ -5172,9 +5212,31 @@ static void cciss_shutdown(struct pci_dev *pdev)
         if (return_code != IO_OK)
                 dev_warn(&h->pdev->dev, "Error flushing cache\n");
         h->access.set_intr_mask(h, CCISS_INTR_OFF);
-        free_irq(h->intr[PERF_MODE_INT], h);
+        free_irq(h->intr[h->intr_mode], h);
 }
 
+static int __devinit cciss_enter_simple_mode(struct ctlr_info *h)
+{
+        u32 trans_support;
+
+        trans_support = readl(&(h->cfgtable->TransportSupport));
+        if (!(trans_support & SIMPLE_MODE))
+                return -ENOTSUPP;
+
+        h->max_commands = readl(&(h->cfgtable->CmdsOutMax));
+        writel(CFGTBL_Trans_Simple, &(h->cfgtable->HostWrite.TransportRequest));
+        writel(CFGTBL_ChangeReq, h->vaddr + SA5_DOORBELL);
+        cciss_wait_for_mode_change_ack(h);
+        print_cfg_table(h);
+        if (!(readl(&(h->cfgtable->TransportActive)) & CFGTBL_Trans_Simple)) {
+                dev_warn(&h->pdev->dev, "unable to get board into simple mode\n");
+                return -ENODEV;
+        }
+        h->transMethod = CFGTBL_Trans_Simple;
+        return 0;
+}
+
+
 static void __devexit cciss_remove_one(struct pci_dev *pdev)
 {
         ctlr_info_t *h;