virtchnl2: rename enum virtchnl2_cap_rss

The "enum virtchnl2_cap_rss" will be used for negotiating flow
steering capabilities. Instead of adding a new enum, rename
virtchnl2_cap_rss to virtchnl2_flow_types. Also rename the enum's
constants.

Flow steering will use this enum in the next patches.

Reviewed-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h
index 0cf9120d1f97ce0c99352b45290ff31ebaa71694..65d62de7b68ed7dd6f672fc97a722415ce69d01a 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf.h
+++ b/drivers/net/ethernet/intel/idpf/idpf.h
@@ -667,16 +667,16 @@ static inline bool idpf_is_rdma_cap_ena(struct idpf_adapter *adapter)
 }
 
 #define IDPF_CAP_RSS (\
-       VIRTCHNL2_CAP_RSS_IPV4_TCP      |\
-       VIRTCHNL2_CAP_RSS_IPV4_TCP      |\
-       VIRTCHNL2_CAP_RSS_IPV4_UDP      |\
-       VIRTCHNL2_CAP_RSS_IPV4_SCTP     |\
-       VIRTCHNL2_CAP_RSS_IPV4_OTHER    |\
-       VIRTCHNL2_CAP_RSS_IPV6_TCP      |\
-       VIRTCHNL2_CAP_RSS_IPV6_TCP      |\
-       VIRTCHNL2_CAP_RSS_IPV6_UDP      |\
-       VIRTCHNL2_CAP_RSS_IPV6_SCTP     |\
-       VIRTCHNL2_CAP_RSS_IPV6_OTHER)
+       VIRTCHNL2_FLOW_IPV4_TCP         |\
+       VIRTCHNL2_FLOW_IPV4_TCP         |\
+       VIRTCHNL2_FLOW_IPV4_UDP         |\
+       VIRTCHNL2_FLOW_IPV4_SCTP        |\
+       VIRTCHNL2_FLOW_IPV4_OTHER       |\
+       VIRTCHNL2_FLOW_IPV6_TCP         |\
+       VIRTCHNL2_FLOW_IPV6_TCP         |\
+       VIRTCHNL2_FLOW_IPV6_UDP         |\
+       VIRTCHNL2_FLOW_IPV6_SCTP        |\
+       VIRTCHNL2_FLOW_IPV6_OTHER)
 
 #define IDPF_CAP_RSC (\
        VIRTCHNL2_CAP_RSC_IPV4_TCP      |\

diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index 0d2199ac5c3e4f7b597e31a4b954c4807f46df16..1b1570026acf9e72c74c25938187fc9d00d66a51 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -850,14 +850,14 @@ static int idpf_send_get_caps_msg(struct idpf_adapter *adapter)
                            VIRTCHNL2_CAP_SEG_TX_SINGLE_TUNNEL);
 
        caps.rss_caps =
