Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RDMA/bnxt_re: introduce wqe mode to select execution path

Browse Source 
The bnxt_re driver need to decide on how much SQ and RQ memory should to
be allocated and which wqe posting/polling algorithm to use.

Making changes to set the wqe-mode to a default value during device
registration sequence. The wqe-mode is passed to the lower layer driver as
well. Going forward in the lower layer driver wqe-mode will be used to
decide execution path. Initializing the wqe-mode to static wqe type for
now.

Link: https://lore.kernel.org/r/1594822619-4098-2-git-send-email-devesh.sharma@broadcom.com
Signed-off-by: Devesh Sharma <devesh.sharma@broadcom.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Devesh Sharma 2020-07-15 10:16:54 -04:00 committed by Jason Gunthorpe
parent ca4beeee98
commit 1da968e0ef
4 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/hw/bnxt_re/ib_verbs.c
View File

@ -1183,6 +1183,7 @@ static int bnxt_re_init_qp_attr(struct bnxt_re_qp *qp, struct bnxt_re_pd *pd,
goto out; goto out;
} }
qplqp->type = (u8)qptype; qplqp->type = (u8)qptype;
qplqp->wqe_mode = rdev->chip_ctx->modes.wqe_mode;
if (init_attr->qp_type == IB_QPT_RC) { if (init_attr->qp_type == IB_QPT_RC) {
qplqp->max_rd_atomic = dev_attr->max_qp_rd_atom; qplqp->max_rd_atomic = dev_attr->max_qp_rd_atom;

23
drivers/infiniband/hw/bnxt_re/main.c
View File

@ -82,6 +82,15 @@ static void bnxt_re_remove_device(struct bnxt_re_dev *rdev);
static void bnxt_re_dealloc_driver(struct ib_device *ib_dev); static void bnxt_re_dealloc_driver(struct ib_device *ib_dev);
static void bnxt_re_stop_irq(void *handle); static void bnxt_re_stop_irq(void *handle);
static void bnxt_re_set_drv_mode(struct bnxt_re_dev *rdev, u8 mode)
{
struct bnxt_qplib_chip_ctx *cctx;
cctx = rdev->chip_ctx;
cctx->modes.wqe_mode = bnxt_qplib_is_chip_gen_p5(rdev->chip_ctx) ?
mode : BNXT_QPLIB_WQE_MODE_STATIC;
}
static void bnxt_re_destroy_chip_ctx(struct bnxt_re_dev *rdev) static void bnxt_re_destroy_chip_ctx(struct bnxt_re_dev *rdev)
{ {
struct bnxt_qplib_chip_ctx *chip_ctx; struct bnxt_qplib_chip_ctx *chip_ctx;
@ -97,7 +106,7 @@ static void bnxt_re_destroy_chip_ctx(struct bnxt_re_dev *rdev)
kfree(chip_ctx); kfree(chip_ctx);
} }
static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev) static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev, u8 wqe_mode)
{ {
struct bnxt_qplib_chip_ctx *chip_ctx; struct bnxt_qplib_chip_ctx *chip_ctx;
struct bnxt_en_dev *en_dev; struct bnxt_en_dev *en_dev;
@ -117,6 +126,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev)
rdev->qplib_res.cctx = rdev->chip_ctx; rdev->qplib_res.cctx = rdev->chip_ctx;
rdev->rcfw.res = &rdev->qplib_res; rdev->rcfw.res = &rdev->qplib_res;
bnxt_re_set_drv_mode(rdev, wqe_mode);
return 0; return 0;
} }
@ -1386,7 +1396,7 @@ static void bnxt_re_worker(struct work_struct *work)
schedule_delayed_work(&rdev->worker, msecs_to_jiffies(30000)); schedule_delayed_work(&rdev->worker, msecs_to_jiffies(30000));
} }
static int bnxt_re_dev_init(struct bnxt_re_dev *rdev) static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
{ {
struct bnxt_qplib_creq_ctx *creq; struct bnxt_qplib_creq_ctx *creq;
struct bnxt_re_ring_attr rattr; struct bnxt_re_ring_attr rattr;
@ -1406,7 +1416,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev)
} }
set_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags); set_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags);
rc = bnxt_re_setup_chip_ctx(rdev); rc = bnxt_re_setup_chip_ctx(rdev, wqe_mode);
if (rc) { if (rc) {
ibdev_err(&rdev->ibdev, "Failed to get chip context\n"); ibdev_err(&rdev->ibdev, "Failed to get chip context\n");
return -EINVAL; return -EINVAL;
@ -1585,7 +1595,7 @@ static void bnxt_re_remove_device(struct bnxt_re_dev *rdev)
} }
static int bnxt_re_add_device(struct bnxt_re_dev **rdev, static int bnxt_re_add_device(struct bnxt_re_dev **rdev,
struct net_device *netdev) struct net_device *netdev, u8 wqe_mode)
{ {
int rc; int rc;
@ -1599,7 +1609,7 @@ static int bnxt_re_add_device(struct bnxt_re_dev **rdev,
} }
pci_dev_get((*rdev)->en_dev->pdev); pci_dev_get((*rdev)->en_dev->pdev);
rc = bnxt_re_dev_init(*rdev); rc = bnxt_re_dev_init(*rdev, wqe_mode);
if (rc) { if (rc) {
pci_dev_put((*rdev)->en_dev->pdev); pci_dev_put((*rdev)->en_dev->pdev);
bnxt_re_dev_unreg(*rdev); bnxt_re_dev_unreg(*rdev);
@ -1711,7 +1721,8 @@ static int bnxt_re_netdev_event(struct notifier_block *notifier,
case NETDEV_REGISTER: case NETDEV_REGISTER:
if (rdev) if (rdev)
break; break;
rc = bnxt_re_add_device(&rdev, real_dev); rc = bnxt_re_add_device(&rdev, real_dev,
BNXT_QPLIB_WQE_MODE_STATIC);
if (!rc) if (!rc)
sch_work = true; sch_work = true;
release = false; release = false;

3
drivers/infiniband/hw/bnxt_re/qplib_fp.h
View File

@ -224,9 +224,10 @@ struct bnxt_qplib_qp {
u32 id; u32 id;
u8 type; u8 type;
u8 sig_type; u8 sig_type;
u32 modify_flags; u8 wqe_mode;
u8 state; u8 state;
u8 cur_qp_state; u8 cur_qp_state;
u64 modify_flags;
u32 max_inline_data; u32 max_inline_data;
u32 mtu; u32 mtu;
u8 path_mtu; u8 path_mtu;

32
drivers/infiniband/hw/bnxt_re/qplib_res.h
View File

@ -41,6 +41,28 @@
extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero; extern const struct bnxt_qplib_gid bnxt_qplib_gid_zero;
#define CHIP_NUM_57508 0x1750
#define CHIP_NUM_57504 0x1751
#define CHIP_NUM_57502 0x1752
enum bnxt_qplib_wqe_mode {
BNXT_QPLIB_WQE_MODE_STATIC = 0x00,
BNXT_QPLIB_WQE_MODE_VARIABLE = 0x01,
BNXT_QPLIB_WQE_MODE_INVALID = 0x02
};
struct bnxt_qplib_drv_modes {
u8 wqe_mode;
/* Other modes to follow here */
};
struct bnxt_qplib_chip_ctx {
u16 chip_num;
u8 chip_rev;
u8 chip_metal;
struct bnxt_qplib_drv_modes modes;
};
#define PTR_CNT_PER_PG (PAGE_SIZE / sizeof(void *)) #define PTR_CNT_PER_PG (PAGE_SIZE / sizeof(void *))
#define PTR_MAX_IDX_PER_PG (PTR_CNT_PER_PG - 1) #define PTR_MAX_IDX_PER_PG (PTR_CNT_PER_PG - 1)
#define PTR_PG(x) (((x) & ~PTR_MAX_IDX_PER_PG) / PTR_CNT_PER_PG) #define PTR_PG(x) (((x) & ~PTR_MAX_IDX_PER_PG) / PTR_CNT_PER_PG)
@ -230,16 +252,6 @@ struct bnxt_qplib_ctx {
u64 hwrm_intf_ver; u64 hwrm_intf_ver;
}; };
struct bnxt_qplib_chip_ctx {
u16 chip_num;
u8 chip_rev;
u8 chip_metal;
};
#define CHIP_NUM_57508 0x1750
#define CHIP_NUM_57504 0x1751
#define CHIP_NUM_57502 0x1752
struct bnxt_qplib_res { struct bnxt_qplib_res {
struct pci_dev *pdev; struct pci_dev *pdev;
struct bnxt_qplib_chip_ctx *cctx; struct bnxt_qplib_chip_ctx *cctx;