From patchwork Thu Oct 6 17:30:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9365191 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 95D5B6077E for ; Thu, 6 Oct 2016 17:31:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8687729210 for ; Thu, 6 Oct 2016 17:31:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7525329212; Thu, 6 Oct 2016 17:31:28 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 D8FD729210 for ; Thu, 6 Oct 2016 17:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752872AbcJFRb0 (ORCPT ); Thu, 6 Oct 2016 13:31:26 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:40732 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbcJFRbZ (ORCPT ); Thu, 6 Oct 2016 13:31:25 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u96HTpbh023299; Thu, 6 Oct 2016 10:31:22 -0700 Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 25wjde4256-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 06 Oct 2016 10:31:22 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Thu, 6 Oct 2016 10:31:21 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Thu, 6 Oct 2016 10:31:21 -0700 Received: from pe-lt949 (unknown [10.31.130.238]) by maili.marvell.com (Postfix) with ESMTP id C489D3F7040; Thu, 6 Oct 2016 10:31:20 -0700 (PDT) Received: from pe-lt949 (piotr-probook.localdomain [127.0.0.1]) by pe-lt949 (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id u96HUxrP020346; Thu, 6 Oct 2016 23:01:00 +0530 Received: (from root@localhost) by pe-lt949 (8.14.4/8.14.4/Submit) id u96HUxPL020345; Thu, 6 Oct 2016 23:00:59 +0530 From: Amitkumar Karwar To: CC: Cathy Luo , Nishant Sarmukadam , , , Amitkumar Karwar Subject: [PATCH v3 3/3] mwifiex: check hw_status in suspend and resume handlers Date: Thu, 6 Oct 2016 23:00:28 +0530 Message-ID: <1475775028-20306-3-git-send-email-akarwar@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475775028-20306-1-git-send-email-akarwar@marvell.com> References: <1475775028-20306-1-git-send-email-akarwar@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-06_07:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610060305 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 We have observed a kernel crash when system immediately suspends after booting. There is a race between suspend and driver initialization paths. This patch adds hw_status checks in suspend/resume to fix this issue and other corner cases. Signed-off-by: Amitkumar Karwar --- v2: Return failure in suspend/resume handler in this scenario. v3: Handle "hw_status" not READY cases carefully. Return 0 if init or shutdown is in progress. Return -EBUSY if firmware download failed or command timeout ocurred(non-recoverable). (Brian Norris) --- drivers/net/wireless/marvell/mwifiex/pcie.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 1e27dbf..cc18e4d 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -121,13 +121,22 @@ static int mwifiex_pcie_suspend(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { - pr_err("Card or adapter structure is not valid\n"); + if (!card || !card->adapter || + card->adapter->hw_status == MWIFIEX_HW_STATUS_RESET || + card->adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY) { + pr_err("Card or adapter structure is not valid or hw_status not ready\n"); return 0; } adapter = card->adapter; + if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING || + adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE || + adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) { + pr_err("We are in the middle of initialzaion or closing\n"); + return -EBUSY; + } + /* Enable the Host Sleep */ if (!mwifiex_enable_hs(adapter)) { mwifiex_dbg(adapter, ERROR, @@ -160,13 +169,23 @@ static int mwifiex_pcie_resume(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { - pr_err("Card or adapter structure is not valid\n"); + + if (!card || !card->adapter || + card->adapter->hw_status == MWIFIEX_HW_STATUS_RESET || + card->adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY) { + pr_err("Card or adapter structure is not valid or hw_status not ready\n"); return 0; } adapter = card->adapter; + if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING || + adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE || + adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) { + pr_err("We are in the middle of initialzaion or closing\n"); + return -EBUSY; + } + if (!adapter->is_suspended) { mwifiex_dbg(adapter, WARN, "Device already resumed\n");