Commit e50cda2b authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Fix the wrong type of parameter "op" of the mailbox 

The "op" field of the mailbox occupies 8 bits, so the parameter "op"
should be of type u8.

Link: https://lore.kernel.org/r/20220302064830.61706-5-liangwenpeng@huawei.com


Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 479dc93b

drivers/infiniband/hw/hns/hns_roce_cmd.c

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define CMD_MAX_NUM 32



static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param,

				     u64 out_param, u32 in_modifier, u16 op,

				     u64 out_param, u32 in_modifier, u8 op,

				     u16 token, int event)

{

	return hr_dev->hw->post_mbox(hr_dev, in_param, out_param, in_modifier,
@@ -49,7 +49,7 @@ static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param, 
/* this should be called with "poll_sem" */

static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,

				    u64 out_param, unsigned long in_modifier,

				    u16 op)

				    u8 op)

{

	int ret;
@@ -67,7 +67,7 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param, 


static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,

				  u64 out_param, unsigned long in_modifier,

				  u16 op)

				  u8 op)

{

	int ret;
@@ -99,7 +99,7 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, 


static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,

				    u64 out_param, unsigned long in_modifier,

				    u16 op)

				    u8 op)

{

	struct hns_roce_cmdq *cmd = &hr_dev->cmd;

	struct hns_roce_cmd_context *context;
@@ -149,7 +149,7 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, 


static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,

				  u64 out_param, unsigned long in_modifier,

				  u16 op)

				  u8 op)

{

	int ret;
@@ -162,7 +162,7 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, 
}



int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param,

		      unsigned long in_modifier, u16 op)

		      unsigned long in_modifier, u8 op)

{

	bool is_busy;

drivers/infiniband/hw/hns/hns_roce_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ enum { 
};



int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param,

		      unsigned long in_modifier, u16 op);

		      unsigned long in_modifier, u8 op);



struct hns_roce_cmd_mailbox *

hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev);

drivers/infiniband/hw/hns/hns_roce_device.h

+3 −3
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ struct hns_roce_hw { 
	int (*hw_init)(struct hns_roce_dev *hr_dev);

	void (*hw_exit)(struct hns_roce_dev *hr_dev);

	int (*post_mbox)(struct hns_roce_dev *hr_dev, u64 in_param,

			 u64 out_param, u32 in_modifier, u16 op,

			 u64 out_param, u32 in_modifier, u8 op,

			 u16 token, int event);

	int (*poll_mbox_done)(struct hns_roce_dev *hr_dev);

	bool (*chk_mbox_avail)(struct hns_roce_dev *hr_dev, bool *is_busy);
@@ -872,10 +872,10 @@ struct hns_roce_hw { 
			  struct hns_roce_cq *hr_cq, void *mb_buf, u64 *mtts,

			  dma_addr_t dma_handle);

	int (*set_hem)(struct hns_roce_dev *hr_dev,

		       struct hns_roce_hem_table *table, int obj, int step_idx);

		       struct hns_roce_hem_table *table, int obj, u32 step_idx);

	int (*clear_hem)(struct hns_roce_dev *hr_dev,

			 struct hns_roce_hem_table *table, int obj,

			 int step_idx);

			 u32 step_idx);

	int (*modify_qp)(struct ib_qp *ibqp, const struct ib_qp_attr *attr,

			 int attr_mask, enum ib_qp_state cur_state,

			 enum ib_qp_state new_state);

drivers/infiniband/hw/hns/hns_roce_hem.c

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int set_mhop_hem(struct hns_roce_dev *hr_dev, 
			struct hns_roce_hem_index *index)

{

	struct ib_device *ibdev = &hr_dev->ib_dev;

	int step_idx;

	u32 step_idx;

	int ret = 0;



