lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 08/17] net: hns3: Add ethtool related offload command
    Date
    This patch adds offload command related to "ethtool -K".

    Signed-off-by: Shenjian <shenjian15@huawei.com>
    Signed-off-by: Lipeng <lipeng321@huawei.com>
    ---
    drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +++
    drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 16 ++++++++++++++++
    drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +++++++++++++
    3 files changed, 32 insertions(+)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    index a5d3d22..a67d02a9 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    @@ -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,
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    index 2aeddf9..956c85f 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    @@ -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 |
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    index d0118ed..8099a7c 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -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);
    @@ -5361,6 +5373,7 @@ static int hclge_set_channels(struct hnae3_handle *handle, u32 new_tqps_num)
    .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,
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-12-18 10:11    [W:2.140 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site