From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux PM <linux-pm@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>,
Haridhar Kalvala <haridhar.kalvala@intel.com>
Subject: [PATCH RESEND 7/9] mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt
Date: Tue, 9 Jan 2018 09:52:24 +0200 [thread overview]
Message-ID: <1515484346-800-8-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1515484346-800-1-git-send-email-adrian.hunter@intel.com>
Do not enable wakeup for SDIO card interrupt unless the SDIO function
driver has requested it which is indicated by mmc_card_wake_sdio_irq().
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index f16df253cc59..c82fd16dd14e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2842,8 +2842,13 @@ static bool sdhci_enable_irq_wakeups(struct sdhci_host *host)
irq_val |= SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE;
}
- wake_val |= SDHCI_WAKE_ON_INT;
- irq_val |= SDHCI_INT_CARD_INT;
+ if (mmc_card_wake_sdio_irq(host->mmc)) {
+ wake_val |= SDHCI_WAKE_ON_INT;
+ irq_val |= SDHCI_INT_CARD_INT;
+ }
+
+ if (!irq_val)
+ return false;
val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL);
val &= ~mask;
--
1.9.1
next prev parent reply other threads:[~2018-01-09 7:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 7:52 [PATCH RESEND 0/9] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
2018-01-09 7:52 ` [PATCH RESEND 1/9] mmc: sdhci-pci: Stop calling sdhci_enable_irq_wakeups() Adrian Hunter
2018-01-17 11:48 ` Ulf Hansson
2018-01-09 7:52 ` [PATCH RESEND 2/9] mmc: sdhci-pci: Use device wakeup capability to determine MMC_PM_WAKE_SDIO_IRQ capability Adrian Hunter
2018-01-17 11:48 ` Ulf Hansson
2018-01-09 7:52 ` [PATCH RESEND 3/9] mmc: sdhci: Stop exporting sdhci_enable_irq_wakeups() Adrian Hunter
2018-01-17 11:48 ` Ulf Hansson
2018-01-09 7:52 ` [PATCH RESEND 4/9] mmc: sdhci: Handle failure of enable_irq_wake() Adrian Hunter
2018-01-17 11:48 ` Ulf Hansson
2018-01-09 7:52 ` [PATCH RESEND 5/9] mmc: sdhci: Rework sdhci_enable_irq_wakeups() Adrian Hunter
2018-01-17 11:48 ` Ulf Hansson
2018-01-09 7:52 ` [PATCH RESEND 6/9] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt Adrian Hunter
2018-01-09 7:52 ` Adrian Hunter [this message]
2018-01-09 7:52 ` [PATCH RESEND 8/9] mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup Adrian Hunter
2018-01-09 7:52 ` [PATCH RESEND 9/9] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO " Adrian Hunter
2018-01-16 7:43 ` [PATCH RESEND 0/9] " Adrian Hunter
2018-01-16 8:24 ` Ulf Hansson
2018-01-17 11:54 ` Ulf Hansson
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=1515484346-800-8-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=haridhar.kalvala@intel.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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