	if (index->inited & HEM_INDEX_L0) {
@@ -618,7 +618,7 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev, 
	struct ib_device *ibdev = &hr_dev->ib_dev;

	u32 hop_num = mhop->hop_num;

	u32 chunk_ba_num;

	int step_idx;

	u32 step_idx;



	index->inited = HEM_INDEX_BUF;

	chunk_ba_num = mhop->bt_chunk_size / BA_BYTE_LEN;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+16 −17
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ static int hns_roce_cmq_send(struct hns_roce_dev *hr_dev, 
}



static int config_hem_ba_to_hw(struct hns_roce_dev *hr_dev, unsigned long obj,

			       dma_addr_t base_addr, u16 op)

			       dma_addr_t base_addr, u8 op)

{

	struct hns_roce_cmd_mailbox *mbox = hns_roce_alloc_cmd_mailbox(hr_dev);

	int ret;
@@ -2781,7 +2781,7 @@ static void hns_roce_v2_exit(struct hns_roce_dev *hr_dev) 


static int hns_roce_mbox_post(struct hns_roce_dev *hr_dev, u64 in_param,

			      u64 out_param, u32 in_modifier,

			      u16 op, u16 token, int event)

			      u8 op, u16 token, int event)

{

	struct hns_roce_cmq_desc desc;

	struct hns_roce_post_mbox *mb = (struct hns_roce_post_mbox *)desc.data;
@@ -2848,7 +2848,7 @@ static int v2_wait_mbox_complete(struct hns_roce_dev *hr_dev, u32 timeout, 


static int v2_post_mbox(struct hns_roce_dev *hr_dev, u64 in_param,

			u64 out_param, u32 in_modifier,

			u16 op, u16 token, int event)

			u8 op, u16 token, int event)

{

	u8 status = 0;

	int ret;
@@ -3818,9 +3818,9 @@ static int hns_roce_v2_poll_cq(struct ib_cq *ibcq, int num_entries, 
}



static int get_op_for_set_hem(struct hns_roce_dev *hr_dev, u32 type,

			      int step_idx, u16 *mbox_op)

			      u32 step_idx, u8 *mbox_op)

{

	u16 op;

	u8 op;



	switch (type) {

	case HEM_TYPE_QPC:
@@ -3872,10 +3872,10 @@ static int config_gmv_ba_to_hw(struct hns_roce_dev *hr_dev, unsigned long obj, 
}



static int set_hem_to_hw(struct hns_roce_dev *hr_dev, int obj,

			 dma_addr_t base_addr, u32 hem_type, int step_idx)

			 dma_addr_t base_addr, u32 hem_type, u32 step_idx)

{

	int ret;

	u16 op;

	u8 op;



	if (unlikely(hem_type == HEM_TYPE_GMV))

		return config_gmv_ba_to_hw(hr_dev, obj, base_addr);
@@ -3892,7 +3892,7 @@ static int set_hem_to_hw(struct hns_roce_dev *hr_dev, int obj, 


static int hns_roce_v2_set_hem(struct hns_roce_dev *hr_dev,

			       struct hns_roce_hem_table *table, int obj,

			       int step_idx)

			       u32 step_idx)

{

	struct hns_roce_hem_iter iter;

	struct hns_roce_hem_mhop mhop;
@@ -3951,12 +3951,12 @@ static int hns_roce_v2_set_hem(struct hns_roce_dev *hr_dev, 


static int hns_roce_v2_clear_hem(struct hns_roce_dev *hr_dev,

				 struct hns_roce_hem_table *table, int obj,

				 int step_idx)

				 u32 step_idx)

{

	struct device *dev = hr_dev->dev;

	struct hns_roce_cmd_mailbox *mailbox;

	struct device *dev = hr_dev->dev;

	u8 op = 0xff;

	int ret;

	u16 op = 0xff;



	if (!hns_roce_check_whether_mhop(hr_dev, table->type))

		return 0;
@@ -5975,8 +5975,7 @@ static int alloc_eq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq) 
}



static int hns_roce_v2_create_eq(struct hns_roce_dev *hr_dev,

				 struct hns_roce_eq *eq,

				 unsigned int eq_cmd)

				 struct hns_roce_eq *eq, u8 eq_cmd)

{

	struct hns_roce_cmd_mailbox *mailbox;

	int ret;
@@ -6105,14 +6104,14 @@ static int hns_roce_v2_init_eq_table(struct hns_roce_dev *hr_dev) 
	struct hns_roce_eq_table *eq_table = &hr_dev->eq_table;

	struct device *dev = hr_dev->dev;

	struct hns_roce_eq *eq;

	unsigned int eq_cmd;

	int irq_num;

	int eq_num;

	int other_num;

	int comp_num;

	int aeq_num;

	int i;

	int irq_num;

	int eq_num;

	u8 eq_cmd;

	int ret;

	int i;



	other_num = hr_dev->caps.num_other_vectors;

	comp_num = hr_dev->caps.num_comp_vectors;