mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed)

For SRIOV, some Hypervisor commands can be executed directly (native = 1).
Others should go through the command wrapper flow (for tracking resource
usage, for example, or for changing some HCA configurations that slaves
need to be notified of).

This patch sets the groundwork for this capability -- adding the correct
value of "native" in each case.

Note that if SRIOV is not activated, this parameter has no effect.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index f36da994a85a..95c94d8f0254 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -109,7 +109,8 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int ignore_mkey, int ignore_bkey,
 
         err = mlx4_cmd_box(dev->dev, inmailbox->dma, outmailbox->dma,
                            in_modifier, op_modifier,
-                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
+                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,
+                           MLX4_CMD_NATIVE);
 
         if (!err)
                 memcpy(response_mad, outmailbox->buf, 256);
@@ -330,7 +331,8 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                 return IB_MAD_RESULT_FAILURE;
 
         err = mlx4_cmd_box(dev->dev, 0, mailbox->dma, inmod, 0,
-                           MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C);
+                           MLX4_CMD_QUERY_IF_STAT, MLX4_CMD_TIME_CLASS_C,
+                           MLX4_CMD_WRAPPED);
         if (err)
                 err = IB_MAD_RESULT_FAILURE;
         else {
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 6128b2940c49..34f8a5d9da75 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -434,7 +434,7 @@ static int mlx4_ib_modify_device(struct ib_device *ibdev, int mask,
         memset(mailbox->buf, 0, 256);
         memcpy(mailbox->buf, props->node_desc, 64);
         mlx4_cmd(to_mdev(ibdev)->dev, mailbox->dma, 1, 0,
-                 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A);
+                 MLX4_CMD_SET_NODE, MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
 
         mlx4_free_cmd_mailbox(to_mdev(ibdev)->dev, mailbox);
 
@@ -463,7 +463,7 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,
         }
 
         err = mlx4_cmd(dev->dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT,
-                       MLX4_CMD_TIME_CLASS_B);
+                       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
 
         mlx4_free_cmd_mailbox(dev->dev, mailbox);
         return err;
@@ -899,7 +899,8 @@ static void update_gids_task(struct work_struct *work)
         memcpy(gids, gw->gids, sizeof gw->gids);
 
         err = mlx4_cmd(dev, mailbox->dma, MLX4_SET_PORT_GID_TABLE << 8 | gw->port,
-                       1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B);
+                       1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B,
+                       MLX4_CMD_NATIVE);
         if (err)
                 printk(KERN_WARNING "set port command failed\n");
         else {