From patchwork Mon Jul 31 16:32:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maya Erez X-Patchwork-Id: 9872453 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 C37CE60365 for ; Mon, 31 Jul 2017 16:32:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE55D2808F for ; Mon, 31 Jul 2017 16:32:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A363C28545; Mon, 31 Jul 2017 16:32:48 +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 603762808F for ; Mon, 31 Jul 2017 16:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbdGaQcr (ORCPT ); Mon, 31 Jul 2017 12:32:47 -0400 Received: from sabertooth02.qualcomm.com ([65.197.215.38]:37826 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752365AbdGaQco (ORCPT ); Mon, 31 Jul 2017 12:32:44 -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=1501518764; x=1533054764; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=jWJJObCemYtuqEd+AYnXC1HNSKXX5NEr5Fvv2z+T91o=; b=KEUn0N9LnT5rehYFjq3IETWhqvVRsxgMj7YpDcFACxSzL2rFAJguOv0O UH2aUd+WKSiMH5O3snvjlJpkAS1j+87bOCou8i/9GWgvyt3xLYwxckLrn KNngUaljBD2lFOdxs5otcFydmW3bjPyZl2i/vSApsOyAiObSZhl6V4RxU U=; X-IronPort-AV: E=Sophos;i="5.41,304,1498546800"; d="scan'208";a="112898153" Received: from unknown (HELO ironmsg02-L.qualcomm.com) ([10.53.140.109]) by sabertooth02.qualcomm.com with ESMTP; 31 Jul 2017 09:32:44 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8608"; a="974365101" X-MGA-submission: =?us-ascii?q?MDFrlTpWZyuW/yBA4Zq5//ThxNTsHyULXAQzMb?= =?us-ascii?q?lf5QZonQpMzzydxcd1W5WpO4KaTsUIzuU2+XxVxDHHrmhNX7Q5L3XKpL?= =?us-ascii?q?46z+Ok7hjI6gxmmX+mAmHcfA+fLaVyLCE0G7887b6fgz8WdSqpXH0Rdw?= =?us-ascii?q?8L?= Received: from lx-merez1.mea.qualcomm.com ([10.18.173.103]) by ironmsg02-L.qualcomm.com with ESMTP; 31 Jul 2017 09:32:42 -0700 From: Maya Erez To: Kalle Valo Cc: Maya Erez , linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com Subject: [PATCH 04/10] wil6210: check no_fw_recovery in resume failure recovery Date: Mon, 31 Jul 2017 19:32:27 +0300 Message-Id: <1501518753-6339-5-git-send-email-qca_merez@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501518753-6339-1-git-send-email-qca_merez@qca.qualcomm.com> References: <1501518753-6339-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);