* [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup
@ 2018-02-14 12:56 Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 1/4] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt Adrian Hunter
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Adrian Hunter @ 2018-02-14 12:56 UTC (permalink / raw)
To: Ulf Hansson, Rafael J. Wysocki; +Cc: Linux PM, linux-mmc, Haridhar Kalvala
Hi
Commit 03dbaa04a2e5 ("mmc: slot-gpio: Add support to enable irq wake on
cd_irq") enabled wakeup irrespective of the host controller's PM flags.
However, users also want to control it from sysfs power/wakeup attribute.
That means the driver needs to check the PM flags before enabling it in the
suspend callback. Patch 4 adds support for that in sdhci-pci, which is the
only driver presently using the MMC_CAP_CD_WAKE flag. Patches 1 - 1 tidy
up aspects of sdhci and sdhci-pci wakeup handling, and patch 3 adds a
helper function to make it easy for drivers.
There are 2 contentious aspects to this patch set:
1) An existing problem with the SDIO API which does not let the host
controller driver know that the SDIO function driver has requested SDIO
card interrupt wakeup until the suspend callback - which results in the
host controller driver having to enable or disable wakeup in the suspend
callback. Fixing the SDIO API is a separate issue IMHO.
2) In order to use the sysfs power/wakeup attribute, the driver must set the
device as wake capable even when it is really a GPIO that wakes the system.
Changes in V2:
mmc: sdhci-pci: Stop calling sdhci_enable_irq_wakeups()
mmc: sdhci-pci: Use device wakeup capability to determine MMC_PM_WAKE_SDIO_IRQ capability
mmc: sdhci: Stop exporting sdhci_enable_irq_wakeups()
mmc: sdhci: Handle failure of enable_irq_wake()
mmc: sdhci: Rework sdhci_enable_irq_wakeups()
Dropped because they have been appled already
mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup
Re-based
Adrian Hunter (4):
mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt
mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt
mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup
mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup
drivers/mmc/core/core.c | 3 +--
drivers/mmc/core/slot-gpio.c | 25 +++++++++++++++++++++++--
drivers/mmc/host/sdhci-pci-core.c | 18 ++++++++++++++----
drivers/mmc/host/sdhci.c | 23 ++++++++++++++++++++---
include/linux/mmc/slot-gpio.h | 1 +
5 files changed, 59 insertions(+), 11 deletions(-)
Regards
Adrian
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 1/4] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt
2018-02-14 12:56 [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
@ 2018-02-14 12:56 ` Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 2/4] mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt Adrian Hunter
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2018-02-14 12:56 UTC (permalink / raw)
To: Ulf Hansson, Rafael J. Wysocki; +Cc: Linux PM, linux-mmc, Haridhar Kalvala
Do not unnecessarily enable card detect wakeup in the cases that the card
is not removable or a GPIO is used for card detect.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2020e57ffa7e..c2653347bb5e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2899,6 +2899,14 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id)
\*****************************************************************************/
#ifdef CONFIG_PM
+
+static bool sdhci_cd_irq_can_wakeup(struct sdhci_host *host)
+{
+ return mmc_card_is_removable(host->mmc) &&
+ !(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
+ host->mmc->slot.cd_irq < 0;
+}
+
/*
* To enable wakeup events, the corresponding events have to be enabled in
* the Interrupt Status Enable register too. See 'Table 1-6: Wakeup Signal
@@ -2915,7 +2923,7 @@ static bool sdhci_enable_irq_wakeups(struct sdhci_host *host)
u8 wake_val = 0;
u8 val;
- if (!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)) {
+ if (sdhci_cd_irq_can_wakeup(host)) {
wake_val |= SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE;
irq_val |= SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 2/4] mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt
2018-02-14 12:56 [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 1/4] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt Adrian Hunter
@ 2018-02-14 12:56 ` Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 3/4] mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 4/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO " Adrian Hunter
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2018-02-14 12:56 UTC (permalink / raw)
To: Ulf Hansson, Rafael J. Wysocki; +Cc: Linux PM, linux-mmc, Haridhar Kalvala
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 c2653347bb5e..565d24ccb2f2 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2928,8 +2928,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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 3/4] mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup
2018-02-14 12:56 [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 1/4] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 2/4] mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt Adrian Hunter
@ 2018-02-14 12:56 ` Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 4/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO " Adrian Hunter
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2018-02-14 12:56 UTC (permalink / raw)
To: Ulf Hansson, Rafael J. Wysocki; +Cc: Linux PM, linux-mmc, Haridhar Kalvala
Commit 03dbaa04a2e5 ("mmc: slot-gpio: Add support to enable irq wake on
cd_irq") enabled wakeup irrespective of the host controller's PM flags.
However, users also want to control it from sysfs power/wakeup attribute.
That means the driver needs to check the PM flags before enabling it in the
suspend callback. Add helper function mmc_gpio_set_cd_wake() to make it
easy for drivers to do that.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/core/core.c | 3 +--
drivers/mmc/core/slot-gpio.c | 23 +++++++++++++++++++++++
include/linux/mmc/slot-gpio.h | 1 +
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index c0ba6d8823b7..7bed23c877de 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2655,8 +2655,7 @@ void mmc_start_host(struct mmc_host *host)
void mmc_stop_host(struct mmc_host *host)
{
if (host->slot.cd_irq >= 0) {
- if (host->slot.cd_wake_enabled)
- disable_irq_wake(host->slot.cd_irq);
+ mmc_gpio_set_cd_wake(host, false);
disable_irq(host->slot.cd_irq);
}
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 3698b0576009..817d668aae34 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -154,6 +154,29 @@ void mmc_gpiod_request_cd_irq(struct mmc_host *host)
}
EXPORT_SYMBOL(mmc_gpiod_request_cd_irq);
+int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on)
+{
+ int ret = 0;
+
+ if (!(host->caps & MMC_CAP_CD_WAKE) ||
+ host->slot.cd_irq < 0 ||
+ on == host->slot.cd_wake_enabled)
+ return 0;
+
+ if (on) {
+ if (device_may_wakeup(mmc_dev(host))) {
+ ret = enable_irq_wake(host->slot.cd_irq);
+ host->slot.cd_wake_enabled = !ret;
+ }
+ } else {
+ disable_irq_wake(host->slot.cd_irq);
+ host->slot.cd_wake_enabled = false;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(mmc_gpio_set_cd_wake);
+
/* Register an alternate interrupt service routine for
* the card-detect GPIO.
*/
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
index 91f1ba0663c8..06607c59c4d0 100644
--- a/include/linux/mmc/slot-gpio.h
+++ b/include/linux/mmc/slot-gpio.h
@@ -31,6 +31,7 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
unsigned int debounce, bool *gpio_invert);
void mmc_gpio_set_cd_isr(struct mmc_host *host,
irqreturn_t (*isr)(int irq, void *dev_id));
+int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on);
void mmc_gpiod_request_cd_irq(struct mmc_host *host);
bool mmc_can_gpio_cd(struct mmc_host *host);
bool mmc_can_gpio_ro(struct mmc_host *host);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 4/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup
2018-02-14 12:56 [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
` (2 preceding siblings ...)
2018-02-14 12:56 ` [PATCH V2 3/4] mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup Adrian Hunter
@ 2018-02-14 12:56 ` Adrian Hunter
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2018-02-14 12:56 UTC (permalink / raw)
To: Ulf Hansson, Rafael J. Wysocki; +Cc: Linux PM, linux-mmc, Haridhar Kalvala
Commit 03dbaa04a2e5 ("mmc: slot-gpio: Add support to enable irq wake on
cd_irq") enabled wakeup irrespective of the host controller's PM flags.
However, users also want to control it from sysfs power/wakeup attribute.
That means the driver needs to check the PM flags before enabling it in the
suspend callback. Add support for that in sdhci-pci, which is the only
driver presently using the MMC_CAP_CD_WAKE flag, and remove the enabling in
mmc_gpiod_request_cd_irq().
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/core/slot-gpio.c | 2 --
drivers/mmc/host/sdhci-pci-core.c | 18 ++++++++++++++----
drivers/mmc/host/sdhci.c | 4 ++++
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 817d668aae34..02d5dd815099 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -149,8 +149,6 @@ void mmc_gpiod_request_cd_irq(struct mmc_host *host)
if (irq < 0)
host->caps |= MMC_CAP_NEEDS_POLL;
- else if ((host->caps & MMC_CAP_CD_WAKE) && !enable_irq_wake(irq))
- host->slot.cd_wake_enabled = true;
}
EXPORT_SYMBOL(mmc_gpiod_request_cd_irq);
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index ce21d86a8141..bd6ee968bcd9 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -41,18 +41,25 @@
static int sdhci_pci_init_wakeup(struct sdhci_pci_chip *chip)
{
mmc_pm_flag_t pm_flags = 0;
+ bool cap_cd_wake = false;
int i;
for (i = 0; i < chip->num_slots; i++) {
struct sdhci_pci_slot *slot = chip->slots[i];
- if (slot)
+ if (slot) {
pm_flags |= slot->host->mmc->pm_flags;
+ if (slot->host->mmc->caps & MMC_CAP_CD_WAKE)
+ cap_cd_wake = true;
+ }
}
- return device_set_wakeup_enable(&chip->pdev->dev,
- (pm_flags & MMC_PM_KEEP_POWER) &&
- (pm_flags & MMC_PM_WAKE_SDIO_IRQ));
+ if ((pm_flags & MMC_PM_KEEP_POWER) && (pm_flags & MMC_PM_WAKE_SDIO_IRQ))
+ return device_wakeup_enable(&chip->pdev->dev);
+ else if (!cap_cd_wake)
+ return device_wakeup_disable(&chip->pdev->dev);
+
+ return 0;
}
static int sdhci_pci_suspend_host(struct sdhci_pci_chip *chip)
@@ -1698,6 +1705,9 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
if (device_can_wakeup(&pdev->dev))
host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+ if (host->mmc->caps & MMC_CAP_CD_WAKE)
+ device_init_wakeup(&pdev->dev, true);
+
if (slot->cd_idx >= 0) {
ret = mmc_gpiod_request_cd(host->mmc, NULL, slot->cd_idx,
slot->cd_override_level, 0, NULL);
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 565d24ccb2f2..511a9a51b1c7 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2977,6 +2977,8 @@ int sdhci_suspend_host(struct sdhci_host *host)
free_irq(host->irq, host);
}
+ mmc_gpio_set_cd_wake(host->mmc, true);
+
return 0;
}
@@ -3004,6 +3006,8 @@ int sdhci_resume_host(struct sdhci_host *host)
mmiowb();
}
+ mmc_gpio_set_cd_wake(host->mmc, false);
+
if (host->irq_wake_enabled) {
sdhci_disable_irq_wakeups(host);
} else {
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-14 12:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-14 12:56 [PATCH V2 0/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO IRQ wakeup Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 1/4] mmc: sdhci: Do not unnecessarily enable wakeup for card detect interrupt Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 2/4] mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 3/4] mmc: slot-gpio: Add a function to enable/disable card detect IRQ wakeup Adrian Hunter
2018-02-14 12:56 ` [PATCH V2 4/4] mmc: sdhci-pci: Respect PM flags when enabling card detect GPIO " Adrian Hunter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.