6 files changed, 123 insertions, 99 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 1251f86ec856..b640107fb732 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -72,13 +72,14 @@ enum {
         IPOIB_MAX_MCAST_QUEUE     = 3,
 
         IPOIB_FLAG_OPER_UP        = 0,
-        IPOIB_FLAG_ADMIN_UP       = 1,
-        IPOIB_PKEY_ASSIGNED       = 2,
-        IPOIB_PKEY_STOP           = 3,
-        IPOIB_FLAG_SUBINTERFACE   = 4,
-        IPOIB_MCAST_RUN           = 5,
-        IPOIB_STOP_REAPER         = 6,
-        IPOIB_MCAST_STARTED       = 7,
+        IPOIB_FLAG_INITIALIZED    = 1,
+        IPOIB_FLAG_ADMIN_UP       = 2,
+        IPOIB_PKEY_ASSIGNED       = 3,
+        IPOIB_PKEY_STOP           = 4,
+        IPOIB_FLAG_SUBINTERFACE   = 5,
+        IPOIB_MCAST_RUN           = 6,
+        IPOIB_STOP_REAPER         = 7,
+        IPOIB_MCAST_STARTED       = 8,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index a1f5a05f2f36..ed65202878d8 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -423,13 +423,33 @@ int ipoib_ib_dev_open(struct net_device *dev)
         clear_bit(IPOIB_STOP_REAPER, &priv->flags);
         queue_delayed_work(ipoib_workqueue, &priv->ah_reap_task, HZ);
 
+        set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
+
         return 0;
 }
 
+static void ipoib_pkey_dev_check_presence(struct net_device *dev)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        u16 pkey_index = 0;
+
+        if (ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
+                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+        else
+                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
+}
+
 int ipoib_ib_dev_up(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        ipoib_pkey_dev_check_presence(dev);
+
+        if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
+                ipoib_dbg(priv, "PKEY is not assigned.\n");
+                return 0;
+        }
+
         set_bit(IPOIB_FLAG_OPER_UP, &priv->flags);
 
         return ipoib_mcast_start_thread(dev);
@@ -483,6 +503,8 @@ int ipoib_ib_dev_stop(struct net_device *dev)
         struct ipoib_tx_buf *tx_req;
         int i;
 
+        clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags);
+
         /*
          * Move our QP to the error state and then reinitialize in
          * when all work requests have completed or have been flushed.
@@ -587,8 +609,15 @@ void ipoib_ib_dev_flush(void *_dev)
         struct net_device *dev = (struct net_device *)_dev;
         struct ipoib_dev_priv *priv = netdev_priv(dev), *cpriv;
 
-        if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags))
+        if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags) ) {
+                ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_INITIALIZED not set.\n");
+                return;
+        }
+
+        if (!test_bit(IPOIB_FLAG_ADMIN_UP, &priv->flags)) {
+                ipoib_dbg(priv, "Not flushing - IPOIB_FLAG_ADMIN_UP not set.\n");
                 return;
+        }
 
         ipoib_dbg(priv, "flushing\n");
 
@@ -605,7 +634,7 @@ void ipoib_ib_dev_flush(void *_dev)
 
         /* Flush any child interfaces too */
         list_for_each_entry(cpriv, &priv->child_intfs, list)
-                ipoib_ib_dev_flush(&cpriv->dev);
+                ipoib_ib_dev_flush(cpriv->dev);
 
         mutex_unlock(&priv->vlan_mutex);
 }
@@ -632,17 +661,6 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
  * change async notification is available.
  */
 
