{IB,net}/mlx5: Setup mkey variant before mr create command invocation

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx5 / core / mr.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mr.c b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
index c501bf2a0252104e4460c33191605f4f9a329dff..770d13bb4f20ddb0945a9439d3ad34840c713550 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
@@ -36,16 +36,6 @@
 #include <linux/mlx5/cmd.h>
 #include "mlx5_core.h"
 
-void mlx5_init_mkey_table(struct mlx5_core_dev *dev)
-{
-       xa_init_flags(&dev->priv.mkey_table, XA_FLAGS_LOCK_IRQ);
-}
-
-void mlx5_cleanup_mkey_table(struct mlx5_core_dev *dev)
-{
-       WARN_ON(!xa_empty(&dev->priv.mkey_table));
-}
-
 int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
                             struct mlx5_core_mkey *mkey,
                             struct mlx5_async_ctx *async_ctx, u32 *in,
@@ -54,7 +44,6 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
                             struct mlx5_async_work *context)
 {
        u32 lout[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
-       struct xarray *mkeys = &dev->priv.mkey_table;
        u32 mkey_index;
        void *mkc;
        int err;
@@ -67,6 +56,7 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
 
        MLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);
        MLX5_SET(mkc, mkc, mkey_7_0, key);
+       mkey->key = key;
 
        if (callback)
                return mlx5_cmd_exec_cb(async_ctx, in, inlen, out, outlen,
@@ -79,21 +69,12 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
        mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);
        mkey->iova = MLX5_GET64(mkc, mkc, start_addr);
        mkey->size = MLX5_GET64(mkc, mkc, len);
-       mkey->key = mlx5_idx_to_mkey(mkey_index) | key;
+       mkey->key |= mlx5_idx_to_mkey(mkey_index);
        mkey->pd = MLX5_GET(mkc, mkc, pd);
 
        mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",
                      mkey_index, key, mkey->key);
-
-       err = xa_err(xa_store_irq(mkeys, mlx5_base_mkey(mkey->key), mkey,
-                                 GFP_KERNEL));
-       if (err) {
-               mlx5_core_warn(dev, "failed xarray insert of mkey 0x%x, %d\n",
-                              mlx5_base_mkey(mkey->key), err);
-               mlx5_core_destroy_mkey(dev, mkey);
-       }
-
-       return err;
+       return 0;
 }
 EXPORT_SYMBOL(mlx5_core_create_mkey_cb);
 
@@ -111,12 +92,6 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev,
 {
        u32 out[MLX5_ST_SZ_DW(destroy_mkey_out)] = {0};
        u32 in[MLX5_ST_SZ_DW(destroy_mkey_in)]   = {0};
-       struct xarray *mkeys = &dev->priv.mkey_table;
-       unsigned long flags;
-
-       xa_lock_irqsave(mkeys, flags);
-       __xa_erase(mkeys, mlx5_base_mkey(mkey->key));
-       xa_unlock_irqrestore(mkeys, flags);
 
        MLX5_SET(destroy_mkey_in, in, opcode, MLX5_CMD_OP_DESTROY_MKEY);
        MLX5_SET(destroy_mkey_in, in, mkey_index, mlx5_mkey_to_idx(mkey->key));