net/ice/base: introduce and use bitmap set API

Introduce ice_bitmap_set() and use it instead of open-coding that
functionality.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_acl_ctrl.c b/drivers/net/ice/base/ice_acl_ctrl.c
index 5310b9d9f6e25da9b6b75a5e27175cc616103174..a732397cebb29a212696d744142ca9f95a8438b5 100644 (file)
--- a/drivers/net/ice/base/ice_acl_ctrl.c
+++ b/drivers/net/ice/base/ice_acl_ctrl.c
@@ -354,7 +354,6 @@ ice_acl_create_tbl(struct ice_hw *hw, struct ice_acl_tbl_params *params)
 
        /* call the AQ command to create the ACL table with these values */
        status = ice_aq_alloc_acl_tbl(hw, &tbl_alloc, NULL);
-
        if (status) {
                if (LE16_TO_CPU(tbl_alloc.buf.resp_buf.alloc_id) <
                    ICE_AQC_ALLOC_ID_LESS_THAN_4K)
@@ -415,8 +414,7 @@ ice_acl_create_tbl(struct ice_hw *hw, struct ice_acl_tbl_params *params)
                (tbl->last_entry / ICE_ACL_ENTRY_ALLOC_UNIT);
 
        /* Indicate available entries in the table */
-       for (i = first_e; i <= last_e; i++)
-               ice_set_bit(i, tbl->avail);
+       ice_bitmap_set(tbl->avail, first_e, last_e - first_e + 1);
 
        INIT_LIST_HEAD(&tbl->scens);
 out:

diff --git a/drivers/net/ice/base/ice_bitops.h b/drivers/net/ice/base/ice_bitops.h
index 3022116a4b9f21c48a5f72b498a9c3aa48400271..8352b5dd7a40acaa0cb5ccd57b7ac62ef4f69c4a 100644 (file)
--- a/drivers/net/ice/base/ice_bitops.h
+++ b/drivers/net/ice/base/ice_bitops.h
@@ -375,6 +375,25 @@ static inline void ice_cp_bitmap(ice_bitmap_t *dst, ice_bitmap_t *src, u16 size)
                   ICE_NONDMA_TO_NONDMA);
 }
 
+/**
+ * ice_bitmap_set - set a number of bits in bitmap from a starting position
+ * @dst: bitmap destination
+ * @pos: first bit position to set
+ * @num_bits: number of bits to set
+ *
+ * This function sets bits in a bitmap from pos to (pos + num_bits) - 1.
+ * Note that this function assumes it is operating on a bitmap declared using
+ * ice_declare_bitmap.
+ */
+static inline void
+ice_bitmap_set(ice_bitmap_t *dst, u16 pos, u16 num_bits)
+{
+       u16 i;
+
+       for (i = pos; i < num_bits; i++)
+               ice_set_bit(i, dst);
+}
+
 /**
  * ice_cmp_bitmaps - compares two bitmaps.
  * @bmp1: the bitmap to compare

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 25d79b5c4ed9bc80bf3635dd1edbada7c9831e14..a08390992680fa2cb01d29ea449aa924e3a0a832 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -1580,18 +1580,13 @@ ice_get_sw_fv_bitmap(struct ice_hw *hw, enum ice_prof_type req_profs,
        struct ice_seg *ice_seg;
        struct ice_fv *fv;
 
-       ice_memset(&state, 0, sizeof(state), ICE_NONDMA_MEM);
-
        if (req_profs == ICE_PROF_ALL) {
-               u16 i;
-
-               for (i = 0; i < ICE_MAX_NUM_PROFILES; i++)
-                       ice_set_bit(i, bm);
+               ice_bitmap_set(bm, 0, ICE_MAX_NUM_PROFILES);
                return;
        }
 
+       ice_memset(&state, 0, sizeof(state), ICE_NONDMA_MEM);
        ice_zero_bitmap(bm, ICE_MAX_NUM_PROFILES);
-
        ice_seg = hw->seg;
        do {
                enum ice_prof_type prof_type;

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 858a73222ac34f4b1466ae7579e7bc1985140283..41ebfedc6e6ea46206b7d2bad11670df7a2b6b1b 100644 (file)
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -5940,8 +5940,7 @@ ice_find_free_recp_res_idx(struct ice_hw *hw, const ice_bitmap_t *profiles,
        ice_zero_bitmap(used_idx, ICE_MAX_FV_WORDS);
        ice_zero_bitmap(free_idx, ICE_MAX_FV_WORDS);
 
-       for (count = 0; count < ICE_MAX_FV_WORDS; count++)
-               ice_set_bit(count, possible_idx);
+       ice_bitmap_set(possible_idx, 0, ICE_MAX_FV_WORDS);
 
        /* For each profile we are going to associate the recipe with, add the
         * recipes that are associated with that profile. This will give us