-static void ipoib_pkey_dev_check_presence(struct net_device *dev)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-        u16 pkey_index = 0;
-
-        if (ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
-                clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-        else
-                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
-}
-
 void ipoib_pkey_poll(void *dev_ptr)
 {
         struct net_device *dev = dev_ptr;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 37da8d3dc388..53a32f65788d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -736,6 +736,11 @@ static void ipoib_set_mcast_list(struct net_device *dev)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
+        if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags)) {
+                ipoib_dbg(priv, "IPOIB_FLAG_OPER_UP not set");
+                return;
+        }
+
         queue_work(ipoib_workqueue, &priv->restart_task);
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 18d2f53ec34c..5f0388027b25 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -251,10 +251,12 @@ void ipoib_event(struct ib_event_handler *handler,
         struct ipoib_dev_priv *priv =
                 container_of(handler, struct ipoib_dev_priv, event_handler);
 
-        if (record->event == IB_EVENT_PORT_ACTIVE ||
+        if (record->event == IB_EVENT_PORT_ERR    ||
+            record->event == IB_EVENT_PKEY_CHANGE ||
+            record->event == IB_EVENT_PORT_ACTIVE ||
             record->event == IB_EVENT_LID_CHANGE  ||
             record->event == IB_EVENT_SM_CHANGE) {
-                ipoib_dbg(priv, "Port active event\n");
+                ipoib_dbg(priv, "Port state change event\n");
                 queue_work(ipoib_workqueue, &priv->flush_task);
         }
 }
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index a13dcdf90a4f..61924cc30e55 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -503,8 +503,10 @@ err:
 static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                         struct srp_request *req)
 {
+        struct scatterlist *scat;
         struct srp_cmd *cmd = req->cmd->buf;
-        int len;
+        int len, nents, count;
+        int i;
         u8 fmt;
 
         if (!scmnd->request_buffer || scmnd->sc_data_direction == DMA_NONE)
@@ -517,82 +519,66 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
                 return -EINVAL;
         }
 
