hinic: fix sending pkts from core while self testing
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 4 ++++ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +4 -0
@@ -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,
drivers/net/ethernet/huawei/hinic/hinic_tx.c +2 -2
@@ -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);
Signature · 1 line
2.17.1
From: Luo bin <[email protected]>
Date: Fri, 18 Sep 2020 12:09:38 +0800
Quoted 6 lines
Call
netif_tx_disablefirstly 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 <[email protected]>
Applied.