25 files changed, 373 insertions, 122 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h
index ba7a1208ff9e..d619d735838b 100644
--- a/drivers/infiniband/hw/amso1100/c2.h
+++ b/drivers/infiniband/hw/amso1100/c2.h
@@ -265,7 +265,6 @@ struct c2_pd_table {
 struct c2_qp_table {
         struct idr idr;
         spinlock_t lock;
-        int last;
 };
 
 struct c2_element {
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 0ab826b280b2..86708dee58b1 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -385,8 +385,7 @@ static int c2_alloc_qpn(struct c2_dev *c2dev, struct c2_qp *qp)
         idr_preload(GFP_KERNEL);
         spin_lock_irq(&c2dev->qp_table.lock);
 
-        ret = idr_alloc(&c2dev->qp_table.idr, qp, c2dev->qp_table.last++, 0,
-                        GFP_NOWAIT);
+        ret = idr_alloc_cyclic(&c2dev->qp_table.idr, qp, 0, 0, GFP_NOWAIT);
         if (ret >= 0)
                 qp->qpn = ret;
 
diff --git a/drivers/infiniband/hw/cxgb3/cxio_resource.c b/drivers/infiniband/hw/cxgb3/cxio_resource.c
index 31f9201b2980..c40088ecf9f3 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_resource.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_resource.c
@@ -62,13 +62,13 @@ static int __cxio_init_resource_fifo(struct kfifo *fifo,
                 kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32));
         if (random) {
                 j = 0;
-                random_bytes = random32();
+                random_bytes = prandom_u32();
                 for (i = 0; i < RANDOM_SIZE; i++)
                         rarray[i] = i + skip_low;
                 for (i = skip_low + RANDOM_SIZE; i < nr - skip_high; i++) {
                         if (j >= RANDOM_SIZE) {
                                 j = 0;
-                                random_bytes = random32();
+                                random_bytes = prandom_u32();
                         }
                         idx = (random_bytes >> (j * 2)) & 0xF;
                         kfifo_in(fifo,
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 565bfb161c1a..65c30ea8c1a1 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -511,12 +511,16 @@ static unsigned int select_ntuple(struct c4iw_dev *dev, struct dst_entry *dst,
 static int send_connect(struct c4iw_ep *ep)
 {
         struct cpl_act_open_req *req;
+        struct cpl_t5_act_open_req *t5_req;
         struct sk_buff *skb;
         u64 opt0;
         u32 opt2;
         unsigned int mtu_idx;
         int wscale;
-        int wrlen = roundup(sizeof *req, 16);
+        int size = is_t4(ep->com.dev->rdev.lldi.adapter_type) ?
+                sizeof(struct cpl_act_open_req) :
+                sizeof(struct cpl_t5_act_open_req);
+        int wrlen = roundup(size, 16);
 
         PDBG("%s ep %p atid %u\n", __func__, ep, ep->atid);
 
@@ -552,17 +556,36 @@ static int send_connect(struct c4iw_ep *ep)
                 opt2 |= WND_SCALE_EN(1);
         t4_set_arp_err_handler(skb, NULL, act_open_req_arp_failure);
 
-        req = (struct cpl_act_open_req *) skb_put(skb, wrlen);
-        INIT_TP_WR(req, 0);
-        OPCODE_TID(req) = cpu_to_be32(
-                MK_OPCODE_TID(CPL_ACT_OPEN_REQ, ((ep->rss_qid<<14)|ep->atid)));
-        req->local_port = ep->com.local_addr.sin_port;
-        req->peer_port = ep->com.remote_addr.sin_port;
-        req->local_ip = ep->com.local_addr.sin_addr.s_addr;
-        req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
-        req->opt0 = cpu_to_be64(opt0);
-        req->params = cpu_to_be32(select_ntuple(ep->com.dev, ep->dst, ep->l2t));
-        req->opt2 = cpu_to_be32(opt2);
+        if (is_t4(ep->com.dev->rdev.lldi.adapter_type)) {
+                req = (struct cpl_act_open_req *) skb_put(skb, wrlen);
+                INIT_TP_WR(req, 0);
+                OPCODE_TID(req) = cpu_to_be32(
+                                MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
+                                ((ep->rss_qid << 14) | ep->atid)));
+                req->local_port = ep->com.local_addr.sin_port;
+                req->peer_port = ep->com.remote_addr.sin_port;
+                req->local_ip = ep->com.local_addr.sin_addr.s_addr;
+                req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
+                req->opt0 = cpu_to_be64(opt0);
+                req->params = cpu_to_be32(select_ntuple(ep->com.dev,
+                                        ep->dst, ep->l2t));
+                req->opt2 = cpu_to_be32(opt2);
+        } else {
+                t5_req = (struct cpl_t5_act_open_req *) skb_put(skb, wrlen);
+                INIT_TP_WR(t5_req, 0);
+                OPCODE_TID(t5_req) = cpu_to_be32(
+                                        MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
+                                        ((ep->rss_qid << 14) | ep->atid)));
+                t5_req->local_port = ep->com.local_addr.sin_port;
+                t5_req->peer_port = ep->com.remote_addr.sin_port;
+                t5_req->local_ip = ep->com.local_addr.sin_addr.s_addr;
+                t5_req->peer_ip = ep->com.remote_addr.sin_addr.s_addr;
+                t5_req->opt0 = cpu_to_be64(opt0);
+                t5_req->params = cpu_to_be64(V_FILTER_TUPLE(
+                                select_ntuple(ep->com.dev, ep->dst, ep->l2t)));
+                t5_req->opt2 = cpu_to_be32(opt2);
+        }
+
         set_bit(ACT_OPEN_REQ, &ep->com.history);
         return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);
 }
@@ -1575,6 +1598,12 @@ static int c4iw_reconnect(struct c4iw_ep *ep)
 
         neigh = dst_neigh_lookup(ep->dst,
                         &ep->com.cm_id->remote_addr.sin_addr.s_addr);
+        if (!neigh) {
+                pr_err("%s - cannot alloc neigh.\n", __func__);
+                err = -ENOMEM;
+                goto fail4;
+        }
+
         /* get a l2t entry */
         if (neigh->dev->flags & IFF_LOOPBACK) {
                 PDBG("%s LOOPBACK\n", __func__);
@@ -1670,9 +1699,9 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb)
         case CPL_ERR_CONN_TIMEDOUT:
                 break;
         case CPL_ERR_TCAM_FULL:
+                dev->rdev.stats.tcam_full++;
                 if (dev->rdev.lldi.enable_fw_ofld_conn) {
                         mutex_lock(&dev->rdev.stats.lock);
-                        dev->rdev.stats.tcam_full++;
                         mutex_unlock(&dev->rdev.stats.lock);
                         send_fw_act_open_req(ep,
                                              GET_TID_TID(GET_AOPEN_ATID(
@@ -2869,12 +2898,14 @@ static int deferred_fw6_msg(struct c4iw_dev *dev, struct sk_buff *skb)
 static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
 {
         u32 l2info;
-        u16 vlantag, len, hdr_len;
+        u16 vlantag, len, hdr_len, eth_hdr_len;
         u8 intf;
         struct cpl_rx_pkt *cpl = cplhdr(skb);
         struct cpl_pass_accept_req *req;
         struct tcp_options_received tmp_opt;
+        struct c4iw_dev *dev;
 
+        dev = *((struct c4iw_dev **) (skb->cb + sizeof(void *)));
         /* Store values from cpl_rx_pkt in temporary location. */
         vlantag = (__force u16) cpl->vlan;
         len = (__force u16) cpl->len;
@@ -2890,7 +2921,7 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
          */
         memset(&tmp_opt, 0, sizeof(tmp_opt));
         tcp_clear_options(&tmp_opt);
-        tcp_parse_options(skb, &tmp_opt, NULL, 0, NULL);
+        tcp_parse_options(skb, &tmp_opt, 0, NULL);
 
         req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));
         memset(req, 0, sizeof(*req));
@@ -2898,14 +2929,16 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
                          V_SYN_MAC_IDX(G_RX_MACIDX(
                          (__force int) htonl(l2info))) |
                          F_SYN_XACT_MATCH);
+        eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?
+                            G_RX_ETHHDR_LEN((__force int) htonl(l2info)) :
+                            G_RX_T5_ETHHDR_LEN((__force int) htonl(l2info));
         req->hdr_len = cpu_to_be32(V_SYN_RX_CHAN(G_RX_CHAN(
                                         (__force int) htonl(l2info))) |
                                    V_TCP_HDR_LEN(G_RX_TCPHDR_LEN(
                                         (__force int) htons(hdr_len))) |
                                    V_IP_HDR_LEN(G_RX_IPHDR_LEN(
                                         (__force int) htons(hdr_len))) |
-                                   V_ETH_HDR_LEN(G_RX_ETHHDR_LEN(
-                                        (__force int) htonl(l2info))));
+                                   V_ETH_HDR_LEN(G_RX_ETHHDR_LEN(eth_hdr_len)));
         req->vlan = (__force __be16) vlantag;
         req->len = (__force __be16) len;
         req->tos_stid = cpu_to_be32(PASS_OPEN_TID(stid) |
@@ -2993,7 +3026,7 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
         u16 window;
         struct port_info *pi;
         struct net_device *pdev;
-        u16 rss_qid;
+        u16 rss_qid, eth_hdr_len;
         int step;
         u32 tx_chan;
         struct neighbour *neigh;
@@ -3022,7 +3055,10 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
                 goto reject;
         }
 
-        if (G_RX_ETHHDR_LEN(ntohl(cpl->l2info)) == ETH_HLEN) {
+        eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?
+                            G_RX_ETHHDR_LEN(htonl(cpl->l2info)) :
+                            G_RX_T5_ETHHDR_LEN(htonl(cpl->l2info));
+        if (eth_hdr_len == ETH_HLEN) {
                 eh = (struct ethhdr *)(req + 1);
                 iph = (struct iphdr *)(eh + 1);
         } else {
@@ -3053,6 +3089,12 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
         dst = &rt->dst;
         neigh = dst_neigh_lookup_skb(dst, skb);
 
+        if (!neigh) {
+                pr_err("%s - failed to allocate neigh!\n",
+                       __func__);
+                goto free_dst;
+        }
+
         if (neigh->dev->flags & IFF_LOOPBACK) {
                 pdev = ip_dev_find(&init_net, iph->daddr);
                 e = cxgb4_l2t_get(dev->rdev.lldi.l2t, neigh,
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 80069ad595c1..ae656016e1ae 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -41,10 +41,20 @@
 #define DRV_VERSION "0.1"
 
 MODULE_AUTHOR("Steve Wise");
-MODULE_DESCRIPTION("Chelsio T4 RDMA Driver");
+MODULE_DESCRIPTION("Chelsio T4/T5 RDMA Driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static int allow_db_fc_on_t5;
+module_param(allow_db_fc_on_t5, int, 0644);
+MODULE_PARM_DESC(allow_db_fc_on_t5,
+                 "Allow DB Flow Control on T5 (default = 0)");
+
+static int allow_db_coalescing_on_t5;
+module_param(allow_db_coalescing_on_t5, int, 0644);
+MODULE_PARM_DESC(allow_db_coalescing_on_t5,
+                 "Allow DB Coalescing on T5 (default = 0)");
+
 struct uld_ctx {
         struct list_head entry;
         struct cxgb4_lld_info lldi;
@@ -614,7 +624,7 @@ static int rdma_supported(const struct cxgb4_lld_info *infop)
 {
         return infop->vr->stag.size > 0 && infop->vr->pbl.size > 0 &&
                infop->vr->rq.size > 0 && infop->vr->qp.size > 0 &&
-               infop->vr->cq.size > 0 && infop->vr->ocq.size > 0;
+               infop->vr->cq.size > 0;
 }
 
 static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
@@ -627,6 +637,22 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
                        pci_name(infop->pdev));
                 return ERR_PTR(-ENOSYS);
         }
+        if (!ocqp_supported(infop))
+                pr_info("%s: On-Chip Queues not supported on this device.\n",
+                        pci_name(infop->pdev));
+
+        if (!is_t4(infop->adapter_type)) {
+                if (!allow_db_fc_on_t5) {
+                        db_fc_threshold = 100000;
+                        pr_info("DB Flow Control Disabled.\n");
+                }
+
+                if (!allow_db_coalescing_on_t5) {
+                        db_coalescing_threshold = -1;
+                        pr_info("DB Coalescing Disabled.\n");
+                }
+        }
+
         devp = (struct c4iw_dev *)ib_alloc_device(sizeof(*devp));
         if (!devp) {
                 printk(KERN_ERR MOD "Cannot allocate ib device\n");
@@ -678,8 +704,8 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
         int i;
 
         if (!vers_printed++)
-                printk(KERN_INFO MOD "Chelsio T4 RDMA Driver - version %s\n",
-                       DRV_VERSION);
+                pr_info("Chelsio T4/T5 RDMA Driver - version %s\n",
+                        DRV_VERSION);
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx) {
diff --git a/drivers/infiniband/hw/cxgb4/id_table.c b/drivers/infiniband/hw/cxgb4/id_table.c
index f95e5df30db2..0161ae6ad629 100644
--- a/drivers/infiniband/hw/cxgb4/id_table.c
+++ b/drivers/infiniband/hw/cxgb4/id_table.c
@@ -54,7 +54,7 @@ u32 c4iw_id_alloc(struct c4iw_id_table *alloc)
 
         if (obj < alloc->max) {
                 if (alloc->flags & C4IW_ID_TABLE_F_RANDOM)
-                        alloc->last += random32() % RANDOM_SKIP;
+                        alloc->last += prandom_u32() % RANDOM_SKIP;
                 else
                         alloc->last = obj + 1;
                 if (alloc->last >= alloc->max)
@@ -88,7 +88,7 @@ int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
         alloc->start = start;
         alloc->flags = flags;
         if (flags & C4IW_ID_TABLE_F_RANDOM)
-                alloc->last = random32() % RANDOM_SKIP;
+                alloc->last = prandom_u32() % RANDOM_SKIP;
         else
                 alloc->last = 0;
         alloc->max  = num;
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 7eec5e13fa8c..485183ad34cd 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -162,7 +162,7 @@ static inline int c4iw_num_stags(struct c4iw_rdev *rdev)
         return min((int)T4_MAX_NUM_STAG, (int)(rdev->lldi.vr->stag.size >> 5));
 }
 
-#define C4IW_WR_TO (10*HZ)
+#define C4IW_WR_TO (30*HZ)
 
 struct c4iw_wr_wait {
         struct completion completion;
@@ -369,7 +369,6 @@ struct c4iw_fr_page_list {
         DEFINE_DMA_UNMAP_ADDR(mapping);
         dma_addr_t dma_addr;
         struct c4iw_dev *dev;
-        int size;
 };
 
 static inline struct c4iw_fr_page_list *to_c4iw_fr_page_list(
@@ -817,6 +816,15 @@ static inline int compute_wscale(int win)
         return wscale;
 }
 
+static inline int ocqp_supported(const struct cxgb4_lld_info *infop)
+{
+#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)
+        return infop->vr->ocq.size > 0;
+#else
+        return 0;
+#endif
+}
+
 u32 c4iw_id_alloc(struct c4iw_id_table *alloc);
 void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj);
 int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
@@ -930,6 +938,8 @@ extern struct cxgb4_client t4c_client;
 extern c4iw_handler_func c4iw_handlers[NUM_CPL_CMDS];
 extern int c4iw_max_read_depth;
 extern int db_fc_threshold;
+extern int db_coalescing_threshold;
+extern int use_dsgl;
 
 
 #endif
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 903a92d6f91d..4cb8eb24497c 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -30,16 +30,76 @@
  * SOFTWARE.
  */
 
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <rdma/ib_umem.h>
 #include <linux/atomic.h>
 
 #include "iw_cxgb4.h"
 
+int use_dsgl = 1;
+module_param(use_dsgl, int, 0644);
+MODULE_PARM_DESC(use_dsgl, "Use DSGL for PBL/FastReg (default=1)");
+
 #define T4_ULPTX_MIN_IO 32
 #define C4IW_MAX_INLINE_SIZE 96
+#define T4_ULPTX_MAX_DMA 1024
+#define C4IW_INLINE_THRESHOLD 128
 
-static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
-                             void *data)
+static int inline_threshold = C4IW_INLINE_THRESHOLD;
+module_param(inline_threshold, int, 0644);
+MODULE_PARM_DESC(inline_threshold, "inline vs dsgl threshold (default=128)");
+
+static int _c4iw_write_mem_dma_aligned(struct c4iw_rdev *rdev, u32 addr,
+                                       u32 len, dma_addr_t data, int wait)
+{
+        struct sk_buff *skb;
+        struct ulp_mem_io *req;
+        struct ulptx_sgl *sgl;
+        u8 wr_len;
+        int ret = 0;
+        struct c4iw_wr_wait wr_wait;
+
+        addr &= 0x7FFFFFF;
+
+        if (wait)
+                c4iw_init_wr_wait(&wr_wait);
+        wr_len = roundup(sizeof(*req) + sizeof(*sgl), 16);
+
+        skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL);
+        if (!skb)
+                return -ENOMEM;
+        set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
+
+        req = (struct ulp_mem_io *)__skb_put(skb, wr_len);
+        memset(req, 0, wr_len);
+        INIT_ULPTX_WR(req, wr_len, 0, 0);
+        req->wr.wr_hi = cpu_to_be32(FW_WR_OP(FW_ULPTX_WR) |
+                        (wait ? FW_WR_COMPL(1) : 0));
+        req->wr.wr_lo = wait ? (__force __be64)&wr_wait : 0;
+        req->wr.wr_mid = cpu_to_be32(FW_WR_LEN16(DIV_ROUND_UP(wr_len, 16)));
+        req->cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE));
+        req->cmd |= cpu_to_be32(V_T5_ULP_MEMIO_ORDER(1));
+        req->dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN(len>>5));
+        req->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(req->wr), 16));
+        req->lock_addr = cpu_to_be32(ULP_MEMIO_ADDR(addr));
+
+        sgl = (struct ulptx_sgl *)(req + 1);
+        sgl->cmd_nsge = cpu_to_be32(ULPTX_CMD(ULP_TX_SC_DSGL) |
+                                    ULPTX_NSGE(1));
+        sgl->len0 = cpu_to_be32(len);
+        sgl->addr0 = cpu_to_be64(data);
+
+        ret = c4iw_ofld_send(rdev, skb);
+        if (ret)
+                return ret;
+        if (wait)
+                ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, 0, __func__);
+        return ret;
+}
+
+static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len,
+                                  void *data)
 {
         struct sk_buff *skb;
         struct ulp_mem_io *req;
@@ -47,6 +107,12 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
         u8 wr_len, *to_dp, *from_dp;
         int copy_len, num_wqe, i, ret = 0;
         struct c4iw_wr_wait wr_wait;
+        __be32 cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE));
+
+        if (is_t4(rdev->lldi.adapter_type))
+                cmd |= cpu_to_be32(ULP_MEMIO_ORDER(1));
+        else
+                cmd |= cpu_to_be32(V_T5_ULP_MEMIO_IMM(1));
 
         addr &= 0x7FFFFFF;
         PDBG("%s addr 0x%x len %u\n", __func__, addr, len);
