cxgb4: fix chipversion initialization
PATCH 1/2 cxgb4: fix chipversion initialization
With Commit 0c3cecfe04d5a, device and vendor members of structure verbs_match_ent are left unintialised. This causes c4iw_alloc_context() failure due to incorrect chipversion.
This patch reorders the code to fetch chipversion from ib device attributes.
Signed-off-by Potnuri Bharat Teja <[email protected]>
--- providers/cxgb4/dev.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
providers/cxgb4/dev.c +17 -17
@@ -144,22 +144,6 @@ static struct verbs_context *c4iw_alloc_context(struct ibv_device *ibdev,verbs_set_ops (&context->ibv_ctx, &c4iw_ctx_common_ops); -switch (rhp->chip_version) { -case CHELSIO_T6 : -PDBG ("%s T6/T5/T4 device\n" , __FUNCTION__); -case CHELSIO_T5 : -PDBG ("%s T5/T4 device\n" , __FUNCTION__); -case CHELSIO_T4 : -PDBG ("%s T4 device\n" , __FUNCTION__); -verbs_set_ops (&context->ibv_ctx, &c4iw_ctx_t4_ops); -break ; -default : -PDBG ("%s unknown hca type %d\n" , __FUNCTION__, - rhp->chip_version); - goto err_unmap; -break ; - } -if (!rhp->mmid2ptr) {int ret;
@@ -196,6 +180,23 @@ static struct verbs_context *c4iw_alloc_context(struct ibv_device *ibdev, context->status_page->write_cmpl_supported; } + rhp->chip_version =CHELSIO_CHIP_VERSION (attr.vendor_part_id >>8 ); +switch (rhp->chip_version) { +case CHELSIO_T6 : +PDBG ("%s T6/T5/T4 device\n" , __FUNCTION__); +case CHELSIO_T5 : +PDBG ("%s T5/T4 device\n" , __FUNCTION__); +case CHELSIO_T4 : +PDBG ("%s T4 device\n" , __FUNCTION__); +verbs_set_ops (&context->ibv_ctx, &c4iw_ctx_t4_ops); +break ; +default : +PDBG ("%s unknown hca type %d\n" , __FUNCTION__, + rhp->chip_version); + goto err_unmap; +break ; + } +return &context->ibv_ctx; err_unmap:
@@ -456,7 +457,6 @@ static struct verbs_device *c4iw_device_alloc(struct verbs_sysfs_dev *sysfs_dev)pthread_spin_init (&dev->lock,PTHREAD_PROCESS_PRIVATE ); c4iw_abi_version = sysfs_dev->abi_ver; - dev->chip_version =CHELSIO_CHIP_VERSION (sysfs_dev->match->device >>8 ); dev->abi_version = sysfs_dev->abi_ver;list_node_init (&dev->list);
Signature · 1 line
2.18.0.232.gb7bd9486b055