hinic: add set_channels ethtool_ops support
Subsystems (3)
PATCH v3 1/1 hinic: add set_channels ethtool_ops support
add support to change TX/RX queue number with ethtool -L ethx combined
Signed-off-by Luo bin <[email protected]>
--- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 40 +++++++++++++++---- .../net/ethernet/huawei/hinic/hinic_main.c | 2 +- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 5 +++ 3 files changed, 38 insertions(+), 9 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +32 -8
@@ -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,
drivers/net/ethernet/huawei/hinic/hinic_main.c +1 -1
@@ -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 );
drivers/net/ethernet/huawei/hinic/hinic_tx.c +5 -0
@@ -470,6 +470,11 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)struct hinic_txq *txq;struct hinic_qp *qp; +if (unlikely (!netif_carrier_ok (netdev))) { +dev_kfree_skb_any (skb); +return NETDEV_TX_OK ; + } + txq = &nic_dev->txqs[q_id]; qp = container_of(txq->sq, struct hinic_qp, sq);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Luo bin <[email protected]>
Date: Fri, 29 May 2020 18:11:50 +0000
Quoted 3 lines
add support to change TX/RX queue number with ethtool -L ethx combined
Signed-off-by Luo bin <[email protected]>
Luo, I am not applying any of your patches until you fix the time on your computer.
This causes a lot of issues and slows down my workflow because it causes your patch submissions to be placed deep in my patchwork backlog because patchwork entries is ordered by date.
Therefore, please fix the date on your computer and resubmit your changes.
Thank you.