From patchwork Mon Oct 31 08:02:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinming Hu X-Patchwork-Id: 9405129 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 257CE6022E for ; Mon, 31 Oct 2016 08:03:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16C5129217 for ; Mon, 31 Oct 2016 08:03:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B22B29230; Mon, 31 Oct 2016 08:03:02 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 572A229217 for ; Mon, 31 Oct 2016 08:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761977AbcJaIC7 (ORCPT ); Mon, 31 Oct 2016 04:02:59 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36616 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761988AbcJaICv (ORCPT ); Mon, 31 Oct 2016 04:02:51 -0400 Received: by mail-pf0-f196.google.com with SMTP id n85so8104114pfi.3 for ; Mon, 31 Oct 2016 01:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZYUqzyniThOWALgzv1kC0JnlkaTi/bUgjNJCMDShSaM=; b=dUnUDhXTJtOFAT19GXGvEH9QS9EZ4dB2/6c9XOgsvDH509f3K+isBdkwP4QwGP8JR1 bHEqXBOFg54KautoZTpT+edKRpuoVswSlypeBjrdW4j+qbse48IhiJ3jwEnyHVNh1MJU PB5Sk1PsmyGVuNqGzuEQ70ZRZPME+3hijTw0t9sv2CCAaEiErawYRfpql+hdWDVH6gkv muSy1YiYpWRrwBkUNIC8GwrRT6s9KlhR6PhK02hJJB2NN04KWAtrGCZ21kPgbQzhlHr0 p4xQbh+Sq+r9DkTBb3I3h8is7z1swMna3F/O4JezXri2xuZftUjcxPzvZmYTIrz+aDPc MihQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZYUqzyniThOWALgzv1kC0JnlkaTi/bUgjNJCMDShSaM=; b=H6nMFNzfCQ+E/CSDR5RR7oHIwQ5R5omAXcjgeyqR1SmRWB93NOXnqyGYt2W6Nv0PkK L1KNn6OYgYpJuGlp0wkIt0TnA/4WtVtQt2t9YMUhuLwDm6qUN0SYi3puvcN+nC05n5E1 6KAmfeY9YibXZaOCGH/esVN8+wi2EwMoDPPRWd5TIhmB0yzj5xKbhhUPpmXnSMQ8I5iI Y5CBNwlSk/DBR4JNM8ddaIqEqctnSJ4hPIUpceYhavrHuOvix2MrrMI9qohTBJCMpIbQ eesSo552t6b5R5SQCkmFzRMQehAeSyDHiKma2VFLNWtY2EFyKGQVwcx0EZOeEfTEh1ms cd1A== X-Gm-Message-State: ABUngvfNpN5GUyNmkETrf04zpYBfGIjizvuwPETJIGLd2cmUrH1VwXnQ+s6wFck1XUrOVQ== X-Received: by 10.98.197.134 with SMTP id j128mr47175815pfg.78.1477900970367; Mon, 31 Oct 2016 01:02:50 -0700 (PDT) Received: from localhost.localdomain ([216.207.47.6]) by smtp.gmail.com with ESMTPSA id k7sm34121196pan.8.2016.10.31.01.02.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Oct 2016 01:02:50 -0700 (PDT) From: Xinming Hu X-Google-Original-From: Xinming Hu To: Linux Wireless Cc: Kalle Valo , Brian Norris , Dmitry Torokhov , Amitkumar Karwar , Cathy Luo , Brian Norris Subject: [PATCH 07/12] mwifiex: resolve suspend() race with async FW init failure Date: Mon, 31 Oct 2016 16:02:15 +0800 Message-Id: <1477900940-10549-7-git-send-email-huxinming820@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477900940-10549-1-git-send-email-huxinming820@marvell.com> References: <1477900940-10549-1-git-send-email-huxinming820@marvell.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 From: Brian Norris Signed-off-by: Brian Norris --- drivers/net/wireless/marvell/mwifiex/pcie.c | 11 +++++++++-- drivers/net/wireless/marvell/mwifiex/sdio.c | 11 +++++++++-- drivers/net/wireless/marvell/mwifiex/usb.c | 12 ++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 32fbb91..b635563 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -102,12 +102,19 @@ 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) { + dev_err(dev, "adapter structure is not valid\n"); return 0; } + /* Might still be loading firmware */ + wait_for_completion(&card->fw_done); + adapter = card->adapter; + if (!adapter) { + dev_err(dev, "card is not valid\n"); + return 0; + } /* Enable the Host Sleep */ if (!mwifiex_enable_hs(adapter)) { diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index a750edb..4d314c1 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -331,8 +331,8 @@ static int mwifiex_sdio_suspend(struct device *dev) } card = sdio_get_drvdata(func); - if (!card || !card->adapter) { - pr_err("suspend: invalid card or adapter\n"); + if (!card) { + dev_err(dev, "suspend: invalid card\n"); return 0; } } else { @@ -340,7 +340,14 @@ static int mwifiex_sdio_suspend(struct device *dev) return 0; } + /* Might still be loading firmware */ + wait_for_completion(&card->fw_done); + adapter = card->adapter; + if (!adapter) { + dev_err(dev, "card is not valid\n"); + return 0; + } /* Enable platform specific wakeup interrupt */ if (card->plt_wake_cfg && card->plt_wake_cfg->irq_wifi >= 0) { diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c index a61455c..70126c3 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.c +++ b/drivers/net/wireless/marvell/mwifiex/usb.c @@ -503,11 +503,19 @@ static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message) struct usb_tx_data_port *port; int i, j; - if (!card || !card->adapter) { - pr_err("%s: card or card->adapter is NULL\n", __func__); + if (!card) { + dev_err(&intf->dev, "%s: card is NULL\n", __func__); return 0; } + + /* Might still be loading firmware */ + wait_for_completion(&card->fw_done); + adapter = card->adapter; + if (!adapter) { + dev_err(&intf->dev, "card is not valid\n"); + return 0; + } if (unlikely(adapter->is_suspended)) mwifiex_dbg(adapter, WARN,