@@ -77,7 +143,7 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
                 req->wr.wr_mid = cpu_to_be32(
                                        FW_WR_LEN16(DIV_ROUND_UP(wr_len, 16)));
 
-                req->cmd = cpu_to_be32(ULPTX_CMD(ULP_TX_MEM_WRITE) | (1<<23));
+                req->cmd = cmd;
                 req->dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN(
                                 DIV_ROUND_UP(copy_len, T4_ULPTX_MIN_IO)));
                 req->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(req->wr),
@@ -107,6 +173,67 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
         return ret;
 }
 
+int _c4iw_write_mem_dma(struct c4iw_rdev *rdev, u32 addr, u32 len, void *data)
+{
+        u32 remain = len;
+        u32 dmalen;
+        int ret = 0;
+        dma_addr_t daddr;
+        dma_addr_t save;
+
+        daddr = dma_map_single(&rdev->lldi.pdev->dev, data, len, DMA_TO_DEVICE);
+        if (dma_mapping_error(&rdev->lldi.pdev->dev, daddr))
+                return -1;
+        save = daddr;
+
+        while (remain > inline_threshold) {
+                if (remain < T4_ULPTX_MAX_DMA) {
+                        if (remain & ~T4_ULPTX_MIN_IO)
+                                dmalen = remain & ~(T4_ULPTX_MIN_IO-1);
+                        else
+                                dmalen = remain;
+                } else
+                        dmalen = T4_ULPTX_MAX_DMA;
+                remain -= dmalen;
+                ret = _c4iw_write_mem_dma_aligned(rdev, addr, dmalen, daddr,
+                                                 !remain);
+                if (ret)
+                        goto out;
+                addr += dmalen >> 5;
+                data += dmalen;
+                daddr += dmalen;
+        }
+        if (remain)
+                ret = _c4iw_write_mem_inline(rdev, addr, remain, data);
+out:
+        dma_unmap_single(&rdev->lldi.pdev->dev, save, len, DMA_TO_DEVICE);
+        return ret;
+}
+
+/*
+ * write len bytes of data into addr (32B aligned address)
+ * If data is NULL, clear len byte of memory to zero.
+ */
+static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
+                             void *data)
+{
+        if (is_t5(rdev->lldi.adapter_type) && use_dsgl) {
+                if (len > inline_threshold) {
+                        if (_c4iw_write_mem_dma(rdev, addr, len, data)) {
+                                printk_ratelimited(KERN_WARNING
+                                                   "%s: dma map"
+                                                   " failure (non fatal)\n",
+                                                   pci_name(rdev->lldi.pdev));
+                                return _c4iw_write_mem_inline(rdev, addr, len,
+                                                              data);
+                        } else
+                                return 0;
+                } else
+                        return _c4iw_write_mem_inline(rdev, addr, len, data);
+        } else
+                return _c4iw_write_mem_inline(rdev, addr, len, data);
+}
+
 /*
  * Build and write a TPT entry.
  * IN: stag key, pdid, perm, bind_enabled, zbva, to, len, page_size,
@@ -760,19 +887,23 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
         struct c4iw_fr_page_list *c4pl;
         struct c4iw_dev *dev = to_c4iw_dev(device);
         dma_addr_t dma_addr;
-        int size = sizeof *c4pl + page_list_len * sizeof(u64);
+        int pll_len = roundup(page_list_len * sizeof(u64), 32);
 
-        c4pl = dma_alloc_coherent(&dev->rdev.lldi.pdev->dev, size,
-                                  &dma_addr, GFP_KERNEL);
+        c4pl = kmalloc(sizeof(*c4pl), GFP_KERNEL);
         if (!c4pl)
                 return ERR_PTR(-ENOMEM);
 
+        c4pl->ibpl.page_list = dma_alloc_coherent(&dev->rdev.lldi.pdev->dev,
+                                                  pll_len, &dma_addr,
+                                                  GFP_KERNEL);
+        if (!c4pl->ibpl.page_list) {
+                kfree(c4pl);
+                return ERR_PTR(-ENOMEM);
+        }
         dma_unmap_addr_set(c4pl, mapping, dma_addr);
         c4pl->dma_addr = dma_addr;
         c4pl->dev = dev;
-        c4pl->size = size;
-        c4pl->ibpl.page_list = (u64 *)(c4pl + 1);
-        c4pl->ibpl.max_page_list_len = page_list_len;
+        c4pl->ibpl.max_page_list_len = pll_len;
 
         return &c4pl->ibpl;
 }
@@ -781,8 +912,10 @@ void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *ibpl)
 {
         struct c4iw_fr_page_list *c4pl = to_c4iw_fr_page_list(ibpl);
 
-        dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev, c4pl->size,
-                          c4pl, dma_unmap_addr(c4pl, mapping));
+        dma_free_coherent(&c4pl->dev->rdev.lldi.pdev->dev,
+                          c4pl->ibpl.max_page_list_len,
+                          c4pl->ibpl.page_list, dma_unmap_addr(c4pl, mapping));
+        kfree(c4pl);
 }
 
 int c4iw_dereg_mr(struct ib_mr *ib_mr)
diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index e084fdc6da7f..7e94c9a656a1 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -162,8 +162,14 @@ static int c4iw_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
                  */
                 if (addr >= rdev->oc_mw_pa)
                         vma->vm_page_prot = t4_pgprot_wc(vma->vm_page_prot);
