17 files changed, 119 insertions, 49 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2e9a87e8e7d8..ef6de669424b 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -165,7 +165,7 @@ scsi_mod-$(CONFIG_SCSI_NETLINK)	+= scsi_netlink.o
 scsi_mod-$(CONFIG_SYSCTL)       += scsi_sysctl.o
 scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o
 scsi_mod-y                      += scsi_trace.o
-scsi_mod-$(CONFIG_PM_OPS)       += scsi_pm.o
+scsi_mod-$(CONFIG_PM)           += scsi_pm.o
 
 scsi_tgt-y                      += scsi_tgt_lib.o scsi_tgt_if.o
 
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 79cefbe31367..638c72b7f94a 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4277,7 +4277,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
 
         snprintf(phba->wq_name, sizeof(phba->wq_name), "beiscsi_q_irq%u",
                  phba->shost->host_no);
-        phba->wq = create_workqueue(phba->wq_name);
+        phba->wq = alloc_workqueue(phba->wq_name, WQ_MEM_RECLAIM, 1);
         if (!phba->wq) {
                 shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe-"
                                 "Failed to allocate work queue\n");
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig
index 5cf4e9831f1b..11dff23f7838 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig
@@ -1,6 +1,8 @@
 config SCSI_CXGB3_ISCSI
         tristate "Chelsio T3 iSCSI support"
-        depends on CHELSIO_T3_DEPENDS
+        depends on PCI && INET
+        select NETDEVICES
+        select NETDEV_10000
         select CHELSIO_T3
         select SCSI_ISCSI_ATTRS
         ---help---
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig
index bb94b39b17b3..d5302c27f377 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig
@@ -1,6 +1,8 @@
 config SCSI_CXGB4_ISCSI
         tristate "Chelsio T4 iSCSI support"
-        depends on CHELSIO_T4_DEPENDS
+        depends on PCI && INET
+        select NETDEVICES
+        select NETDEV_10000
         select CHELSIO_T4
         select SCSI_ISCSI_ATTRS
         ---help---
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index d2ad3d676724..a24dff9f9163 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -451,26 +451,13 @@ static struct cxgbi_sock *cxgbi_sock_create(struct cxgbi_device *cdev)
 }
 
 static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr,
-                                        __be16 sport, __be16 dport, u8 tos)
+                                      __be16 sport, __be16 dport, u8 tos)
 {
         struct rtable *rt;
-        struct flowi fl = {
-                .oif = 0,
-                .nl_u = {
-                        .ip4_u = {
-                                .daddr = daddr,
-                                .saddr = saddr,
-                                .tos = tos }
-                        },
-                .proto = IPPROTO_TCP,
-                .uli_u = {
-                        .ports = {
-                                .sport = sport,
-                                .dport = dport }
-                        }
-        };
 
-        if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+        rt = ip_route_output_ports(&init_net, NULL, daddr, saddr,
+                                   dport, sport, IPPROTO_TCP, tos, 0);
+        if (IS_ERR(rt))
                 return NULL;
 
         return rt;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 9f9600b67001..3becc6a20a4f 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -285,9 +285,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
         }
 
         /* Do not support for bonding device */
-        if ((netdev->priv_flags & IFF_MASTER_ALB) ||
-            (netdev->priv_flags & IFF_SLAVE_INACTIVE) ||
-            (netdev->priv_flags & IFF_MASTER_8023AD)) {
+        if (netdev->priv_flags & IFF_BONDING && netdev->flags & IFF_MASTER) {
                 FCOE_NETDEV_DBG(netdev, "Bonded interfaces not supported\n");
                 return -EOPNOTSUPP;
         }
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 9c5c8be72231..d841e98a8bd5 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6219,11 +6219,10 @@ static struct ata_port_operations ipr_sata_ops = {
 };
 
 static struct ata_port_info sata_port_info = {
-        .flags  = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET |
-        ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
-        .pio_mask       = 0x10, /* pio4 */
-        .mwdma_mask = 0x07,
-        .udma_mask      = 0x7f, /* udma0-6 */
+        .flags          = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,
+        .pio_mask       = ATA_PIO4_ONLY,
+        .mwdma_mask     = ATA_MWDMA2,
+        .udma_mask      = ATA_UDMA6,
         .port_ops       = &ipr_sata_ops
 };
 
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index e1a395b438ee..4d3b704ede1c 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -238,37 +238,43 @@ static bool sas_ata_qc_fill_rtf(struct ata_queued_cmd *qc)
         return true;
 }
 
