Patch "IB/mlx5: Check BlueFlame HCA support" has been added to the 4.4-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-08-18 12:44:34
This is a note to let you know that I've just added the patch titled
IB/mlx5: Check BlueFlame HCA support
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-mlx5-check-blueflame-hca-support.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 2cc6ad5f2130733e561f97dba7a2052f8ea024aa Mon Sep 17 00:00:00 2001
From: Noa Osherovich <redacted>
Date: Sat, 4 Jun 2016 15:15:33 +0300
Subject: IB/mlx5: Check BlueFlame HCA support
From: Noa Osherovich <redacted>
commit 2cc6ad5f2130733e561f97dba7a2052f8ea024aa upstream.
BlueFlame support is reported only for PFs when the HCA capability is
on.
Fixes: 938fe83c8dcbb ('net/mlx5_core: New device capabilities...')
Signed-off-by: Majd Dibbiny <redacted>
Signed-off-by: Noa Osherovich <redacted>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Doug Ledford <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/infiniband/hw/mlx5/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c@@ -626,7 +626,8 @@ static struct ib_ucontext *mlx5_ib_alloc num_uars = req.total_num_uuars / MLX5_NON_FP_BF_REGS_PER_PAGE; gross_uuars = num_uars * MLX5_BF_REGS_PER_PAGE; resp.qp_tab_size = 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp); - resp.bf_reg_size = 1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size); + if (mlx5_core_is_pf(dev->mdev) && MLX5_CAP_GEN(dev->mdev, bf)) + resp.bf_reg_size = 1 << MLX5_CAP_GEN(dev->mdev, log_bf_reg_size); resp.cache_line_size = L1_CACHE_BYTES; resp.max_sq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq); resp.max_rq_desc_sz = MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq);
Patches currently in stable-queue which might be from noaos@mellanox.com are queue-4.4/ib-mlx5-fix-returned-values-of-query-qp.patch queue-4.4/ib-mlx5-return-port_err-in-active-to-initializing-tranisition.patch queue-4.4/ib-mlx5-fix-entries-checks-in-mlx5_ib_create_cq.patch queue-4.4/ib-mlx5-fix-entries-check-in-mlx5_ib_resize_cq.patch queue-4.4/ib-mlx5-check-blueflame-hca-support.patch