-                else
-                        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+                else {
+                        if (is_t5(rdev->lldi.adapter_type))
+                                vma->vm_page_prot =
+                                        t4_pgprot_wc(vma->vm_page_prot);
+                        else
+                                vma->vm_page_prot =
+                                        pgprot_noncached(vma->vm_page_prot);
+                }
                 ret = io_remap_pfn_range(vma, vma->vm_start,
                                          addr >> PAGE_SHIFT,
                                          len, vma->vm_page_prot);
@@ -263,7 +269,7 @@ static int c4iw_query_device(struct ib_device *ibdev,
         dev = to_c4iw_dev(ibdev);
         memset(props, 0, sizeof *props);
         memcpy(&props->sys_image_guid, dev->rdev.lldi.ports[0]->dev_addr, 6);
-        props->hw_ver = dev->rdev.lldi.adapter_type;
+        props->hw_ver = CHELSIO_CHIP_RELEASE(dev->rdev.lldi.adapter_type);
         props->fw_ver = dev->rdev.lldi.fw_vers;
         props->device_cap_flags = dev->device_cap_flags;
         props->page_size_cap = T4_PAGESIZE_MASK;
@@ -346,7 +352,8 @@ static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
         struct c4iw_dev *c4iw_dev = container_of(dev, struct c4iw_dev,
                                                  ibdev.dev);
         PDBG("%s dev 0x%p\n", __func__, dev);
-        return sprintf(buf, "%d\n", c4iw_dev->rdev.lldi.adapter_type);
+        return sprintf(buf, "%d\n",
+                       CHELSIO_CHIP_RELEASE(c4iw_dev->rdev.lldi.adapter_type));
 }
 
 static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 17ba4f8bc12d..5b059e2d80cc 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -42,10 +42,21 @@ static int ocqp_support = 1;
 module_param(ocqp_support, int, 0644);
 MODULE_PARM_DESC(ocqp_support, "Support on-chip SQs (default=1)");
 
