#define IAVF_FLAG_AQ_SET_HENA                  BIT_ULL(12)
 #define IAVF_FLAG_AQ_SET_RSS_KEY               BIT_ULL(13)
 #define IAVF_FLAG_AQ_SET_RSS_LUT               BIT_ULL(14)
-#define IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE    BIT_ULL(15)
+#define IAVF_FLAG_AQ_SET_RSS_HFUNC             BIT_ULL(15)
+#define IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE    BIT_ULL(16)
 #define IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING     BIT_ULL(19)
 #define IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING    BIT_ULL(20)
 #define IAVF_FLAG_AQ_ENABLE_CHANNELS           BIT_ULL(21)
        struct iavf_vsi vsi;
        u32 aq_wait_count;
        /* RSS stuff */
+       enum virtchnl_rss_algorithm hfunc;
        u64 hena;
        u16 rss_key_size;
        u16 rss_lut_size;
 void iavf_set_hena(struct iavf_adapter *adapter);
 void iavf_set_rss_key(struct iavf_adapter *adapter);
 void iavf_set_rss_lut(struct iavf_adapter *adapter);
+void iavf_set_rss_hfunc(struct iavf_adapter *adapter);
 void iavf_enable_vlan_stripping(struct iavf_adapter *adapter);
 void iavf_disable_vlan_stripping(struct iavf_adapter *adapter);
 void iavf_virtchnl_completion(struct iavf_adapter *adapter,
 
  * @rss_cfg: the virtchnl message to be filled with RSS configuration setting
  * @packet_hdrs: the RSS configuration protocol header types
  * @hash_flds: the RSS configuration protocol hash fields
+ * @symm: if true, symmetric hash is required
  *
  * Returns 0 if the RSS configuration virtchnl message is filled successfully
  */
 int
 iavf_fill_adv_rss_cfg_msg(struct virtchnl_rss_cfg *rss_cfg,
-                         u32 packet_hdrs, u64 hash_flds)
+                         u32 packet_hdrs, u64 hash_flds, bool symm)
 {
        struct virtchnl_proto_hdrs *proto_hdrs = &rss_cfg->proto_hdrs;
        struct virtchnl_proto_hdr *hdr;
 
-       rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+       if (symm)
+               rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
+       else
+               rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
 
        proto_hdrs->tunnel_level = 0;   /* always outer layer */
 
 
 
        u32 packet_hdrs;
        u64 hash_flds;
+       bool symm;
 
        struct virtchnl_rss_cfg cfg_msg;
 };
 
 int
 iavf_fill_adv_rss_cfg_msg(struct virtchnl_rss_cfg *rss_cfg,
-                         u32 packet_hdrs, u64 hash_flds);
+                         u32 packet_hdrs, u64 hash_flds, bool symm);
 struct iavf_adv_rss *
 iavf_find_adv_rss_cfg_by_hdrs(struct iavf_adapter *adapter, u32 packet_hdrs);
 void
 
 /**
  * iavf_adv_rss_parse_hash_flds - parses hash fields from RSS hash input
  * @cmd: ethtool rxnfc command
+ * @symm: true if Symmetric Topelitz is set
  *
  * This function parses the rxnfc command and returns intended hash fields for
  * RSS configuration
  */