-static void sas_ata_phy_reset(struct ata_port *ap)
+static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class,
+                               unsigned long deadline)
 {
+        struct ata_port *ap = link->ap;
         struct domain_device *dev = ap->private_data;
         struct sas_internal *i =
                 to_sas_internal(dev->port->ha->core.shost->transportt);
         int res = TMF_RESP_FUNC_FAILED;
+        int ret = 0;
 
         if (i->dft->lldd_I_T_nexus_reset)
                 res = i->dft->lldd_I_T_nexus_reset(dev);
 
-        if (res != TMF_RESP_FUNC_COMPLETE)
+        if (res != TMF_RESP_FUNC_COMPLETE) {
                 SAS_DPRINTK("%s: Unable to reset I T nexus?\n", __func__);
+                ret = -EAGAIN;
+        }
 
         switch (dev->sata_dev.command_set) {
                 case ATA_COMMAND_SET:
                         SAS_DPRINTK("%s: Found ATA device.\n", __func__);
-                        ap->link.device[0].class = ATA_DEV_ATA;
+                        *class = ATA_DEV_ATA;
                         break;
                 case ATAPI_COMMAND_SET:
                         SAS_DPRINTK("%s: Found ATAPI device.\n", __func__);
-                        ap->link.device[0].class = ATA_DEV_ATAPI;
+                        *class = ATA_DEV_ATAPI;
                         break;
                 default:
                         SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
                                     __func__,
                                     dev->sata_dev.command_set);
-                        ap->link.device[0].class = ATA_DEV_UNKNOWN;
+                        *class = ATA_DEV_UNKNOWN;
                         break;
         }
 
         ap->cbl = ATA_CBL_SATA;
+        return ret;
 }
 
 static void sas_ata_post_internal(struct ata_queued_cmd *qc)
@@ -349,7 +355,11 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
 }
 
 static struct ata_port_operations sas_sata_ops = {
-        .phy_reset              = sas_ata_phy_reset,
+        .prereset               = ata_std_prereset,
+        .softreset              = NULL,
+        .hardreset              = sas_ata_hard_reset,
+        .postreset              = ata_std_postreset,
+        .error_handler          = ata_std_error_handler,
         .post_internal_cmd      = sas_ata_post_internal,
         .qc_defer               = ata_std_qc_defer,
         .qc_prep                = ata_noop_qc_prep,
@@ -362,10 +372,9 @@ static struct ata_port_operations sas_sata_ops = {
 };
 
 static struct ata_port_info sata_port_info = {
-        .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET |
-                ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ,
-        .pio_mask = 0x1f, /* PIO0-4 */
-        .mwdma_mask = 0x07, /* MWDMA0-2 */
+        .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ,
+        .pio_mask = ATA_PIO4,
+        .mwdma_mask = ATA_MWDMA2,
         .udma_mask = ATA_UDMA6,
         .port_ops = &sas_sata_ops
 };
@@ -781,3 +790,68 @@ int sas_discover_sata(struct domain_device *dev)
 
         return res;
 }
+
+void sas_ata_strategy_handler(struct Scsi_Host *shost)
+{
+        struct scsi_device *sdev;
+
+        shost_for_each_device(sdev, shost) {
+                struct domain_device *ddev = sdev_to_domain_dev(sdev);
+                struct ata_port *ap = ddev->sata_dev.ap;
+
+                if (!dev_is_sata(ddev))
+                        continue;
+                
+                ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler");
+                ata_scsi_port_error_handler(shost, ap);
+        }
+}
+
+int sas_ata_timed_out(struct scsi_cmnd *cmd, struct sas_task *task,
+                      enum blk_eh_timer_return *rtn)
+{
+        struct domain_device *ddev = cmd_to_domain_dev(cmd);
+
+        if (!dev_is_sata(ddev) || task)
+                return 0;
+
+        /* we're a sata device with no task, so this must be a libata
+         * eh timeout.  Ideally should hook into libata timeout
+         * handling, but there's no point, it just wants to activate
+         * the eh thread */
+        *rtn = BLK_EH_NOT_HANDLED;
+        return 1;
+}
+
+int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
+               struct list_head *done_q)
+{
+        int rtn = 0;
+        struct scsi_cmnd *cmd, *n;
+        struct ata_port *ap;
+
+        do {
+                LIST_HEAD(sata_q);
+
+                ap = NULL;
+                
+                list_for_each_entry_safe(cmd, n, work_q, eh_entry) {
+                        struct domain_device *ddev = cmd_to_domain_dev(cmd);
+
+                        if (!dev_is_sata(ddev) || TO_SAS_TASK(cmd))
+                                continue;
+                        if(ap && ap != ddev->sata_dev.ap)
+                                continue;
+                        ap = ddev->sata_dev.ap;
+                        rtn = 1;
+                        list_move(&cmd->eh_entry, &sata_q);
+                }
+
+                if (!list_empty(&sata_q)) {
+                        ata_port_printk(ap, KERN_DEBUG,"sas eh calling libata cmd error handler\n");
+                        ata_scsi_cmd_error_handler(shost, ap, &sata_q);
+                }
+        } while (ap);
+
+        return rtn;
+}
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 9a7aaf5f1311..67758ea8eb7f 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -663,11 +663,16 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
          * scsi_unjam_host does, but we skip scsi_eh_abort_cmds because any
          * command we see here has no sas_task and is thus unknown to the HA.
          */