-int db_fc_threshold = 2000;
+int db_fc_threshold = 1000;
 module_param(db_fc_threshold, int, 0644);
-MODULE_PARM_DESC(db_fc_threshold, "QP count/threshold that triggers automatic "
-                 "db flow control mode (default = 2000)");
+MODULE_PARM_DESC(db_fc_threshold,
+                 "QP count/threshold that triggers"
+                 " automatic db flow control mode (default = 1000)");
+
+int db_coalescing_threshold;
+module_param(db_coalescing_threshold, int, 0644);
+MODULE_PARM_DESC(db_coalescing_threshold,
+                 "QP count/threshold that triggers"
+                 " disabling db coalescing (default = 0)");
+
+static int max_fr_immd = T4_MAX_FR_IMMD;
+module_param(max_fr_immd, int, 0644);
+MODULE_PARM_DESC(max_fr_immd, "fastreg threshold for using DSGL instead of immedate");
 
 static void set_state(struct c4iw_qp *qhp, enum c4iw_qp_state state)
 {
@@ -76,7 +87,7 @@ static void dealloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
 
 static int alloc_oc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
 {
-        if (!ocqp_support || !t4_ocqp_supported())
+        if (!ocqp_support || !ocqp_supported(&rdev->lldi))
                 return -ENOSYS;
         sq->dma_addr = c4iw_ocqp_pool_alloc(rdev, sq->memsize);
         if (!sq->dma_addr)
@@ -129,7 +140,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         int wr_len;
         struct c4iw_wr_wait wr_wait;
         struct sk_buff *skb;
-        int ret;
+        int ret = 0;
         int eqsize;
 
         wq->sq.qid = c4iw_get_qpid(rdev, uctx);
@@ -169,25 +180,24 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         }
 
         if (user) {
-                ret = alloc_oc_sq(rdev, &wq->sq);
-                if (ret)
+                if (alloc_oc_sq(rdev, &wq->sq) && alloc_host_sq(rdev, &wq->sq))
                         goto free_hwaddr;
-
-                ret = alloc_host_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_sq;
-        } else
+        } else {
                 ret = alloc_host_sq(rdev, &wq->sq);
                 if (ret)
                         goto free_hwaddr;
+        }
+
         memset(wq->sq.queue, 0, wq->sq.memsize);
         dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
         wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),
                                           wq->rq.memsize, &(wq->rq.dma_addr),
                                           GFP_KERNEL);
