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

Commit eb41049f authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by David S. Miller
Browse files

mlx4_core: removed function index from vf. 



The Virtual Functions should not be aware their function number.

Signed-off-by: default avatarMarcel Apfelbaum <marcela@dev.mellanox.co.il>
Reviewed-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93ece0c1

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

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type) 
static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,

			 int cq_num)

{

	return mlx4_cmd(dev, mailbox->dma | dev->caps.function, cq_num, 0,

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

			MLX4_CMD_SW2HW_CQ, MLX4_CMD_TIME_CLASS_A,

			MLX4_CMD_WRAPPED);

}
@@ -111,7 +111,7 @@ static int mlx4_MODIFY_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox 
static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,

			 int cq_num)

{

	return mlx4_cmd_box(dev, dev->caps.function, mailbox ? mailbox->dma : 0,

	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_WRAPPED);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int mlx4_MAP_EQ(struct mlx4_dev *dev, u64 event_mask, int unmap, 
static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,

			 int eq_num)

{

	return mlx4_cmd(dev, mailbox->dma | dev->caps.function, eq_num, 0,

	return mlx4_cmd(dev, mailbox->dma, eq_num, 0,

			MLX4_CMD_SW2HW_EQ, MLX4_CMD_TIME_CLASS_A,

			MLX4_CMD_WRAPPED);

}
@@ -554,7 +554,7 @@ static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox, 
static int mlx4_HW2SW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,

			 int eq_num)

{

	return mlx4_cmd_box(dev, dev->caps.function, mailbox->dma, eq_num,

	return mlx4_cmd_box(dev, 0, mailbox->dma, eq_num,

			    0, MLX4_CMD_HW2SW_EQ, MLX4_CMD_TIME_CLASS_A,

			    MLX4_CMD_WRAPPED);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave, 


#define QUERY_FUNC_CAP_FLAGS_OFFSET		0x0

#define QUERY_FUNC_CAP_NUM_PORTS_OFFSET		0x1

#define QUERY_FUNC_CAP_FUNCTION_OFFSET		0x3

#define QUERY_FUNC_CAP_PF_BHVR_OFFSET		0x4

#define QUERY_FUNC_CAP_QP_QUOTA_OFFSET		0x10

#define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET		0x14
@@ -182,9 +181,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave, 
		field = 1 << 7; /* enable only ethernet interface */

		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);



		field = slave;

		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FUNCTION_OFFSET);



		field = dev->caps.num_ports;

		MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
@@ -249,9 +245,6 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap) 
		goto out;

	}



	MLX4_GET(field, outbox, QUERY_FUNC_CAP_FUNCTION_OFFSET);

	func_cap->function = field;



	MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);

	func_cap->num_ports = field;

drivers/net/ethernet/mellanox/mlx4/fw.h

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct mlx4_dev_cap { 
};



struct mlx4_func_cap {

	u8	function;

	u8	num_ports;

	u8	flags;

	u32	pf_context_behaviour;

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

+0 −1
Original line number Diff line number Diff line
@@ -471,7 +471,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
		return -ENOSYS;

	}



	dev->caps.function		= func_cap.function;

	dev->caps.num_ports		= func_cap.num_ports;

	dev->caps.num_qps		= func_cap.qp_quota;

	dev->caps.num_srqs		= func_cap.srq_quota;