14 files changed, 8393 insertions, 0 deletions

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index eb0add311dc8..a0f29c1d03bc 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -51,6 +51,7 @@ source "drivers/infiniband/hw/cxgb3/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/mlx4/Kconfig"
 source "drivers/infiniband/hw/nes/Kconfig"
+source "drivers/infiniband/hw/ocrdma/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index a3b2d8eac86e..bf846a14b9d3 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_INFINIBAND_CXGB3)		+= hw/cxgb3/
 obj-$(CONFIG_INFINIBAND_CXGB4)          += hw/cxgb4/
 obj-$(CONFIG_MLX4_INFINIBAND)           += hw/mlx4/
 obj-$(CONFIG_INFINIBAND_NES)            += hw/nes/
+obj-$(CONFIG_INFINIBAND_OCRDMA)         += hw/ocrdma/
 obj-$(CONFIG_INFINIBAND_IPOIB)          += ulp/ipoib/
 obj-$(CONFIG_INFINIBAND_SRP)            += ulp/srp/
 obj-$(CONFIG_INFINIBAND_SRPT)           += ulp/srpt/
diff --git a/drivers/infiniband/hw/ocrdma/Kconfig b/drivers/infiniband/hw/ocrdma/Kconfig
new file mode 100644
index 000000000000..cf993424e2fb
--- /dev/null
+++ b/drivers/infiniband/hw/ocrdma/Kconfig
@@ -0,0 +1,8 @@
+config INFINIBAND_OCRDMA
+        tristate "Emulex One Connect HCA support"
+        depends on ETHERNET && NETDEVICES && PCI
+        select NET_VENDOR_EMULEX
+        select BE2NET
+        ---help---
+          This driver provides low-level InfiniBand over Ethernet
+          support for Emulex One Connect host channel adapters (HCAs).
diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile
new file mode 100644
index 000000000000..06a5bed12e43
--- /dev/null
+++ b/drivers/infiniband/hw/ocrdma/Makefile
@@ -0,0 +1,5 @@
+ccflags-y := -Idrivers/net/ethernet/emulex/benet
+
+obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o
+
+ocrdma-y :=     ocrdma_main.o ocrdma_verbs.o ocrdma_hw.o ocrdma_ah.o
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
new file mode 100644
index 000000000000..d7a44b812dfc
--- /dev/null
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -0,0 +1,392 @@
+/*******************************************************************
+ * This file is part of the Emulex RoCE Device Driver for          *
+ * RoCE (RDMA over Converged Ethernet) adapters.                   *
+ * Copyright (C) 2008-2012 Emulex. All rights reserved.            *
+ * EMULEX and SLI are trademarks of Emulex.                        *
+ * www.emulex.com                                                  *
+ *                                                                 *
+ * This program is free software; you can redistribute it and/or   *
+ * modify it under the terms of version 2 of the GNU General       *
+ * Public License as published by the Free Software Foundation.    *
+ * This program is distributed in the hope that it will be useful. *
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *
+ * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *
+ * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *
+ * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *
+ * TO BE LEGALLY INVALID.  See the GNU General Public License for  *
+ * more details, a copy of which can be found in the file COPYING  *
+ * included with this package.                                     *
+ *
+ * Contact Information:
+ * linux-drivers@emulex.com
+ *
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
+ *******************************************************************/
+
+#ifndef __OCRDMA_H__
+#define __OCRDMA_H__
+
+#include <linux/mutex.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/pci.h>
+
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_user_verbs.h>
+
+#include <be_roce.h>
+#include "ocrdma_sli.h"
+
+#define OCRDMA_ROCE_DEV_VERSION "1.0.0"
+#define OCRDMA_NODE_DESC "Emulex OneConnect RoCE HCA"
+
+#define ocrdma_err(format, arg...) printk(KERN_ERR format, ##arg)
+
+#define OCRDMA_MAX_AH 512
+
+#define OCRDMA_UVERBS(CMD_NAME) (1ull << IB_USER_VERBS_CMD_##CMD_NAME)
+
+struct ocrdma_dev_attr {
+        u8 fw_ver[32];
+        u32 vendor_id;
+        u32 device_id;
+        u16 max_pd;
+        u16 max_cq;
+        u16 max_cqe;
+        u16 max_qp;
+        u16 max_wqe;
+        u16 max_rqe;
+        u32 max_inline_data;
+        int max_send_sge;
+        int max_recv_sge;
+        int max_mr;
+        u64 max_mr_size;
+        u32 max_num_mr_pbl;
+        int max_fmr;
+        int max_map_per_fmr;
+        int max_pages_per_frmr;
+        u16 max_ord_per_qp;
+        u16 max_ird_per_qp;
+
+        int device_cap_flags;
+        u8 cq_overflow_detect;
+        u8 srq_supported;
+
+        u32 wqe_size;
+        u32 rqe_size;
+        u32 ird_page_size;
+        u8 local_ca_ack_delay;
+        u8 ird;
+        u8 num_ird_pages;
+};
+
+struct ocrdma_pbl {
+        void *va;
+        dma_addr_t pa;
+};
+
+struct ocrdma_queue_info {
+        void *va;
+        dma_addr_t dma;
+        u32 size;
+        u16 len;
+        u16 entry_size;         /* Size of an element in the queue */
+        u16 id;                 /* qid, where to ring the doorbell. */
+        u16 head, tail;
+        bool created;
+        atomic_t used;          /* Number of valid elements in the queue */
+};
+
+struct ocrdma_eq {
+        struct ocrdma_queue_info q;
+        u32 vector;
+        int cq_cnt;
+        struct ocrdma_dev *dev;
+        char irq_name[32];
+};
+
+struct ocrdma_mq {
+        struct ocrdma_queue_info sq;
+        struct ocrdma_queue_info cq;
+        bool rearm_cq;
+};
+
+struct mqe_ctx {
+        struct mutex lock; /* for serializing mailbox commands on MQ */
+        wait_queue_head_t cmd_wait;
+        u32 tag;
+        u16 cqe_status;
+        u16 ext_status;
+        bool cmd_done;
+};
+
+struct ocrdma_dev {
+        struct ib_device ibdev;
+        struct ocrdma_dev_attr attr;
+
+        struct mutex dev_lock; /* provides syncronise access to device data */
+        spinlock_t flush_q_lock ____cacheline_aligned;
+
+        struct ocrdma_cq **cq_tbl;
+        struct ocrdma_qp **qp_tbl;