Commit 304cc838 authored by Bhargava Chenna Marreddy's avatar Bhargava Chenna Marreddy Committed by Leon Romanovsky
Browse files

RDMA/bnxt_re: Enhance RoCE SRIOV resource configuration design 



Refine RoCE SRIOV resource configuration design,
using the INITIALIZE_FW's flag as an indication
for the new design to the firmware. RoCE driver does not
have to provision resources to VF when firmware
advertises support for RoCE resource management by NIC driver.

Signed-off-by: default avatarBhargava Chenna Marreddy <bhargava.marreddy@broadcom.com>
Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: default avatarVikas Gupta <vikas.gupta@broadcom.com>
Reviewed-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
CC: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1730882676-24434-3-git-send-email-selvin.xavier@broadcom.com


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

drivers/infiniband/hw/bnxt_re/main.c

+8 −5
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev) 
	rdev->rcfw.res = &rdev->qplib_res;

	rdev->qplib_res.dattr = &rdev->dev_attr;

	rdev->qplib_res.is_vf = BNXT_EN_VF(en_dev);

	rdev->qplib_res.en_dev = en_dev;



	bnxt_re_set_drv_mode(rdev);
@@ -285,6 +286,10 @@ static void bnxt_re_set_resource_limits(struct bnxt_re_dev *rdev) 


static void bnxt_re_vf_res_config(struct bnxt_re_dev *rdev)

{

	/*

	 * Use the total VF count since the actual VF count may not be

	 * available at this point.

	 */

	rdev->num_vfs = pci_sriov_get_totalvfs(rdev->en_dev->pdev);

	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {

		bnxt_re_set_resource_limits(rdev);
@@ -2056,10 +2061,8 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
		INIT_DELAYED_WORK(&rdev->worker, bnxt_re_worker);

		set_bit(BNXT_RE_FLAG_QOS_WORK_REG, &rdev->flags);

		schedule_delayed_work(&rdev->worker, msecs_to_jiffies(30000));

		/*

		 * Use the total VF count since the actual VF count may not be

		 * available at this point.

		 */



		if (!(rdev->qplib_res.en_dev->flags & BNXT_EN_FLAG_ROCE_VF_RES_MGMT))

			bnxt_re_vf_res_config(rdev);

	}

	hash_init(rdev->cq_hash);

drivers/infiniband/hw/bnxt_re/qplib_rcfw.c

+2 −0
Original line number Diff line number Diff line
@@ -910,6 +910,8 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, 
		flags |= CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED;

	if (_is_optimize_modify_qp_supported(rcfw->res->dattr->dev_cap_flags2))

		flags |= CMDQ_INITIALIZE_FW_FLAGS_OPTIMIZE_MODIFY_QP_SUPPORTED;

	if (rcfw->res->en_dev->flags & BNXT_EN_FLAG_ROCE_VF_RES_MGMT)

		flags |= CMDQ_INITIALIZE_FW_FLAGS_L2_VF_RESOURCE_MGMT;

	req.flags |= cpu_to_le16(flags);

	req.stat_ctx_id = cpu_to_le32(ctx->stats.fw_id);

	bnxt_qplib_fill_cmdqmsg(&msg, &req, &resp, NULL, sizeof(req), sizeof(resp), 0);

drivers/infiniband/hw/bnxt_re/qplib_res.h

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#ifndef __BNXT_QPLIB_RES_H__

#define __BNXT_QPLIB_RES_H__



#include "bnxt_ulp.h"



extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;



#define CHIP_NUM_57508		0x1750
@@ -302,6 +304,7 @@ struct bnxt_qplib_res { 
	struct bnxt_qplib_chip_ctx	*cctx;

	struct bnxt_qplib_dev_attr      *dattr;

	struct net_device		*netdev;

	struct bnxt_en_dev		*en_dev;

	struct bnxt_qplib_rcfw		*rcfw;

	struct bnxt_qplib_pd_tbl	pd_tbl;

	/* To protect the pd table bit map */

drivers/infiniband/hw/bnxt_re/roce_hsi.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct cmdq_initialize_fw { 
	#define CMDQ_INITIALIZE_FW_FLAGS_MRAV_RESERVATION_SPLIT          0x1UL

	#define CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED     0x2UL

	#define CMDQ_INITIALIZE_FW_FLAGS_OPTIMIZE_MODIFY_QP_SUPPORTED    0x8UL

	#define CMDQ_INITIALIZE_FW_FLAGS_L2_VF_RESOURCE_MGMT		 0x10UL

	__le16	cookie;

	u8	resp_size;

	u8	reserved8;

drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp) 
		edev->flags |= BNXT_EN_FLAG_ROCEV2_CAP;

	if (bp->flags & BNXT_FLAG_VF)

		edev->flags |= BNXT_EN_FLAG_VF;

	if (BNXT_ROCE_VF_RESC_CAP(bp))

		edev->flags |= BNXT_EN_FLAG_ROCE_VF_RES_MGMT;



	edev->chip_num = bp->chip_num;

	edev->hw_ring_stats_size = bp->hw_ring_stats_size;