-static u64 iavf_adv_rss_parse_hash_flds(struct ethtool_rxnfc *cmd)
+static u64 iavf_adv_rss_parse_hash_flds(struct ethtool_rxnfc *cmd, bool symm)
 {
        u64 hfld = IAVF_ADV_RSS_HASH_INVALID;
 
        struct iavf_adv_rss *rss_old, *rss_new;
        bool rss_new_add = false;
        int count = 50, err = 0;
+       bool symm = false;
        u64 hash_flds;
        u32 hdrs;
 
        if (!ADV_RSS_SUPPORT(adapter))
                return -EOPNOTSUPP;
 
+       symm = !!(adapter->hfunc == VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC);
+
        hdrs = iavf_adv_rss_parse_hdrs(cmd);
        if (hdrs == IAVF_ADV_RSS_FLOW_SEG_HDR_NONE)
                return -EINVAL;
 
-       hash_flds = iavf_adv_rss_parse_hash_flds(cmd);
+       hash_flds = iavf_adv_rss_parse_hash_flds(cmd, symm);
        if (hash_flds == IAVF_ADV_RSS_HASH_INVALID)
                return -EINVAL;
 
        if (!rss_new)
                return -ENOMEM;
 
-       if (iavf_fill_adv_rss_cfg_msg(&rss_new->cfg_msg, hdrs, hash_flds)) {
+       if (iavf_fill_adv_rss_cfg_msg(&rss_new->cfg_msg, hdrs, hash_flds,
+                                     symm)) {
                kfree(rss_new);
                return -EINVAL;
        }
        if (rss_old) {
                if (rss_old->state != IAVF_ADV_RSS_ACTIVE) {
                        err = -EBUSY;
-               } else if (rss_old->hash_flds != hash_flds) {
+               } else if (rss_old->hash_flds != hash_flds ||
+                          rss_old->symm != symm) {
                        rss_old->state = IAVF_ADV_RSS_ADD_REQUEST;
                        rss_old->hash_flds = hash_flds;
+                       rss_old->symm = symm;
                        memcpy(&rss_old->cfg_msg, &rss_new->cfg_msg,
                               sizeof(rss_new->cfg_msg));
                } else {
                rss_new->state = IAVF_ADV_RSS_ADD_REQUEST;
                rss_new->packet_hdrs = hdrs;
                rss_new->hash_flds = hash_flds;
+               rss_new->symm = symm;
                list_add_tail(&rss_new->list, &adapter->adv_rss_list_head);
        }
        spin_unlock_bh(&adapter->adv_rss_lock);
        u16 i;
 
        rxfh->hfunc = ETH_RSS_HASH_TOP;
+       if (adapter->hfunc == VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC)
+               rxfh->input_xfrm |= RXH_XFRM_SYM_XOR;
+
        if (rxfh->key)
                memcpy(rxfh->key, adapter->rss_key, adapter->rss_key_size);
 
            rxfh->hfunc != ETH_RSS_HASH_TOP)
                return -EOPNOTSUPP;
 
+       if ((rxfh->input_xfrm & RXH_XFRM_SYM_XOR) &&
+           adapter->hfunc != VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC) {
+               if (!ADV_RSS_SUPPORT(adapter))
+                       return -EOPNOTSUPP;
+               adapter->hfunc = VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
+               adapter->aq_required |= IAVF_FLAG_AQ_SET_RSS_HFUNC;
+       } else if (!(rxfh->input_xfrm & RXH_XFRM_SYM_XOR) &&
+                   adapter->hfunc != VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC) {
+               adapter->hfunc = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+               adapter->aq_required |= IAVF_FLAG_AQ_SET_RSS_HFUNC;
+       }
+
        if (!rxfh->key && !rxfh->indir)
                return 0;
 
 static const struct ethtool_ops iavf_ethtool_ops = {
        .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
                                     ETHTOOL_COALESCE_USE_ADAPTIVE,
+       .cap_rss_sym_xor_supported = true,
        .get_drvinfo            = iavf_get_drvinfo,
        .get_link               = ethtool_op_get_link,
        .get_ringparam          = iavf_get_ringparam,
 
                iavf_set_rss_lut(adapter);
                return 0;
        }
+       if (adapter->aq_required & IAVF_FLAG_AQ_SET_RSS_HFUNC) {
+               iavf_set_rss_hfunc(adapter);
+               return 0;
+       }
 
        if (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_PROMISC_MODE) {
                iavf_set_promiscuous(adapter);
 
        kfree(vrl);
 }
 
+/**
+ * iavf_set_rss_hfunc
+ * @adapter: adapter structure
+ *
+ * Request the PF to set our RSS Hash function
+ **/
+void iavf_set_rss_hfunc(struct iavf_adapter *adapter)
+{
+       struct virtchnl_rss_hfunc *vrh;
+       int len = sizeof(*vrh);
+
+       if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {
+               /* bail because we already have a command pending */
+               dev_err(&adapter->pdev->dev, "Cannot set RSS Hash function, command %d pending\n",
+                       adapter->current_op);
+               return;
+       }
+       vrh = kzalloc(len, GFP_KERNEL);
+       if (!vrh)
+               return;
+       vrh->vsi_id = adapter->vsi.id;
+       vrh->rss_algorithm = adapter->hfunc;
+       adapter->current_op = VIRTCHNL_OP_CONFIG_RSS_HFUNC;
+       adapter->aq_required &= ~IAVF_FLAG_AQ_SET_RSS_HFUNC;
+       iavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_RSS_HFUNC, (u8 *)vrh, len);
+       kfree(vrh);
+}
+
 /**
  * iavf_enable_vlan_stripping
  * @adapter: adapter structure
                        dev_warn(&adapter->pdev->dev, "Failed to add VLAN filter, error %s\n",
                                 iavf_stat_str(&adapter->hw, v_retval));
                        break;
+               case VIRTCHNL_OP_CONFIG_RSS_HFUNC:
+                       dev_warn(&adapter->pdev->dev, "Failed to configure hash function, error %s\n",
+                                iavf_stat_str(&adapter->hw, v_retval));
+
+                       if (adapter->hfunc ==
+                                       VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC)
+                               adapter->hfunc =
+                                       VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;
+                       else
+                               adapter->hfunc =
+                                       VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
+
+                       break;
                default:
                        dev_err(&adapter->pdev->dev, "PF returned error %d (%s) to our request %d\n",
                                v_retval, iavf_stat_str(&adapter->hw, v_retval),
 
                                     NULL, 0);
 }
 
+/**
+ * ice_vc_config_rss_hfunc
+ * @vf: pointer to the VF info
+ * @msg: pointer to the msg buffer
+ *
+ * Configure the VF's RSS Hash function
+ */
+static int ice_vc_config_rss_hfunc(struct ice_vf *vf, u8 *msg)
+{
+       struct virtchnl_rss_hfunc *vrh = (struct virtchnl_rss_hfunc *)msg;
+       enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
+       u8 hfunc = ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ;
+       struct ice_vsi *vsi;
+
+       if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
+               v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+               goto error_param;
+       }
+
+       if (!ice_vc_isvalid_vsi_id(vf, vrh->vsi_id)) {
+               v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+               goto error_param;
+       }
+
+       if (!test_bit(ICE_FLAG_RSS_ENA, vf->pf->flags)) {
+               v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+               goto error_param;
+       }
+
+       vsi = ice_get_vf_vsi(vf);
+       if (!vsi) {
+               v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+               goto error_param;
+       }
+
+       if (vrh->rss_algorithm == VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC)
+               hfunc = ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ;
+
+       if (ice_set_rss_hfunc(vsi, hfunc))
+               v_ret = VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR;
+error_param:
+       return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_RSS_HFUNC, v_ret,
+                                    NULL, 0);
+}
+
 /**
  * ice_vc_cfg_promiscuous_mode_msg
  * @vf: pointer to the VF info
        .cfg_irq_map_msg = ice_vc_cfg_irq_map_msg,
        .config_rss_key = ice_vc_config_rss_key,
        .config_rss_lut = ice_vc_config_rss_lut,
+       .config_rss_hfunc = ice_vc_config_rss_hfunc,
        .get_stats_msg = ice_vc_get_stats_msg,
        .cfg_promiscuous_mode_msg = ice_vc_cfg_promiscuous_mode_msg,
        .add_vlan_msg = ice_vc_add_vlan_msg,
        .cfg_irq_map_msg = ice_vc_cfg_irq_map_msg,
        .config_rss_key = ice_vc_config_rss_key,
        .config_rss_lut = ice_vc_config_rss_lut,
+       .config_rss_hfunc = ice_vc_config_rss_hfunc,
        .get_stats_msg = ice_vc_get_stats_msg,
        .cfg_promiscuous_mode_msg = ice_vc_repr_cfg_promiscuous_mode,
        .add_vlan_msg = ice_vc_add_vlan_msg,
        case VIRTCHNL_OP_CONFIG_RSS_LUT:
                err = ops->config_rss_lut(vf, msg);
                break;
+       case VIRTCHNL_OP_CONFIG_RSS_HFUNC:
+               err = ops->config_rss_hfunc(vf, msg);
+               break;
        case VIRTCHNL_OP_GET_STATS:
                err = ops->get_stats_msg(vf, msg);
                break;
 
        int (*cfg_irq_map_msg)(struct ice_vf *vf, u8 *msg);
        int (*config_rss_key)(struct ice_vf *vf, u8 *msg);
        int (*config_rss_lut)(struct ice_vf *vf, u8 *msg);
+       int (*config_rss_hfunc)(struct ice_vf *vf, u8 *msg);
        int (*get_stats_msg)(struct ice_vf *vf, u8 *msg);
        int (*cfg_promiscuous_mode_msg)(struct ice_vf *vf, u8 *msg);
        int (*add_vlan_msg)(struct ice_vf *vf, u8 *msg);
 
 static const u32 rss_pf_allowlist_opcodes[] = {
        VIRTCHNL_OP_CONFIG_RSS_KEY, VIRTCHNL_OP_CONFIG_RSS_LUT,
        VIRTCHNL_OP_GET_RSS_HENA_CAPS, VIRTCHNL_OP_SET_RSS_HENA,
+       VIRTCHNL_OP_CONFIG_RSS_HFUNC,
 };
 
 /* VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC */
 
        VIRTCHNL_OP_GET_STATS = 15,
        VIRTCHNL_OP_RSVD = 16,
        VIRTCHNL_OP_EVENT = 17, /* must ALWAYS be 17 */
