lkml.org 
[lkml]   [2017]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V4 net-next 01/17] net: hns3: add support to query tqps number
    Date
    This patch adds the support to query tqps number for PF driver
    by using ehtool -l command.

    Signed-off-by: Lipeng <lipeng321@huawei.com>
    Signed-off-by: Mingguang Qu <qumingguang@huawei.com>
    ---
    drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 ++
    drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 10 ++++++++++
    .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 21 +++++++++++++++++++++
    3 files changed, 33 insertions(+)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    index a9e2b32..d887721 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
    @@ -386,6 +386,8 @@ struct hnae3_ae_ops {
    u16 vlan, u8 qos, __be16 proto);
    void (*reset_event)(struct hnae3_handle *handle,
    enum hnae3_reset_type reset);
    + void (*get_channels)(struct hnae3_handle *handle,
    + struct ethtool_channels *ch);
    };

    struct hnae3_dcb_ops {
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
    index 65a69b4..23af36c 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
    @@ -849,6 +849,15 @@ static int hns3_nway_reset(struct net_device *netdev)
    return genphy_restart_aneg(phy);
    }

    +void hns3_get_channels(struct net_device *netdev,
    + struct ethtool_channels *ch)
    +{
    + struct hnae3_handle *h = hns3_get_handle(netdev);
    +
    + if (h->ae_algo->ops->get_channels)
    + h->ae_algo->ops->get_channels(h, ch);
    +}
    +
    static const struct ethtool_ops hns3vf_ethtool_ops = {
    .get_drvinfo = hns3_get_drvinfo,
    .get_ringparam = hns3_get_ringparam,
    @@ -883,6 +892,7 @@ static int hns3_nway_reset(struct net_device *netdev)
    .get_link_ksettings = hns3_get_link_ksettings,
    .set_link_ksettings = hns3_set_link_ksettings,
    .nway_reset = hns3_nway_reset,
    + .get_channels = hns3_get_channels,
    };

    void hns3_ethtool_set_ops(struct net_device *netdev)
    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    index e97fd66..a3101bc 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -5002,6 +5002,26 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
    ae_dev->priv = NULL;
    }

    +static u32 hclge_get_max_channels(struct hnae3_handle *handle)
    +{
    + struct hnae3_knic_private_info *kinfo = &handle->kinfo;
    + struct hclge_vport *vport = hclge_get_vport(handle);
    + struct hclge_dev *hdev = vport->back;
    +
    + return min_t(u32, hdev->rss_size_max * kinfo->num_tc, hdev->num_tqps);
    +}
    +
    +static void hclge_get_channels(struct hnae3_handle *handle,
    + struct ethtool_channels *ch)
    +{
    + struct hclge_vport *vport = hclge_get_vport(handle);
    +
    + ch->max_combined = hclge_get_max_channels(handle);
    + ch->other_count = 1;
    + ch->max_other = 1;
    + ch->combined_count = vport->alloc_tqps;
    +}
    +
    static const struct hnae3_ae_ops hclge_ops = {
    .init_ae_dev = hclge_init_ae_dev,
    .uninit_ae_dev = hclge_uninit_ae_dev,
    @@ -5046,6 +5066,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
    .set_vlan_filter = hclge_set_port_vlan_filter,
    .set_vf_vlan_filter = hclge_set_vf_vlan_filter,
    .reset_event = hclge_reset_event,
    + .get_channels = hclge_get_channels,
    };

    static struct hnae3_ae_algo ae_algo = {
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-12-21 08:05    [W:2.810 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site