-        if (!wq->rq.queue)
+        if (!wq->rq.queue) {
+                ret = -ENOMEM;
                 goto free_sq;
+        }
         PDBG("%s sq base va 0x%p pa 0x%llx rq base va 0x%p pa 0x%llx\n",
                 __func__, wq->sq.queue,
                 (unsigned long long)virt_to_phys(wq->sq.queue),
@@ -532,7 +542,7 @@ static int build_rdma_recv(struct c4iw_qp *qhp, union t4_recv_wr *wqe,
 }
 
 static int build_fastreg(struct t4_sq *sq, union t4_wr *wqe,
-                         struct ib_send_wr *wr, u8 *len16)
+                         struct ib_send_wr *wr, u8 *len16, u8 t5dev)
 {
 
         struct fw_ri_immd *imdp;
@@ -554,28 +564,51 @@ static int build_fastreg(struct t4_sq *sq, union t4_wr *wqe,
         wqe->fr.va_hi = cpu_to_be32(wr->wr.fast_reg.iova_start >> 32);
         wqe->fr.va_lo_fbo = cpu_to_be32(wr->wr.fast_reg.iova_start &
                                         0xffffffff);
-        WARN_ON(pbllen > T4_MAX_FR_IMMD);
-        imdp = (struct fw_ri_immd *)(&wqe->fr + 1);
-        imdp->op = FW_RI_DATA_IMMD;
-        imdp->r1 = 0;
-        imdp->r2 = 0;
-        imdp->immdlen = cpu_to_be32(pbllen);
-        p = (__be64 *)(imdp + 1);
-        rem = pbllen;
-        for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
-                *p = cpu_to_be64((u64)wr->wr.fast_reg.page_list->page_list[i]);
-                rem -= sizeof *p;
-                if (++p == (__be64 *)&sq->queue[sq->size])
-                        p = (__be64 *)sq->queue;
-        }
-        BUG_ON(rem < 0);
-        while (rem) {
-                *p = 0;
-                rem -= sizeof *p;
-                if (++p == (__be64 *)&sq->queue[sq->size])
-                        p = (__be64 *)sq->queue;
+
+        if (t5dev && use_dsgl && (pbllen > max_fr_immd)) {
+                struct c4iw_fr_page_list *c4pl =
+                        to_c4iw_fr_page_list(wr->wr.fast_reg.page_list);
+                struct fw_ri_dsgl *sglp;
+
+                for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
+                        wr->wr.fast_reg.page_list->page_list[i] = (__force u64)
+                                cpu_to_be64((u64)
+                                wr->wr.fast_reg.page_list->page_list[i]);
+                }
+
+                sglp = (struct fw_ri_dsgl *)(&wqe->fr + 1);
+                sglp->op = FW_RI_DATA_DSGL;
+                sglp->r1 = 0;
+                sglp->nsge = cpu_to_be16(1);
+                sglp->addr0 = cpu_to_be64(c4pl->dma_addr);
+                sglp->len0 = cpu_to_be32(pbllen);
+
+                *len16 = DIV_ROUND_UP(sizeof(wqe->fr) + sizeof(*sglp), 16);
+        } else {
+                imdp = (struct fw_ri_immd *)(&wqe->fr + 1);
+                imdp->op = FW_RI_DATA_IMMD;
+                imdp->r1 = 0;
+                imdp->r2 = 0;
+                imdp->immdlen = cpu_to_be32(pbllen);
+                p = (__be64 *)(imdp + 1);
+                rem = pbllen;
+                for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
+                        *p = cpu_to_be64(
+                                (u64)wr->wr.fast_reg.page_list->page_list[i]);
+                        rem -= sizeof(*p);
+                        if (++p == (__be64 *)&sq->queue[sq->size])
+                                p = (__be64 *)sq->queue;
+                }
+                BUG_ON(rem < 0);
+                while (rem) {
+                        *p = 0;
+                        rem -= sizeof(*p);
+                        if (++p == (__be64 *)&sq->queue[sq->size])
+                                p = (__be64 *)sq->queue;
+                }
+                *len16 = DIV_ROUND_UP(sizeof(wqe->fr) + sizeof(*imdp)
+                                      + pbllen, 16);
         }
