i40iw: Use utility function roundup_pow_of_two()

Consolidate all power of 2 round calculations to
use kernel utility function roundup_pow_of_two().

Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
index 493d6ef3d2d57e4f1e020fd680ab4fc009f8cb7e..03e6fc67d9555965550e3e1add7970652a9ea571 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
@@ -92,14 +92,9 @@ void i40iw_free_sqbuf(struct i40iw_sc_vsi *vsi, void *bufp)
 static u8 i40iw_derive_hw_ird_setting(u16 cm_ird)
 {
        u8 encoded_ird_size;
-       u8 pof2_cm_ird = 1;
-
-       /* round-off to next powerof2 */
-       while (pof2_cm_ird < cm_ird)
-               pof2_cm_ird *= 2;
 
        /* ird_size field is encoded in qp_ctx */
-       switch (pof2_cm_ird) {
+       switch (cm_ird ? roundup_pow_of_two(cm_ird) : 0) {
        case I40IW_HW_IRD_SETTING_64:
                encoded_ird_size = 3;
                break;

diff --git a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
index d88c6cf47cf275565ea98aba66f9638387db702c..90171643cf7f0b70332996b6632ceedf6e21be1c 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_ctrl.c
@@ -3855,7 +3855,6 @@ enum i40iw_status_code i40iw_config_fpm_values(struct i40iw_sc_dev *dev, u32 qp_
        struct i40iw_virt_mem virt_mem;
        u32 i, mem_size;
        u32 qpwantedoriginal, qpwanted, mrwanted, pblewanted;
-       u32 powerof2;
        u64 sd_needed;
        u32 loop_count = 0;
 
@@ -3928,16 +3927,10 @@ enum i40iw_status_code i40iw_config_fpm_values(struct i40iw_sc_dev *dev, u32 qp_
                if ((loop_count > 1000) ||
                    ((!(loop_count % 10)) &&
                    (qpwanted > qpwantedoriginal * 2 / 3))) {
-                       if (qpwanted > FPM_MULTIPLIER) {
-                               qpwanted -= FPM_MULTIPLIER;
-                               powerof2 = 1;
-                               while (powerof2 < qpwanted)
-                                       powerof2 *= 2;
-                               powerof2 /= 2;
-                               qpwanted = powerof2;
-                       } else {
-                               qpwanted /= 2;
-                       }
+                       if (qpwanted > FPM_MULTIPLIER)
+                               qpwanted = roundup_pow_of_two(qpwanted -
+                                                             FPM_MULTIPLIER);
+                       qpwanted >>= 1;
                }
                if (mrwanted > FPM_MULTIPLIER * 10)
                        mrwanted -= FPM_MULTIPLIER * 10;

diff --git a/drivers/infiniband/hw/i40iw/i40iw_uk.c b/drivers/infiniband/hw/i40iw/i40iw_uk.c
index 3ec5389a81a1a685a44d961f8354c8b3bde6a0f8..8afa5a67a86b5cdb8e84e1f79ea3b99806857860 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_uk.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_uk.c
@@ -893,20 +893,6 @@ exit:
        return ret_code;
 }
 
-/**
- * i40iw_qp_roundup - return round up QP WQ depth
- * @wqdepth: WQ depth in quantas to round up
- */
-static int i40iw_qp_round_up(u32 wqdepth)
-{
-       int scount = 1;
-
-       for (wqdepth--; scount <= 16; scount *= 2)
-               wqdepth |= wqdepth >> scount;
-
-       return ++wqdepth;
-}
-
 /**
  * i40iw_get_wqe_shift - get shift count for maximum wqe size
  * @sge: Maximum Scatter Gather Elements wqe
@@ -934,7 +920,7 @@ void i40iw_get_wqe_shift(u32 sge, u32 inline_data, u8 *shift)
  */
 enum i40iw_status_code i40iw_get_sqdepth(u32 sq_size, u8 shift, u32 *sqdepth)
 {
-       *sqdepth = i40iw_qp_round_up((sq_size << shift) + I40IW_SQ_RSVD);
+       *sqdepth = roundup_pow_of_two((sq_size << shift) + I40IW_SQ_RSVD);
 
        if (*sqdepth < (I40IW_QP_SW_MIN_WQSIZE << shift))
                *sqdepth = I40IW_QP_SW_MIN_WQSIZE << shift;
@@ -953,7 +939,7 @@ enum i40iw_status_code i40iw_get_sqdepth(u32 sq_size, u8 shift, u32 *sqdepth)
  */
 enum i40iw_status_code i40iw_get_rqdepth(u32 rq_size, u8 shift, u32 *rqdepth)
 {
-       *rqdepth = i40iw_qp_round_up((rq_size << shift) + I40IW_RQ_RSVD);
+       *rqdepth = roundup_pow_of_two((rq_size << shift) + I40IW_RQ_RSVD);
 
        if (*rqdepth < (I40IW_QP_SW_MIN_WQSIZE << shift))
                *rqdepth = I40IW_QP_SW_MIN_WQSIZE << shift;