UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: hns3: set the max ring num when alloc netdev 

HNS3 driver should alloc netdev with max support ring num, as
driver support change netdev count by ethtool -L.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Peng Li 2018-03-08 19:41:54 +08:00 committed by David S. Miller
parent 814e0274fd
commit 678335a123
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -249,6 +249,16 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev)
return 0; return 0;
} }
static u16 hns3_get_max_available_channels(struct hnae3_handle *h)
{
u16 free_tqps, max_rss_size, max_tqps;
h->ae_algo->ops->get_tqps_and_rss_info(h, &free_tqps, &max_rss_size);
max_tqps = h->kinfo.num_tc * max_rss_size;
return min_t(u16, max_tqps, (free_tqps + h->kinfo.num_tqps));
}
static int hns3_nic_net_up(struct net_device *netdev) static int hns3_nic_net_up(struct net_device *netdev)
{ {
struct hns3_nic_priv *priv = netdev_priv(netdev); struct hns3_nic_priv *priv = netdev_priv(netdev);
@ -3013,7 +3023,7 @@ static int hns3_client_init(struct hnae3_handle *handle)
int ret; int ret;
netdev = alloc_etherdev_mq(sizeof(struct hns3_nic_priv), netdev = alloc_etherdev_mq(sizeof(struct hns3_nic_priv),
handle->kinfo.num_tqps); hns3_get_max_available_channels(handle));
if (!netdev) if (!netdev)
return -ENOMEM; return -ENOMEM;
@ -3336,17 +3346,6 @@ static int hns3_reset_notify(struct hnae3_handle *handle,
return ret; return ret;
} }
static u16 hns3_get_max_available_channels(struct net_device *netdev)
{
struct hnae3_handle *h = hns3_get_handle(netdev);
u16 free_tqps, max_rss_size, max_tqps;
h->ae_algo->ops->get_tqps_and_rss_info(h, &free_tqps, &max_rss_size);
max_tqps = h->kinfo.num_tc * max_rss_size;
return min_t(u16, max_tqps, (free_tqps + h->kinfo.num_tqps));
}
static int hns3_modify_tqp_num(struct net_device *netdev, u16 new_tqp_num) static int hns3_modify_tqp_num(struct net_device *netdev, u16 new_tqp_num)
{ {
struct hns3_nic_priv *priv = netdev_priv(netdev); struct hns3_nic_priv *priv = netdev_priv(netdev);
@ -3397,12 +3396,12 @@ int hns3_set_channels(struct net_device *netdev,
if (ch->rx_count || ch->tx_count) if (ch->rx_count || ch->tx_count)
return -EINVAL; return -EINVAL;
if (new_tqp_num > hns3_get_max_available_channels(netdev) || if (new_tqp_num > hns3_get_max_available_channels(h) ||
new_tqp_num < kinfo->num_tc) { new_tqp_num < kinfo->num_tc) {
dev_err(&netdev->dev, dev_err(&netdev->dev,
"Change tqps fail, the tqp range is from %d to %d", "Change tqps fail, the tqp range is from %d to %d",
kinfo->num_tc, kinfo->num_tc,
hns3_get_max_available_channels(netdev)); hns3_get_max_available_channels(h));
return -EINVAL; return -EINVAL;
} }