-        *len16 = DIV_ROUND_UP(sizeof wqe->fr + sizeof *imdp + pbllen, 16);
         return 0;
 }
 
@@ -676,7 +709,10 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                 case IB_WR_FAST_REG_MR:
                         fw_opcode = FW_RI_FR_NSMR_WR;
                         swsqe->opcode = FW_RI_FAST_REGISTER;
-                        err = build_fastreg(&qhp->wq.sq, wqe, wr, &len16);
+                        err = build_fastreg(&qhp->wq.sq, wqe, wr, &len16,
+                                            is_t5(
+                                            qhp->rhp->rdev.lldi.adapter_type) ?
+                                            1 : 0);
                         break;
                 case IB_WR_LOCAL_INV:
                         if (wr->send_flags & IB_SEND_FENCE)
@@ -1448,6 +1484,9 @@ int c4iw_destroy_qp(struct ib_qp *ib_qp)
                 rhp->db_state = NORMAL;
                 idr_for_each(&rhp->qpidr, enable_qp_db, NULL);
         }
+        if (db_coalescing_threshold >= 0)
+                if (rhp->qpcnt <= db_coalescing_threshold)
+                        cxgb4_enable_db_coalescing(rhp->rdev.lldi.ports[0]);
         spin_unlock_irq(&rhp->lock);
         atomic_dec(&qhp->refcnt);
         wait_event(qhp->wait, !atomic_read(&qhp->refcnt));
