4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Shiraz Saleem <shiraz.sal...@intel.com>


[ Upstream commit fe99afd1febd74e0ef1fed7e3283f09effe1f4f0 ]

Lower Inbound RDMA Read Queue (Q1) object count by a factor of 2
as it is incorrectly doubled. Also, round up Q1 and Transmit FIFO (XF)
object count to power of 2 to satisfy hardware requirement.

Fixes: 86dbcd0f12e9 ("i40iw: add file to handle cqp calls")
Signed-off-by: Shiraz Saleem <shiraz.sal...@intel.com>
Signed-off-by: Jason Gunthorpe <j...@mellanox.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/infiniband/hw/i40iw/i40iw_ctrl.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
@@ -3875,8 +3875,10 @@ enum i40iw_status_code i40iw_config_fpm_
                hmc_info->hmc_obj[I40IW_HMC_IW_APBVT_ENTRY].cnt = 1;
                hmc_info->hmc_obj[I40IW_HMC_IW_MR].cnt = mrwanted;
 
-               hmc_info->hmc_obj[I40IW_HMC_IW_XF].cnt = I40IW_MAX_WQ_ENTRIES * 
qpwanted;
-               hmc_info->hmc_obj[I40IW_HMC_IW_Q1].cnt = 4 * I40IW_MAX_IRD_SIZE 
* qpwanted;
+               hmc_info->hmc_obj[I40IW_HMC_IW_XF].cnt =
+                       roundup_pow_of_two(I40IW_MAX_WQ_ENTRIES * qpwanted);
+               hmc_info->hmc_obj[I40IW_HMC_IW_Q1].cnt =
+                       roundup_pow_of_two(2 * I40IW_MAX_IRD_SIZE * qpwanted);
                hmc_info->hmc_obj[I40IW_HMC_IW_XFFL].cnt =
                        hmc_info->hmc_obj[I40IW_HMC_IW_XF].cnt / 
hmc_fpm_misc->xf_block_size;
                hmc_info->hmc_obj[I40IW_HMC_IW_Q1FL].cnt =


Reply via email to