10 files changed, 256 insertions, 49 deletions

diff --git a/drivers/infiniband/ulp/ipoib/Makefile b/drivers/infiniband/ulp/ipoib/Makefile
index 98ee38e8c2c4..3090100f0de7 100644
--- a/drivers/infiniband/ulp/ipoib/Makefile
+++ b/drivers/infiniband/ulp/ipoib/Makefile
@@ -4,7 +4,8 @@ ib_ipoib-y					:= ipoib_main.o \
                                                    ipoib_ib.o \
                                                    ipoib_multicast.o \
                                                    ipoib_verbs.o \
-                                                   ipoib_vlan.o
+                                                   ipoib_vlan.o \
+                                                   ipoib_ethtool.o
 ib_ipoib-$(CONFIG_INFINIBAND_IPOIB_CM)          += ipoib_cm.o
 ib_ipoib-$(CONFIG_INFINIBAND_IPOIB_DEBUG)       += ipoib_fs.o
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 054fab8e27a0..73b2b176ad0e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -87,6 +87,7 @@ enum {
         IPOIB_MCAST_STARTED       = 8,
         IPOIB_FLAG_ADMIN_CM       = 9,
         IPOIB_FLAG_UMCAST         = 10,
+        IPOIB_FLAG_CSUM           = 11,
 
         IPOIB_MAX_BACKOFF_SECONDS = 16,
 
@@ -241,6 +242,11 @@ struct ipoib_cm_dev_priv {
         int                     num_frags;
 };
 
+struct ipoib_ethtool_st {
+        u16     coalesce_usecs;
+        u16     max_coalesced_frames;
+};
+
 /*
  * Device private locking: tx_lock protects members used in TX fast
  * path (and we use LLTX so upper layers don't do extra locking).
@@ -318,6 +324,8 @@ struct ipoib_dev_priv {
         struct dentry *mcg_dentry;
         struct dentry *path_dentry;
 #endif
+        int     hca_caps;
+        struct ipoib_ethtool_st ethtool;
 };
 
 struct ipoib_ah {
@@ -458,6 +466,8 @@ void ipoib_pkey_poll(struct work_struct *work);
 int ipoib_pkey_dev_delay_open(struct net_device *dev);
 void ipoib_drain_cq(struct net_device *dev);
 
+void ipoib_set_ethtool_ops(struct net_device *dev);
+
 #ifdef CONFIG_INFINIBAND_IPOIB_CM
 
 #define IPOIB_FLAGS_RC          0x80
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 2490b2d79dbb..9db7b0bd9134 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1007,9 +1007,9 @@ static int ipoib_cm_modify_tx_init(struct net_device *dev,
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_qp_attr qp_attr;
         int qp_attr_mask, ret;
-        ret = ib_find_cached_pkey(priv->ca, priv->port, priv->pkey, &qp_attr.pkey_index);
+        ret = ib_find_pkey(priv->ca, priv->port, priv->pkey, &qp_attr.pkey_index);
         if (ret) {
-                ipoib_warn(priv, "pkey 0x%x not in cache: %d\n", priv->pkey, ret);
+                ipoib_warn(priv, "pkey 0x%x not found: %d\n", priv->pkey, ret);
                 return ret;
         }
 
@@ -1383,6 +1383,10 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr,
                 set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
                 ipoib_warn(priv, "enabling connected mode "
                            "will cause multicast packet drops\n");
+
+                dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO);
+                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
+
                 ipoib_flush_paths(dev);
                 return count;
         }
@@ -1391,6 +1395,13 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr,
                 clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
                 dev->mtu = min(priv->mcast_mtu, dev->mtu);
                 ipoib_flush_paths(dev);
+
+                if (test_bit(IPOIB_FLAG_CSUM, &priv->flags)) {
+                        dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
+                        if (priv->hca_caps & IB_DEVICE_UD_TSO)
+                                dev->features |= NETIF_F_TSO;
+                }
+
                 return count;
         }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
new file mode 100644
index 000000000000..9a47428366c9
--- /dev/null
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/ethtool.h>
+#include <linux/netdevice.h>
+
+#include "ipoib.h"
+
+static void ipoib_get_drvinfo(struct net_device *netdev,
+                              struct ethtool_drvinfo *drvinfo)
+{
+        strncpy(drvinfo->driver, "ipoib", sizeof(drvinfo->driver) - 1);
+}
+
+static int ipoib_get_coalesce(struct net_device *dev,
+                              struct ethtool_coalesce *coal)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+
+        coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs;
+        coal->tx_coalesce_usecs = priv->ethtool.coalesce_usecs;
+        coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;
+        coal->tx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;
+
+        return 0;
+}
+
+static int ipoib_set_coalesce(struct net_device *dev,
+                              struct ethtool_coalesce *coal)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        int ret;
+
+        /*
+         * Since IPoIB uses a single CQ for both rx and tx, we assume
+         * that rx params dictate the configuration.  These values are
+         * saved in the private data and returned when ipoib_get_coalesce()
+         * is called.
+         */
+        if (coal->rx_coalesce_usecs       > 0xffff ||
+            coal->rx_max_coalesced_frames > 0xffff)
+                return -EINVAL;
+
+        ret = ib_modify_cq(priv->cq, coal->rx_max_coalesced_frames,
+                           coal->rx_coalesce_usecs);
+        if (ret && ret != -ENOSYS) {
+                ipoib_warn(priv, "failed modifying CQ (%d)\n", ret);
+                return ret;
+        }
+
+        coal->tx_coalesce_usecs       = coal->rx_coalesce_usecs;
+        coal->tx_max_coalesced_frames = coal->rx_max_coalesced_frames;
+        priv->ethtool.coalesce_usecs       = coal->rx_coalesce_usecs;
+        priv->ethtool.max_coalesced_frames = coal->rx_max_coalesced_frames;
+
+        return 0;
+}
+
+static const struct ethtool_ops ipoib_ethtool_ops = {
+        .get_drvinfo            = ipoib_get_drvinfo,
+        .get_tso                = ethtool_op_get_tso,
+        .get_coalesce           = ipoib_get_coalesce,
+        .set_coalesce           = ipoib_set_coalesce,
+};
+
+void ipoib_set_ethtool_ops(struct net_device *dev)
+{
+        SET_ETHTOOL_OPS(dev, &ipoib_ethtool_ops);
+}
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 08c4396cf418..0205eb7c1bd3 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -39,6 +39,8 @@
 #include <linux/dma-mapping.h>
 
 #include <rdma/ib_cache.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
 
 #include "ipoib.h"
 
