RDMA/bnxt_re: Driver minor update
Subsystems (2)
Selvin Xavier
maintainercover RDMA/bnxt_re: Driver minor update
Includes some of the minor cleanup and update on the driver.
Please review and apply.
Thanks,
Selvin
Kalesh AP (5):
RDMA/bnxt_re: Fix max_qp count for virtual functions RDMA/bnxt_re: Remove a redundant flag
RDMA/bnxt_re: Cleanup bnxt_re_process_raw_qp_pkt_rx() function RDMA/bnxt_re: Avoid unnecessary memset
RDMA/bnxt_re: Remove unnecessary variable initializations
Selvin Xavier (1):
RDMA/bnxt_re: Fix the sideband buffer size handling for FW commands
drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 - drivers/infiniband/hw/bnxt_re/ib_verbs.c | 36 ++++++-------- drivers/infiniband/hw/bnxt_re/main.c | 35 ++++++-------- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 44 +++++++++-------- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 36 ++------------ drivers/infiniband/hw/bnxt_re/qplib_res.c | 8 +-- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 78 +++++++++++++++--------------- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- 8 files changed, 100 insertions(+), 140 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 1/6 RDMA/bnxt_re: Fix max_qp count for virtual functions
From: Kalesh AP <[email protected]>
Driver has not accounted QP1 for virtual functions when fetching device attributes and hence max_qp count is one less than active_qp count. Fixed driver so that it counts QP1 for virtual functions as well while fetching device attributes
--- drivers/infiniband/hw/bnxt_re/main.c | 6 ++---- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 7 +++---- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +2 -4
@@ -1152,8 +1152,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev)/* Configure and allocate resources for qplib */ rdev->qplib_res.rcfw = &rdev->rcfw; - rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr, - rdev->is_virtfn); + rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr);if (rc) goto fail;
@@ -1531,8 +1530,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode) rdev->pacing.dbr_pacing = false; } } - rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr, - rdev->is_virtfn); + rc =bnxt_qplib_get_dev_attr (&rdev->rcfw, &rdev->dev_attr);if (rc) goto disable_rcfw;
drivers/infiniband/hw/bnxt_re/qplib_sp.c +3 -4
@@ -89,7 +89,7 @@ static void bnxt_qplib_query_version(struct bnxt_qplib_rcfw *rcfw, }int bnxt_qplib_get_dev_attr (struct bnxt_qplib_rcfw *rcfw, -struct bnxt_qplib_dev_attr *attr,bool vf) +struct bnxt_qplib_dev_attr *attr) {struct creq_query_func_resp resp = {};struct bnxt_qplib_cmdqmsg msg = {};
@@ -121,9 +121,8 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,/* Extract the context from the side buffer */ attr->max_qp =le32_to_cpu (sb->max_qp); -/* max_qp value reported by FW for PF doesn't include the QP1 for PF */ -if (!vf) - attr->max_qp +=1 ; +/* max_qp value reported by FW doesn't include the QP1 */ + attr->max_qp +=1 ; attr->max_qp_rd_atom = sb->max_qp_rd_atom >BNXT_QPLIB_MAX_OUT_RD_ATOM ?BNXT_QPLIB_MAX_OUT_RD_ATOM : sb->max_qp_rd_atom;
drivers/infiniband/hw/bnxt_re/qplib_sp.h +1 -1
@@ -322,7 +322,7 @@ int bnxt_qplib_update_sgid(struct bnxt_qplib_sgid_tbl *sgid_tbl, struct bnxt_qplib_gid *gid, u16 gid_idx, const u8 *smac);int bnxt_qplib_get_dev_attr (struct bnxt_qplib_rcfw *rcfw, -struct bnxt_qplib_dev_attr *attr,bool vf); +struct bnxt_qplib_dev_attr *attr);int bnxt_qplib_set_func_resources (struct bnxt_qplib_res *res,struct bnxt_qplib_rcfw *rcfw,struct bnxt_qplib_ctx *ctx);
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 2/6 RDMA/bnxt_re: Remove a redundant flag
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
After the cited commit, BNXT_RE_FLAG_GOT_MSIX is redundant. Remove it.
--- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 - drivers/infiniband/hw/bnxt_re/main.c | 5 ++--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 3 ++- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 6 ++++-- 4 files changed, 8 insertions(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/bnxt_re.h +0 -1
@@ -140,7 +140,6 @@ struct bnxt_re_dev {struct list_head list;unsigned long flags;#define BNXT_RE_FLAG_NETDEV_REGISTERED 0 -#define BNXT_RE_FLAG_GOT_MSIX 2#define BNXT_RE_FLAG_HAVE_L2_REF 3#define BNXT_RE_FLAG_RCFW_CHANNEL_EN 4#define BNXT_RE_FLAG_QOS_WORK_REG 5
drivers/infiniband/hw/bnxt_re/main.c +2 -3
@@ -1422,8 +1422,8 @@ static void bnxt_re_dev_uninit(struct bnxt_re_dev *rdev)bnxt_re_net_ring_free (rdev, rdev->rcfw.creq.ring_id, type);bnxt_qplib_free_rcfw_channel (&rdev->rcfw); } -if (test_and_clear_bit (BNXT_RE_FLAG_GOT_MSIX , &rdev->flags)) - rdev->num_msix =0 ; + + rdev->num_msix =0 ;if (rdev->pacing.dbr_pacing)bnxt_re_deinitialize_dbr_pacing (rdev);
@@ -1480,7 +1480,6 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)ibdev_dbg (&rdev->ibdev,"Got %d MSI-X vectors\n" , rdev->en_dev->ulp_tbl->msix_requested); rdev->num_msix = rdev->en_dev->ulp_tbl->msix_requested; -set_bit (BNXT_RE_FLAG_GOT_MSIX , &rdev->flags);bnxt_re_query_hwrm_intf_version (rdev);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 -1
@@ -335,7 +335,8 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, cpu_to_le64(sbuf->dma_addr));__set_cmdq_base_resp_size (msg->req, msg->req_sz,ALIGN (sbuf->size, -BNXT_QPLIB_CMDQE_UNITS )); +BNXT_QPLIB_CMDQE_UNITS ) / +BNXT_QPLIB_CMDQE_UNITS ); } preq = (u8 *)msg->req;
drivers/infiniband/hw/bnxt_re/qplib_sp.c +4 -2
@@ -801,9 +801,11 @@ int bnxt_qplib_qext_stat(struct bnxt_qplib_rcfw *rcfw, u32 fid,struct cmdq_query_roce_stats_ext req = {};struct bnxt_qplib_cmdqmsg msg = {};struct bnxt_qplib_rcfw_sbuf *sbuf; +u32 size;int rc; - sbuf =bnxt_qplib_rcfw_alloc_sbuf (rcfw,sizeof (*sb)); + size =ALIGN (sizeof (*sb),BNXT_QPLIB_CMDQE_UNITS ); + sbuf =bnxt_qplib_rcfw_alloc_sbuf (rcfw, size);if (!sbuf) {dev_err (&rcfw->pdev->dev,"SP: QUERY_ROCE_STATS_EXT alloc sb failed" );
@@ -814,7 +816,7 @@ int bnxt_qplib_qext_stat(struct bnxt_qplib_rcfw *rcfw, u32 fid,CMDQ_QUERY_ROCE_STATS_EXT_OPCODE_QUERY_ROCE_STATS , sizeof(req)); - req.resp_size =ALIGN (sizeof (*sb),BNXT_QPLIB_CMDQE_UNITS ); + req.resp_size = size /BNXT_QPLIB_CMDQE_UNITS ; req.resp_addr =cpu_to_le64 (sbuf->dma_addr); req.function_id =cpu_to_le32 (fid); req.flags =cpu_to_le16 (CMDQ_QUERY_ROCE_STATS_EXT_FLAGS_FUNCTION_ID );
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 3/6 RDMA/bnxt_re: Fix the sideband buffer size handling for FW commands
In reply to Selvin Xavierbnxt_qplib_rcfw_alloc_sbuf allocates 24 bytes for holding a temporary data and it is better to fit them on stack variables. This way we can avoid unwanted kmalloc call. Call dma_alloc_coherent directly instead of wrapper bnxt_qplib_rcfw_alloc_sbuf.
Also, FW expects the side buffer to be aligned to BNXT_QPLIB_CMDQE_UNITS(16B). So align the size to have the extra padding data.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 38 +++++++++-------- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 31 -------------- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 65 ++++++++++++++---------------- 3 files changed, 53 insertions(+), 81 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +22 -16
@@ -709,7 +709,7 @@ int bnxt_qplib_query_srq(struct bnxt_qplib_res *res,struct bnxt_qplib_rcfw *rcfw = res->rcfw;struct creq_query_srq_resp resp = {};struct bnxt_qplib_cmdqmsg msg = {}; -struct bnxt_qplib_rcfw_sbuf *sbuf; +struct bnxt_qplib_rcfw_sbuf sbuf;struct creq_query_srq_resp_sb *sb;struct cmdq_query_srq req = {};int rc =0 ;
@@ -719,17 +719,20 @@ int bnxt_qplib_query_srq(struct bnxt_qplib_res *res, sizeof(req));/* Configure the request */ - sbuf =bnxt_qplib_rcfw_alloc_sbuf (rcfw,sizeof (*sb)); -if (!sbuf) + sbuf.size =ALIGN (sizeof (*sb),BNXT_QPLIB_CMDQE_UNITS ); + sbuf.sb =dma_alloc_coherent (&rcfw->pdev->dev, sbuf.size, + &sbuf.dma_addr,GFP_KERNEL ); +if (!sbuf.sb)return -ENOMEM ; - req.resp_size =sizeof (*sb) /BNXT_QPLIB_CMDQE_UNITS ; + req.resp_size = sbuf.size /BNXT_QPLIB_CMDQE_UNITS ; req.srq_cid =cpu_to_le32 (srq->id); - sb = sbuf->sb; -bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp, sbuf,sizeof (req), + sb = sbuf.sb; +bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp, &sbuf,sizeof (req),sizeof (resp),0 ); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg); srq->threshold =le16_to_cpu (sb->srq_limit); -bnxt_qplib_rcfw_free_sbuf (rcfw, sbuf); +dma_free_coherent (&rcfw->pdev->dev, sbuf.size, + sbuf.sb, sbuf.dma_addr);return rc; }
@@ -1347,24 +1350,26 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)struct bnxt_qplib_rcfw *rcfw = res->rcfw;struct creq_query_qp_resp resp = {};struct bnxt_qplib_cmdqmsg msg = {}; -struct bnxt_qplib_rcfw_sbuf *sbuf; +struct bnxt_qplib_rcfw_sbuf sbuf;struct creq_query_qp_resp_sb *sb;struct cmdq_query_qp req = {};u32 temp32[4 ];int i, rc =0 ; + sbuf.size =ALIGN (sizeof (*sb),BNXT_QPLIB_CMDQE_UNITS ); + sbuf.sb =dma_alloc_coherent (&rcfw->pdev->dev, sbuf.size, + &sbuf.dma_addr,GFP_KERNEL ); +if (!sbuf.sb) +return -ENOMEM ; + sb = sbuf.sb; +bnxt_qplib_rcfw_cmd_prep ((struct cmdq_base *)&req,CMDQ_BASE_OPCODE_QUERY_QP ,sizeof (req)); - sbuf =bnxt_qplib_rcfw_alloc_sbuf (rcfw,sizeof (*sb)); -if (!sbuf) -return -ENOMEM ; - sb = sbuf->sb; - req.qp_cid =cpu_to_le32 (qp->id); - req.resp_size =sizeof (*sb) /BNXT_QPLIB_CMDQE_UNITS ; -bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp, sbuf,sizeof (req), + req.resp_size = sbuf.size /BNXT_QPLIB_CMDQE_UNITS ; +bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp, &sbuf,sizeof (req),sizeof (resp),0 ); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg);if (rc)
@@ -1423,7 +1428,8 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)memcpy (qp->smac, sb->src_mac,6 ); qp->vlan_id =le16_to_cpu (sb->vlan_pcp_vlan_dei_vlan_id); bail: -bnxt_qplib_rcfw_free_sbuf (rcfw, sbuf); +dma_free_coherent (&rcfw->pdev->dev, sbuf.size, + sbuf.sb, sbuf.dma_addr);return rc; }
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +0 -31
@@ -1197,34 +1197,3 @@ int bnxt_qplib_enable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw,return 0 ; } - -struct bnxt_qplib_rcfw_sbuf *bnxt_qplib_rcfw_alloc_sbuf ( -struct bnxt_qplib_rcfw *rcfw, -u32 size) -{ -struct bnxt_qplib_rcfw_sbuf *sbuf; - - sbuf =kzalloc (sizeof (*sbuf),GFP_KERNEL ); -if (!sbuf) -return NULL ; - - sbuf->size = size; - sbuf->sb =dma_alloc_coherent (&rcfw->pdev->dev, sbuf->size, - &sbuf->dma_addr,GFP_KERNEL ); -if (!sbuf->sb) - goto bail; - -return sbuf; -bail: -kfree (sbuf); -return NULL ; -} - -void bnxt_qplib_rcfw_free_sbuf (struct bnxt_qplib_rcfw *rcfw, -struct bnxt_qplib_rcfw_sbuf *sbuf) -{ -if (sbuf->sb) -dma_free_coherent (&rcfw->pdev->dev, sbuf->size, - sbuf->sb, sbuf->dma_addr); -kfree (sbuf); -}
drivers/infiniband/hw/bnxt_re/qplib_sp.c +31 -34
132 lines not on this page · raw message
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 4/6 RDMA/bnxt_re: Cleanup bnxt_re_process_raw_qp_pkt_rx() function
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
- Remove unnecessary memset by initializing the variables during declaration itself.
- Arranged variable declarartion in RCT order.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +8 -13
@@ -3333,26 +3333,21 @@ static int bnxt_re_process_raw_qp_pkt_rx(struct bnxt_re_qp *gsi_qp,struct bnxt_re_dev *rdev = gsi_qp->rdev;struct bnxt_re_sqp_entries *sqp_entry =NULL ;struct bnxt_re_qp *gsi_sqp = rdev->gsi_ctx.gsi_sqp; +dma_addr_t shrq_hdr_buf_map; +struct ib_sge s_sge[2 ] = {}; +struct ib_sge r_sge[2 ] = {};struct bnxt_re_ah *gsi_sah; +struct ib_recv_wr rwr = {}; +dma_addr_t rq_hdr_buf_map; +struct ib_ud_wr udwr = {};struct ib_send_wr *swr; -struct ib_ud_wr udwr; -struct ib_recv_wr rwr; +u32 skip_bytes =0 ;int pkt_type =0 ; -u32 tbl_idx;void *rq_hdr_buf; -dma_addr_t rq_hdr_buf_map; -dma_addr_t shrq_hdr_buf_map;u32 offset =0 ; -u32 skip_bytes =0 ; -struct ib_sge s_sge[2 ]; -struct ib_sge r_sge[2 ]; +u32 tbl_idx;int rc; -memset (&udwr,0 ,sizeof (udwr)); -memset (&rwr,0 ,sizeof (rwr)); -memset (&s_sge,0 ,sizeof (s_sge)); -memset (&r_sge,0 ,sizeof (r_sge)); - swr = &udwr.wr; tbl_idx = cqe->wr_id;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 5/6 RDMA/bnxt_re: Avoid unnecessary memset
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Avoid memset by initializing the variables during
declaration itself.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 - drivers/infiniband/hw/bnxt_re/main.c | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +0 -1
@@ -2797,7 +2797,6 @@ static int bnxt_re_post_recv_shadow_qp(struct bnxt_re_dev *rdev,struct bnxt_qplib_swqe wqe;int rc =0 ; -memset (&wqe,0 ,sizeof (wqe));while (wr) {/* House keeping */ memset (&wqe,0 ,sizeof (wqe));
drivers/infiniband/hw/bnxt_re/main.c +4 -8
@@ -395,10 +395,9 @@ static int bnxt_re_hwrm_qcfg(struct bnxt_re_dev *rdev, u32 *db_len,struct bnxt_en_dev *en_dev = rdev->en_dev;struct hwrm_func_qcfg_output resp = {0 };struct hwrm_func_qcfg_input req = {0 }; -struct bnxt_fw_msg fw_msg; +struct bnxt_fw_msg fw_msg = {};int rc; -memset (&fw_msg,0 ,sizeof (fw_msg));bnxt_re_init_hwrm_hdr ((void *)&req,HWRM_FUNC_QCFG ); req.fid =cpu_to_le16 (0xffff ); bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
@@ -969,7 +968,7 @@ static int bnxt_re_handle_unaffi_async_event(struct creq_func_eventstatic int bnxt_re_handle_qp_async_event (struct creq_qp_event *qp_event,struct bnxt_re_qp *qp) { -struct ib_event event; +struct ib_event event = {};unsigned int flags; if (qp->qplib_qp.state == CMDQ_MODIFY_QP_NEW_STATE_ERR &&
@@ -979,7 +978,6 @@ static int bnxt_re_handle_qp_async_event(struct creq_qp_event *qp_event,bnxt_re_unlock_cqs (qp, flags); } -memset (&event,0 ,sizeof (event));if (qp->qplib_qp.srq) { event.device = &qp->rdev->ibdev; event.element.qp = &qp->ib_qp;
@@ -1299,11 +1297,10 @@ static u32 bnxt_re_get_priority_mask(struct bnxt_re_dev *rdev) {u32 prio_map =0 , tmp_map =0 ;struct net_device *netdev; -struct dcb_app app; +struct dcb_app app = {}; netdev = rdev->netdev; -memset (&app,0 ,sizeof (app)); app.selector =IEEE_8021QAZ_APP_SEL_ETHERTYPE ; app.protocol =ETH_P_IBOE ; tmp_map =dcb_ieee_getapp_mask (netdev, &app);
@@ -1445,15 +1442,14 @@ static void bnxt_re_worker(struct work_struct *work)static int bnxt_re_dev_init (struct bnxt_re_dev *rdev,u8 wqe_mode) { +struct bnxt_re_ring_attr rattr = {};struct bnxt_qplib_creq_ctx *creq; -struct bnxt_re_ring_attr rattr;u32 db_offt;int vid;u8 type;int rc;/* Registered a new RoCE device instance to netdev */ -memset (&rattr,0 ,sizeof (rattr)); rc =bnxt_re_register_netdev (rdev);if (rc) { ibdev_err(&rdev->ibdev,
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 6/6 RDMA/bnxt_re: Remove unnecessary variable initializations
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Remove unnecessary variable initializations.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 14 +++++++------- drivers/infiniband/hw/bnxt_re/main.c | 12 ++++++------ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 6 +++--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 8 ++++---- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +7 -7
@@ -284,7 +284,7 @@ int bnxt_re_query_gid(struct ib_device *ibdev, u32 port_num, int index, union ib_gid *gid) { struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev); -int rc =0 ; +int rc;/* Ignore port_num */ memset (gid,0 ,sizeof (*gid));
@@ -684,7 +684,7 @@ int bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags) struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);struct bnxt_re_dev *rdev = ah->rdev;bool block = true; -int rc =0 ; +int rc; block = !(flags &RDMA_DESTROY_AH_SLEEPABLE ); rc =bnxt_qplib_destroy_ah (&rdev->qplib_res, &ah->qplib_ah, block);
@@ -834,7 +834,7 @@ static int bnxt_re_destroy_gsi_sqp(struct bnxt_re_qp *qp)struct bnxt_re_qp *gsi_sqp;struct bnxt_re_ah *gsi_sah;struct bnxt_re_dev *rdev; -int rc =0 ; +int rc; rdev = qp->rdev; gsi_sqp = rdev->gsi_ctx.gsi_sqp;
@@ -1441,7 +1441,7 @@ static int bnxt_re_create_gsi_qp(struct bnxt_re_qp *qp, struct bnxt_re_pd *pd, {struct bnxt_re_dev *rdev;struct bnxt_qplib_qp *qplqp; -int rc =0 ; +int rc; rdev = qp->rdev; qplqp = &qp->qplib_qp;
@@ -1872,7 +1872,7 @@ static int bnxt_re_modify_shadow_qp(struct bnxt_re_dev *rdev, int qp_attr_mask) {struct bnxt_re_qp *qp = rdev->gsi_ctx.gsi_sqp; -int rc =0 ; +int rc;if (qp_attr_mask &IB_QP_STATE ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_STATE ;
@@ -2222,7 +2222,7 @@ static int bnxt_re_build_qp1_send_v2(struct bnxt_re_qp *qp,u8 ip_version =0 ;u16 vlan_id =0xFFFF ;void *buf; -int i, rc =0 ; +int i, rc;memset (&qp->qp1_hdr,0 ,sizeof (qp->qp1_hdr));
@@ -3586,7 +3586,7 @@ static int send_phantom_wqe(struct bnxt_re_qp *qp) {struct bnxt_qplib_qp *lib_qp = &qp->qplib_qp;unsigned long flags; -int rc =0 ; +int rc;spin_lock_irqsave (&qp->sq_lock, flags);
drivers/infiniband/hw/bnxt_re/main.c +6 -6
@@ -360,7 +360,7 @@ static struct bnxt_ulp_ops bnxt_re_ulp_ops = {static int bnxt_re_register_netdev (struct bnxt_re_dev *rdev) {struct bnxt_en_dev *en_dev; -int rc =0 ; +int rc; en_dev = rdev->en_dev;
@@ -1145,7 +1145,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev) {struct bnxt_re_ring_attr rattr = {};int num_vec_created =0 ; -int rc =0 , i; +int rc, i;u8 type;/* Configure and allocate resources for qplib */
@@ -1343,7 +1343,7 @@ static void bnxt_re_query_hwrm_intf_version(struct bnxt_re_dev *rdev)struct hwrm_ver_get_input req = {};struct bnxt_qplib_chip_ctx *cctx;struct bnxt_fw_msg fw_msg = {}; -int rc =0 ; +int rc;bnxt_re_init_hwrm_hdr ((void *)&req,HWRM_VER_GET ); req.hwrm_intf_maj =HWRM_VERSION_MAJOR ;
@@ -1373,7 +1373,7 @@ static void bnxt_re_query_hwrm_intf_version(struct bnxt_re_dev *rdev)static int bnxt_re_ib_init (struct bnxt_re_dev *rdev) { -int rc =0 ; +int rc;u32 event;/* Register ib dev */
@@ -1613,7 +1613,7 @@ static int bnxt_re_add_device(struct auxiliary_device *adev, u8 wqe_mode) container_of(adev, struct bnxt_aux_priv, aux_dev);struct bnxt_en_dev *en_dev;struct bnxt_re_dev *rdev; -int rc =0 ; +int rc;/* en_dev should never be NULL as long as adev and aux_dev are valid. */ en_dev = aux_priv->edev;
@@ -1859,7 +1859,7 @@ static struct auxiliary_driver bnxt_re_driver = {static int __init bnxt_re_mod_init (void ) { -int rc =0 ; +int rc;pr_info ("%s: %s" ,ROCE_DRV_MODULE_NAME , version); rc =auxiliary_driver_register (&bnxt_re_driver);
drivers/infiniband/hw/bnxt_re/qplib_fp.c +3 -3
@@ -517,7 +517,7 @@ int bnxt_qplib_enable_nq(struct pci_dev *pdev, struct bnxt_qplib_nq *nq,cqn_handler_t cqn_handler, srqn_handler_t srqn_handler) { - int rc = -1; + int rc; nq->pdev = pdev; nq->cqn_handler = cqn_handler;
@@ -712,7 +712,7 @@ int bnxt_qplib_query_srq(struct bnxt_qplib_res *res,struct bnxt_qplib_rcfw_sbuf sbuf;struct creq_query_srq_resp_sb *sb;struct cmdq_query_srq req = {}; -int rc =0 ; +int rc; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_QUERY_SRQ,
@@ -1354,7 +1354,7 @@ int bnxt_qplib_query_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)struct creq_query_qp_resp_sb *sb;struct cmdq_query_qp req = {};u32 temp32[4 ]; -int i, rc =0 ; +int i, rc; sbuf.size =ALIGN (sizeof (*sb),BNXT_QPLIB_CMDQE_UNITS ); sbuf.sb = dma_alloc_coherent(&rcfw->pdev->dev, sbuf.size,
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +1 -1
@@ -488,7 +488,7 @@ static int __bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw,struct bnxt_qplib_crsqe *crsqe;unsigned long flags;u16 cookie; -int rc =0 ; +int rc;u8 opcode; opcode =__get_cmdq_base_opcode (msg->req, msg->req_sz);
drivers/infiniband/hw/bnxt_re/qplib_res.c +4 -4
@@ -385,7 +385,7 @@ static int bnxt_qplib_alloc_tqm_rings(struct bnxt_qplib_res *res,struct bnxt_qplib_hwq_attr hwq_attr = {};struct bnxt_qplib_sg_info sginfo = {};struct bnxt_qplib_tqm_ctx *tqmctx; -int rc =0 ; +int rc;int i; tqmctx = &ctx->tqm_ctx;
@@ -463,7 +463,7 @@ static void bnxt_qplib_map_tqm_pgtbl(struct bnxt_qplib_tqm_ctx *ctx)static int bnxt_qplib_setup_tqm_rings (struct bnxt_qplib_res *res,struct bnxt_qplib_ctx *ctx) { -int rc =0 ; +int rc; rc =bnxt_qplib_alloc_tqm_rings (res, ctx);if (rc)
@@ -501,7 +501,7 @@ int bnxt_qplib_alloc_ctx(struct bnxt_qplib_res *res, {struct bnxt_qplib_hwq_attr hwq_attr = {};struct bnxt_qplib_sg_info sginfo = {}; -int rc =0 ; +int rc;if (virt_fn || is_p5) goto stats_alloc;
@@ -876,7 +876,7 @@ int bnxt_qplib_alloc_res(struct bnxt_qplib_res *res, struct pci_dev *pdev,struct net_device *netdev, struct bnxt_qplib_dev_attr *dev_attr) { - int rc = 0; + int rc; res->pdev = pdev; res->netdev = netdev;
drivers/infiniband/hw/bnxt_re/qplib_sp.c +4 -4
@@ -72,7 +72,7 @@ static void bnxt_qplib_query_version(struct bnxt_qplib_rcfw *rcfw,struct creq_query_version_resp resp = {};struct bnxt_qplib_cmdqmsg msg = {};struct cmdq_query_version req = {}; -int rc =0 ; +int rc; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_QUERY_VERSION,
@@ -97,7 +97,7 @@ int bnxt_qplib_get_dev_attr(struct bnxt_qplib_rcfw *rcfw,struct bnxt_qplib_rcfw_sbuf sbuf;struct cmdq_query_func req = {};u8 *tqm_alloc; -int i, rc =0 ; +int i, rc;u32 temp; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req,
@@ -184,7 +184,7 @@ int bnxt_qplib_set_func_resources(struct bnxt_qplib_res *res,struct creq_set_func_resources_resp resp = {};struct cmdq_set_func_resources req = {};struct bnxt_qplib_cmdqmsg msg = {}; -int rc =0 ; +int rc; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_SET_FUNC_RESOURCES,
@@ -717,7 +717,7 @@ int bnxt_qplib_get_roce_stats(struct bnxt_qplib_rcfw *rcfw,struct cmdq_query_roce_stats req = {};struct bnxt_qplib_cmdqmsg msg = {};struct bnxt_qplib_rcfw_sbuf sbuf; -int rc =0 ; +int rc; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_QUERY_ROCE_STATS,
Signature · 1 line
2.5.5
Selvin Xavier
maintainerQuoted 4 lines · Selvin Xavier
Includes some of the minor cleanup and update on the driver.
Please review and apply.
Please ignore this series. Some changes in patch 3 got into patch 2. Seems like i made some mistake while amending a commit. Will post a v2
Quoted 27 lines
Thanks,
SelvinKalesh AP (5):
RDMA/bnxt_re: Fixmax_qpcount for virtual functions RDMA/bnxt_re: Remove a redundant flag
RDMA/bnxt_re: Cleanupbnxt_re_process_raw_qp_pkt_rx()function RDMA/bnxt_re: Avoid unnecessary memset
RDMA/bnxt_re: Remove unnecessary variable initializationsSelvin Xavier (1):
RDMA/bnxt_re: Fix the sideband buffer size handling for FW commandsdrivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 - drivers/infiniband/hw/bnxt_re/ib_verbs.c | 36 ++++++-------- drivers/infiniband/hw/bnxt_re/main.c | 35 ++++++-------- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 44 +++++++++-------- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 36 ++------------ drivers/infiniband/hw/bnxt_re/qplib_res.c | 8 +-- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 78 +++++++++++++++--------------- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- 8 files changed, 100 insertions(+), 140 deletions(-)--
2.5.5