Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5450797pxu; Tue, 22 Dec 2020 18:22:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJx08ed9RcVXrQ0/Nq0nm5gCNFgjKKKlFvDqcO2IL39mh96uLPJib0PruzAw0XzR/SkjGDpj X-Received: by 2002:a17:906:4e50:: with SMTP id g16mr23011827ejw.191.1608690172875; Tue, 22 Dec 2020 18:22:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608690172; cv=none; d=google.com; s=arc-20160816; b=aQWOlnVB5SNfTSWRqC/1+VyupRQjI2WtLV1X62NGYZFcOXSrle5LJPrJ1QZwRvqV+l VJNZ9zJltfUtJyHbcTmXYfPNSPyD2s8VsoTq/i26szzcs+a0Coovj+a5pphBDX/vZrgo 5t1TjUWa0BfgLv4H2Fg3tmI+grEOgG/l2RvNfAs4lFuVxeOs7J7Vxi7ntchwDl6Cesuf xP6GqwOVY3IMLkgZdYYq8BmI6y1y9wpLIgHWUKI1q/WJOS0fzqNhe7HSWarK6R6yih3X pIlYw6/3su55Ju1KfOvAsVQWShbsihPIuH7+2rPwBmN6+DWvMiOqm9cBbA9Uk8ETQ0to EUUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GAx8syFupK5eq3Shtlh4J2MPfvLr1lKf7hBmqnne5DU=; b=wmPAvHL64SsuKoOg4T8NlSBEc+jBMydgAhVNHvc9UTS/ljhnDbnTFiuyKkGgg8ZwH9 Ise8Li9xXD3TQk/twkg8V/3ioYf80VQtIwHaxGFNw0mN1ACy9crPkrRE0rmBiTmLUE8O DdE5fYvrs92aco32L1nyhK5kP//xNMEH7Ye1hvT6tBr3zXL1NgRTzF+kO9onB4C/oGbn Au3y2lRnnVuM4J5iQlX1WniNgEMsX6HNqsX7EC4Qk7J6PbIDtXkO6cOkKSf2eaWTjILb CYBYAUVREP1tR3YQkZ7GjA9a0FPNmZrIt/dPQvvCvT6/D+h1tx8b4rT0nurFE7a2QeAA lbsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M0o4CtxZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gn22si10729861ejc.749.2020.12.22.18.22.30; Tue, 22 Dec 2020 18:22:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M0o4CtxZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729283AbgLWCVQ (ORCPT + 99 others); Tue, 22 Dec 2020 21:21:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:45428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729108AbgLWCUu (ORCPT ); Tue, 22 Dec 2020 21:20:50 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 755A823159; Wed, 23 Dec 2020 02:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690035; bh=Mkb77UdVz/5p1f8UEjjbVmNsg1UaKH/m8P8zqp2BlQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0o4CtxZk8oHhMjVoUhdeKLdkBC+jh0rIXIh03INyqGMi6bIQJs2/U00z/42sJRD5 8t5F94ovA+M+l5NuweH7VSbh6uZBBr1PFrMqOmiVgG4c6nHrYrD/+Mj78/PC+wr6Cl nt41SNNNdF339Bje60PNWqK7aLbq+YVUNXryPNPGfb7Gxlil49e/SVaJF27P5M/pqL jFAcG/Nc74GEU0Ul+8foRcjP1CohUP+IagGsp7e68LP7Y36hsIw/B3t7XGUtaKvSVL mFZ0t8eiVoEjwDQ8/hNMGWBAdLQXkKtMHwCHChk3ptPPb8QCktlVYWW73pKOadk6zP O9R/Klodu44WA== 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 5.4 110/130] iwlwifi: trans: consider firmware dead after errors Date: Tue, 22 Dec 2020 21:17:53 -0500 Message-Id: <20201223021813.2791612-110-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-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: linux-kernel@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/intel/iwlwifi/iwl-trans.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h index 1e85d59b91613..b31bb56ca6591 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h @@ -1230,8 +1230,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; + } } static inline void iwl_trans_sync_nmi(struct iwl_trans *trans) -- 2.27.0