iavf: field prep conversion

Refactor iavf driver to use FIELD_PREP(), which reduces lines of code
and adds clarity of intent.

This code was generated by the following coccinelle/spatch script and
then manually repaired.

Clean up a couple spots in the code that had repetitive
y = cpu_to_*((blah << blah_blah) & blat)
y |= cpu_to_*((blahs << blahs_blahs) & blats)
to
x = FIELD_PREP(blat blah)
x |= FIELD_PREP(blats, blahs)
y = cpu_to_*(x);

@prep2@
constant shift,mask;
type T;
expression a;
@@
-(((T)(a) << shift) & mask)
+FIELD_PREP(mask, a)

@prep@
constant shift,mask;
type T;
expression a;
@@
-((T)((a) << shift) & mask)
+FIELD_PREP(mask, a)

Cc: Julia Lawall <Julia.Lawall@inria.fr>
Cc: Ahmed Zaki <ahmed.zaki@intel.com>
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c
index af5cc69f26e3cab96b9c88d466530b02d370afe2..5a25233a89d5fdb3f1026ce7c9e6646c50f6eb48 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_common.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_common.c
@@ -331,6 +331,7 @@ static enum iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw,
        struct iavf_aq_desc desc;
        struct iavf_aqc_get_set_rss_lut *cmd_resp =
                   (struct iavf_aqc_get_set_rss_lut *)&desc.params.raw;
+       u16 flags;
 
        if (set)
                iavf_fill_default_direct_cmd_desc(&desc,
@@ -343,22 +344,18 @@ static enum iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw,
        desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_BUF);
        desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_RD);
 
-       cmd_resp->vsi_id =
-                       cpu_to_le16((u16)((vsi_id <<
-                                         IAVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT) &
-                                         IAVF_AQC_SET_RSS_LUT_VSI_ID_MASK));
-       cmd_resp->vsi_id |= cpu_to_le16((u16)IAVF_AQC_SET_RSS_LUT_VSI_VALID);
+       vsi_id = FIELD_PREP(IAVF_AQC_SET_RSS_LUT_VSI_ID_MASK, vsi_id) |
+                FIELD_PREP(IAVF_AQC_SET_RSS_LUT_VSI_VALID, 1);
+       cmd_resp->vsi_id = cpu_to_le16(vsi_id);
 
        if (pf_lut)
-               cmd_resp->flags |= cpu_to_le16((u16)
-                                       ((IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_PF <<
-                                       IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &
-                                       IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));
+               flags = FIELD_PREP(IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK,
+                                  IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_PF);
        else
-               cmd_resp->flags |= cpu_to_le16((u16)
-                                       ((IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_VSI <<
-                                       IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &
-                                       IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));
+               flags = FIELD_PREP(IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK,
+                                  IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_VSI);
+
+       cmd_resp->flags = cpu_to_le16(flags);
 
        status = iavf_asq_send_command(hw, &desc, lut, lut_size, NULL);
 
@@ -412,11 +409,9 @@ iavf_status iavf_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id,
        desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_BUF);
        desc.flags |= cpu_to_le16((u16)IAVF_AQ_FLAG_RD);
 
-       cmd_resp->vsi_id =
-                       cpu_to_le16((u16)((vsi_id <<
-                                         IAVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &
-                                         IAVF_AQC_SET_RSS_KEY_VSI_ID_MASK));
-       cmd_resp->vsi_id |= cpu_to_le16((u16)IAVF_AQC_SET_RSS_KEY_VSI_VALID);
+       vsi_id = FIELD_PREP(IAVF_AQC_SET_RSS_KEY_VSI_ID_MASK, vsi_id) |
+                FIELD_PREP(IAVF_AQC_SET_RSS_KEY_VSI_VALID, 1);
+       cmd_resp->vsi_id = cpu_to_le16(vsi_id);
 
        status = iavf_asq_send_command(hw, &desc, key, key_size, NULL);
 

diff --git a/drivers/net/ethernet/intel/iavf/iavf_fdir.c b/drivers/net/ethernet/intel/iavf/iavf_fdir.c
index 65ddcd81c993e72869527fb13b0d9127175a8502..2d47b0b4640e4a05c116a5fb5e4b6644b490cc47 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_fdir.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_fdir.c
@@ -358,7 +358,7 @@ iavf_fill_fdir_ip6_hdr(struct iavf_fdir_fltr *fltr,
 
        if (fltr->ip_mask.tclass == U8_MAX) {
                iph->priority = (fltr->ip_data.tclass >> 4) & 0xF;
-               iph->flow_lbl[0] = (fltr->ip_data.tclass << 4) & 0xF0;
+               iph->flow_lbl[0] = FIELD_PREP(0xF0, fltr->ip_data.tclass);
                VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, TC);
        }