RDMA/hns: Cleanups on CMDQ
Subsystems (2)
v2 cover RDMA/hns: Cleanups on CMDQ
This series first rename the CMDQ pointers to make it better understandable, then remove some dead code.
Changes since v1:
* Remove the print in hns_roce_alloc_cmq_desc() in #2 because the caller
already has a print.
* Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Lang Cheng (3):
RDMA/hns: Rename CMDQ head/tail pointer to PI/CI RDMA/hns: Remove Receive Queue of CMDQ RDMA/hns: Remove unused CMDQ member
drivers/infiniband/hw/hns/hns_roce_common.h | 4 +- drivers/infiniband/hw/hns/hns_roce_device.h | 1 - drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 103 ++++++++-------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 - 4 files changed, 30 insertions(+), 79 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/3 RDMA/hns: Rename CMDQ head/tail pointer to PI/CI
From: Lang Cheng <[email protected]>
the same name represents opposite meanings in new/old driver, it is hard to maintain, so rename them to PI/CI.
--- drivers/infiniband/hw/hns/hns_roce_common.h | 4 ++-- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hns/hns_roce_common.h +2 -2
@@ -373,8 +373,8 @@#define ROCEE_TX_CMQ_BASEADDR_L_REG 0x07000#define ROCEE_TX_CMQ_BASEADDR_H_REG 0x07004#define ROCEE_TX_CMQ_DEPTH_REG 0x07008 -#define ROCEE_TX_CMQ_HEAD_REG 0x07010 -#define ROCEE_TX_CMQ_TAIL_REG 0x07014 +#define ROCEE_TX_CMQ_PI_REG 0x07010 +#define ROCEE_TX_CMQ_CI_REG 0x07014#define ROCEE_RX_CMQ_BASEADDR_L_REG 0x07018#define ROCEE_RX_CMQ_BASEADDR_H_REG 0x0701c
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +5 -5
@@ -1255,8 +1255,8 @@ static void hns_roce_cmq_init_regs(struct hns_roce_dev *hr_dev, bool ring_type) (u32)ring->desc_num >> HNS_ROCE_CMQ_DESC_NUM_S);/* Make sure to write tail first and then head */ -roce_write (hr_dev,ROCEE_TX_CMQ_TAIL_REG ,0 ); -roce_write (hr_dev,ROCEE_TX_CMQ_HEAD_REG ,0 ); +roce_write (hr_dev,ROCEE_TX_CMQ_CI_REG ,0 ); +roce_write (hr_dev,ROCEE_TX_CMQ_PI_REG ,0 ); }else {roce_write (hr_dev,ROCEE_RX_CMQ_BASEADDR_L_REG , (u32 )dma); roce_write(hr_dev, ROCEE_RX_CMQ_BASEADDR_H_REG,
@@ -1338,7 +1338,7 @@ static void hns_roce_cmq_setup_basic_desc(struct hns_roce_cmq_desc *desc,static int hns_roce_cmq_csq_done (struct hns_roce_dev *hr_dev) { -u32 tail =roce_read (hr_dev,ROCEE_TX_CMQ_TAIL_REG ); +u32 tail =roce_read (hr_dev,ROCEE_TX_CMQ_CI_REG );struct hns_roce_v2_priv *priv = hr_dev->priv;return tail == priv->cmq.csq.head;
@@ -1366,7 +1366,7 @@ static int __hns_roce_cmq_send(struct hns_roce_dev *hr_dev, }/* Write to hardware */ -roce_write (hr_dev,ROCEE_TX_CMQ_HEAD_REG , csq->head); +roce_write (hr_dev,ROCEE_TX_CMQ_PI_REG , csq->head);/* If the command is sync, wait for the firmware to write back, * if multi descriptors to be sent, use the first one to check
@@ -1397,7 +1397,7 @@ static int __hns_roce_cmq_send(struct hns_roce_dev *hr_dev, } }else {/* FW/HW reset or incorrect number of desc */ - tail =roce_read (hr_dev,ROCEE_TX_CMQ_TAIL_REG ); + tail =roce_read (hr_dev,ROCEE_TX_CMQ_CI_REG );dev_warn (hr_dev->dev,"CMDQ move tail from %d to %d\n" , csq->head, tail); csq->head = tail;
Signature · 1 line
2.7.4
PATCH v2 2/3 RDMA/hns: Remove Receive Queue of CMDQ
In reply to Weihang LiFrom: Lang Cheng <[email protected]>
The CRQ of CMDQ is unused, so remove code about it.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 97 ++++++++---------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 - 2 files changed, 25 insertions(+), 73 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +25 -72
@@ -1209,8 +1209,6 @@ static int hns_roce_alloc_cmq_desc(struct hns_roce_dev *hr_dev,kfree (ring->desc); ring->desc =NULL ; -dev_err_ratelimited (hr_dev->dev, -"failed to map cmq desc addr.\n" );return -ENOMEM ; }
@@ -1228,44 +1226,32 @@ static void hns_roce_free_cmq_desc(struct hns_roce_dev *hr_dev,kfree (ring->desc); } -static int hns_roce_init_cmq_ring (struct hns_roce_dev *hr_dev,bool ring_type) +static int init_csq (struct hns_roce_dev *hr_dev, +struct hns_roce_v2_cmq_ring *csq) { -struct hns_roce_v2_priv *priv = hr_dev->priv; -struct hns_roce_v2_cmq_ring *ring = (ring_type ==TYPE_CSQ ) ? - &priv->cmq.csq : &priv->cmq.crq; +dma_addr_t dma; +int ret; - ring->flag = ring_type; - ring->head =0 ; + csq->desc_num =CMD_CSQ_DESC_NUM ; +spin_lock_init (&csq->lock); + csq->flag =TYPE_CSQ ; + csq->head =0 ; -return hns_roce_alloc_cmq_desc (hr_dev, ring); -} + ret =hns_roce_alloc_cmq_desc (hr_dev, csq); +if (ret) +return ret; -static void hns_roce_cmq_init_regs (struct hns_roce_dev *hr_dev,bool ring_type) -{ -struct hns_roce_v2_priv *priv = hr_dev->priv; -struct hns_roce_v2_cmq_ring *ring = (ring_type ==TYPE_CSQ ) ? - &priv->cmq.csq : &priv->cmq.crq; -dma_addr_t dma = ring->desc_dma_addr; - -if (ring_type ==TYPE_CSQ ) { -roce_write (hr_dev,ROCEE_TX_CMQ_BASEADDR_L_REG , (u32 )dma); -roce_write (hr_dev,ROCEE_TX_CMQ_BASEADDR_H_REG , -upper_32_bits (dma)); -roce_write (hr_dev,ROCEE_TX_CMQ_DEPTH_REG , - (u32 )ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S ); - -/* Make sure to write tail first and then head */ -roce_write (hr_dev,ROCEE_TX_CMQ_CI_REG ,0 ); -roce_write (hr_dev,ROCEE_TX_CMQ_PI_REG ,0 ); - }else { -roce_write (hr_dev,ROCEE_RX_CMQ_BASEADDR_L_REG , (u32 )dma); -roce_write (hr_dev,ROCEE_RX_CMQ_BASEADDR_H_REG , -upper_32_bits (dma)); -roce_write (hr_dev,ROCEE_RX_CMQ_DEPTH_REG , - (u32 )ring->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S ); -roce_write (hr_dev,ROCEE_RX_CMQ_HEAD_REG ,0 ); -roce_write (hr_dev,ROCEE_RX_CMQ_TAIL_REG ,0 ); - } + dma = csq->desc_dma_addr; +roce_write (hr_dev,ROCEE_TX_CMQ_BASEADDR_L_REG ,lower_32_bits (dma)); +roce_write (hr_dev,ROCEE_TX_CMQ_BASEADDR_H_REG ,upper_32_bits (dma)); +roce_write (hr_dev,ROCEE_TX_CMQ_DEPTH_REG , + (u32 )csq->desc_num >>HNS_ROCE_CMQ_DESC_NUM_S ); + +/* Make sure to write CI first and then PI */ +roce_write (hr_dev,ROCEE_TX_CMQ_CI_REG ,0 ); +roce_write (hr_dev,ROCEE_TX_CMQ_PI_REG ,0 ); + +return 0 ; }static int hns_roce_v2_cmq_init (struct hns_roce_dev *hr_dev)
@@ -1273,43 +1259,11 @@ static int hns_roce_v2_cmq_init(struct hns_roce_dev *hr_dev)struct hns_roce_v2_priv *priv = hr_dev->priv;int ret; -/* Setup the queue entries for command queue */ - priv->cmq.csq.desc_num =CMD_CSQ_DESC_NUM ; - priv->cmq.crq.desc_num =CMD_CRQ_DESC_NUM ; - -/* Setup the lock for command queue */ -spin_lock_init (&priv->cmq.csq.lock); -spin_lock_init (&priv->cmq.crq.lock); - -/* Setup Tx write back timeout */ priv->cmq.tx_timeout =HNS_ROCE_CMQ_TX_TIMEOUT ; -/* Init CSQ */ - ret =hns_roce_init_cmq_ring (hr_dev,TYPE_CSQ ); -if (ret) { -dev_err_ratelimited (hr_dev->dev, -"failed to init CSQ, ret = %d.\n" , ret); -return ret; - } - -/* Init CRQ */ - ret =hns_roce_init_cmq_ring (hr_dev,TYPE_CRQ ); -if (ret) { -dev_err_ratelimited (hr_dev->dev, -"failed to init CRQ, ret = %d.\n" , ret); - goto err_crq; - } - -/* Init CSQ REG */ -hns_roce_cmq_init_regs (hr_dev,TYPE_CSQ ); - -/* Init CRQ REG */ -hns_roce_cmq_init_regs (hr_dev,TYPE_CRQ ); - -return 0 ; - -err_crq: -hns_roce_free_cmq_desc (hr_dev, &priv->cmq.csq); + ret =init_csq (hr_dev, &priv->cmq.csq); +if (ret) +dev_err (hr_dev->dev,"failed to init CSQ, ret = %d.\n" , ret);return ret; }
@@ -1319,7 +1273,6 @@ static void hns_roce_v2_cmq_exit(struct hns_roce_dev *hr_dev)struct hns_roce_v2_priv *priv = hr_dev->priv;hns_roce_free_cmq_desc (hr_dev, &priv->cmq.csq); -hns_roce_free_cmq_desc (hr_dev, &priv->cmq.crq); } static void hns_roce_cmq_setup_basic_desc(struct hns_roce_cmq_desc *desc,
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +0 -1
@@ -1731,7 +1731,6 @@ struct hns_roce_v2_cmq_ring {struct hns_roce_v2_cmq {struct hns_roce_v2_cmq_ring csq; -struct hns_roce_v2_cmq_ring crq;u16 tx_timeout; };
Signature · 1 line
2.7.4
Re: [PATCH v2 for-next 2/3] RDMA/hns: Remove Receive Queue of CMDQ
Quoted 11 lines · Weihang Li
From: Lang Cheng <[email protected]>
The CRQ of CMDQ is unused, so remove code about it.
Signed-off-by Lang Cheng <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 97 ++++++++---------------------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 - 2 files changed, 25 insertions(+), 73 deletions(-)
Thanks,
PATCH v2 3/3 RDMA/hns: Remove unused CMDQ member
In reply to Weihang LiFrom: Lang Cheng <[email protected]>
The hcr_mutex was used to serialize mailbox post. Now that mailbox supports concurrency, this variable is no longer useful.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_device.h +0 -1
@@ -555,7 +555,6 @@ struct hns_roce_cmd_context {struct hns_roce_cmdq {struct dma_pool *pool; -struct mutex hcr_mutex;struct semaphore poll_sem;/* * Event mode: cmd register mutex protection,
Signature · 1 line
2.7.4
Quoted 8 lines · Weihang Li
This series first rename the CMDQ pointers to make it better understandable, then remove some dead code.
Changes since v1:
* Remove the print inhns_roce_alloc_cmq_desc()in #2 because the caller
already has a print.
* Link: https://patchwork.kernel.org/project/linux-rdma/cover/[email protected]/
Quoted 4 lines
Lang Cheng (3):
RDMA/hns: Rename CMDQ head/tail pointer to PI/CI RDMA/hns: Remove Receive Queue of CMDQ RDMA/hns: Remove unused CMDQ member
Applied to for-next, thanks
Jason