iavf: Add reset to watchdog task
Subsystems (2)
PATCH 1/1 iavf: Add reset to watchdog task
Remove the reset as separate task and implement the reset procedure inside the watchdog state machine. This allows to avoid additional overhead for processes synchronization. The reset flags are still used to mark reset progress for asynchonous invoked callback functions.
Signed-off-by Jakub Pawlak <[email protected]>
Signed-off-by Jan Sokolowski <[email protected]>
Signed-off-by Aleksandr Loktionov <[email protected]>
Signed-off-by Arkadiusz Kubalewski <[email protected]>
--- drivers/net/ethernet/intel/iavf/iavf.h | 1 - .../net/ethernet/intel/iavf/iavf_ethtool.c | 12 ++-- drivers/net/ethernet/intel/iavf/iavf_main.c | 71 ++++++------------- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 4 +- 4 files changed, 29 insertions(+), 59 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +0 -1
@@ -237,7 +237,6 @@ struct iavf_cloud_filter {/* board specific private data structure */ struct iavf_adapter { -struct work_struct reset_task;struct work_struct adminq_task;struct delayed_work client_task;wait_queue_head_t down_waitqueue;
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +4 -8
@@ -530,10 +530,8 @@ static int iavf_set_priv_flags(struct net_device *netdev, u32 flags)/* issue a reset to force legacy-rx change to take effect */ if (changed_flags &IAVF_FLAG_LEGACY_RX ) { -if (netif_running (netdev)) { - adapter->flags |=IAVF_FLAG_RESET_NEEDED ; -queue_work (iavf_wq, &adapter->reset_task); - } +if (netif_running (netdev)) +iavf_schedule_reset (adapter); }return 0 ;
@@ -670,10 +668,8 @@ static int iavf_set_ringparam(struct net_device *netdev, adapter->rx_desc_count = new_rx_count; } -if (netif_running (netdev)) { - adapter->flags |=IAVF_FLAG_RESET_NEEDED ; -queue_work (iavf_wq, &adapter->reset_task); - } +if (netif_running (netdev)) +iavf_schedule_reset (adapter);return 0 ; }
drivers/net/ethernet/intel/iavf/iavf_main.c +23 -48
165 lines not on this page · raw message
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +2 -2
@@ -1899,8 +1899,8 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,dev_info (&adapter->pdev->dev,"Reset indication received from the PF\n" );if (!(adapter->flags &IAVF_FLAG_RESET_PENDING )) { adapter->flags |=IAVF_FLAG_RESET_PENDING ; -dev_info (&adapter->pdev->dev,"Scheduling reset task\n" ); -queue_work (iavf_wq, &adapter->reset_task); +dev_info (&adapter->pdev->dev,"Scheduling reset\n" ); +iavf_schedule_reset (adapter); }break ;default :
Signature · 1 line
2.32.0