Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9baff50 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

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: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65dab25d

drivers/infiniband/hw/mlx4/mad.c

+4 −2
Original line number Diff line number Diff line
@@ -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 {

drivers/infiniband/hw/mlx4/main.c

+4 −3
Original line number Diff line number Diff line
@@ -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 {

drivers/net/ethernet/mellanox/mlx4/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param, 


int __mlx4_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param,

	       int out_is_imm, u32 in_modifier, u8 op_modifier,

	       u16 op, unsigned long timeout)

	       u16 op, unsigned long timeout, int native)

{

	if (mlx4_priv(dev)->cmd.use_events)

		return mlx4_cmd_wait(dev, in_param, out_param, out_is_imm,

drivers/net/ethernet/mellanox/mlx4/cq.c

+3 −3
Original line number Diff line number Diff line
@@ -118,14 +118,14 @@ static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox, 
			 int cq_num)

{

	return mlx4_cmd(dev, mailbox->dma, cq_num, 0, MLX4_CMD_SW2HW_CQ,

			MLX4_CMD_TIME_CLASS_A);

			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);

}



static int mlx4_MODIFY_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,

			 int cq_num, u32 opmod)

{

	return mlx4_cmd(dev, mailbox->dma, cq_num, opmod, MLX4_CMD_MODIFY_CQ,

			MLX4_CMD_TIME_CLASS_A);

			MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);

}



static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
@@ -133,7 +133,7 @@ static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox, 
{

	return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, cq_num,

			    mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,

			    MLX4_CMD_TIME_CLASS_A);

			    MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);

}



int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq,

drivers/net/ethernet/mellanox/mlx4/en_port.c

+9 −6
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, 
			u64 mac, u64 clear, u8 mode)

{

	return mlx4_cmd(dev, (mac | (clear << 63)), port, mode,

			MLX4_CMD_SET_MCAST_FLTR, MLX4_CMD_TIME_CLASS_B);

			MLX4_CMD_SET_MCAST_FLTR, MLX4_CMD_TIME_CLASS_B,

			MLX4_CMD_WRAPPED);

}



int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv)
@@ -72,7 +73,7 @@ int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv) 
		filter->entry[i] = cpu_to_be32(entry);

	}

	err = mlx4_cmd(dev, mailbox->dma, priv->port, 0, MLX4_CMD_SET_VLAN_FLTR,

		       MLX4_CMD_TIME_CLASS_B);

		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);

	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;

}
@@ -101,7 +102,7 @@ int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, 


	in_mod = MLX4_SET_PORT_GENERAL << 8 | port;

	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,

		       MLX4_CMD_TIME_CLASS_B);

		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);



	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;
@@ -140,7 +141,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, 


	in_mod = MLX4_SET_PORT_RQP_CALC << 8 | port;

	err = mlx4_cmd(dev, mailbox->dma, in_mod, 1, MLX4_CMD_SET_PORT,

		       MLX4_CMD_TIME_CLASS_B);

		       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);



	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;
@@ -159,7 +160,8 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port) 
		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, sizeof(*qport_context));

	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, port, 0,

			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B);

			   MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,

			   MLX4_CMD_WRAPPED);

	if (err)

		goto out;

	qport_context = mailbox->buf;
@@ -204,7 +206,8 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset) 
		return PTR_ERR(mailbox);

	memset(mailbox->buf, 0, sizeof(*mlx4_en_stats));

	err = mlx4_cmd_box(mdev->dev, 0, mailbox->dma, in_mod, 0,

			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B);

			   MLX4_CMD_DUMP_ETH_STATS, MLX4_CMD_TIME_CLASS_B,

			   MLX4_CMD_WRAPPED);

	if (err)

		goto out;