Commit 72769dba authored by Cheng Xu's avatar Cheng Xu Committed by Leon Romanovsky
Browse files

RDMA/erdma: Eliminate unnecessary casting of EQ doorbells 



Using void * to define EQ doorbell pointer can eliminate unnecessary
casting when performing assignment. Also rename *db_addr* to *db* for a
shorter name.

Signed-off-by: default avatarCheng Xu <chengyou@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230322093319.84045-3-chengyou@linux.alibaba.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent de19ec77

drivers/infiniband/hw/erdma/erdma.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct erdma_eq { 
	atomic64_t event_num;

	atomic64_t notify_num;



	u64 __iomem *db_addr;

	void __iomem *db;

	u64 *db_record;

};

drivers/infiniband/hw/erdma/erdma_cmdq.c

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev) 
	spin_lock_init(&eq->lock);

	atomic64_set(&eq->event_num, 0);



	eq->db_addr =

		(u64 __iomem *)(dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG);

	eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG;

	eq->db_record = (u64 *)(eq->qbuf + buf_size);



	erdma_reg_write32(dev, ERDMA_REGS_CMDQ_EQ_ADDR_H_REG,

drivers/infiniband/hw/erdma/erdma_eq.c

+4 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ void notify_eq(struct erdma_eq *eq) 
		      FIELD_PREP(ERDMA_EQDB_ARM_MASK, 1);



	*eq->db_record = db_data;

	writeq(db_data, eq->db_addr);

	writeq(db_data, eq->db);



	atomic64_inc(&eq->notify_num);

}
@@ -98,7 +98,7 @@ int erdma_aeq_init(struct erdma_dev *dev) 
	atomic64_set(&eq->event_num, 0);

	atomic64_set(&eq->notify_num, 0);



	eq->db_addr = (u64 __iomem *)(dev->func_bar + ERDMA_REGS_AEQ_DB_REG);

	eq->db = dev->func_bar + ERDMA_REGS_AEQ_DB_REG;

	eq->db_record = (u64 *)(eq->qbuf + buf_size);



	erdma_reg_write32(dev, ERDMA_REGS_AEQ_ADDR_H_REG,
@@ -243,9 +243,8 @@ static int erdma_ceq_init_one(struct erdma_dev *dev, u16 ceqn) 
	atomic64_set(&eq->notify_num, 0);



	eq->depth = ERDMA_DEFAULT_EQ_DEPTH;

	eq->db_addr =

		(u64 __iomem *)(dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG +

				(ceqn + 1) * ERDMA_DB_SIZE);

	eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG +

		 (ceqn + 1) * ERDMA_DB_SIZE;

	eq->db_record = (u64 *)(eq->qbuf + buf_size);

	eq->ci = 0;

	dev->ceqs[ceqn].dev = dev;