i40iw: Correct Q1/XF object count equation

[ 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.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
index d86f3e6708040599fb61fc12190bb3d8c98c15d4..472ef4d6e858a7cd97bcaa5828f92ad0ff20bfcc 100644 (file)
--- 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_values(struct i40iw_sc_dev *dev, u32 qp_
                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 =