From patchwork Tue Sep 27 16:50:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 675738 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sk6LX3Vfmz9sBr for ; Wed, 28 Sep 2016 02:51:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=hNU0nKwy; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935436AbcI0Qvk (ORCPT ); Tue, 27 Sep 2016 12:51:40 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:34310 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935102AbcI0Qvg (ORCPT ); Tue, 27 Sep 2016 12:51:36 -0400 Received: by mail-pf0-f179.google.com with SMTP id l25so7629696pfb.1 for ; Tue, 27 Sep 2016 09:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Z8dGQhJ4wS5f8ljftFvSUE6JiTwJzbzVYC0ZBW8l+40=; b=hNU0nKwyVn3gg1G4gX8tmXozd8SA4+djSck7dgRXhzHg8Hwh/SF+9NIqZP+yhqOx3i ZUQyJjlG9pmg3tFpgeZvqeBaVyr8miIyMjERhZgtK1ubooFDvKcNLC/5A8Sq6wqZvPiZ KK4rvnaeAk4TVPPBqvR88jLfW/Qcr8AJH1p+CSTNFGzeiRj/LN+bd6Gpaemy26SoR71n VvtP/+B+8339qRBEdzYLCIjiojRFv1C9Xej2iBSo7lauEfZBu/GfUurfHdQ3OvmqBCUD YkbDIZ6zwStC9uY05MU7g5TUhGOkrmh2/xrPnpHpG1UyQB/Nn6+Aa7XKiFW6tZ5b1Gq1 LYaA== 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; bh=Z8dGQhJ4wS5f8ljftFvSUE6JiTwJzbzVYC0ZBW8l+40=; b=mMUabg+my/pwUhJ6xKEv/SPGGEJyhHz0gtcoNDn1t4bH+s9haawd0/i6Sm2BneXKqZ bK15oohdzpTCFHaJdlnUYaQlx3JzjY8TovrD9wKfHcY1n7JWrclbe3VzSRSK8Anlc3j5 ryutnoSv+Xx/q5kZufJimijXClkFCbkYWm2jnaaiuhIzRXEP5mpjHtQQ6sOxEPOgbEkF lyHEgNZ0FZKui81jRot9N/UjuRqiyIx4nNwIcZsoYKvIBR/EFClaJtrsTdwKrnaJ3HzI 9JO+IsvBH/yXzThnqOcyu+SEu184W0Ao1Pi+oGt8/JvZDr31fAJMlTzymv3Jlin1xB08 qMMg== X-Gm-Message-State: AE9vXwO7unqETR8ksdRNO+IusT22NRbHrQ9c43uTz7ZUnpR0vVlww+VlfvjMdTgSgzXT5miX X-Received: by 10.98.46.198 with SMTP id u189mr48913081pfu.116.1474995095508; Tue, 27 Sep 2016 09:51:35 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id p189sm6232218pfb.5.2016.09.27.09.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Sep 2016 09:51:35 -0700 (PDT) From: Rajat Jain To: Amitkumar Karwar , Nishant Sarmukadam , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: Wei-Ning Huang , Brian Norris , Eric Caruso , rajatxjain@gmail.com, Rajat Jain Subject: Date: Tue, 27 Sep 2016 09:50:52 -0700 Message-Id: <1474995052-122337-1-git-send-email-rajatja@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei-Ning Huang Date: Thu, 17 Mar 2016 11:43:16 +0800 Subject: [PATCH] mwifiex: report wakeup for wowlan Enable notifying wakeup source to the PM core. This allow darkresume to correctly track wakeup source and mark mwifiex_plt as 'automatic' wakeup source. Signed-off-by: Wei-Ning Huang Signed-off-by: Rajat Jain Tested-by: Wei-Ning Huang Reviewed-by: Eric Caruso --- drivers/net/wireless/marvell/mwifiex/sdio.c | 8 ++++++++ drivers/net/wireless/marvell/mwifiex/sdio.h | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index d3e1561..a5f63e4 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -89,6 +89,9 @@ static irqreturn_t mwifiex_wake_irq_wifi(int irq, void *priv) disable_irq_nosync(irq); } + /* Notify PM core we are wakeup source */ + pm_wakeup_event(cfg->dev, 0); + return IRQ_HANDLED; } @@ -112,6 +115,7 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) GFP_KERNEL); cfg = card->plt_wake_cfg; if (cfg && card->plt_of_node) { + cfg->dev = dev; cfg->irq_wifi = irq_of_parse_and_map(card->plt_of_node, 0); if (!cfg->irq_wifi) { dev_dbg(dev, @@ -130,6 +134,10 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) } } + ret = device_init_wakeup(dev, true); + if (ret) + dev_err(dev, "fail to init wakeup for mwifiex"); + return 0; } diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h index db837f1..07cdd23 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.h +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h @@ -155,6 +155,7 @@ } while (0) struct mwifiex_plt_wake_cfg { + struct device *dev; int irq_wifi; bool wake_by_wifi; };