Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48398b6e authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by David S. Miller
Browse files

enic: set UDP rss flag 



New hardware needs UDP flag set to enable UDP L4 rss hash. Add ethtool
get option to display supported rss flow hash.

Signed-off-by: default avatarGovindarajulu Varadarajan <gvaradar@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e24c642

drivers/net/ethernet/cisco/enic/enic_ethtool.c

+36 −0
Original line number Diff line number Diff line
@@ -474,6 +474,39 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd) 
	return 0;

}



static int enic_get_rx_flow_hash(struct enic *enic, struct ethtool_rxnfc *cmd)

{

	cmd->data = 0;



	switch (cmd->flow_type) {

	case TCP_V6_FLOW:

	case TCP_V4_FLOW:

		cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

		/* Fall through */

	case UDP_V6_FLOW:

	case UDP_V4_FLOW:

		if (vnic_dev_capable_udp_rss(enic->vdev))

			cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

		/* Fall through */

	case SCTP_V4_FLOW:

	case AH_ESP_V4_FLOW:

	case AH_V4_FLOW:

	case ESP_V4_FLOW:

	case SCTP_V6_FLOW:

	case AH_ESP_V6_FLOW:

	case AH_V6_FLOW:

	case ESP_V6_FLOW:

	case IPV4_FLOW:

	case IPV6_FLOW:

		cmd->data |= RXH_IP_SRC | RXH_IP_DST;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,

			  u32 *rule_locs)

{
@@ -500,6 +533,9 @@ static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 
		ret = enic_grxclsrule(enic, cmd);

		spin_unlock_bh(&enic->rfs_h.lock);

		break;

	case ETHTOOL_GRXFH:

		ret = enic_get_rx_flow_hash(enic, cmd);

		break;

	default:

		ret = -EOPNOTSUPP;

		break;

drivers/net/ethernet/cisco/enic/enic_main.c

+3 −1
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ static int enic_set_rss_nic_cfg(struct enic *enic) 
{

	struct device *dev = enic_get_dev(enic);

	const u8 rss_default_cpu = 0;

	const u8 rss_hash_type = NIC_CFG_RSS_HASH_TYPE_IPV4 |

	u8 rss_hash_type = NIC_CFG_RSS_HASH_TYPE_IPV4 |

		NIC_CFG_RSS_HASH_TYPE_TCP_IPV4 |

		NIC_CFG_RSS_HASH_TYPE_IPV6 |

		NIC_CFG_RSS_HASH_TYPE_TCP_IPV6;
@@ -2324,6 +2324,8 @@ static int enic_set_rss_nic_cfg(struct enic *enic) 
	const u8 rss_base_cpu = 0;

	u8 rss_enable = ENIC_SETTING(enic, RSS) && (enic->rq_count > 1);



	if (vnic_dev_capable_udp_rss(enic->vdev))

		rss_hash_type |= NIC_CFG_RSS_HASH_TYPE_UDP;

	if (rss_enable) {

		if (!enic_set_rsskey(enic)) {

			if (enic_set_rsscpu(enic, rss_hash_bits)) {

drivers/net/ethernet/cisco/enic/vnic_dev.c

+17 −0
Original line number Diff line number Diff line
@@ -1281,3 +1281,20 @@ int vnic_dev_get_supported_feature_ver(struct vnic_dev *vdev, u8 feature, 


	return ret;

}



bool vnic_dev_capable_udp_rss(struct vnic_dev *vdev)

{

	u64 a0 = CMD_NIC_CFG, a1 = 0;

	u64 rss_hash_type;

	int wait = 1000;

	int err;



	err = vnic_dev_cmd(vdev, CMD_CAPABILITY, &a0, &a1, wait);

	if (err || !a0)

		return 0;



	rss_hash_type = (a1 >> NIC_CFG_RSS_HASH_TYPE_SHIFT) &

			NIC_CFG_RSS_HASH_TYPE_MASK_FIELD;



	return (rss_hash_type & NIC_CFG_RSS_HASH_TYPE_UDP);

}

drivers/net/ethernet/cisco/enic/vnic_dev.h

+1 −0
Original line number Diff line number Diff line
@@ -184,5 +184,6 @@ int vnic_dev_overlay_offload_cfg(struct vnic_dev *vdev, u8 overlay, 
				 u16 vxlan_udp_port_number);

int vnic_dev_get_supported_feature_ver(struct vnic_dev *vdev, u8 feature,

				       u64 *supported_versions, u64 *a1);

bool vnic_dev_capable_udp_rss(struct vnic_dev *vdev);



#endif /* _VNIC_DEV_H_ */

drivers/net/ethernet/cisco/enic/vnic_nic.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6		(1 << 4)

#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX		(1 << 5)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX	(1 << 6)

#define NIC_CFG_RSS_HASH_TYPE_UDP		(1 << 7)



static inline void vnic_set_nic_cfg(u32 *nic_cfg,

	u8 rss_default_cpu, u8 rss_hash_type,