From patchwork Tue Oct 4 20:37:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 678203 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 3spW2b4fkJz9s3s for ; Wed, 5 Oct 2016 07:38:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=F1rT+GI2; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753722AbcJDUiK (ORCPT ); Tue, 4 Oct 2016 16:38:10 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34815 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753651AbcJDUiJ (ORCPT ); Tue, 4 Oct 2016 16:38:09 -0400 Received: by mail-pa0-f47.google.com with SMTP id rz1so21337158pab.1 for ; Tue, 04 Oct 2016 13:38:09 -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:in-reply-to:references; bh=W8yUUK9th7yfi7Eif3z1axsA+gg9PuVio9x97eTHtYI=; b=F1rT+GI2vOgpxO+PgZDSQfCt6jNhGlQfZ2RSlCuDlfIlQJl04XErWp8mpbLrE4QMBf Kbf40LfnZ+XtDDxKCqHvts8UC4ft2uoUUsTWKFPolkxq9LW7JyHnTIWVyMSqsMp1xHtd M+dBwPk4o7dPFR8nuFPhnGpYl0Hsj6rkoaz+yImpObyVX7otEm3WgSwikJ7d6HK79Wck 5LmE88bzTASB4WyVXB+0+DleyinbZf8fUB7gRFqHWQE5eYOGDzndsKagV8v7pSqX/4xA AtoVaye6pLhG5y+QVYW26JlPyu9kMMwrkwFekfe2oIabKsFKbUmzd3AoA1lfdaY+zIWi yR/Q== 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=W8yUUK9th7yfi7Eif3z1axsA+gg9PuVio9x97eTHtYI=; b=dmPfVnEs+VLjXJNaEinJG60nlQdxPi4TnSPqgxz2Lsl07UQTYyF6BE3w9HnvIaIvRr 3XhXqb07ncoUaAQpiT7bmsgRICu4ChRyloX+VH4Ci3YFTymbzSicvjenMOdIt0nPgPvh dJZmMXlXxVU5ufWhBYScLZZETgnxJW5rH5vzgIZ7HwBl6mIHJuImIIIh6z+9DYIpd8gP DsgIbXzg5yJiX+b5cySaRd1X4U3Dg1kromnGsJtQrYWewhGdyN/q+1DQCdC4FXRUdOaN o0z8CByio9rZTsVwRMlDBj0xmvR29YRHlZPLKDFEQto59r+8cR8cyEUkF9L2VN3pC3Io wJLg== X-Gm-Message-State: AA6/9RnIaTftaALJITrZh0bU+cx7T6DYZiRXijm7MS2S1ffEsjf5fBLd2Hknxpm0xpyaK1d/ X-Received: by 10.67.7.170 with SMTP id dd10mr7826313pad.152.1475613488993; Tue, 04 Oct 2016 13:38:08 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([172.22.64.13]) by smtp.gmail.com with ESMTPSA id 137sm21265280pfv.26.2016.10.04.13.38.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Oct 2016 13:38:08 -0700 (PDT) From: Rajat Jain To: Amitkumar Karwar , Nishant Sarmukadam , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Cc: Rajat Jain , Wei-Ning Huang , Brian Norris , Eric Caruso , rajatxjain@gmail.com Subject: [PATCH v3] mwifiex: report wakeup for wowlan Date: Tue, 4 Oct 2016 13:37:42 -0700 Message-Id: <1475613462-93384-1-git-send-email-rajatja@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <87vax8p9is.fsf@kamboji.qca.qualcomm.com> References: <87vax8p9is.fsf@kamboji.qca.qualcomm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Register the WLAN device as a wakeup source since it can wake the system via wake-on-wireless-lan. In an actual wowlan event, notify the PM core that we are the current wakeup source. This allows the PM core to update the wakeup attributes in /sys. This was causing wakeup issues on chromeos as the system was apparently confused about the wakeup source. Signed-off-by: Wei-Ning Huang Signed-off-by: Rajat Jain Tested-by: Wei-Ning Huang Reviewed-by: Eric Caruso Acked-by: Amitkumar Karwar --- v3: Fix the commit log v2: Fix the commit log 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; };