lkml.org 
[lkml]   [2020]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 33/38] iwlwifi: trans: consider firmware dead after errors
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 152fdc0f698896708f9d7889a4ba4da6944b74f7 ]

    If we get an error, no longer consider the firmware to be
    in IWL_TRANS_FW_ALIVE state.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20201209231352.a9d01e79c1c7.Ib2deb076b392fb516a7230bac91d7ab8a9586d86@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/iwlwifi/iwl-trans.h | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
    index 6f76525088f0e..8dd30de1976f0 100644
    --- a/drivers/net/wireless/iwlwifi/iwl-trans.h
    +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
    @@ -1102,8 +1102,10 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)
    return;

    /* prevent double restarts due to the same erroneous FW */
    - if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status))
    + if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status)) {
    iwl_op_mode_nic_error(trans->op_mode);
    + trans->state = IWL_TRANS_NO_FW;
    + }
    }

    /*****************************************************
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-12-23 03:28    [W:3.450 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site