Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 18:36:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hinic: add set_channels ethtool_ops support

Browse Source 
add support to change TX/RX queue number with "ethtool -L combined".

V5 -> V6: remove check for carrier in hinic_xmit_frame
V4 -> V5: change time zone in patch header
V3 -> V4: update date in patch header
V2 -> V3: remove check for zero channels->combined_count
V1 -> V2: update commit message("ethtool -L" to "ethtool -L combined")
V0 -> V1: remove check for channels->tx_count/rx_count/other_count

Signed-off-by: Luo bin <luobin9@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Luo bin 2020-06-02 08:40:32 +08:00 committed by David S. Miller
parent 9a5a908c38
commit 2eed5a8b61
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
View File

@ -619,14 +619,37 @@ static void hinic_get_channels(struct net_device *netdev,
struct hinic_dev *nic_dev = netdev_priv(netdev);
struct hinic_hwdev *hwdev = nic_dev->hwdev;
channels->max_rx = hwdev->nic_cap.max_qps;
channels->max_tx = hwdev->nic_cap.max_qps;
channels->max_other = 0;
channels->max_combined = 0;
channels->rx_count = hinic_hwdev_num_qps(hwdev);
channels->tx_count = hinic_hwdev_num_qps(hwdev);
channels->other_count = 0;
channels->combined_count = 0;
channels->max_combined = nic_dev->max_qps;
channels->combined_count = hinic_hwdev_num_qps(hwdev);
}
static int hinic_set_channels(struct net_device *netdev,
struct ethtool_channels *channels)
{
struct hinic_dev *nic_dev = netdev_priv(netdev);
unsigned int count = channels->combined_count;
int err;
netif_info(nic_dev, drv, netdev, "Set max combined queue number from %d to %d\n",
hinic_hwdev_num_qps(nic_dev->hwdev), count);
if (netif_running(netdev)) {
netif_info(nic_dev, drv, netdev, "Restarting netdev\n");
hinic_close(netdev);
nic_dev->hwdev->nic_cap.num_qps = count;
err = hinic_open(netdev);
if (err) {
netif_err(nic_dev, drv, netdev,
"Failed to open netdev\n");
return -EFAULT;
}
} else {
nic_dev->hwdev->nic_cap.num_qps = count;
}
return 0;
}
static int hinic_get_rss_hash_opts(struct hinic_dev *nic_dev,
@ -1219,6 +1242,7 @@ static const struct ethtool_ops hinic_ethtool_ops = {
.get_ringparam = hinic_get_ringparam,
.set_ringparam = hinic_set_ringparam,
.get_channels = hinic_get_channels,
.set_channels = hinic_set_channels,
.get_rxnfc = hinic_get_rxnfc,
.set_rxnfc = hinic_set_rxnfc,
.get_rxfh_key_size = hinic_get_rxfh_key_size,

2
drivers/net/ethernet/huawei/hinic/hinic_main.c
View File

@ -326,7 +326,6 @@ static void hinic_enable_rss(struct hinic_dev *nic_dev)
int i, node, err = 0;
u16 num_cpus = 0;
nic_dev->max_qps = hinic_hwdev_max_num_qps(hwdev);
if (nic_dev->max_qps <= 1) {
nic_dev->flags &= ~HINIC_RSS_ENABLE;
nic_dev->rss_limit = nic_dev->max_qps;
@ -1031,6 +1030,7 @@ static int nic_dev_init(struct pci_dev *pdev)
nic_dev->rq_depth = HINIC_RQ_DEPTH;
nic_dev->sriov_info.hwdev = hwdev;
nic_dev->sriov_info.pdev = pdev;
nic_dev->max_qps = num_qps;
sema_init(&nic_dev->mgmt_lock, 1);