-        if (scmnd->use_sg) {
-                struct scatterlist *scat = scmnd->request_buffer;
-                int n;
-                int i;
-
-                n = dma_map_sg(target->srp_host->dev->dma_device,
-                               scat, scmnd->use_sg, scmnd->sc_data_direction);
+        /*
+         * This handling of non-SG commands can be killed when the
+         * SCSI midlayer no longer generates non-SG commands.
+         */
+        if (likely(scmnd->use_sg)) {
+                nents = scmnd->use_sg;
+                scat  = scmnd->request_buffer;
+        } else {
+                nents = 1;
+                scat  = &req->fake_sg;
+                sg_init_one(scat, scmnd->request_buffer, scmnd->request_bufflen);
+        }
 
-                if (n == 1) {
-                        struct srp_direct_buf *buf = (void *) cmd->add_data;
+        count = dma_map_sg(target->srp_host->dev->dma_device, scat, nents,
+                           scmnd->sc_data_direction);
 
-                        fmt = SRP_DATA_DESC_DIRECT;
+        if (count == 1) {
+                struct srp_direct_buf *buf = (void *) cmd->add_data;
 
-                        buf->va  = cpu_to_be64(sg_dma_address(scat));
-                        buf->key = cpu_to_be32(target->srp_host->mr->rkey);
-                        buf->len = cpu_to_be32(sg_dma_len(scat));
+                fmt = SRP_DATA_DESC_DIRECT;
 
-                        len = sizeof (struct srp_cmd) +
-                                sizeof (struct srp_direct_buf);
-                } else {
-                        struct srp_indirect_buf *buf = (void *) cmd->add_data;
-                        u32 datalen = 0;
+                buf->va  = cpu_to_be64(sg_dma_address(scat));
+                buf->key = cpu_to_be32(target->srp_host->mr->rkey);
+                buf->len = cpu_to_be32(sg_dma_len(scat));
 
-                        fmt = SRP_DATA_DESC_INDIRECT;
+                len = sizeof (struct srp_cmd) +
+                        sizeof (struct srp_direct_buf);
+        } else {
+                struct srp_indirect_buf *buf = (void *) cmd->add_data;
+                u32 datalen = 0;
 
-                        if (scmnd->sc_data_direction == DMA_TO_DEVICE)
-                                cmd->data_out_desc_cnt = n;
-                        else
-                                cmd->data_in_desc_cnt = n;
+                fmt = SRP_DATA_DESC_INDIRECT;
 
-                        buf->table_desc.va  = cpu_to_be64(req->cmd->dma +
-                                                          sizeof *cmd +
-                                                          sizeof *buf);
-                        buf->table_desc.key =
+                if (scmnd->sc_data_direction == DMA_TO_DEVICE)
+                        cmd->data_out_desc_cnt = count;
+                else
+                        cmd->data_in_desc_cnt = count;
+
+                buf->table_desc.va  = cpu_to_be64(req->cmd->dma +
+                                                  sizeof *cmd +
+                                                  sizeof *buf);
+                buf->table_desc.key =
+                        cpu_to_be32(target->srp_host->mr->rkey);
+                buf->table_desc.len =
+                        cpu_to_be32(count * sizeof (struct srp_direct_buf));
+
+                for (i = 0; i < count; ++i) {
+                        buf->desc_list[i].va  = cpu_to_be64(sg_dma_address(&scat[i]));
+                        buf->desc_list[i].key =
                                 cpu_to_be32(target->srp_host->mr->rkey);
-                        buf->table_desc.len =
-                                cpu_to_be32(n * sizeof (struct srp_direct_buf));
-
-                        for (i = 0; i < n; ++i) {
-                                buf->desc_list[i].va  = cpu_to_be64(sg_dma_address(&scat[i]));
-                                buf->desc_list[i].key =
-                                        cpu_to_be32(target->srp_host->mr->rkey);
-                                buf->desc_list[i].len = cpu_to_be32(sg_dma_len(&scat[i]));
-
-                                datalen += sg_dma_len(&scat[i]);
-                        }
+                        buf->desc_list[i].len = cpu_to_be32(sg_dma_len(&scat[i]));
 
-                        buf->len = cpu_to_be32(datalen);
-
-                        len = sizeof (struct srp_cmd) +
-                                sizeof (struct srp_indirect_buf) +
-                                n * sizeof (struct srp_direct_buf);
-                }
-        } else {
-                struct srp_direct_buf *buf = (void *) cmd->add_data;
-                dma_addr_t dma;
-
-                dma = dma_map_single(target->srp_host->dev->dma_device,
-                                     scmnd->request_buffer, scmnd->request_bufflen,
-                                     scmnd->sc_data_direction);
-                if (dma_mapping_error(dma)) {
-                        printk(KERN_WARNING PFX "unable to map %p/%d (dir %d)\n",
-                               scmnd->request_buffer, (int) scmnd->request_bufflen,
-                               scmnd->sc_data_direction);
-                        return -EINVAL;
+                        datalen += sg_dma_len(&scat[i]);
                 }
 
-                pci_unmap_addr_set(req, direct_mapping, dma);
+                buf->len = cpu_to_be32(datalen);
 
-                buf->va  = cpu_to_be64(dma);
-                buf->key = cpu_to_be32(target->srp_host->mr->rkey);
-                buf->len = cpu_to_be32(scmnd->request_bufflen);
-
-                fmt = SRP_DATA_DESC_DIRECT;
-
-                len = sizeof (struct srp_cmd) + sizeof (struct srp_direct_buf);
+                len = sizeof (struct srp_cmd) +
+                        sizeof (struct srp_indirect_buf) +
+                        count * sizeof (struct srp_direct_buf);
         }
 
         if (scmnd->sc_data_direction == DMA_TO_DEVICE)
@@ -600,7 +586,6 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
         else
                 cmd->buf_fmt = fmt;
 
-
         return len;
 }
 
@@ -608,20 +593,28 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
                            struct srp_target_port *target,
                            struct srp_request *req)
 {
+        struct scatterlist *scat;
+        int nents;
+
         if (!scmnd->request_buffer ||
             (scmnd->sc_data_direction != DMA_TO_DEVICE &&
              scmnd->sc_data_direction != DMA_FROM_DEVICE))
-            return;
+                return;
 
-        if (scmnd->use_sg)
-                dma_unmap_sg(target->srp_host->dev->dma_device,
-                             (struct scatterlist *) scmnd->request_buffer,
-                             scmnd->use_sg, scmnd->sc_data_direction);
-        else
-                dma_unmap_single(target->srp_host->dev->dma_device,
-                                 pci_unmap_addr(req, direct_mapping),
-                                 scmnd->request_bufflen,
-                                 scmnd->sc_data_direction);
+        /*
+         * This handling of non-SG commands can be killed when the
+         * SCSI midlayer no longer generates non-SG commands.
+         */
+        if (likely(scmnd->use_sg)) {
+                nents = scmnd->use_sg;
+                scat  = (struct scatterlist *) scmnd->request_buffer;
+        } else {
+                nents = 1;
+                scat  = (struct scatterlist *) scmnd->request_buffer;
+        }
+
+        dma_unmap_sg(target->srp_host->dev->dma_device, scat, nents,
+                     scmnd->sc_data_direction);
 }
 
 static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index 4e7727df32f1..bd7f7c3115de 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -38,6 +38,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
+#include <linux/scatterlist.h>
 
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
@@ -94,7 +95,11 @@ struct srp_request {
         struct scsi_cmnd       *scmnd;
         struct srp_iu          *cmd;
         struct srp_iu          *tsk_mgmt;
-        DECLARE_PCI_UNMAP_ADDR(direct_mapping)
+        /*
+         * Fake scatterlist used when scmnd->use_sg==0.  Can be killed
+         * when the SCSI midlayer no longer generates non-SG commands.
+         */
+        struct scatterlist      fake_sg;
         struct completion       done;
         short                   next;
         u8                      cmd_done;