@@ -231,6 +233,10 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb->dev = dev;
         /* XXX get correct PACKET_ type here */
         skb->pkt_type = PACKET_HOST;
+
+        if (test_bit(IPOIB_FLAG_CSUM, &priv->flags) && likely(wc->csum_ok))
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
         netif_receive_skb(skb);
 
 repost:
@@ -245,29 +251,37 @@ static int ipoib_dma_map_tx(struct ib_device *ca,
         struct sk_buff *skb = tx_req->skb;
         u64 *mapping = tx_req->mapping;
         int i;
+        int off;
 
-        mapping[0] = ib_dma_map_single(ca, skb->data, skb_headlen(skb),
-                                       DMA_TO_DEVICE);
-        if (unlikely(ib_dma_mapping_error(ca, mapping[0])))
-                return -EIO;
+        if (skb_headlen(skb)) {
+                mapping[0] = ib_dma_map_single(ca, skb->data, skb_headlen(skb),
+                                               DMA_TO_DEVICE);
+                if (unlikely(ib_dma_mapping_error(ca, mapping[0])))
+                        return -EIO;
+
+                off = 1;
+        } else
+                off = 0;
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; ++i) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                mapping[i + 1] = ib_dma_map_page(ca, frag->page,
+                mapping[i + off] = ib_dma_map_page(ca, frag->page,
                                                  frag->page_offset, frag->size,
                                                  DMA_TO_DEVICE);
-                if (unlikely(ib_dma_mapping_error(ca, mapping[i + 1])))
+                if (unlikely(ib_dma_mapping_error(ca, mapping[i + off])))
                         goto partial_error;
         }
         return 0;
 
 partial_error:
