Skip to content

L
linux
Commit b24506f1 authored by Cheng Xu's avatar Cheng Xu Committed by Leon Romanovsky
Browse files
Options

RDMA/erdma: Refactor the initialization and destruction of EQ 

We extracted the common parts of the initialization/destruction
process to make the code cleaner.
Signed-off-by: default avatarCheng Xu <chengyou@linux.alibaba.com>
Link: https://patch.msgid.link/20240902112920.58749-2-chengyou@linux.alibaba.comSigned-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 34efda17
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 69 deletions
drivers/infiniband/hw/erdma/erdma.h
View file @ b24506f1
...@@ -274,7 +274,8 @@ void notify_eq(struct erdma_eq *eq); ...@@ -274,7 +274,8 @@ void notify_eq(struct erdma_eq *eq);
void *get_next_valid_eqe(struct erdma_eq *eq); void *get_next_valid_eqe(struct erdma_eq *eq);
int erdma_aeq_init(struct erdma_dev *dev); int erdma_aeq_init(struct erdma_dev *dev);
void erdma_aeq_destroy(struct erdma_dev *dev); int erdma_eq_common_init(struct erdma_dev *dev, struct erdma_eq *eq, u32 depth);
void erdma_eq_destroy(struct erdma_dev *dev, struct erdma_eq *eq);
void erdma_aeq_event_handler(struct erdma_dev *dev); void erdma_aeq_event_handler(struct erdma_dev *dev);
void erdma_ceq_completion_handler(struct erdma_eq_cb *ceq_cb); void erdma_ceq_completion_handler(struct erdma_eq_cb *ceq_cb);
......
drivers/infiniband/hw/erdma/erdma_cmdq.c
View file @ b24506f1
...@@ -158,20 +158,13 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev) ...@@ -158,20 +158,13 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev)
{ {
struct erdma_cmdq *cmdq = &dev->cmdq; struct erdma_cmdq *cmdq = &dev->cmdq;
struct erdma_eq *eq = &cmdq->eq; struct erdma_eq *eq = &cmdq->eq;
int ret;
eq->depth = cmdq->max_outstandings; ret = erdma_eq_common_init(dev, eq, cmdq->max_outstandings);
eq->qbuf = dma_alloc_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, if (ret)
&eq->qbuf_dma_addr, GFP_KERNEL); return ret;
if (!eq->qbuf)
return -ENOMEM;
spin_lock_init(&eq->lock);
atomic64_set(&eq->event_num, 0);
eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG; eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG;
eq->dbrec = dma_pool_zalloc(dev->db_pool, GFP_KERNEL, &eq->dbrec_dma);
if (!eq->dbrec)
goto err_out;
erdma_reg_write32(dev, ERDMA_REGS_CMDQ_EQ_ADDR_H_REG, erdma_reg_write32(dev, ERDMA_REGS_CMDQ_EQ_ADDR_H_REG,
upper_32_bits(eq->qbuf_dma_addr)); upper_32_bits(eq->qbuf_dma_addr));
...@@ -181,12 +174,6 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev) ...@@ -181,12 +174,6 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev)
erdma_reg_write64(dev, ERDMA_CMDQ_EQ_DB_HOST_ADDR_REG, eq->dbrec_dma); erdma_reg_write64(dev, ERDMA_CMDQ_EQ_DB_HOST_ADDR_REG, eq->dbrec_dma);
return 0; return 0;
err_out:
dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, eq->qbuf,
eq->qbuf_dma_addr);
return -ENOMEM;
} }
int erdma_cmdq_init(struct erdma_dev *dev) int erdma_cmdq_init(struct erdma_dev *dev)
...@@ -247,10 +234,7 @@ void erdma_cmdq_destroy(struct erdma_dev *dev) ...@@ -247,10 +234,7 @@ void erdma_cmdq_destroy(struct erdma_dev *dev)
clear_bit(ERDMA_CMDQ_STATE_OK_BIT, &cmdq->state); clear_bit(ERDMA_CMDQ_STATE_OK_BIT, &cmdq->state);
dma_free_coherent(&dev->pdev->dev, cmdq->eq.depth << EQE_SHIFT, erdma_eq_destroy(dev, &cmdq->eq);
cmdq->eq.qbuf, cmdq->eq.qbuf_dma_addr);
dma_pool_free(dev->db_pool, cmdq->eq.dbrec, cmdq->eq.dbrec_dma);
dma_free_coherent(&dev->pdev->dev, cmdq->sq.depth << SQEBB_SHIFT, dma_free_coherent(&dev->pdev->dev, cmdq->sq.depth << SQEBB_SHIFT,
cmdq->sq.qbuf, cmdq->sq.qbuf_dma_addr); cmdq->sq.qbuf, cmdq->sq.qbuf_dma_addr);
......
drivers/infiniband/hw/erdma/erdma_eq.c
View file @ b24506f1
...@@ -80,50 +80,60 @@ void erdma_aeq_event_handler(struct erdma_dev *dev) ...@@ -80,50 +80,60 @@ void erdma_aeq_event_handler(struct erdma_dev *dev)
notify_eq(&dev->aeq); notify_eq(&dev->aeq);
} }
int erdma_aeq_init(struct erdma_dev *dev) int erdma_eq_common_init(struct erdma_dev *dev, struct erdma_eq *eq, u32 depth)
{ {
struct erdma_eq *eq = &dev->aeq; u32 buf_size = depth << EQE_SHIFT;
eq->depth = ERDMA_DEFAULT_EQ_DEPTH; eq->qbuf = dma_alloc_coherent(&dev->pdev->dev, buf_size,
eq->qbuf = dma_alloc_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT,
&eq->qbuf_dma_addr, GFP_KERNEL); &eq->qbuf_dma_addr, GFP_KERNEL);
if (!eq->qbuf) if (!eq->qbuf)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&eq->lock);
atomic64_set(&eq->event_num, 0);
atomic64_set(&eq->notify_num, 0);
eq->db = dev->func_bar + ERDMA_REGS_AEQ_DB_REG;
eq->dbrec = dma_pool_zalloc(dev->db_pool, GFP_KERNEL, &eq->dbrec_dma); eq->dbrec = dma_pool_zalloc(dev->db_pool, GFP_KERNEL, &eq->dbrec_dma);
if (!eq->dbrec) if (!eq->dbrec)
goto err_out; goto err_free_qbuf;
erdma_reg_write32(dev, ERDMA_REGS_AEQ_ADDR_H_REG, spin_lock_init(&eq->lock);
upper_32_bits(eq->qbuf_dma_addr)); atomic64_set(&eq->event_num, 0);
erdma_reg_write32(dev, ERDMA_REGS_AEQ_ADDR_L_REG, atomic64_set(&eq->notify_num, 0);
lower_32_bits(eq->qbuf_dma_addr)); eq->ci = 0;
erdma_reg_write32(dev, ERDMA_REGS_AEQ_DEPTH_REG, eq->depth); eq->depth = depth;
erdma_reg_write64(dev, ERDMA_AEQ_DB_HOST_ADDR_REG, eq->dbrec_dma);
return 0; return 0;
err_out: err_free_qbuf:
dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, eq->qbuf, dma_free_coherent(&dev->pdev->dev, buf_size, eq->qbuf,
eq->qbuf_dma_addr); eq->qbuf_dma_addr);
return -ENOMEM; return -ENOMEM;
} }
void erdma_aeq_destroy(struct erdma_dev *dev) void erdma_eq_destroy(struct erdma_dev *dev, struct erdma_eq *eq)
{ {
struct erdma_eq *eq = &dev->aeq; dma_pool_free(dev->db_pool, eq->dbrec, eq->dbrec_dma);
dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, eq->qbuf, dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, eq->qbuf,
eq->qbuf_dma_addr); eq->qbuf_dma_addr);
}
dma_pool_free(dev->db_pool, eq->dbrec, eq->dbrec_dma); int erdma_aeq_init(struct erdma_dev *dev)
{
struct erdma_eq *eq = &dev->aeq;
int ret;
ret = erdma_eq_common_init(dev, &dev->aeq, ERDMA_DEFAULT_EQ_DEPTH);
if (ret)
return ret;
eq->db = dev->func_bar + ERDMA_REGS_AEQ_DB_REG;
erdma_reg_write32(dev, ERDMA_REGS_AEQ_ADDR_H_REG,
upper_32_bits(eq->qbuf_dma_addr));
erdma_reg_write32(dev, ERDMA_REGS_AEQ_ADDR_L_REG,
lower_32_bits(eq->qbuf_dma_addr));
erdma_reg_write32(dev, ERDMA_REGS_AEQ_DEPTH_REG, eq->depth);
erdma_reg_write64(dev, ERDMA_AEQ_DB_HOST_ADDR_REG, eq->dbrec_dma);
return 0;
} }
void erdma_ceq_completion_handler(struct erdma_eq_cb *ceq_cb) void erdma_ceq_completion_handler(struct erdma_eq_cb *ceq_cb)
...@@ -234,32 +244,21 @@ static int erdma_ceq_init_one(struct erdma_dev *dev, u16 ceqn) ...@@ -234,32 +244,21 @@ static int erdma_ceq_init_one(struct erdma_dev *dev, u16 ceqn)
struct erdma_eq *eq = &dev->ceqs[ceqn].eq; struct erdma_eq *eq = &dev->ceqs[ceqn].eq;
int ret; int ret;
eq->depth = ERDMA_DEFAULT_EQ_DEPTH; ret = erdma_eq_common_init(dev, eq, ERDMA_DEFAULT_EQ_DEPTH);
eq->qbuf = dma_alloc_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, if (ret)
&eq->qbuf_dma_addr, GFP_KERNEL); return ret;
if (!eq->qbuf)
return -ENOMEM;
spin_lock_init(&eq->lock);
atomic64_set(&eq->event_num, 0);
atomic64_set(&eq->notify_num, 0);
eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG + eq->db = dev->func_bar + ERDMA_REGS_CEQ_DB_BASE_REG +
(ceqn + 1) * ERDMA_DB_SIZE; (ceqn + 1) * ERDMA_DB_SIZE;
eq->dbrec = dma_pool_zalloc(dev->db_pool, GFP_KERNEL, &eq->dbrec_dma);
if (!eq->dbrec) {
dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT,
eq->qbuf, eq->qbuf_dma_addr);
return -ENOMEM;
}
eq->ci = 0;
dev->ceqs[ceqn].dev = dev; dev->ceqs[ceqn].dev = dev;
dev->ceqs[ceqn].ready = true;
/* CEQ indexed from 1, 0 rsvd for CMDQ-EQ. */ /* CEQ indexed from 1, 0 rsvd for CMDQ-EQ. */
ret = create_eq_cmd(dev, ceqn + 1, eq); ret = create_eq_cmd(dev, ceqn + 1, eq);
dev->ceqs[ceqn].ready = ret ? false : true; if (ret) {
erdma_eq_destroy(dev, eq);
dev->ceqs[ceqn].ready = false;
}
return ret; return ret;
} }
...@@ -283,9 +282,7 @@ static void erdma_ceq_uninit_one(struct erdma_dev *dev, u16 ceqn) ...@@ -283,9 +282,7 @@ static void erdma_ceq_uninit_one(struct erdma_dev *dev, u16 ceqn)
if (err) if (err)
return; return;
dma_free_coherent(&dev->pdev->dev, eq->depth << EQE_SHIFT, eq->qbuf, erdma_eq_destroy(dev, eq);
eq->qbuf_dma_addr);
dma_pool_free(dev->db_pool, eq->dbrec, eq->dbrec_dma);
} }
int erdma_ceqs_init(struct erdma_dev *dev) int erdma_ceqs_init(struct erdma_dev *dev)
......
drivers/infiniband/hw/erdma/erdma_main.c
View file @ b24506f1
...@@ -333,7 +333,7 @@ static int erdma_probe_dev(struct pci_dev *pdev) ...@@ -333,7 +333,7 @@ static int erdma_probe_dev(struct pci_dev *pdev)
erdma_cmdq_destroy(dev); erdma_cmdq_destroy(dev);
err_uninit_aeq: err_uninit_aeq:
erdma_aeq_destroy(dev); erdma_eq_destroy(dev, &dev->aeq);
err_uninit_comm_irq: err_uninit_comm_irq:
erdma_comm_irq_uninit(dev); erdma_comm_irq_uninit(dev);
...@@ -366,7 +366,7 @@ static void erdma_remove_dev(struct pci_dev *pdev) ...@@ -366,7 +366,7 @@ static void erdma_remove_dev(struct pci_dev *pdev)
erdma_ceqs_uninit(dev); erdma_ceqs_uninit(dev);
erdma_hw_reset(dev); erdma_hw_reset(dev);
erdma_cmdq_destroy(dev); erdma_cmdq_destroy(dev);
erdma_aeq_destroy(dev); erdma_eq_destroy(dev, &dev->aeq);
erdma_comm_irq_uninit(dev); erdma_comm_irq_uninit(dev);
pci_free_irq_vectors(dev->pdev); pci_free_irq_vectors(dev->pdev);
erdma_device_uninit(dev); erdma_device_uninit(dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7