@@ -1559,11 +1598,15 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
         spin_lock_irq(&rhp->lock);
         if (rhp->db_state != NORMAL)
                 t4_disable_wq_db(&qhp->wq);
-        if (++rhp->qpcnt > db_fc_threshold && rhp->db_state == NORMAL) {
+        rhp->qpcnt++;
+        if (rhp->qpcnt > db_fc_threshold && rhp->db_state == NORMAL) {
                 rhp->rdev.stats.db_state_transitions++;
                 rhp->db_state = FLOW_CONTROL;
                 idr_for_each(&rhp->qpidr, disable_qp_db, NULL);
         }
+        if (db_coalescing_threshold >= 0)
+                if (rhp->qpcnt > db_coalescing_threshold)
+                        cxgb4_disable_db_coalescing(rhp->rdev.lldi.ports[0]);
         ret = insert_handle_nolock(rhp, &rhp->qpidr, qhp, qhp->wq.sq.qid);
         spin_unlock_irq(&rhp->lock);
         if (ret)
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index 16f26ab29302..ebcb03bd1b72 100644
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -84,7 +84,7 @@ struct t4_status_page {
                         sizeof(struct fw_ri_isgl)) / sizeof(struct fw_ri_sge))
 #define T4_MAX_FR_IMMD ((T4_SQ_NUM_BYTES - sizeof(struct fw_ri_fr_nsmr_wr) - \
                         sizeof(struct fw_ri_immd)) & ~31UL)
-#define T4_MAX_FR_DEPTH (T4_MAX_FR_IMMD / sizeof(u64))
+#define T4_MAX_FR_DEPTH (1024 / sizeof(u64))
 
 #define T4_RQ_NUM_SLOTS 2
 #define T4_RQ_NUM_BYTES (T4_EQ_ENTRY_SIZE * T4_RQ_NUM_SLOTS)
@@ -280,15 +280,6 @@ static inline pgprot_t t4_pgprot_wc(pgprot_t prot)
 #endif
 }
 
-static inline int t4_ocqp_supported(void)
-{
-#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)
-        return 1;
-#else
-        return 0;
-#endif
-}
-
 enum {
         T4_SQ_ONCHIP = (1<<0),
 };
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index aed8afee56da..6d7f453b4d05 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -40,6 +40,7 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/io.h>
+#include <linux/aio.h>
 #include <linux/jiffies.h>
 #include <linux/cpu.h>
 #include <asm/pgtable.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 439c35d4a669..ea93870266eb 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -620,7 +620,7 @@ void ipath_ib_rcv(struct ipath_ibdev *dev, void *rhdr, void *data,
                 goto bail;
         }
 
-        opcode = be32_to_cpu(ohdr->bth[0]) >> 24;
+        opcode = (be32_to_cpu(ohdr->bth[0]) >> 24) & 0x7f;
         dev->opstats[opcode].n_bytes += tlen;
         dev->opstats[opcode].n_packets++;
 
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index add98d01476c..d1f5f1dd77b0 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -204,7 +204,6 @@ static struct id_map_entry *
 id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
 {
         int ret;
-        static int next_id;
         struct id_map_entry *ent;
         struct mlx4_ib_sriov *sriov = &to_mdev(ibdev)->sriov;
 
@@ -223,9 +222,8 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
         idr_preload(GFP_KERNEL);
         spin_lock(&to_mdev(ibdev)->sriov.id_map_lock);
 
-        ret = idr_alloc(&sriov->pv_id_table, ent, next_id, 0, GFP_NOWAIT);
+        ret = idr_alloc_cyclic(&sriov->pv_id_table, ent, 0, 0, GFP_NOWAIT);
         if (ret >= 0) {
-                next_id = max(ret + 1, 0);
                 ent->pv_cm_id = (u32)ret;
                 sl_id_map_add(ibdev, ent);
                 list_add_tail(&ent->list, &sriov->cm_list);
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index ae67df35dd4d..73b3a7132587 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -228,7 +228,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector
                 vector = dev->eq_table[vector % ibdev->num_comp_vectors];
 
         err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,
-                            cq->db.dma, &cq->mcq, vector, 0);
+                            cq->db.dma, &cq->mcq, vector, 0, 0);
         if (err)
                 goto err_dbmap;
 
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 934792c477bc..4d599cedbb0b 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -93,7 +93,7 @@ static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,
 __be64 mlx4_ib_gen_node_guid(void)
 {
 #define NODE_GUID_HI    ((u64) (((u64)IB_OPENIB_OUI) << 40))
-        return cpu_to_be64(NODE_GUID_HI | random32());
+        return cpu_to_be64(NODE_GUID_HI | prandom_u32());
 }
 
 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 67647e264611..418004c93feb 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2948,7 +2948,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
                                         nes_debug(NES_DBG_CQ, "%s: Reporting stripped VLAN packet. Tag = 0x%04X\n",
                                                         nesvnic->netdev->name, vlan_tag);
 
-                                        __vlan_hwaccel_put_tag(rx_skb, vlan_tag);
+                                        __vlan_hwaccel_put_tag(rx_skb, htons(ETH_P_8021Q), vlan_tag);
                                 }
                                 if (nes_use_lro)
                                         lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL);
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 85cf4d1ac442..49eb5111d2cd 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1599,7 +1599,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,
 
         /* Enable/Disable VLAN Stripping */
         u32temp = nes_read_indexed(nesdev, NES_IDX_PCIX_DIAG);
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
                 u32temp &= 0xfdffffff;
         else
                 u32temp |= 0x02000000;