-               cpu_to_le64(VIRTCHNL2_CAP_RSS_IPV4_TCP          |
-                           VIRTCHNL2_CAP_RSS_IPV4_UDP          |
-                           VIRTCHNL2_CAP_RSS_IPV4_SCTP         |
-                           VIRTCHNL2_CAP_RSS_IPV4_OTHER        |
-                           VIRTCHNL2_CAP_RSS_IPV6_TCP          |
-                           VIRTCHNL2_CAP_RSS_IPV6_UDP          |
-                           VIRTCHNL2_CAP_RSS_IPV6_SCTP         |
-                           VIRTCHNL2_CAP_RSS_IPV6_OTHER);
+               cpu_to_le64(VIRTCHNL2_FLOW_IPV4_TCP             |
+                           VIRTCHNL2_FLOW_IPV4_UDP             |
+                           VIRTCHNL2_FLOW_IPV4_SCTP            |
+                           VIRTCHNL2_FLOW_IPV4_OTHER           |
+                           VIRTCHNL2_FLOW_IPV6_TCP             |
+                           VIRTCHNL2_FLOW_IPV6_UDP             |
+                           VIRTCHNL2_FLOW_IPV6_SCTP            |
+                           VIRTCHNL2_FLOW_IPV6_OTHER);
 
        caps.hsplit_caps =
                cpu_to_le32(VIRTCHNL2_CAP_RX_HSPLIT_AT_L4V4     |

diff --git a/drivers/net/ethernet/intel/idpf/virtchnl2.h b/drivers/net/ethernet/intel/idpf/virtchnl2.h
index 48d3cc9236a46dba5d4cde98642febb027fcac51..8d316aa701ad029a37234cf43b89eed0f361dce6 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/virtchnl2.h
+++ b/drivers/net/ethernet/intel/idpf/virtchnl2.h
@@ -153,22 +153,22 @@ enum virtchnl2_cap_seg {
        VIRTCHNL2_CAP_SEG_TX_DOUBLE_TUNNEL      = BIT(8),
 };
 
-/* Receive Side Scaling Flow type capability flags */
-enum virtchnl2_cap_rss {
-       VIRTCHNL2_CAP_RSS_IPV4_TCP              = BIT(0),
-       VIRTCHNL2_CAP_RSS_IPV4_UDP              = BIT(1),
-       VIRTCHNL2_CAP_RSS_IPV4_SCTP             = BIT(2),
-       VIRTCHNL2_CAP_RSS_IPV4_OTHER            = BIT(3),
-       VIRTCHNL2_CAP_RSS_IPV6_TCP              = BIT(4),
-       VIRTCHNL2_CAP_RSS_IPV6_UDP              = BIT(5),
-       VIRTCHNL2_CAP_RSS_IPV6_SCTP             = BIT(6),
-       VIRTCHNL2_CAP_RSS_IPV6_OTHER            = BIT(7),
-       VIRTCHNL2_CAP_RSS_IPV4_AH               = BIT(8),
-       VIRTCHNL2_CAP_RSS_IPV4_ESP              = BIT(9),
-       VIRTCHNL2_CAP_RSS_IPV4_AH_ESP           = BIT(10),
-       VIRTCHNL2_CAP_RSS_IPV6_AH               = BIT(11),
-       VIRTCHNL2_CAP_RSS_IPV6_ESP              = BIT(12),
-       VIRTCHNL2_CAP_RSS_IPV6_AH_ESP           = BIT(13),
+/* Receive Side Scaling and Flow Steering Flow type capability flags */
+enum virtchnl2_flow_types {
+       VIRTCHNL2_FLOW_IPV4_TCP         = BIT(0),
+       VIRTCHNL2_FLOW_IPV4_UDP         = BIT(1),
+       VIRTCHNL2_FLOW_IPV4_SCTP        = BIT(2),
+       VIRTCHNL2_FLOW_IPV4_OTHER       = BIT(3),
+       VIRTCHNL2_FLOW_IPV6_TCP         = BIT(4),
+       VIRTCHNL2_FLOW_IPV6_UDP         = BIT(5),
+       VIRTCHNL2_FLOW_IPV6_SCTP        = BIT(6),
+       VIRTCHNL2_FLOW_IPV6_OTHER       = BIT(7),
+       VIRTCHNL2_FLOW_IPV4_AH          = BIT(8),
+       VIRTCHNL2_FLOW_IPV4_ESP         = BIT(9),
+       VIRTCHNL2_FLOW_IPV4_AH_ESP      = BIT(10),
+       VIRTCHNL2_FLOW_IPV6_AH          = BIT(11),
+       VIRTCHNL2_FLOW_IPV6_ESP         = BIT(12),
+       VIRTCHNL2_FLOW_IPV6_AH_ESP      = BIT(13),
 };
 
 /* Header split capability flags */
@@ -461,7 +461,7 @@ VIRTCHNL2_CHECK_STRUCT_LEN(8, virtchnl2_version_info);
  * @seg_caps: See enum virtchnl2_cap_seg.
  * @hsplit_caps: See enum virtchnl2_cap_rx_hsplit_at.
  * @rsc_caps: See enum virtchnl2_cap_rsc.
- * @rss_caps: See enum virtchnl2_cap_rss.
+ * @rss_caps: See enum virtchnl2_flow_types.
  * @other_caps: See enum virtchnl2_cap_other.
  * @mailbox_dyn_ctl: DYN_CTL register offset and vector id for mailbox
  *                  provided by CP.