net: hns3: Add support for enable/disable flow director

This patch adds switch for flow director with ethtool command

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index e185d0485468589fa33e8091a2db35ab90a322cd..591ee2ee4bf6400dc57d78c3fe30644ce6b6f739 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -430,6 +430,7 @@ struct hnae3_ae_ops {
        int (*get_fd_all_rules)(struct hnae3_handle *handle,
                                struct ethtool_rxnfc *cmd, u32 *rule_locs);
        int (*restore_fd_rules)(struct hnae3_handle *handle);
+       void (*enable_fd)(struct hnae3_handle *handle, bool enable);
 };
 
 struct hnae3_dcb_ops {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 96f07ca3ea46522a5bc122e8bf3a797eeb23ee9e..c2692563a4d9ff66433019752e1a450215ecd93d 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1285,6 +1285,13 @@ static int hns3_nic_set_features(struct net_device *netdev,
                        return ret;
        }
 
+       if ((changed & NETIF_F_NTUPLE) && h->ae_algo->ops->enable_fd) {
+               if (features & NETIF_F_NTUPLE)
+                       h->ae_algo->ops->enable_fd(h, true);
+               else
+                       h->ae_algo->ops->enable_fd(h, false);
+       }
+
        netdev->features = features;
        return 0;
 }
@@ -1770,8 +1777,14 @@ static void hns3_set_default_feature(struct net_device *netdev)
                NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |
                NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_SCTP_CRC;
 
-       if (pdev->revision != 0x20)
+       if (pdev->revision >= 0x21) {
                netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+
+               if (!(h->flags & HNAE3_SUPPORT_VF)) {
+                       netdev->hw_features |= NETIF_F_NTUPLE;
+                       netdev->features |= NETIF_F_NTUPLE;
+               }
+       }
 }
 
 static int hns3_alloc_buffer(struct hns3_enet_ring *ring,

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 90701affd7d725f9aed7142974f0ca85f3a60c1b..21ca4af3b37aded0024d21b323cb16293fe04a82 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4597,6 +4597,18 @@ static int hclge_get_all_rules(struct hnae3_handle *handle,
        return 0;
 }
 
+static void hclge_enable_fd(struct hnae3_handle *handle, bool enable)
+{
+       struct hclge_vport *vport = hclge_get_vport(handle);
+       struct hclge_dev *hdev = vport->back;
+
+       hdev->fd_cfg.fd_en = enable;
+       if (!enable)
+               hclge_del_all_fd_entries(handle, false);
+       else
+               hclge_restore_fd_entries(handle);
+}
+
 static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
 {
        struct hclge_desc desc;
@@ -7337,6 +7349,7 @@ static const struct hnae3_ae_ops hclge_ops = {
        .get_fd_rule_info = hclge_get_fd_rule_info,
        .get_fd_all_rules = hclge_get_all_rules,
        .restore_fd_rules = hclge_restore_fd_entries,
+       .enable_fd = hclge_enable_fd,
 };
 
 static struct hnae3_ae_algo ae_algo = {