diff options
| author |   Luo bin <luobin9@huawei.com> | 2020-09-18 12:09:38 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-09-18 14:11:01 -0700 |
| commit | fc25fa97976b1c2fd226ae2b43e1f5abb61b77c9 (patch) | |
| tree | f4a2c4e4b482128c39b293f00b38f5aa39ebbae3 /drivers/net/ethernet/huawei | |
| parent | Merge branch 'Bugfixes-in-Microsemi-Ocelot-switch-driver' (diff) | |
| download | linux-dev-fc25fa97976b1c2fd226ae2b43e1f5abb61b77c9.tar.xz linux-dev-fc25fa97976b1c2fd226ae2b43e1f5abb61b77c9.zip | |
hinic: fix sending pkts from core while self testing
Call netif_tx_disable firstly before starting doing self-test to
avoid sending packet from networking core and self-test packet
simultaneously which may cause self-test failure or hw abnormal.
Fixes: 4aa218a4fe77 ("hinic: add self test support")
Signed-off-by: Luo bin <luobin9@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/huawei')
| -rw-r--r-- | drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index 6bb65ade1d77..c340d9acba80 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -1654,6 +1654,7 @@ static void hinic_diag_test(struct net_device *netdev, } netif_carrier_off(netdev); + netif_tx_disable(netdev); err = do_lp_test(nic_dev, eth_test->flags, LP_DEFAULT_TIME, &test_index); @@ -1662,9 +1663,12 @@ static void hinic_diag_test(struct net_device *netdev, data[test_index] = 1; } + netif_tx_wake_all_queues(netdev); + err = hinic_port_link_state(nic_dev, &link_state); if (!err && link_state == HINIC_LINK_STATE_UP) netif_carrier_on(netdev); + } static int hinic_set_phys_id(struct net_device *netdev, diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index 2b418b568767..c1f81e9144a1 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c @@ -717,8 +717,8 @@ static int free_tx_poll(struct napi_struct *napi, int budget) netdev_txq = netdev_get_tx_queue(txq->netdev, qp->q_id); __netif_tx_lock(netdev_txq, smp_processor_id()); - - netif_wake_subqueue(nic_dev->netdev, qp->q_id); + if (!netif_testing(nic_dev->netdev)) + netif_wake_subqueue(nic_dev->netdev, qp->q_id); __netif_tx_unlock(netdev_txq); |