Return-path: Received: from mga01.intel.com ([192.55.52.88]:61029 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750753AbbALGnn (ORCPT ); Mon, 12 Jan 2015 01:43:43 -0500 Message-ID: <54B36D1A.40608@linux.intel.com> (sfid-20150112_074401_671259_38D00462) Date: Mon, 12 Jan 2015 14:43:38 +0800 From: "Fu, Zhonghui" MIME-Version: 1.0 To: Arend van Spriel CC: brudley@broadcom.com, Franky Lin , 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: Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation References: <54A3B1B4.7090705@linux.intel.com> <54A3C837.6040400@broadcom.com> <54A9F82D.9030003@linux.intel.com> <54AA6BEB.9060207@broadcom.com> In-Reply-To: <54AA6BEB.9060207@broadcom.com> Content-Type: text/plain; charset=utf-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: I sent a new version of this patch in another mail. Thanks, Zhonghui On 2015/1/5 18:48, Arend van Spriel wrote: > On 01/05/15 03:34, Fu, Zhonghui wrote: >> Hi Arend, >> >> Where to find your patch for this? > > Well, we did not submit it. Hence my "Acked-by:" to your patch below. > > Regards, > Arend > >> >> Thanks, >> Zhonghui >> >> On 2014/12/31 17:56, Arend van Spriel wrote: >>> On 12/31/14 09:20, Fu, Zhonghui wrote: >>>> From e34419970a07bfcd365f9c66bdfa552188a0cd26 Mon Sep 17 00:00:00 2001 >>>> From: Zhonghui Fu >>>> 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. >>> >>> We have a patch queued up for this as well, but this one looks good enough although I personally prefer container_of() instead of dev_to_sdio_func(). >>> >>> Acked-by: Arend van Spriel >>>> Signed-off-by: Zhonghui Fu >>>> --- >>>> 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 >>>> >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >>> the body of a message to majordomo@vger.kernel.org >>> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html