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

Commit 052ece6d authored by Peng Li's avatar Peng Li Committed by David S. Miller
Browse files

net: hns3: add ethtool related offload command 



This patch adds offload command related to "ethtool -K".

Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f6ea83f

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ struct hnae3_ae_dev { 
 *   Set vlan filter config of Ports

 * set_vf_vlan_filter()

 *   Set vlan filter config of vf

 * enable_hw_strip_rxvtag()

 *   Enable/disable hardware strip vlan tag of packets received

 */

struct hnae3_ae_ops {

	int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
@@ -384,6 +386,7 @@ struct hnae3_ae_ops { 
			       u16 vlan_id, bool is_kill);

	int (*set_vf_vlan_filter)(struct hnae3_handle *handle, int vfid,

				  u16 vlan, u8 qos, __be16 proto);

	int (*enable_hw_strip_rxvtag)(struct hnae3_handle *handle, bool enable);

	void (*reset_event)(struct hnae3_handle *handle,

			    enum hnae3_reset_type reset);

	void (*get_channels)(struct hnae3_handle *handle,

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+16 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,9 @@ static int hns3_nic_set_features(struct net_device *netdev, 
				 netdev_features_t features)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;

	netdev_features_t changed;

	int ret;



	if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {

		priv->ops.fill_desc = hns3_fill_desc_tso;
@@ -1041,6 +1044,17 @@ static int hns3_nic_set_features(struct net_device *netdev, 
		priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;

	}



	changed = netdev->features ^ features;

	if (changed & NETIF_F_HW_VLAN_CTAG_RX) {

		if (features & NETIF_F_HW_VLAN_CTAG_RX)

			ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);

		else

			ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, false);



		if (ret)

			return ret;

	}



	netdev->features = features;

	return 0;

}
@@ -1492,6 +1506,7 @@ static void hns3_set_default_feature(struct net_device *netdev) 


	netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

		NETIF_F_HW_VLAN_CTAG_FILTER |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |
@@ -1506,6 +1521,7 @@ static void hns3_set_default_feature(struct net_device *netdev) 


	netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

		NETIF_F_HW_VLAN_CTAG_FILTER |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+13 −0
Original line number Diff line number Diff line
@@ -4547,6 +4547,18 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) 
	return hclge_set_port_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);

}



static int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)

{

	struct hclge_vport *vport = hclge_get_vport(handle);



	vport->rxvlan_cfg.strip_tag1_en = false;

	vport->rxvlan_cfg.strip_tag2_en = enable;

	vport->rxvlan_cfg.vlan1_vlan_prionly = false;

	vport->rxvlan_cfg.vlan2_vlan_prionly = false;



	return hclge_set_vlan_rx_offload_cfg(vport);

}



static int hclge_set_mtu(struct hnae3_handle *handle, int new_mtu)

{

	struct hclge_vport *vport = hclge_get_vport(handle);
@@ -5362,6 +5374,7 @@ static const struct hnae3_ae_ops hclge_ops = { 
	.get_mdix_mode = hclge_get_mdix_mode,

	.set_vlan_filter = hclge_set_port_vlan_filter,

	.set_vf_vlan_filter = hclge_set_vf_vlan_filter,

	.enable_hw_strip_rxvtag = hclge_en_hw_strip_rxvtag,

	.reset_event = hclge_reset_event,

	.get_tqps_and_rss_info = hclge_get_tqps_and_rss_info,

	.set_channels = hclge_set_channels,