ice: Add 52 byte RSS hash key support

Add support to set 52 byte RSS hash key.

Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
index 583f92d4db4c2db4804a3648423a75402552d92b..6ef083002f5b0fb25433635a4358fa64cccb58bc 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
@@ -1291,6 +1291,9 @@ struct ice_aqc_get_set_rss_key {
 
 #define ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE      0x28
 #define ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE     0xC
+#define ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE \
+                               (ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE + \
+                                ICE_AQC_GET_SET_RSS_KEY_DATA_HASH_KEY_SIZE)
 
 struct ice_aqc_get_set_rss_keys {
        u8 standard_rss_key[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE];

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index e75d8c4fadc6252ccf4f462b82a99cb496b3e46c..982a3a9e9b8d62b97b8aac0cfb0eca033a6de3ae 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -1394,7 +1394,6 @@ int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena)
  */
 static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)
 {
-       u8 seed[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE];
        struct ice_aqc_get_set_rss_keys *key;
        struct ice_pf *pf = vsi->back;
        enum ice_status status;
@@ -1429,13 +1428,12 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)
        }
 
        if (vsi->rss_hkey_user)
-               memcpy(seed, vsi->rss_hkey_user,
-                      ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);
+               memcpy(key,
+                      (struct ice_aqc_get_set_rss_keys *)vsi->rss_hkey_user,
+                      ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE);
        else
-               netdev_rss_key_fill((void *)seed,
-                                   ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);
-       memcpy(&key->standard_rss_key, seed,
-              ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE);
+               netdev_rss_key_fill((void *)key,
+                                   ICE_GET_SET_RSS_KEY_EXTEND_KEY_SIZE);
 
        status = ice_aq_set_rss_key(&pf->hw, vsi->idx, key);