-        ib_dma_unmap_single(ca, mapping[0], skb_headlen(skb), DMA_TO_DEVICE);
-
         for (; i > 0; --i) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
-                ib_dma_unmap_page(ca, mapping[i], frag->size, DMA_TO_DEVICE);
+                ib_dma_unmap_page(ca, mapping[i - !off], frag->size, DMA_TO_DEVICE);
         }
+
+        if (off)
+                ib_dma_unmap_single(ca, mapping[0], skb_headlen(skb), DMA_TO_DEVICE);
+
         return -EIO;
 }
 
@@ -277,12 +291,17 @@ static void ipoib_dma_unmap_tx(struct ib_device *ca,
         struct sk_buff *skb = tx_req->skb;
         u64 *mapping = tx_req->mapping;
         int i;
+        int off;
 
-        ib_dma_unmap_single(ca, mapping[0], skb_headlen(skb), DMA_TO_DEVICE);
+        if (skb_headlen(skb)) {
+                ib_dma_unmap_single(ca, mapping[0], skb_headlen(skb), DMA_TO_DEVICE);
+                off = 1;
+        } else
+                off = 0;
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; ++i) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                ib_dma_unmap_page(ca, mapping[i + 1], frag->size,
+                ib_dma_unmap_page(ca, mapping[i + off], frag->size,
                                   DMA_TO_DEVICE);
         }
 }
@@ -388,24 +407,40 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
 static inline int post_send(struct ipoib_dev_priv *priv,
                             unsigned int wr_id,
                             struct ib_ah *address, u32 qpn,
-                            u64 *mapping, int headlen,
-                            skb_frag_t *frags,
-                            int nr_frags)
+                            struct ipoib_tx_buf *tx_req,
+                            void *head, int hlen)
 {
         struct ib_send_wr *bad_wr;
-        int i;
+        int i, off;
+        struct sk_buff *skb = tx_req->skb;
+        skb_frag_t *frags = skb_shinfo(skb)->frags;
+        int nr_frags = skb_shinfo(skb)->nr_frags;
+        u64 *mapping = tx_req->mapping;
+
+        if (skb_headlen(skb)) {
+                priv->tx_sge[0].addr         = mapping[0];
+                priv->tx_sge[0].length       = skb_headlen(skb);
+                off = 1;
+        } else
+                off = 0;
 
-        priv->tx_sge[0].addr         = mapping[0];
-        priv->tx_sge[0].length       = headlen;
         for (i = 0; i < nr_frags; ++i) {
-                priv->tx_sge[i + 1].addr = mapping[i + 1];
-                priv->tx_sge[i + 1].length = frags[i].size;
+                priv->tx_sge[i + off].addr = mapping[i + off];
+                priv->tx_sge[i + off].length = frags[i].size;
         }
-        priv->tx_wr.num_sge          = nr_frags + 1;
+        priv->tx_wr.num_sge          = nr_frags + off;
         priv->tx_wr.wr_id            = wr_id;
         priv->tx_wr.wr.ud.remote_qpn = qpn;
         priv->tx_wr.wr.ud.ah         = address;
 
+        if (head) {
+                priv->tx_wr.wr.ud.mss    = skb_shinfo(skb)->gso_size;
+                priv->tx_wr.wr.ud.header = head;
+                priv->tx_wr.wr.ud.hlen   = hlen;
+                priv->tx_wr.opcode       = IB_WR_LSO;
+        } else
+                priv->tx_wr.opcode       = IB_WR_SEND;
+
         return ib_post_send(priv->qp, &priv->tx_wr, &bad_wr);
 }
 
