From: "Fu, Zhonghui" <zhonghui.fu@linux•intel.com>
To: brudley@broadcom•com, Arend van Spriel <arend@broadcom•com>,
Franky Lin <frankyl@broadcom•com>,
meuleman@broadcom•com, kvalo@codeaurora•org,
linville@tuxdriver•com, pieterpg@broadcom•com,
hdegoede@redhat•com, wens@csie•org,
linux-wireless@vger•kernel.org, brcm80211-dev-list@broadcom•com,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation
Date: Wed, 31 Dec 2014 16:20:04 +0800 [thread overview]
Message-ID: <54A3B1B4.7090705@linux.intel.com> (raw)
>From e34419970a07bfcd365f9c66bdfa552188a0cd26 Mon Sep 17 00:00:00 2001
From: Zhonghui Fu <zhonghui.fu@linux•intel.com>
Date: Mon, 29 Dec 2014 21:25:31 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation
WiFi chip has 2 SDIO functions, and PM core will trigger
twice suspend/resume operations for one WiFi chip to do
the same things. This patch avoid this case.
Signed-off-by: Zhonghui Fu <zhonghui.fu@linux•intel.com>
---
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 3c06e93..eee7818 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -1139,11 +1139,18 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled)
static int brcmf_ops_sdio_suspend(struct device *dev)
{
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
- struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+ struct brcmf_sdio_dev *sdiodev;
mmc_pm_flag_t sdio_flags;
+ struct sdio_func *func = dev_to_sdio_func(dev);
brcmf_dbg(SDIO, "Enter\n");
+ if (func->num == 2) {
+ return 0;
+ }
+
+ sdiodev = bus_if->bus_priv.sdio;
+
atomic_set(&sdiodev->suspend, true);
if (sdiodev->wowl_enabled) {
@@ -1164,9 +1171,17 @@ static int brcmf_ops_sdio_suspend(struct device *dev)
static int brcmf_ops_sdio_resume(struct device *dev)
{
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
- struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+ struct brcmf_sdio_dev *sdiodev;
+ struct sdio_func *func = dev_to_sdio_func(dev);
brcmf_dbg(SDIO, "Enter\n");
+
+ if (func->num == 2) {
+ return 0;
+ }
+
+ sdiodev = bus_if->bus_priv.sdio;
+
if (sdiodev->pdata->oob_irq_supported)
disable_irq_wake(sdiodev->pdata->oob_irq_nr);
brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);
-- 1.7.1
next reply other threads:[~2014-12-31 8:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-31 8:20 Fu, Zhonghui [this message]
2014-12-31 9:56 ` [PATCH] brcmfmac: avoid duplicated suspend/resume operation Arend van Spriel
2015-01-05 2:34 ` Fu, Zhonghui
2015-01-05 10:48 ` Arend van Spriel
2015-01-12 6:43 ` Fu, Zhonghui
2014-12-31 11:22 ` Sergei Shtylyov
2015-01-05 2:37 ` Fu, Zhonghui
-- strict thread matches above, loose matches on Subject: below --
2015-01-12 6:41 Fu, Zhonghui
2015-01-12 10:00 ` Arend van Spriel
[not found] ` <54B39B59.8000907-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-01-15 12:52 ` Kalle Valo
2015-01-20 3:34 ` Fu, Zhonghui
2015-01-12 14:06 ` Sergei Shtylyov
2015-01-12 16:24 ` Arend van Spriel
2015-01-20 3:31 Fu, Zhonghui
[not found] ` <54BDCC06.8090107-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-01-22 13:49 ` Kalle Valo
[not found] ` <87twzincvz.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2015-01-22 13:54 ` Sergei Shtylyov
[not found] ` <54C1012F.1020400-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2015-01-22 20:58 ` Arend van Spriel
[not found] ` <54C1646B.4080409-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-01-23 15:29 ` Kalle Valo
2015-01-23 18:09 ` Arend van Spriel
2015-01-27 5:35 ` Fu, Zhonghui
2015-02-02 1:58 ` Fu, Zhonghui
2015-01-26 2:46 Fu, Zhonghui
2015-02-03 13:08 ` Kalle Valo
2015-02-05 11:56 ` Fu, Zhonghui
2015-02-05 11:34 ` Fu, Zhonghui
2015-02-05 11:46 ` Arend van Spriel
2015-02-09 4:49 ` Fu, Zhonghui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54A3B1B4.7090705@linux.intel.com \
--to=zhonghui.fu@linux$(echo .)intel.com \
--cc=arend@broadcom$(echo .)com \
--cc=brcm80211-dev-list@broadcom$(echo .)com \
--cc=brudley@broadcom$(echo .)com \
--cc=frankyl@broadcom$(echo .)com \
--cc=hdegoede@redhat$(echo .)com \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=meuleman@broadcom$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pieterpg@broadcom$(echo .)com \
--cc=wens@csie$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox