4 files changed, 95 insertions, 0 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index 9cd5415fe017..aa7f94375108 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -35,6 +35,12 @@ static void _be_roce_dev_add(struct be_adapter *adapter)
 
         if (!ocrdma_drv)
                 return;
+
+        if (ocrdma_drv->be_abi_version != BE_ROCE_ABI_VERSION) {
+                dev_warn(&pdev->dev, "Cannot initialize RoCE due to ocrdma ABI mismatch\n");
+                return;
+        }
+
         if (pdev->device == OC_DEVICE_ID5) {
                 /* only msix is supported on these devices */
                 if (!msix_enabled(adapter))
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.h b/drivers/net/ethernet/emulex/benet/be_roce.h
index 2cd1129e19af..1bfb16164df8 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.h
+++ b/drivers/net/ethernet/emulex/benet/be_roce.h
@@ -21,6 +21,8 @@
 #include <linux/pci.h>
 #include <linux/netdevice.h>
 
+#define BE_ROCE_ABI_VERSION     1
+
 struct ocrdma_dev;
 
 enum be_interrupt_mode {
@@ -52,6 +54,7 @@ struct be_dev_info {
 /* ocrdma driver register's the callback functions with nic driver. */
 struct ocrdma_driver {
         unsigned char name[32];
+        u32 be_abi_version;
         struct ocrdma_dev *(*add) (struct be_dev_info *dev_info);
         void (*remove) (struct ocrdma_dev *);
         void (*state_change_handler) (struct ocrdma_dev *, u32 new_state);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index a064f06e0cb8..96a0617f7609 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -446,6 +446,7 @@ int mlx5_dev_init(struct mlx5_core_dev *dev, struct pci_dev *pdev)
         mlx5_init_cq_table(dev);
         mlx5_init_qp_table(dev);
         mlx5_init_srq_table(dev);
+        mlx5_init_mr_table(dev);
 
         return 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mr.c b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
index 35e514dc7b7d..4cc927649404 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
@@ -36,11 +36,24 @@
 #include <linux/mlx5/cmd.h>
 #include "mlx5_core.h"
 
+void mlx5_init_mr_table(struct mlx5_core_dev *dev)
+{
+        struct mlx5_mr_table *table = &dev->priv.mr_table;
+
+        rwlock_init(&table->lock);
+        INIT_RADIX_TREE(&table->tree, GFP_ATOMIC);
+}
+
+void mlx5_cleanup_mr_table(struct mlx5_core_dev *dev)
+{
+}
+
 int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
                           struct mlx5_create_mkey_mbox_in *in, int inlen,
                           mlx5_cmd_cbk_t callback, void *context,
                           struct mlx5_create_mkey_mbox_out *out)
 {
+        struct mlx5_mr_table *table = &dev->priv.mr_table;
         struct mlx5_create_mkey_mbox_out lout;
         int err;
         u8 key;
@@ -73,14 +86,21 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
         mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",
                       be32_to_cpu(lout.mkey), key, mr->key);
 
+        /* connect to MR tree */
+        write_lock_irq(&table->lock);
+        err = radix_tree_insert(&table->tree, mlx5_base_mkey(mr->key), mr);
+        write_unlock_irq(&table->lock);
+
         return err;
 }
 EXPORT_SYMBOL(mlx5_core_create_mkey);
 
 int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr)
 {
+        struct mlx5_mr_table *table = &dev->priv.mr_table;
         struct mlx5_destroy_mkey_mbox_in in;
         struct mlx5_destroy_mkey_mbox_out out;
+        unsigned long flags;
         int err;
 
         memset(&in, 0, sizeof(in));
@@ -95,6 +115,10 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr)
         if (out.hdr.status)
                 return mlx5_cmd_status_to_err(&out.hdr);
 
+        write_lock_irqsave(&table->lock, flags);
+        radix_tree_delete(&table->tree, mlx5_base_mkey(mr->key));
+        write_unlock_irqrestore(&table->lock, flags);
+
         return err;
 }
 EXPORT_SYMBOL(mlx5_core_destroy_mkey);
@@ -144,3 +168,64 @@ int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
         return err;
 }
 EXPORT_SYMBOL(mlx5_core_dump_fill_mkey);
+
+int mlx5_core_create_psv(struct mlx5_core_dev *dev, u32 pdn,
+                         int npsvs, u32 *sig_index)
+{
+        struct mlx5_allocate_psv_in in;
+        struct mlx5_allocate_psv_out out;
+        int i, err;
+
+        if (npsvs > MLX5_MAX_PSVS)
+                return -EINVAL;
+
+        memset(&in, 0, sizeof(in));
+        memset(&out, 0, sizeof(out));
+
+        in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_CREATE_PSV);
+        in.npsv_pd = cpu_to_be32((npsvs << 28) | pdn);
+        err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
+        if (err) {
+                mlx5_core_err(dev, "cmd exec failed %d\n", err);
+                return err;
+        }
+
+        if (out.hdr.status) {
+                mlx5_core_err(dev, "create_psv bad status %d\n", out.hdr.status);
+                return mlx5_cmd_status_to_err(&out.hdr);
+        }
+
+        for (i = 0; i < npsvs; i++)
+                sig_index[i] = be32_to_cpu(out.psv_idx[i]) & 0xffffff;
+
+        return err;
+}
+EXPORT_SYMBOL(mlx5_core_create_psv);
+
+int mlx5_core_destroy_psv(struct mlx5_core_dev *dev, int psv_num)
+{
+        struct mlx5_destroy_psv_in in;
+        struct mlx5_destroy_psv_out out;
+        int err;
+
+        memset(&in, 0, sizeof(in));
+        memset(&out, 0, sizeof(out));
+
+        in.psv_number = cpu_to_be32(psv_num);
+        in.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_DESTROY_PSV);
+        err = mlx5_cmd_exec(dev, &in, sizeof(in), &out, sizeof(out));
+        if (err) {
+                mlx5_core_err(dev, "destroy_psv cmd exec failed %d\n", err);
+                goto out;
+        }
+
+        if (out.hdr.status) {
+                mlx5_core_err(dev, "destroy_psv bad status %d\n", out.hdr.status);
+                err = mlx5_cmd_status_to_err(&out.hdr);
+                goto out;
+        }
+
+out:
+        return err;
+}
+EXPORT_SYMBOL(mlx5_core_destroy_psv);