+       VIRTCHNL_OP_CONFIG_RSS_HFUNC = 18,
        /* opcode 19 is reserved */
        VIRTCHNL_OP_IWARP = 20, /* advanced opcode */
        VIRTCHNL_OP_RDMA = VIRTCHNL_OP_IWARP,
        VIRTCHNL_RSS_ALG_XOR_SYMMETRIC          = 3,
 };
 
+/* VIRTCHNL_OP_CONFIG_RSS_HFUNC
+ * VF sends this message to configure the RSS hash function. Only supported
+ * if both PF and VF drivers set the VIRTCHNL_VF_OFFLOAD_RSS_PF bit during
+ * configuration negotiation.
+ * The hash function is initialized to VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC
+ * by the PF.
+ */
+struct virtchnl_rss_hfunc {
+       u16 vsi_id;
+       u16 rss_algorithm; /* enum virtchnl_rss_algorithm */
+       u32 reserved;
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_rss_hfunc);
+
 /* VIRTCHNL_OP_ENABLE_CHANNELS
  * VIRTCHNL_OP_DISABLE_CHANNELS
  * VF sends these messages to enable or disable channels based on
                                                         vrl->lut_entries);
                }
                break;
+       case VIRTCHNL_OP_CONFIG_RSS_HFUNC:
+               valid_len = sizeof(struct virtchnl_rss_hfunc);
+               break;
        case VIRTCHNL_OP_GET_RSS_HENA_CAPS:
                break;
        case VIRTCHNL_OP_SET_RSS_HENA: