From patchwork Thu Aug 3 13:25:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maya Erez X-Patchwork-Id: 9879097 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4ED89603B4 for ; Thu, 3 Aug 2017 13:25:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4288D288F4 for ; Thu, 3 Aug 2017 13:25:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3783B288E5; Thu, 3 Aug 2017 13:25:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC3E8288E4 for ; Thu, 3 Aug 2017 13:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751890AbdHCNZw (ORCPT ); Thu, 3 Aug 2017 09:25:52 -0400 Received: from sabertooth02.qualcomm.com ([65.197.215.38]:45841 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdHCNZv (ORCPT ); Thu, 3 Aug 2017 09:25:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1501766751; x=1533302751; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=jWJJObCemYtuqEd+AYnXC1HNSKXX5NEr5Fvv2z+T91o=; b=klgU7XVRBmDpaUOkX/O86ZMTZ2P9taW3lQR1PU1TdshhbfTjbOnFAHmn y9gLcS2hzlGL6NXjzSCYVhwOLGs6ph38SrFe6EJd/uoTWZpMQSU5d028s SsPjwY9DChgkPJ7wT1nPTxZerRkVGKaOOpCrKrOUebWXy9y8g9r1Q2dpe I=; X-IronPort-AV: E=Sophos;i="5.41,316,1498546800"; d="scan'208";a="112982866" Received: from unknown (HELO ironmsg02-R.qualcomm.com) ([10.53.140.106]) by sabertooth02.qualcomm.com with ESMTP; 03 Aug 2017 06:25:51 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8610"; a="1010143057" X-MGA-submission: =?us-ascii?q?MDGO+UzHkD//EYJrngjCQ0cTQy/FirP87DUU/B?= =?us-ascii?q?XgG2ZdgAFoza8iu+Z3S0VpIBvlbaxKKuM2owR8QGzDoqjby6RdDEgUkZ?= =?us-ascii?q?KR+9MgfqkOpRhEvWuMaSArR1o8t7aAWB7PUSm4WW5VrfhfBcvU+w7uE6?= =?us-ascii?q?8p?= Received: from lx-merez1.mea.qualcomm.com ([10.18.173.103]) by ironmsg02-R.qualcomm.com with ESMTP; 03 Aug 2017 06:25:49 -0700 From: Maya Erez To: Kalle Valo Cc: Maya Erez , linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com Subject: [PATCH v3 4/9] wil6210: check no_fw_recovery in resume failure recovery Date: Thu, 3 Aug 2017 16:25:34 +0300 Message-Id: <1501766739-31996-5-git-send-email-qca_merez@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501766739-31996-1-git-send-email-qca_merez@qca.qualcomm.com> References: <1501766739-31996-1-git-send-email-qca_merez@qca.qualcomm.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reset 11ad device on resume failure only if no_fw_recovery is not set. Signed-off-by: Maya Erez --- drivers/net/wireless/ath/wil6210/pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c index ce1f384..4548829 100644 --- a/drivers/net/wireless/ath/wil6210/pm.c +++ b/drivers/net/wireless/ath/wil6210/pm.c @@ -85,7 +85,9 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil) /* Send WMI resume request to the device */ rc = wmi_resume(wil); if (rc) { - wil_err(wil, "device failed to resume (%d), resetting\n", rc); + wil_err(wil, "device failed to resume (%d)\n", rc); + if (no_fw_recovery) + goto out; rc = wil_down(wil); if (rc) { wil_err(wil, "wil_down failed (%d)\n", rc);