-        if (!scsi_eh_get_sense(&eh_work_q, &ha->eh_done_q))
-                scsi_eh_ready_devs(shost, &eh_work_q, &ha->eh_done_q);
+        if (!sas_ata_eh(shost, &eh_work_q, &ha->eh_done_q))
+                if (!scsi_eh_get_sense(&eh_work_q, &ha->eh_done_q))
+                        scsi_eh_ready_devs(shost, &eh_work_q, &ha->eh_done_q);
 
 out:
+        /* now link into libata eh --- if we have any ata devices */
+        sas_ata_strategy_handler(shost);
+
         scsi_eh_flush_done_q(&ha->eh_done_q);
+
         SAS_DPRINTK("--- Exit %s\n", __func__);
         return;
 }
@@ -676,6 +681,11 @@ enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)
 {
         struct sas_task *task = TO_SAS_TASK(cmd);
         unsigned long flags;
+        enum blk_eh_timer_return rtn; 
+
+        if (sas_ata_timed_out(cmd, task, &rtn))
+                return rtn;
+        
 
         if (!task) {
                 cmd->request->timeout /= 2;
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 53fa96ae2b3e..8fe3a45794fc 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -39,7 +39,6 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <linux/uio.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index c1e09d5a6196..d6e2a663b165 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -38,7 +38,6 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/smp_lock.h>
 #include <linux/uio.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index f27724d76cf6..e90f7c16b956 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -349,7 +349,7 @@ static int qla25xx_setup_mode(struct scsi_qla_host *vha)
                                 "Can't create request queue\n");
                         goto fail;
                 }
-                ha->wq = create_workqueue("qla2xxx_wq");
+                ha->wq = alloc_workqueue("qla2xxx_wq", WQ_MEM_RECLAIM, 1);
                 vha->req = ha->req_q_map[req];
                 options |= BIT_1;
                 for (ques = 1; ques < ha->max_rsp_queues; ques++) {
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9045c52abd25..fb2bb35c62cb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -443,7 +443,7 @@ static void scsi_run_queue(struct request_queue *q)
                                         &sdev->request_queue->queue_flags);
                 if (flagset)
                         queue_flag_set(QUEUE_FLAG_REENTER, sdev->request_queue);
-                __blk_run_queue(sdev->request_queue);
+                __blk_run_queue(sdev->request_queue, false);
                 if (flagset)
                         queue_flag_clear(QUEUE_FLAG_REENTER, sdev->request_queue);
                 spin_unlock(sdev->request_queue->queue_lock);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index b4056d14f812..342ee1a9c41d 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -146,7 +146,7 @@ static inline void scsi_netlink_exit(void) {}
 #endif
 
 /* scsi_pm.c */
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
 extern const struct dev_pm_ops scsi_bus_pm_ops;
 #endif
 #ifdef CONFIG_PM_RUNTIME
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 490ce213204e..e44ff64233fd 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -383,7 +383,7 @@ struct bus_type scsi_bus_type = {
         .name           = "scsi",
         .match          = scsi_bus_match,
         .uevent         = scsi_bus_uevent,
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
         .pm             = &scsi_bus_pm_ops,
 #endif
 };
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index c399be979921..f67282058ba1 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -629,7 +629,7 @@ static int __init scsi_tgt_init(void)
         if (!scsi_tgt_cmd_cache)
                 return -ENOMEM;
 
-        scsi_tgtd = create_workqueue("scsi_tgtd");
+        scsi_tgtd = alloc_workqueue("scsi_tgtd", 0, 1);
         if (!scsi_tgtd) {
                 err = -ENOMEM;
                 goto free_kmemcache;
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 998c01be3234..5c3ccfc6b622 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3829,7 +3829,7 @@ fc_bsg_goose_queue(struct fc_rport *rport)
                   !test_bit(QUEUE_FLAG_REENTER, &rport->rqst_q->queue_flags);
         if (flagset)
                 queue_flag_set(QUEUE_FLAG_REENTER, rport->rqst_q);
-        __blk_run_queue(rport->rqst_q);
+        __blk_run_queue(rport->rqst_q, false);
         if (flagset)
                 queue_flag_clear(QUEUE_FLAG_REENTER, rport->rqst_q);
         spin_unlock_irqrestore(rport->rqst_q->queue_lock, flags);