|
Thomas Bogendoerfer |
9ef2ce |
From: Peng Li <lipeng321@huawei.com>
|
|
Thomas Bogendoerfer |
9ef2ce |
Date: Fri, 22 Dec 2017 12:21:47 +0800
|
|
Thomas Bogendoerfer |
9ef2ce |
Subject: net: hns3: add ethtool related offload command
|
|
Thomas Bogendoerfer |
9ef2ce |
Patch-mainline: v4.16-rc1
|
|
Thomas Bogendoerfer |
9ef2ce |
Git-commit: 052ece6dc19c610a48c1cedeee1b2f1478838e99
|
|
Thomas Bogendoerfer |
9ef2ce |
References: bsc#1104353 FATE#326415
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
This patch adds offload command related to "ethtool -K".
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
Signed-off-by: Peng Li <lipeng321@huawei.com>
|
|
Thomas Bogendoerfer |
9ef2ce |
Signed-off-by: Jian Shen <shenjian15@huawei.com>
|
|
Thomas Bogendoerfer |
9ef2ce |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Thomas Bogendoerfer |
9ef2ce |
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
|
|
Thomas Bogendoerfer |
9ef2ce |
---
|
|
Thomas Bogendoerfer |
9ef2ce |
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +++
|
|
Thomas Bogendoerfer |
9ef2ce |
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 16 ++++++++++++++++
|
|
Thomas Bogendoerfer |
9ef2ce |
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +++++++++++++
|
|
Thomas Bogendoerfer |
9ef2ce |
3 files changed, 32 insertions(+)
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
|
|
Thomas Bogendoerfer |
9ef2ce |
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -278,6 +278,8 @@ struct hnae3_ae_dev {
|
|
Thomas Bogendoerfer |
9ef2ce |
* Set vlan filter config of Ports
|
|
Thomas Bogendoerfer |
9ef2ce |
* set_vf_vlan_filter()
|
|
Thomas Bogendoerfer |
9ef2ce |
* Set vlan filter config of vf
|
|
Thomas Bogendoerfer |
9ef2ce |
+ * enable_hw_strip_rxvtag()
|
|
Thomas Bogendoerfer |
9ef2ce |
+ * Enable/disable hardware strip vlan tag of packets received
|
|
Thomas Bogendoerfer |
9ef2ce |
*/
|
|
Thomas Bogendoerfer |
9ef2ce |
struct hnae3_ae_ops {
|
|
Thomas Bogendoerfer |
9ef2ce |
int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -384,6 +386,7 @@ struct hnae3_ae_ops {
|
|
Thomas Bogendoerfer |
9ef2ce |
u16 vlan_id, bool is_kill);
|
|
Thomas Bogendoerfer |
9ef2ce |
int (*set_vf_vlan_filter)(struct hnae3_handle *handle, int vfid,
|
|
Thomas Bogendoerfer |
9ef2ce |
u16 vlan, u8 qos, __be16 proto);
|
|
Thomas Bogendoerfer |
9ef2ce |
+ int (*enable_hw_strip_rxvtag)(struct hnae3_handle *handle, bool enable);
|
|
Thomas Bogendoerfer |
9ef2ce |
void (*reset_event)(struct hnae3_handle *handle,
|
|
Thomas Bogendoerfer |
9ef2ce |
enum hnae3_reset_type reset);
|
|
Thomas Bogendoerfer |
9ef2ce |
void (*get_channels)(struct hnae3_handle *handle,
|
|
Thomas Bogendoerfer |
9ef2ce |
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
Thomas Bogendoerfer |
9ef2ce |
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -1031,6 +1031,9 @@ static int hns3_nic_set_features(struct
|
|
Thomas Bogendoerfer |
9ef2ce |
netdev_features_t features)
|
|
Thomas Bogendoerfer |
9ef2ce |
{
|
|
Thomas Bogendoerfer |
9ef2ce |
struct hns3_nic_priv *priv = netdev_priv(netdev);
|
|
Thomas Bogendoerfer |
9ef2ce |
+ struct hnae3_handle *h = priv->ae_handle;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ netdev_features_t changed;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ int ret;
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
if (features & (NETIF_F_TSO | NETIF_F_TSO6)) {
|
|
Thomas Bogendoerfer |
9ef2ce |
priv->ops.fill_desc = hns3_fill_desc_tso;
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -1040,6 +1043,17 @@ static int hns3_nic_set_features(struct
|
|
Thomas Bogendoerfer |
9ef2ce |
priv->ops.maybe_stop_tx = hns3_nic_maybe_stop_tx;
|
|
Thomas Bogendoerfer |
9ef2ce |
}
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
+ changed = netdev->features ^ features;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
|
|
Thomas Bogendoerfer |
9ef2ce |
+ if (features & NETIF_F_HW_VLAN_CTAG_RX)
|
|
Thomas Bogendoerfer |
9ef2ce |
+ ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);
|
|
Thomas Bogendoerfer |
9ef2ce |
+ else
|
|
Thomas Bogendoerfer |
9ef2ce |
+ ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, false);
|
|
Thomas Bogendoerfer |
9ef2ce |
+
|
|
Thomas Bogendoerfer |
9ef2ce |
+ if (ret)
|
|
Thomas Bogendoerfer |
9ef2ce |
+ return ret;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ }
|
|
Thomas Bogendoerfer |
9ef2ce |
+
|
|
Thomas Bogendoerfer |
9ef2ce |
netdev->features = features;
|
|
Thomas Bogendoerfer |
9ef2ce |
return 0;
|
|
Thomas Bogendoerfer |
9ef2ce |
}
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -1470,6 +1484,7 @@ static void hns3_set_default_feature(str
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
netdev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_HW_VLAN_CTAG_FILTER |
|
|
Thomas Bogendoerfer |
9ef2ce |
+ NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -1484,6 +1499,7 @@ static void hns3_set_default_feature(str
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_HW_VLAN_CTAG_FILTER |
|
|
Thomas Bogendoerfer |
9ef2ce |
+ NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |
|
|
Thomas Bogendoerfer |
9ef2ce |
NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |
|
|
Thomas Bogendoerfer |
9ef2ce |
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
Thomas Bogendoerfer |
9ef2ce |
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -4547,6 +4547,18 @@ static int hclge_init_vlan_config(struct
|
|
Thomas Bogendoerfer |
9ef2ce |
return hclge_set_port_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);
|
|
Thomas Bogendoerfer |
9ef2ce |
}
|
|
Thomas Bogendoerfer |
9ef2ce |
|
|
Thomas Bogendoerfer |
9ef2ce |
+static int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)
|
|
Thomas Bogendoerfer |
9ef2ce |
+{
|
|
Thomas Bogendoerfer |
9ef2ce |
+ struct hclge_vport *vport = hclge_get_vport(handle);
|
|
Thomas Bogendoerfer |
9ef2ce |
+
|
|
Thomas Bogendoerfer |
9ef2ce |
+ vport->rxvlan_cfg.strip_tag1_en = false;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ vport->rxvlan_cfg.strip_tag2_en = enable;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ vport->rxvlan_cfg.vlan1_vlan_prionly = false;
|
|
Thomas Bogendoerfer |
9ef2ce |
+ vport->rxvlan_cfg.vlan2_vlan_prionly = false;
|
|
Thomas Bogendoerfer |
9ef2ce |
+
|
|
Thomas Bogendoerfer |
9ef2ce |
+ return hclge_set_vlan_rx_offload_cfg(vport);
|
|
Thomas Bogendoerfer |
9ef2ce |
+}
|
|
Thomas Bogendoerfer |
9ef2ce |
+
|
|
Thomas Bogendoerfer |
9ef2ce |
static int hclge_set_mtu(struct hnae3_handle *handle, int new_mtu)
|
|
Thomas Bogendoerfer |
9ef2ce |
{
|
|
Thomas Bogendoerfer |
9ef2ce |
struct hclge_vport *vport = hclge_get_vport(handle);
|
|
Thomas Bogendoerfer |
9ef2ce |
@@ -5363,6 +5375,7 @@ static const struct hnae3_ae_ops hclge_o
|
|
Thomas Bogendoerfer |
9ef2ce |
.get_mdix_mode = hclge_get_mdix_mode,
|
|
Thomas Bogendoerfer |
9ef2ce |
.set_vlan_filter = hclge_set_port_vlan_filter,
|
|
Thomas Bogendoerfer |
9ef2ce |
.set_vf_vlan_filter = hclge_set_vf_vlan_filter,
|
|
Thomas Bogendoerfer |
9ef2ce |
+ .enable_hw_strip_rxvtag = hclge_en_hw_strip_rxvtag,
|
|
Thomas Bogendoerfer |
9ef2ce |
.reset_event = hclge_reset_event,
|
|
Thomas Bogendoerfer |
9ef2ce |
.get_tqps_and_rss_info = hclge_get_tqps_and_rss_info,
|
|
Thomas Bogendoerfer |
9ef2ce |
.set_channels = hclge_set_channels,
|