From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39B0FC432C3 for ; Wed, 23 Dec 2020 02:28:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A4B5206EC for ; Wed, 23 Dec 2020 02:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730817AbgLWC2X (ORCPT ); Tue, 22 Dec 2020 21:28:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:55734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729788AbgLWC0N (ORCPT ); Tue, 22 Dec 2020 21:26:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7967C22A83; Wed, 23 Dec 2020 02:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690358; bh=OmvrlJhJ/YifQyy3+guv6v5apGg8Wr1Wj2N56B5e2zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fYr65u/xeS1819Ej0P23U3kwT24+mBwwH5DYImWiOSyR/uS6zjYfyclayIUT7Dj61 LWGNRoIAh3hM56LFFUpw1dfFQkf+UXGNmAZFZZ19+GjoReYooqKI/JCpnnvKisXGKX RM4vhQNSgfjBBZMCphBnL7krhr1W3nfLTaLdQ+GJcsInnj1+Uf0x3FG2uyrdrLaYhT mV4bVhhW0DSsduEHDCl9GaYll2hRwWlAiJ5DjMtrzwLlbiO+2fB7LlEwkmHuW5UNuH H6oPRYes6SRkDYE/+WnujIFCj1zZGbTfP/VE+yfmxNEYififQVhLHZDWbODjq8gmjt n5ceuRYYDCggw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Luca Coelho , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 33/38] iwlwifi: trans: consider firmware dead after errors Date: Tue, 22 Dec 2020 21:25:11 -0500 Message-Id: <20201223022516.2794471-33-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022516.2794471-1-sashal@kernel.org> References: <20201223022516.2794471-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Johannes Berg [ 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 Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20201209231352.a9d01e79c1c7.Ib2deb076b392fb516a7230bac91d7ab8a9586d86@changeid Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- 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