lkml.org 
[lkml]   [2021]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 027/145] e1000e: Only run S0ix flows if shutdown succeeded
    Date
    From: Mario Limonciello <mario.limonciello@dell.com>

    [ Upstream commit 808e0d8832cc81738f3e8df12dff0688352baf50 ]

    If the shutdown failed, the part will be thawed and running
    S0ix flows will put it into an undefined state.

    Reported-by: Alexander Duyck <alexander.duyck@gmail.com>
    Reviewed-by: Alexander Duyck <alexander.duyck@gmail.com>
    Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
    Tested-by: Yijun Shen <Yijun.shen@dell.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/intel/e1000e/netdev.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/intel/e1000e/netdev.c
    +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
    @@ -6970,13 +6970,14 @@ static __maybe_unused int e1000e_pm_susp
    e1000e_pm_freeze(dev);

    rc = __e1000_shutdown(pdev, false);
    - if (rc)
    + if (rc) {
    e1000e_pm_thaw(dev);
    -
    - /* Introduce S0ix implementation */
    - if (hw->mac.type >= e1000_pch_cnp &&
    - !e1000e_check_me(hw->adapter->pdev->device))
    - e1000e_s0ix_entry_flow(adapter);
    + } else {
    + /* Introduce S0ix implementation */
    + if (hw->mac.type >= e1000_pch_cnp &&
    + !e1000e_check_me(hw->adapter->pdev->device))
    + e1000e_s0ix_entry_flow(adapter);
    + }

    return rc;
    }

    \
     
     \ /
      Last update: 2021-01-11 14:34    [W:4.135 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site