@@ -1614,10 +1614,10 @@ static netdev_features_t nes_fix_features(struct net_device *netdev, netdev_feat
          * Since there is no support for separate rx/tx vlan accel
          * enable/disable make sure tx flag is always in same state as rx.
          */
-        if (features & NETIF_F_HW_VLAN_RX)
-                features |= NETIF_F_HW_VLAN_TX;
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
         else
-                features &= ~NETIF_F_HW_VLAN_TX;
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
         return features;
 }
@@ -1628,7 +1628,7 @@ static int nes_set_features(struct net_device *netdev, netdev_features_t feature
         struct nes_device *nesdev = nesvnic->nesdev;
         u32 changed = netdev->features ^ features;
 
-        if (changed & NETIF_F_HW_VLAN_RX)
+        if (changed & NETIF_F_HW_VLAN_CTAG_RX)
                 nes_vlan_mode(netdev, nesdev, features);
 
         return 0;
@@ -1706,11 +1706,11 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
         netdev->dev_addr[4] = (u8)(u64temp>>8);
         netdev->dev_addr[5] = (u8)u64temp;
 
-        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX;
+        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX;
         if ((nesvnic->logical_port < 2) || (nesdev->nesadapter->hw_rev != NE020_REV))
                 netdev->hw_features |= NETIF_F_TSO;
 
-        netdev->features = netdev->hw_features | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX;
+        netdev->features = netdev->hw_features | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX;
         netdev->hw_features |= NETIF_F_LRO;
 
         nes_debug(NES_DBG_INIT, "nesvnic = %p, reported features = 0x%lX, QPid = %d,"
diff --git a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig
index 8349f9c5064c..1e603a375069 100644
--- a/drivers/infiniband/hw/qib/Kconfig
+++ b/drivers/infiniband/hw/qib/Kconfig
@@ -1,7 +1,7 @@
 config INFINIBAND_QIB
-        tristate "QLogic PCIe HCA support"
+        tristate "Intel PCIe HCA support"
         depends on 64BIT
         ---help---
-        This is a low-level driver for QLogic PCIe QLE InfiniBand host
-        channel adapters.  This driver does not support the QLogic
+        This is a low-level driver for Intel PCIe QLE InfiniBand host
+        channel adapters.  This driver does not support the Intel
         HyperTransport card (model QHT7140).
diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c
index 5423edcab51f..216092477dfc 100644
--- a/drivers/infiniband/hw/qib/qib_driver.c
+++ b/drivers/infiniband/hw/qib/qib_driver.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2013 Intel Corporation. All rights reserved.
  * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
  *
@@ -63,8 +64,8 @@ MODULE_PARM_DESC(compat_ddr_negotiate,
                  "Attempt pre-IBTA 1.2 DDR speed negotiation");
 
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("QLogic <support@qlogic.com>");
-MODULE_DESCRIPTION("QLogic IB driver");
+MODULE_AUTHOR("Intel <ibsupport@intel.com>");
+MODULE_DESCRIPTION("Intel IB driver");
 MODULE_VERSION(QIB_DRIVER_VERSION);
 
 /*
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 4f7aa301b3b1..b56c9428f3c5 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -39,7 +39,7 @@
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
 #include <linux/io.h>
-#include <linux/uio.h>
+#include <linux/aio.h>
 #include <linux/jiffies.h>
 #include <asm/pgtable.h>
 #include <linux/delay.h>
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index a099ac171e22..0232ae56b1fa 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2013 Intel Corporation. All rights reserved.
  * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation.
  * All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
@@ -51,7 +52,7 @@ static u32 qib_6120_iblink_state(u64);
 
 /*
  * This file contains all the chip-specific register information and
- * access functions for the QLogic QLogic_IB PCI-Express chip.
+ * access functions for the Intel Intel_IB PCI-Express chip.
  *
  */
 
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index 50e33aa0b4e3..173f805790da 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2012, 2013 Intel Corporation.  All rights reserved.
  * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
  *
@@ -1138,7 +1138,7 @@ void qib_disable_after_error(struct qib_devdata *dd)
 static void qib_remove_one(struct pci_dev *);
 static int qib_init_one(struct pci_dev *, const struct pci_device_id *);
 
-#define DRIVER_LOAD_MSG "QLogic " QIB_DRV_NAME " loaded: "
+#define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: "
 #define PFX QIB_DRV_NAME ": "
 
 static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = {
@@ -1355,7 +1355,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dd = qib_init_iba6120_funcs(pdev, ent);
 #else
                 qib_early_err(&pdev->dev,
-                        "QLogic PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n",
+                        "Intel PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n",
                         ent->device);
                 dd = ERR_PTR(-ENODEV);
 #endif
@@ -1371,7 +1371,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         default:
                 qib_early_err(&pdev->dev,
-                        "Failing on unknown QLogic deviceid 0x%x\n",
+                        "Failing on unknown Intel deviceid 0x%x\n",
                         ent->device);
                 ret = -ENODEV;
         }
diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c
index 50a8a0d4fe67..911205d3d5a0 100644
--- a/drivers/infiniband/hw/qib/qib_sd7220.c
+++ b/drivers/infiniband/hw/qib/qib_sd7220.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Intel Corporation. All rights reserved.
+ * Copyright (c) 2013 Intel Corporation. All rights reserved.
  * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
  *
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index ba51a4715a1d..7c0ab16a2fe2 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2012, 2013 Intel Corporation.  All rights reserved.
  * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.
  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
  *
@@ -2224,7 +2224,7 @@ int qib_register_ib_device(struct qib_devdata *dd)
         ibdev->dma_ops = &qib_dma_mapping_ops;
 
         snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),
-                 "QLogic Infiniband HCA %s", init_utsname()->nodename);
+                 "Intel Infiniband HCA %s", init_utsname()->nodename);
 
         ret = ib_register_device(ibdev, qib_create_port_files);
         if (ret)