@@ -414,14 +449,30 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_tx_buf *tx_req;
-
-        if (unlikely(skb->len > priv->mcast_mtu + IPOIB_ENCAP_LEN)) {
-                ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
-                           skb->len, priv->mcast_mtu + IPOIB_ENCAP_LEN);
-                ++dev->stats.tx_dropped;
-                ++dev->stats.tx_errors;
-                ipoib_cm_skb_too_long(dev, skb, priv->mcast_mtu);
-                return;
+        int hlen;
+        void *phead;
+
+        if (skb_is_gso(skb)) {
+                hlen = skb_transport_offset(skb) + tcp_hdrlen(skb);
+                phead = skb->data;
+                if (unlikely(!skb_pull(skb, hlen))) {
+                        ipoib_warn(priv, "linear data too small\n");
+                        ++dev->stats.tx_dropped;
+                        ++dev->stats.tx_errors;
+                        dev_kfree_skb_any(skb);
+                        return;
+                }
+        } else {
+                if (unlikely(skb->len > priv->mcast_mtu + IPOIB_ENCAP_LEN)) {
+                        ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
+                                   skb->len, priv->mcast_mtu + IPOIB_ENCAP_LEN);
+                        ++dev->stats.tx_dropped;
+                        ++dev->stats.tx_errors;
+                        ipoib_cm_skb_too_long(dev, skb, priv->mcast_mtu);
+                        return;
+                }
+                phead = NULL;
+                hlen  = 0;
         }
 
         ipoib_dbg_data(priv, "sending packet, length=%d address=%p qpn=0x%06x\n",
@@ -442,10 +493,13 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
                 return;
         }
 
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
+                priv->tx_wr.send_flags |= IB_SEND_IP_CSUM;
+        else
+                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
+
         if (unlikely(post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
-                               address->ah, qpn,
-                               tx_req->mapping, skb_headlen(skb),
-                               skb_shinfo(skb)->frags, skb_shinfo(skb)->nr_frags))) {
+                               address->ah, qpn, tx_req, phead, hlen))) {
                 ipoib_warn(priv, "post_send failed\n");
                 ++dev->stats.tx_errors;
                 ipoib_dma_unmap_tx(priv->ca, tx_req);
@@ -540,7 +594,7 @@ 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))
+        if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &pkey_index))
                 clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
         else
                 set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
@@ -781,13 +835,13 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, int pkey_event)
                         clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
                         ipoib_ib_dev_down(dev, 0);
                         ipoib_ib_dev_stop(dev, 0);
-                        ipoib_pkey_dev_delay_open(dev);
-                        return;
+                        if (ipoib_pkey_dev_delay_open(dev))
+                                return;
                 }
-                set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
 
                 /* restart QP only if P_Key index is changed */
