Skip to contentSkip to conversation

RDMA/hns: Remove unused variables and definitions

PATCH Superseded Weihang Li 2 participants 5 messages Sep 27, 2020 – Sep 28, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Weihang Li

author
#0 lore raw

PATCH 1/1 RDMA/hns: Remove unused variables and definitions

From: Lang Cheng <[email protected]>

Some code was removed but the variables were still there, and some parameters have been changed to be queried from firmware. So the definitions of them are no longer needed.

---
 drivers/infiniband/hw/hns/hns_roce_device.h | 8 --------
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 2 --
 2 files changed, 10 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +0 -8
index a8183ef..6d2acff 100644
@@ -57,7 +57,6 @@
 /* Hardware specification only for v1 engine */
 #define HNS_ROCE_MAX_INNER_MTPT_NUM		0x7
 #define HNS_ROCE_MAX_MTPT_PBL_NUM		0x100000
-#define HNS_ROCE_MAX_SGE_NUM			2
 
 #define HNS_ROCE_EACH_FREE_CQ_WAIT_MSECS	20
 #define HNS_ROCE_MAX_FREE_CQ_WAIT_CNT	\
@@ -87,12 +86,7 @@
 #define HNS_ROCE_V2_QPC_SZ 256
 #define HNS_ROCE_V3_QPC_SZ 512
 
-#define HNS_ROCE_SL_SHIFT			28
-#define HNS_ROCE_TCLASS_SHIFT			20
-#define HNS_ROCE_FLOW_LABEL_MASK		0xfffff
-
 #define HNS_ROCE_MAX_PORTS			6
-#define HNS_ROCE_MAX_GID_NUM			16
 #define HNS_ROCE_GID_SIZE			16
 #define HNS_ROCE_SGE_SIZE			16
 
@@ -120,8 +114,6 @@
 #define PAGES_SHIFT_24				24
 #define PAGES_SHIFT_32				32
 
-#define HNS_ROCE_PCI_BAR_NUM			2
-
 #define HNS_ROCE_IDX_QUE_ENTRY_SZ		4
 #define SRQ_DB_REG				0x230
 
drivers/infiniband/hw/hns/hns_roce_qp.c +0 -2
index 7c3b548..d08e575 100644
@@ -41,8 +41,6 @@
 #include "hns_roce_hem.h"
 #include <rdma/hns-abi.h>
 
-#define SQP_NUM				(2 * HNS_ROCE_MAX_PORTS)
-
 static void flush_work_handle(struct work_struct *work)
 {
 	struct hns_roce_work *flush_work = container_of(work,
Signature · 1 line
2.8.1
#1 lore raw
Quoted 6 lines · Weihang Li

From: Lang Cheng <[email protected]>

Some code was removed but the variables were still there, and some parameters have been changed to be queried from firmware. So the definitions of them are no longer needed.

Quoted 6 lines
---
 drivers/infiniband/hw/hns/hns_roce_device.h | 8 --------
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 2 --
 2 files changed, 10 deletions(-)

Should have a fixes for the patch that removed the code

Jason

author
#2 lore raw
Quoted 14 lines · Jason Gunthorpe
Quoted 6 lines · Weihang Li

From: Lang Cheng <[email protected]>

Some code was removed but the variables were still there, and some parameters have been changed to be queried from firmware. So the definitions of them are no longer needed.

Quoted 6 lines
---
 drivers/infiniband/hw/hns/hns_roce_device.h | 8 --------
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 2 --
 2 files changed, 10 deletions(-)
Quoted 4 lines

Should have a fixes for the patch that removed the code

Jason

Hi Jason,

Thanks for the comment. But I'm confused about when we should add fixes tag.

For example, The only purpose of this patch is to remove redundant macro definitions, the macros to be removed belong to 4 different former patches, so we have to add 4 lines of fixes. It seems difficult to merge this one back to previous versions of kernel.

Should I split this patch into 4 patches and add a fixes tag for each one, or just put all these fixes tag in this patch?

Thanks
Weihang

#3 lore raw
Quoted 21 lines · liweihang
Quoted 13 lines · Jason Gunthorpe
Quoted 11 lines · Weihang Li

From: Lang Cheng <[email protected]>

Some code was removed but the variables were still there, and some parameters have been changed to be queried from firmware. So the definitions of them are no longer needed.

 drivers/infiniband/hw/hns/hns_roce_device.h | 8 --------
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 2 --
 2 files changed, 10 deletions(-)
Quoted 4 lines

Should have a fixes for the patch that removed the code

Jason

Hi Jason,

Quoted 7 lines

Thanks for the comment. But I'm confused about when we should add fixes tag.

For example, The only purpose of this patch is to remove redundant macro definitions, the macros to be removed belong to 4 different former patches, so we have to add 4 lines of fixes. It seems difficult to merge this one back to previous versions of kernel.

You can just list all four patches

Jason

author
#4 lore raw
Quoted 25 lines · Jason Gunthorpe
Quoted 24 lines · liweihang
Quoted 13 lines · Jason Gunthorpe
Quoted 11 lines · Weihang Li

From: Lang Cheng <[email protected]>

Some code was removed but the variables were still there, and some parameters have been changed to be queried from firmware. So the definitions of them are no longer needed.

 drivers/infiniband/hw/hns/hns_roce_device.h | 8 --------
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 2 --
 2 files changed, 10 deletions(-)
Quoted 4 lines

Should have a fixes for the patch that removed the code

Jason

Hi Jason,

Thanks for the comment. But I'm confused about when we should add fixes tag.

Quoted 9 lines
Quoted 4 lines

For example, The only purpose of this patch is to remove redundant macro definitions, the macros to be removed belong to 4 different former patches, so we have to add 4 lines of fixes. It seems difficult to merge this one back to previous versions of kernel.

You can just list all four patches

Jason

I see, thank you.

Weihang