From patchwork Tue Oct 4 17:08:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9362149 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 3BE4F600C8 for ; Tue, 4 Oct 2016 17:09:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 286D72873C for ; Tue, 4 Oct 2016 17:09:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CF36287E6; Tue, 4 Oct 2016 17:09:09 +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 3C8682873C for ; Tue, 4 Oct 2016 17:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063AbcJDRJF (ORCPT ); Tue, 4 Oct 2016 13:09:05 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:33474 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754052AbcJDRJE (ORCPT ); Tue, 4 Oct 2016 13:09:04 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u94H5cl3009857; Tue, 4 Oct 2016 10:09:02 -0700 Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 25uy83p17m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 04 Oct 2016 10:09:01 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Tue, 4 Oct 2016 10:09:00 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Tue, 4 Oct 2016 10:09:00 -0700 Received: from pe-lt949 (unknown [10.31.130.238]) by maili.marvell.com (Postfix) with ESMTP id C1FC93F703F; Tue, 4 Oct 2016 10:08:59 -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 u94H8hLp003035; Tue, 4 Oct 2016 22:38:43 +0530 Received: (from root@localhost) by pe-lt949 (8.14.4/8.14.4/Submit) id u94H8hD1003034; Tue, 4 Oct 2016 22:38:43 +0530 From: Amitkumar Karwar To: CC: Cathy Luo , Nishant Sarmukadam , , , Xinming Hu , Amitkumar Karwar Subject: [PATCH v2 2/2] mwifiex: check hw_status in suspend and resume handlers Date: Tue, 4 Oct 2016 22:38:25 +0530 Message-ID: <1475600905-2997-2-git-send-email-akarwar@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475600905-2997-1-git-send-email-akarwar@marvell.com> References: <1475600905-2997-1-git-send-email-akarwar@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-04_06:, , 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-1610040294 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 From: Xinming Hu 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 to fix the problem Signed-off-by: Xinming Hu Signed-off-by: Amitkumar Karwar --- v2: Return failure in suspend/resume handler in this scenario. --- drivers/net/wireless/marvell/mwifiex/pcie.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index ba9e068..fa6bf85 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -122,9 +122,10 @@ static int mwifiex_pcie_suspend(struct device *dev) if (pdev) { card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { + if (!card || !card->adapter || + card->adapter->hw_status != MWIFIEX_HW_STATUS_READY) { pr_err("Card or adapter structure is not valid\n"); - return 0; + return -EBUSY; } } else { pr_err("PCIE device is not specified\n"); @@ -166,9 +167,10 @@ static int mwifiex_pcie_resume(struct device *dev) if (pdev) { card = pci_get_drvdata(pdev); - if (!card || !card->adapter) { + if (!card || !card->adapter || + card->adapter->hw_status != MWIFIEX_HW_STATUS_READY) { pr_err("Card or adapter structure is not valid\n"); - return 0; + return -EBUSY; } } else { pr_err("PCIE device is not specified\n");