-                if (new_index == priv->pkey_index) {
+                if (test_and_set_bit(IPOIB_PKEY_ASSIGNED, &priv->flags) &&
+                    new_index == priv->pkey_index) {
                         ipoib_dbg(priv, "Not flushing - P_Key index not changed.\n");
                         return;
                 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 57282048865c..bd07f02cf02b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -359,8 +359,7 @@ void ipoib_flush_paths(struct net_device *dev)
         spin_lock_irq(&priv->tx_lock);
         spin_lock(&priv->lock);
 
-        list_splice(&priv->path_list, &remove_list);
-        INIT_LIST_HEAD(&priv->path_list);
+        list_splice_init(&priv->path_list, &remove_list);
 
         list_for_each_entry(path, &remove_list, list)
                 rb_erase(&path->rb_node, &priv->path_tree);
@@ -952,6 +951,8 @@ static void ipoib_setup(struct net_device *dev)
         dev->set_multicast_list  = ipoib_set_mcast_list;
         dev->neigh_setup         = ipoib_neigh_setup_dev;
 
+        ipoib_set_ethtool_ops(dev);
+
         netif_napi_add(dev, &priv->napi, ipoib_poll, 100);
 
         dev->watchdog_timeo      = HZ;
@@ -1105,6 +1106,7 @@ static struct net_device *ipoib_add_port(const char *format,
                                          struct ib_device *hca, u8 port)
 {
         struct ipoib_dev_priv *priv;
+        struct ib_device_attr *device_attr;
         int result = -ENOMEM;
 
         priv = ipoib_intf_alloc(format);
@@ -1120,6 +1122,29 @@ static struct net_device *ipoib_add_port(const char *format,
                 goto device_init_failed;
         }
 
+        device_attr = kmalloc(sizeof *device_attr, GFP_KERNEL);
+        if (!device_attr) {
+                printk(KERN_WARNING "%s: allocation of %zu bytes failed\n",
+                       hca->name, sizeof *device_attr);
+                goto device_init_failed;
+        }
+
+        result = ib_query_device(hca, device_attr);
+        if (result) {
+                printk(KERN_WARNING "%s: ib_query_device failed (ret = %d)\n",
+                       hca->name, result);
+                kfree(device_attr);
+                goto device_init_failed;
+        }
+        priv->hca_caps = device_attr->device_cap_flags;
+
+        kfree(device_attr);
+
+        if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
+                set_bit(IPOIB_FLAG_CSUM, &priv->flags);
+                priv->dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
+        }
+
         /*
          * Set the full membership bit, so that we join the right
          * broadcast group, etc.
@@ -1137,7 +1162,6 @@ static struct net_device *ipoib_add_port(const char *format,
         } else
                 memcpy(priv->dev->dev_addr + 4, priv->local_gid.raw, sizeof (union ib_gid));
 
-
         result = ipoib_dev_init(priv->dev, hca, port);
         if (result < 0) {
                 printk(KERN_WARNING "%s: failed to initialize port %d (ret = %d)\n",
@@ -1155,6 +1179,9 @@ static struct net_device *ipoib_add_port(const char *format,
                 goto event_failed;
         }
 
+        if (priv->dev->features & NETIF_F_SG && priv->hca_caps & IB_DEVICE_UD_TSO)
+                priv->dev->features |= NETIF_F_TSO;
+
         result = register_netdev(priv->dev);
         if (result) {
                 printk(KERN_WARNING "%s: couldn't register ipoib port %d; error %d\n",
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index a3aeb911f024..8a20e3742c43 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -192,6 +192,9 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
         init_attr.send_cq = priv->cq;
         init_attr.recv_cq = priv->cq;
 
+        if (priv->hca_caps & IB_DEVICE_UD_TSO)
+                init_attr.create_flags = IB_QP_CREATE_IPOIB_UD_LSO;
+
         if (dev->features & NETIF_F_SG)
                 init_attr.cap.max_send_sge = MAX_SKB_FRAGS + 1;
 
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 83247f1fdf72..08dc81c46f41 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -405,7 +405,7 @@ int iser_send_data_out(struct iscsi_conn     *conn,
         struct iser_dto *send_dto = NULL;
         unsigned long buf_offset;
         unsigned long data_seg_len;
-        unsigned int itt;
+        uint32_t itt;
         int err = 0;
 
         if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
@@ -416,7 +416,7 @@ int iser_send_data_out(struct iscsi_conn     *conn,
         if (iser_check_xmit(conn, ctask))
                 return -ENOBUFS;
 
-        itt = ntohl(hdr->itt);
+        itt = (__force uint32_t)hdr->itt;
         data_seg_len = ntoh24(hdr->dlength);
         buf_offset   = ntohl(hdr->offset);
 
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 993f0a8ff28f..d19cfe605ebb 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -473,11 +473,8 @@ static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *eve
                 iser_connect_error(cma_id);
                 break;
         case RDMA_CM_EVENT_DISCONNECTED:
-                iser_disconnected_handler(cma_id);
-                break;
         case RDMA_CM_EVENT_DEVICE_REMOVAL:
-                iser_err("Device removal is currently unsupported\n");
-                BUG();
+                iser_disconnected_handler(cma_id);
                 break;
         default:
                 iser_err("Unexpected RDMA CM event (%d)\n", event->event);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index fd4a49fc4773..125765aa9d59 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -68,7 +68,7 @@ static int srp_max_iu_len;
 
 module_param(srp_sg_tablesize, int, 0444);
 MODULE_PARM_DESC(srp_sg_tablesize,
-                 "Max number of gather/scatter entries per I/O (default is 12)");
+                 "Max number of gather/scatter entries per I/O (default is 12, max 255)");
 
 static int topspin_workarounds = 1;
 
@@ -2138,6 +2138,11 @@ static int __init srp_init_module(void)
 {
         int ret;
 
+        if (srp_sg_tablesize > 255) {
+                printk(KERN_WARNING PFX "Clamping srp_sg_tablesize to 255\n");
+                srp_sg_tablesize = 255;
+        }
+
         ib_srp_transport_template =
                 srp_attach_transport(&ib_srp_transport_functions);
         if (!ib_srp_transport_template)