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

Commit 4044a3f4 authored by Yixian Liu's avatar Yixian Liu Committed by Jason Gunthorpe
Browse files

RDMA/hns: Add detailed comments for mb() call 



This patch adds more detailed comments when we call the
memory barrier function, such as rmb, wmb and mb. Three
mb() callers are deleted since they are unnecessary.

Suggested-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarYixian Liu <liuyixian@huawei.com>
Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 1ee47ab3

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+12 −7
Original line number Diff line number Diff line
@@ -3963,8 +3963,6 @@ static void set_eq_cons_index_v1(struct hns_roce_eq *eq, int req_not) 
{

	roce_raw_write((eq->cons_index & HNS_ROCE_V1_CONS_IDX_M) |

		      (req_not << eq->log_entries), eq->doorbell);

	/* Memory barrier */

	mb();

}



static void hns_roce_v1_wq_catas_err_handle(struct hns_roce_dev *hr_dev,
@@ -4156,13 +4154,16 @@ static int hns_roce_v1_aeq_int(struct hns_roce_dev *hr_dev, 
	int event_type;



	while ((aeqe = next_aeqe_sw_v1(eq))) {



		/* Make sure we read the AEQ entry after we have checked the

		 * ownership bit

		 */

		dma_rmb();



		dev_dbg(dev, "aeqe = %p, aeqe->asyn.event_type = 0x%lx\n", aeqe,

			roce_get_field(aeqe->asyn,

				       HNS_ROCE_AEQE_U32_4_EVENT_TYPE_M,

				       HNS_ROCE_AEQE_U32_4_EVENT_TYPE_S));

		/* Memory barrier */

		rmb();



		event_type = roce_get_field(aeqe->asyn,

					    HNS_ROCE_AEQE_U32_4_EVENT_TYPE_M,

					    HNS_ROCE_AEQE_U32_4_EVENT_TYPE_S);
@@ -4260,8 +4261,12 @@ static int hns_roce_v1_ceq_int(struct hns_roce_dev *hr_dev, 
	u32 cqn;



	while ((ceqe = next_ceqe_sw_v1(eq))) {

		/* Memory barrier */

		rmb();



		/* Make sure we read CEQ entry after we have checked the

		 * ownership bit

		 */

		dma_rmb();



		cqn = roce_get_field(ceqe->comp,

				     HNS_ROCE_CEQE_CEQE_COMP_CQN_M,

				     HNS_ROCE_CEQE_CEQE_COMP_CQN_S);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+10 −16
Original line number Diff line number Diff line
@@ -3207,10 +3207,6 @@ static void set_eq_cons_index_v2(struct hns_roce_eq *eq) 
		       (eq->cons_index & HNS_ROCE_V2_CONS_IDX_M));



	hns_roce_write64_k(doorbell, eq->doorbell);



	/* Memory barrier */

	mb();



}



static void hns_roce_v2_wq_catas_err_handle(struct hns_roce_dev *hr_dev,
@@ -3392,8 +3388,11 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev, 
	int event_type;



	while ((aeqe = next_aeqe_sw_v2(eq))) {

		/* Memory barrier */

		rmb();



		/* Make sure we read AEQ entry after we have checked the

		 * ownership bit

		 */

		dma_rmb();



		event_type = roce_get_field(aeqe->asyn,

					    HNS_ROCE_V2_AEQE_EVENT_TYPE_M,
@@ -3508,8 +3507,11 @@ static int hns_roce_v2_ceq_int(struct hns_roce_dev *hr_dev, 


	while ((ceqe = next_ceqe_sw_v2(eq))) {



		/* Memory barrier */

		rmb();

		/* Make sure we read CEQ entry after we have checked the

		 * ownership bit

		 */

		dma_rmb();



		cqn = roce_get_field(ceqe->comp,

				     HNS_ROCE_V2_CEQE_COMP_CQN_M,

				     HNS_ROCE_V2_CEQE_COMP_CQN_S);
@@ -3564,9 +3566,6 @@ static irqreturn_t hns_roce_v2_msix_interrupt_abn(int irq, void *dev_id) 
		roce_set_bit(int_st, HNS_ROCE_V2_VF_INT_ST_AEQ_OVERFLOW_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG, int_st);



		/* Memory barrier */

		mb();



		roce_set_bit(int_en, HNS_ROCE_V2_VF_ABN_INT_EN_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_EN_REG, int_en);
@@ -3577,9 +3576,6 @@ static irqreturn_t hns_roce_v2_msix_interrupt_abn(int irq, void *dev_id) 
		roce_set_bit(int_st, HNS_ROCE_V2_VF_INT_ST_BUS_ERR_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG, int_st);



		/* Memory barrier */

		mb();



		roce_set_bit(int_en, HNS_ROCE_V2_VF_ABN_INT_EN_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_EN_REG, int_en);
@@ -3590,8 +3586,6 @@ static irqreturn_t hns_roce_v2_msix_interrupt_abn(int irq, void *dev_id) 
		roce_set_bit(int_st, HNS_ROCE_V2_VF_INT_ST_OTHER_ERR_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG, int_st);



		/* Memory barrier */

		mb();

		roce_set_bit(int_en, HNS_ROCE_V2_VF_ABN_INT_EN_S, 1);

		roce_write(hr_dev, ROCEE_VF_ABN_INT_EN_REG, int_en);