* [PATCH v11 2/7] mmc: omap_hsmmc: Enable SDIO interrupt
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-09 17:09 ` Balaji T K
2014-05-08 23:20 ` [PATCH v11 3/7] mmc: omap_hsmmc: enable wakeup event for sdio OMAP4 Andreas Fenkart
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap,
Andreas Fenkart
There have been various patches floating around for enabling
the SDIO IRQ for hsmmc, but none of them ever got merged.
Probably the reason for not merging the SDIO interrupt patches
has been the lack of wake-up path for SDIO on some omaps that
has also needed remuxing the SDIO DAT1 line to a GPIO making
the patches complex.
This patch adds the minimal SDIO IRQ support to hsmmc for
omaps that do have the wake-up path. For those omaps, the
DAT1 line need to have the wake-up enable bit set, and the
wake-up interrupt is the same as for the MMC controller.
This patch has been tested on am3730 es1.2 with mwifiex
connected to MMC3 with mwifiex waking to Ethernet traffic
from off-idle mode. Note that for omaps that do not have
the SDIO wake-up path, this patch will not work for idle
modes and further patches for remuxing DAT1 to GPIO are
needed.
Based on earlier patches [1][2] by David Vrabel
<david.vrabel@csr.com>, Steve Sakoman <steve@sakoman.com>
For now, only support SDIO interrupt if we are booted with
a separate wake-irq configued via device tree. This is
because omaps need the wake-irq for idle states, and some
omaps need special quirks. And we don't want to add new
legacy mux platform init code callbacks any longer as we
are moving to DT based booting anyways.
To use it, you need to specify the wake-irq using the
interrupts-extended property.
[1] http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux.git;a=commitdiff_plain;h=010810d22f6f49ac03da4ba384969432e0320453
[2] http://comments.gmane.org/gmane.linux.kernel.mmc/20446
Cc: Balaji T K <balajitk@ti.com>
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 5042a15..f43a69e 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -29,6 +29,7 @@
#include <linux/timer.h>
#include <linux/clk.h>
#include <linux/of.h>
+#include <linux/of_irq.h>
#include <linux/of_gpio.h>
#include <linux/of_device.h>
#include <linux/omap-dma.h>
@@ -36,6 +37,7 @@
#include <linux/mmc/core.h>
#include <linux/mmc/mmc.h>
#include <linux/io.h>
+#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/pinctrl/consumer.h>
@@ -133,6 +135,7 @@ static void apply_clk_hack(struct device *dev)
#define TC_EN (1 << 1)
#define BWR_EN (1 << 4)
#define BRR_EN (1 << 5)
+#define CIRQ_EN (1 << 8)
#define ERR_EN (1 << 15)
#define CTO_EN (1 << 16)
#define CCRC_EN (1 << 17)
@@ -167,7 +170,6 @@ static void apply_clk_hack(struct device *dev)
#define VDD_3V0 3000000 /* 300000 uV */
#define VDD_165_195 (ffs(MMC_VDD_165_195) - 1)
-#define AUTO_CMD23 (1 << 1) /* Auto CMD23 support */
/*
* One controller can have multiple slots, like on some omap boards using
* omap.c controller driver. Luckily this is not currently done on any known
@@ -221,6 +223,7 @@ struct omap_hsmmc_host {
u32 sysctl;
u32 capa;
int irq;
+ int wake_irq;
int use_dma, dma_ch;
struct dma_chan *tx_chan;
struct dma_chan *rx_chan;
@@ -233,6 +236,9 @@ struct omap_hsmmc_host {
int req_in_progress;
unsigned long clk_rate;
unsigned int flags;
+#define AUTO_CMD23 (1 << 0) /* Auto CMD23 support */
+#define HSMMC_SDIO_IRQ_ENABLED (1 << 1) /* SDIO irq enabled */
+#define HSMMC_WAKE_IRQ_ENABLED (1 << 2)
struct omap_hsmmc_next next_data;
struct omap_mmc_platform_data *pdata;
};
@@ -537,27 +543,40 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,
struct mmc_command *cmd)
{
- unsigned int irq_mask;
+ u32 irq_mask = INT_EN_MASK;
+ unsigned long flags;
if (host->use_dma)
- irq_mask = INT_EN_MASK & ~(BRR_EN | BWR_EN);
- else
- irq_mask = INT_EN_MASK;
+ irq_mask &= ~(BRR_EN | BWR_EN);
/* Disable timeout for erases */
if (cmd->opcode == MMC_ERASE)
irq_mask &= ~DTO_EN;
+ spin_lock_irqsave(&host->irq_lock, flags);
OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
+
+ /* latch pending CIRQ, but don't signal MMC core */
+ if (host->flags & HSMMC_SDIO_IRQ_ENABLED)
+ irq_mask |= CIRQ_EN;
OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
+ spin_unlock_irqrestore(&host->irq_lock, flags);
}
static void omap_hsmmc_disable_irq(struct omap_hsmmc_host *host)
{
- OMAP_HSMMC_WRITE(host->base, ISE, 0);
- OMAP_HSMMC_WRITE(host->base, IE, 0);
+ u32 irq_mask = 0;
+ unsigned long flags;
+
+ spin_lock_irqsave(&host->irq_lock, flags);
+ /* no transfer running but need to keep cirq if enabled */
+ if (host->flags & HSMMC_SDIO_IRQ_ENABLED)
+ irq_mask |= CIRQ_EN;
+ OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
+ OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+ spin_unlock_irqrestore(&host->irq_lock, flags);
}
/* Calculate divisor for the given clock frequency */
@@ -708,7 +727,9 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
&& time_before(jiffies, timeout))
;
- omap_hsmmc_disable_irq(host);
+ OMAP_HSMMC_WRITE(host->base, ISE, 0);
+ OMAP_HSMMC_WRITE(host->base, IE, 0);
+ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
/* Do not initialize card-specific things if the power is off */
if (host->power_mode == MMC_POWER_OFF)
@@ -1144,8 +1165,12 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
int status;
status = OMAP_HSMMC_READ(host->base, STAT);
- while (status & INT_EN_MASK && host->req_in_progress) {
- omap_hsmmc_do_irq(host, status);
+ while (status & (INT_EN_MASK | CIRQ_EN)) {
+ if (host->req_in_progress)
+ omap_hsmmc_do_irq(host, status);
+
+ if (status & CIRQ_EN)
+ mmc_signal_sdio_irq(host->mmc);
/* Flush posted write */
status = OMAP_HSMMC_READ(host->base, STAT);
@@ -1154,6 +1179,22 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static irqreturn_t omap_hsmmc_wake_irq(int irq, void *dev_id)
+{
+ struct omap_hsmmc_host *host = dev_id;
+
+ /* cirq is level triggered, disable to avoid infinite loop */
+ spin_lock(&host->irq_lock);
+ if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
+ disable_irq_nosync(host->wake_irq);
+ host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
+ }
+ spin_unlock(&host->irq_lock);
+ pm_request_resume(host->dev); /* no use counter */
+
+ return IRQ_HANDLED;
+}
+
static void set_sd_bus_power(struct omap_hsmmc_host *host)
{
unsigned long i;
@@ -1665,6 +1706,81 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
mmc_slot(host).init_card(card);
}
+static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
+{
+ struct omap_hsmmc_host *host = mmc_priv(mmc);
+ u32 irq_mask;
+ unsigned long flags;
+
+ spin_lock_irqsave(&host->irq_lock, flags);
+
+ irq_mask = OMAP_HSMMC_READ(host->base, ISE);
+ if (enable) {
+ host->flags |= HSMMC_SDIO_IRQ_ENABLED;
+ irq_mask |= CIRQ_EN;
+ } else {
+ host->flags &= ~HSMMC_SDIO_IRQ_ENABLED;
+ irq_mask &= ~CIRQ_EN;
+ }
+ OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
+
+ /*
+ * if enable, piggy back detection on current request
+ * but always disable immediately
+ */
+ if (!host->req_in_progress || !enable)
+ OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
+
+ /* flush posted write */
+ OMAP_HSMMC_READ(host->base, IE);
+
+ spin_unlock_irqrestore(&host->irq_lock, flags);
+}
+
+static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
+{
+ struct mmc_host *mmc = host->mmc;
+ int ret;
+
+ /*
+ * For omaps with wake-up path, wakeirq will be irq from pinctrl and
+ * for other omaps, wakeirq will be from GPIO (dat line remuxed to
+ * gpio). wakeirq is needed to detect sdio irq in runtime suspend state
+ * with functional clock disabled.
+ */
+ if (!host->dev->of_node || !host->wake_irq) {
+ ret = -ENODEV;
+ goto err;
+ }
+
+ /* Prevent auto-enabling of IRQ */
+ irq_set_status_flags(host->wake_irq, IRQ_NOAUTOEN);
+ ret = devm_request_irq(host->dev, host->wake_irq, omap_hsmmc_wake_irq,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ mmc_hostname(mmc), host);
+ if (ret) {
+ dev_err(mmc_dev(host->mmc), "Unable to request wake IRQ\n");
+ goto err;
+ }
+
+ /*
+ * Some omaps don't have wake-up path from deeper idle states
+ * and need to remux SDIO DAT1 to GPIO for wake-up from idle.
+ */
+ if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {
+ ret = -ENODEV;
+ devm_free_irq(host->dev, host->wake_irq, host);
+ goto err;
+ }
+
+ return 0;
+
+err:
+ dev_warn(host->dev, "no SDIO IRQ support, falling back to polling\n");
+ host->wake_irq = 0;
+ return ret;
+}
+
static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
{
u32 hctl, capa, value;
@@ -1717,7 +1833,7 @@ static const struct mmc_host_ops omap_hsmmc_ops = {
.get_cd = omap_hsmmc_get_cd,
.get_ro = omap_hsmmc_get_ro,
.init_card = omap_hsmmc_init_card,
- /* NYET -- enable_sdio_irq */
+ .enable_sdio_irq = omap_hsmmc_enable_sdio_irq,
};
#ifdef CONFIG_DEBUG_FS
@@ -1787,6 +1903,10 @@ static const struct omap_mmc_of_data omap3_pre_es3_mmc_of_data = {
static const struct omap_mmc_of_data omap4_mmc_of_data = {
.reg_offset = 0x100,
};
+static const struct omap_mmc_of_data am33xx_mmc_of_data = {
+ .reg_offset = 0x100,
+ .controller_flags = OMAP_HSMMC_SWAKEUP_MISSING,
+};
static const struct of_device_id omap_mmc_of_match[] = {
{
@@ -1803,6 +1923,10 @@ static const struct of_device_id omap_mmc_of_match[] = {
.compatible = "ti,omap4-hsmmc",
.data = &omap4_mmc_of_data,
},
+ {
+ .compatible = "ti,am33xx-hsmmc",
+ .data = &am33xx_mmc_of_data,
+ },
{},
};
MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
@@ -1941,6 +2065,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, host);
+ if (pdev->dev.of_node)
+ host->wake_irq = irq_of_parse_and_map(pdev->dev.of_node, 1);
+
mmc->ops = &omap_hsmmc_ops;
mmc->f_min = OMAP_MMC_MIN_CLOCK;
@@ -2105,6 +2232,18 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
dev_warn(&pdev->dev,
"pins are not configured from the driver\n");
+ /*
+ * For now, only support SDIO interrupt if we have a separate
+ * wake-up interrupt configured from device tree. This is because
+ * the wake-up interrupt is needed for idle state and some
+ * platforms need special quirks. And we don't want to add new
+ * legacy mux platform init code callbacks any longer as we
+ * are moving to DT based booting anyways.
+ */
+ ret = omap_hsmmc_configure_wake_irq(host);
+ if (!ret)
+ mmc->caps |= MMC_CAP_SDIO_IRQ;
+
omap_hsmmc_protect_card(host);
mmc_add_host(mmc);
@@ -2231,11 +2370,18 @@ static int omap_hsmmc_suspend(struct device *dev)
pm_runtime_get_sync(host->dev);
if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
- omap_hsmmc_disable_irq(host);
+ OMAP_HSMMC_WRITE(host->base, ISE, 0);
+ OMAP_HSMMC_WRITE(host->base, IE, 0);
+ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
}
+ /* do not wake up due to sdio irq */
+ if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
+ !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
+ disable_irq(host->wake_irq);
+
if (host->dbclk)
clk_disable_unprepare(host->dbclk);
@@ -2261,6 +2407,10 @@ static int omap_hsmmc_resume(struct device *dev)
omap_hsmmc_protect_card(host);
+ if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
+ !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
+ enable_irq(host->wake_irq);
+
pm_runtime_mark_last_busy(host->dev);
pm_runtime_put_autosuspend(host->dev);
return 0;
@@ -2276,22 +2426,51 @@ static int omap_hsmmc_resume(struct device *dev)
static int omap_hsmmc_runtime_suspend(struct device *dev)
{
struct omap_hsmmc_host *host;
+ unsigned long flags;
host = platform_get_drvdata(to_platform_device(dev));
omap_hsmmc_context_save(host);
dev_dbg(dev, "disabled\n");
+ spin_lock_irqsave(&host->irq_lock, flags);
+ if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
+ (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {
+ /* disable sdio irq handling to prevent race */
+ OMAP_HSMMC_WRITE(host->base, ISE, 0);
+ OMAP_HSMMC_WRITE(host->base, IE, 0);
+ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+
+ WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
+ enable_irq(host->wake_irq);
+ host->flags |= HSMMC_WAKE_IRQ_ENABLED;
+ }
+ spin_unlock_irqrestore(&host->irq_lock, flags);
return 0;
}
static int omap_hsmmc_runtime_resume(struct device *dev)
{
struct omap_hsmmc_host *host;
+ unsigned long flags;
host = platform_get_drvdata(to_platform_device(dev));
omap_hsmmc_context_restore(host);
dev_dbg(dev, "enabled\n");
+ spin_lock_irqsave(&host->irq_lock, flags);
+ if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
+ (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {
+ /* sdio irq flag can't change while in runtime suspend */
+ if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
+ disable_irq_nosync(host->wake_irq);
+ host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
+ }
+
+ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+ OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
+ OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
+ }
+ spin_unlock_irqrestore(&host->irq_lock, flags);
return 0;
}
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
index 2bf1b30..51e70cf 100644
--- a/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@ -28,6 +28,7 @@
*/
#define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0)
#define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1)
+#define OMAP_HSMMC_SWAKEUP_MISSING BIT(2)
struct mmc_card;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v11 2/7] mmc: omap_hsmmc: Enable SDIO interrupt
2014-05-08 23:20 ` [PATCH v11 2/7] mmc: omap_hsmmc: Enable SDIO interrupt Andreas Fenkart
@ 2014-05-09 17:09 ` Balaji T K
0 siblings, 0 replies; 14+ messages in thread
From: Balaji T K @ 2014-05-09 17:09 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
On Friday 09 May 2014 04:50 AM, Andreas Fenkart wrote:
> There have been various patches floating around for enabling
> the SDIO IRQ for hsmmc, but none of them ever got merged.
>
> Probably the reason for not merging the SDIO interrupt patches
> has been the lack of wake-up path for SDIO on some omaps that
> has also needed remuxing the SDIO DAT1 line to a GPIO making
> the patches complex.
>
> This patch adds the minimal SDIO IRQ support to hsmmc for
> omaps that do have the wake-up path. For those omaps, the
> DAT1 line need to have the wake-up enable bit set, and the
> wake-up interrupt is the same as for the MMC controller.
>
> This patch has been tested on am3730 es1.2 with mwifiex
> connected to MMC3 with mwifiex waking to Ethernet traffic
> from off-idle mode. Note that for omaps that do not have
> the SDIO wake-up path, this patch will not work for idle
> modes and further patches for remuxing DAT1 to GPIO are
> needed.
>
> Based on earlier patches [1][2] by David Vrabel
> <david.vrabel@csr.com>, Steve Sakoman <steve@sakoman.com>
>
> For now, only support SDIO interrupt if we are booted with
> a separate wake-irq configued via device tree. This is
> because omaps need the wake-irq for idle states, and some
> omaps need special quirks. And we don't want to add new
> legacy mux platform init code callbacks any longer as we
> are moving to DT based booting anyways.
>
> To use it, you need to specify the wake-irq using the
> interrupts-extended property.
>
> [1] http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux.git;a=commitdiff_plain;h=010810d22f6f49ac03da4ba384969432e0320453
> [2] http://comments.gmane.org/gmane.linux.kernel.mmc/20446
>
> Cc: Balaji T K <balajitk@ti.com>
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
Hi Andreas,
Thanks for the new patch series.
Minor nit below,
other than that
Acked-by: Balaji T K <balajitk@ti.com>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 5042a15..f43a69e 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -29,6 +29,7 @@
> #include <linux/timer.h>
> #include <linux/clk.h>
> #include <linux/of.h>
> +#include <linux/of_irq.h>
> #include <linux/of_gpio.h>
> #include <linux/of_device.h>
> #include <linux/omap-dma.h>
> @@ -36,6 +37,7 @@
> #include <linux/mmc/core.h>
> #include <linux/mmc/mmc.h>
> #include <linux/io.h>
> +#include <linux/irq.h>
> #include <linux/gpio.h>
> #include <linux/regulator/consumer.h>
> #include <linux/pinctrl/consumer.h>
> @@ -133,6 +135,7 @@ static void apply_clk_hack(struct device *dev)
> #define TC_EN (1 << 1)
> #define BWR_EN (1 << 4)
> #define BRR_EN (1 << 5)
> +#define CIRQ_EN (1 << 8)
> #define ERR_EN (1 << 15)
> #define CTO_EN (1 << 16)
> #define CCRC_EN (1 << 17)
> @@ -167,7 +170,6 @@ static void apply_clk_hack(struct device *dev)
> #define VDD_3V0 3000000 /* 300000 uV */
> #define VDD_165_195 (ffs(MMC_VDD_165_195) - 1)
>
> -#define AUTO_CMD23 (1 << 1) /* Auto CMD23 support */
> /*
> * One controller can have multiple slots, like on some omap boards using
> * omap.c controller driver. Luckily this is not currently done on any known
> @@ -221,6 +223,7 @@ struct omap_hsmmc_host {
> u32 sysctl;
> u32 capa;
> int irq;
> + int wake_irq;
> int use_dma, dma_ch;
> struct dma_chan *tx_chan;
> struct dma_chan *rx_chan;
> @@ -233,6 +236,9 @@ struct omap_hsmmc_host {
> int req_in_progress;
> unsigned long clk_rate;
> unsigned int flags;
> +#define AUTO_CMD23 (1 << 0) /* Auto CMD23 support */
> +#define HSMMC_SDIO_IRQ_ENABLED (1 << 1) /* SDIO irq enabled */
> +#define HSMMC_WAKE_IRQ_ENABLED (1 << 2)
> struct omap_hsmmc_next next_data;
> struct omap_mmc_platform_data *pdata;
> };
> @@ -537,27 +543,40 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
> static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,
> struct mmc_command *cmd)
> {
> - unsigned int irq_mask;
> + u32 irq_mask = INT_EN_MASK;
> + unsigned long flags;
>
> if (host->use_dma)
> - irq_mask = INT_EN_MASK & ~(BRR_EN | BWR_EN);
> - else
> - irq_mask = INT_EN_MASK;
> + irq_mask &= ~(BRR_EN | BWR_EN);
>
> /* Disable timeout for erases */
> if (cmd->opcode == MMC_ERASE)
> irq_mask &= ~DTO_EN;
>
> + spin_lock_irqsave(&host->irq_lock, flags);
> OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
> +
> + /* latch pending CIRQ, but don't signal MMC core */
> + if (host->flags & HSMMC_SDIO_IRQ_ENABLED)
> + irq_mask |= CIRQ_EN;
> OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
> + spin_unlock_irqrestore(&host->irq_lock, flags);
> }
>
> static void omap_hsmmc_disable_irq(struct omap_hsmmc_host *host)
> {
> - OMAP_HSMMC_WRITE(host->base, ISE, 0);
> - OMAP_HSMMC_WRITE(host->base, IE, 0);
> + u32 irq_mask = 0;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&host->irq_lock, flags);
> + /* no transfer running but need to keep cirq if enabled */
> + if (host->flags & HSMMC_SDIO_IRQ_ENABLED)
> + irq_mask |= CIRQ_EN;
> + OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
> + OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
> OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> + spin_unlock_irqrestore(&host->irq_lock, flags);
> }
>
> /* Calculate divisor for the given clock frequency */
> @@ -708,7 +727,9 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
> && time_before(jiffies, timeout))
> ;
>
> - omap_hsmmc_disable_irq(host);
> + OMAP_HSMMC_WRITE(host->base, ISE, 0);
> + OMAP_HSMMC_WRITE(host->base, IE, 0);
> + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
>
> /* Do not initialize card-specific things if the power is off */
> if (host->power_mode == MMC_POWER_OFF)
> @@ -1144,8 +1165,12 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
> int status;
>
> status = OMAP_HSMMC_READ(host->base, STAT);
> - while (status & INT_EN_MASK && host->req_in_progress) {
> - omap_hsmmc_do_irq(host, status);
> + while (status & (INT_EN_MASK | CIRQ_EN)) {
> + if (host->req_in_progress)
> + omap_hsmmc_do_irq(host, status);
> +
> + if (status & CIRQ_EN)
> + mmc_signal_sdio_irq(host->mmc);
>
> /* Flush posted write */
> status = OMAP_HSMMC_READ(host->base, STAT);
> @@ -1154,6 +1179,22 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> +static irqreturn_t omap_hsmmc_wake_irq(int irq, void *dev_id)
> +{
> + struct omap_hsmmc_host *host = dev_id;
> +
> + /* cirq is level triggered, disable to avoid infinite loop */
> + spin_lock(&host->irq_lock);
> + if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
> + disable_irq_nosync(host->wake_irq);
> + host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
> + }
> + spin_unlock(&host->irq_lock);
> + pm_request_resume(host->dev); /* no use counter */
> +
> + return IRQ_HANDLED;
> +}
> +
> static void set_sd_bus_power(struct omap_hsmmc_host *host)
> {
> unsigned long i;
> @@ -1665,6 +1706,81 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
> mmc_slot(host).init_card(card);
> }
>
> +static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
> +{
> + struct omap_hsmmc_host *host = mmc_priv(mmc);
> + u32 irq_mask;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&host->irq_lock, flags);
> +
> + irq_mask = OMAP_HSMMC_READ(host->base, ISE);
> + if (enable) {
> + host->flags |= HSMMC_SDIO_IRQ_ENABLED;
> + irq_mask |= CIRQ_EN;
> + } else {
> + host->flags &= ~HSMMC_SDIO_IRQ_ENABLED;
> + irq_mask &= ~CIRQ_EN;
> + }
> + OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
> +
> + /*
> + * if enable, piggy back detection on current request
> + * but always disable immediately
> + */
> + if (!host->req_in_progress || !enable)
> + OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
> +
> + /* flush posted write */
> + OMAP_HSMMC_READ(host->base, IE);
> +
> + spin_unlock_irqrestore(&host->irq_lock, flags);
> +}
> +
> +static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
> +{
> + struct mmc_host *mmc = host->mmc;
> + int ret;
> +
> + /*
> + * For omaps with wake-up path, wakeirq will be irq from pinctrl and
> + * for other omaps, wakeirq will be from GPIO (dat line remuxed to
> + * gpio). wakeirq is needed to detect sdio irq in runtime suspend state
> + * with functional clock disabled.
> + */
> + if (!host->dev->of_node || !host->wake_irq) {
> + ret = -ENODEV;
from here, May be just do return -ENODEV;
To avoid warning message below for SD/eMMC cards.
> + goto err;
> + }
> +
> + /* Prevent auto-enabling of IRQ */
> + irq_set_status_flags(host->wake_irq, IRQ_NOAUTOEN);
> + ret = devm_request_irq(host->dev, host->wake_irq, omap_hsmmc_wake_irq,
> + IRQF_TRIGGER_LOW | IRQF_ONESHOT,
> + mmc_hostname(mmc), host);
> + if (ret) {
> + dev_err(mmc_dev(host->mmc), "Unable to request wake IRQ\n");
> + goto err;
> + }
> +
> + /*
> + * Some omaps don't have wake-up path from deeper idle states
> + * and need to remux SDIO DAT1 to GPIO for wake-up from idle.
> + */
> + if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {
> + ret = -ENODEV;
> + devm_free_irq(host->dev, host->wake_irq, host);
> + goto err;
> + }
> +
> + return 0;
> +
> +err:
> + dev_warn(host->dev, "no SDIO IRQ support, falling back to polling\n");
Now, I start to see this message for SD/eMMC cards to too :-)
> + host->wake_irq = 0;
> + return ret;
> +}
> +
> static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
> {
> u32 hctl, capa, value;
> @@ -1717,7 +1833,7 @@ static const struct mmc_host_ops omap_hsmmc_ops = {
> .get_cd = omap_hsmmc_get_cd,
> .get_ro = omap_hsmmc_get_ro,
> .init_card = omap_hsmmc_init_card,
> - /* NYET -- enable_sdio_irq */
> + .enable_sdio_irq = omap_hsmmc_enable_sdio_irq,
> };
>
> #ifdef CONFIG_DEBUG_FS
> @@ -1787,6 +1903,10 @@ static const struct omap_mmc_of_data omap3_pre_es3_mmc_of_data = {
> static const struct omap_mmc_of_data omap4_mmc_of_data = {
> .reg_offset = 0x100,
> };
> +static const struct omap_mmc_of_data am33xx_mmc_of_data = {
> + .reg_offset = 0x100,
> + .controller_flags = OMAP_HSMMC_SWAKEUP_MISSING,
> +};
>
> static const struct of_device_id omap_mmc_of_match[] = {
> {
> @@ -1803,6 +1923,10 @@ static const struct of_device_id omap_mmc_of_match[] = {
> .compatible = "ti,omap4-hsmmc",
> .data = &omap4_mmc_of_data,
> },
> + {
> + .compatible = "ti,am33xx-hsmmc",
> + .data = &am33xx_mmc_of_data,
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, omap_mmc_of_match);
> @@ -1941,6 +2065,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, host);
>
> + if (pdev->dev.of_node)
> + host->wake_irq = irq_of_parse_and_map(pdev->dev.of_node, 1);
> +
> mmc->ops = &omap_hsmmc_ops;
>
> mmc->f_min = OMAP_MMC_MIN_CLOCK;
> @@ -2105,6 +2232,18 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
> dev_warn(&pdev->dev,
> "pins are not configured from the driver\n");
>
> + /*
> + * For now, only support SDIO interrupt if we have a separate
> + * wake-up interrupt configured from device tree. This is because
> + * the wake-up interrupt is needed for idle state and some
> + * platforms need special quirks. And we don't want to add new
> + * legacy mux platform init code callbacks any longer as we
> + * are moving to DT based booting anyways.
> + */
> + ret = omap_hsmmc_configure_wake_irq(host);
> + if (!ret)
> + mmc->caps |= MMC_CAP_SDIO_IRQ;
> +
> omap_hsmmc_protect_card(host);
>
> mmc_add_host(mmc);
> @@ -2231,11 +2370,18 @@ static int omap_hsmmc_suspend(struct device *dev)
> pm_runtime_get_sync(host->dev);
>
> if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
> - omap_hsmmc_disable_irq(host);
> + OMAP_HSMMC_WRITE(host->base, ISE, 0);
> + OMAP_HSMMC_WRITE(host->base, IE, 0);
> + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> OMAP_HSMMC_WRITE(host->base, HCTL,
> OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
> }
>
> + /* do not wake up due to sdio irq */
> + if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> + !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
> + disable_irq(host->wake_irq);
> +
> if (host->dbclk)
> clk_disable_unprepare(host->dbclk);
>
> @@ -2261,6 +2407,10 @@ static int omap_hsmmc_resume(struct device *dev)
>
> omap_hsmmc_protect_card(host);
>
> + if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> + !(host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ))
> + enable_irq(host->wake_irq);
> +
> pm_runtime_mark_last_busy(host->dev);
> pm_runtime_put_autosuspend(host->dev);
> return 0;
> @@ -2276,22 +2426,51 @@ static int omap_hsmmc_resume(struct device *dev)
> static int omap_hsmmc_runtime_suspend(struct device *dev)
> {
> struct omap_hsmmc_host *host;
> + unsigned long flags;
>
> host = platform_get_drvdata(to_platform_device(dev));
> omap_hsmmc_context_save(host);
> dev_dbg(dev, "disabled\n");
>
> + spin_lock_irqsave(&host->irq_lock, flags);
> + if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> + (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {
> + /* disable sdio irq handling to prevent race */
> + OMAP_HSMMC_WRITE(host->base, ISE, 0);
> + OMAP_HSMMC_WRITE(host->base, IE, 0);
> + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> +
> + WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
> + enable_irq(host->wake_irq);
> + host->flags |= HSMMC_WAKE_IRQ_ENABLED;
> + }
> + spin_unlock_irqrestore(&host->irq_lock, flags);
> return 0;
> }
>
> static int omap_hsmmc_runtime_resume(struct device *dev)
> {
> struct omap_hsmmc_host *host;
> + unsigned long flags;
>
> host = platform_get_drvdata(to_platform_device(dev));
> omap_hsmmc_context_restore(host);
> dev_dbg(dev, "enabled\n");
>
> + spin_lock_irqsave(&host->irq_lock, flags);
> + if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&
> + (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {
> + /* sdio irq flag can't change while in runtime suspend */
> + if (host->flags & HSMMC_WAKE_IRQ_ENABLED) {
> + disable_irq_nosync(host->wake_irq);
> + host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
> + }
> +
> + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> + OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
> + OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
> + }
> + spin_unlock_irqrestore(&host->irq_lock, flags);
> return 0;
> }
>
> diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
> index 2bf1b30..51e70cf 100644
> --- a/include/linux/platform_data/mmc-omap.h
> +++ b/include/linux/platform_data/mmc-omap.h
> @@ -28,6 +28,7 @@
> */
> #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0)
> #define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1)
> +#define OMAP_HSMMC_SWAKEUP_MISSING BIT(2)
>
> struct mmc_card;
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v11 3/7] mmc: omap_hsmmc: enable wakeup event for sdio OMAP4
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
2014-05-08 23:20 ` [PATCH v11 2/7] mmc: omap_hsmmc: Enable SDIO interrupt Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-08 23:20 ` [PATCH v11 4/7] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state Andreas Fenkart
` (4 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
From: Balaji T K <balajitk@ti.com>
To detect sdio irqs properly without spurious events,
OMAP4 needs IWE in CON and CTPL, CLKEXTFREE in HCTL to be set
Signed-off-by: Balaji T K <balajitk@ti.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index f43a69e..f76462d 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -120,7 +120,10 @@ static void apply_clk_hack(struct device *dev)
#define BCE (1 << 1)
#define FOUR_BIT (1 << 1)
#define HSPE (1 << 2)
+#define IWE (1 << 24)
#define DDR (1 << 19)
+#define CLKEXTFREE (1 << 16)
+#define CTPL (1 << 11)
#define DW8 (1 << 5)
#define OD 0x1
#define STAT_CLEAR 0xFFFFFFFF
@@ -713,6 +716,9 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
capa = VS18;
}
+ if (host->mmc->caps & MMC_CAP_SDIO_IRQ)
+ hctl |= IWE;
+
OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) | hctl);
@@ -1709,19 +1715,23 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
{
struct omap_hsmmc_host *host = mmc_priv(mmc);
- u32 irq_mask;
+ u32 irq_mask, con;
unsigned long flags;
spin_lock_irqsave(&host->irq_lock, flags);
+ con = OMAP_HSMMC_READ(host->base, CON);
irq_mask = OMAP_HSMMC_READ(host->base, ISE);
if (enable) {
host->flags |= HSMMC_SDIO_IRQ_ENABLED;
irq_mask |= CIRQ_EN;
+ con |= CTPL | CLKEXTFREE;
} else {
host->flags &= ~HSMMC_SDIO_IRQ_ENABLED;
irq_mask &= ~CIRQ_EN;
+ con &= ~(CTPL | CLKEXTFREE);
}
+ OMAP_HSMMC_WRITE(host->base, CON, con);
OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
/*
@@ -1773,6 +1783,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
goto err;
}
+ OMAP_HSMMC_WRITE(host->base, HCTL,
+ OMAP_HSMMC_READ(host->base, HCTL) | IWE);
return 0;
err:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v11 4/7] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
2014-05-08 23:20 ` [PATCH v11 2/7] mmc: omap_hsmmc: Enable SDIO interrupt Andreas Fenkart
2014-05-08 23:20 ` [PATCH v11 3/7] mmc: omap_hsmmc: enable wakeup event for sdio OMAP4 Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-09 17:10 ` Balaji T K
2014-05-08 23:20 ` [PATCH v11 5/7] mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected Andreas Fenkart
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap,
Andreas Fenkart
Add SDIO IRQ entries to debugfs entry. Note that PSTATE shows current
state of data lines, incl. SDIO IRQ pending
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index f76462d..14857d7 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -83,6 +83,7 @@ static void apply_clk_hack(struct device *dev)
#define OMAP_HSMMC_RSP54 0x0118
#define OMAP_HSMMC_RSP76 0x011C
#define OMAP_HSMMC_DATA 0x0120
+#define OMAP_HSMMC_PSTATE 0x0124
#define OMAP_HSMMC_HCTL 0x0128
#define OMAP_HSMMC_SYSCTL 0x012C
#define OMAP_HSMMC_STAT 0x0130
@@ -1854,14 +1855,29 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
{
struct mmc_host *mmc = s->private;
struct omap_hsmmc_host *host = mmc_priv(mmc);
+ bool suspended;
- seq_printf(s, "mmc%d:\n ctx_loss:\t%d\n\nregs:\n",
- mmc->index, host->context_loss);
+ seq_printf(s, "mmc%d:\n", mmc->index);
+ seq_printf(s, "sdio irq mode\t%s\n",
+ (mmc->caps & MMC_CAP_SDIO_IRQ) ? "interrupt" : "polling");
- pm_runtime_get_sync(host->dev);
+ if (mmc->caps & MMC_CAP_SDIO_IRQ) {
+ seq_printf(s, "sdio irq \t%s\n",
+ (host->flags & HSMMC_SDIO_IRQ_ENABLED) ? "enabled"
+ : "disabled");
+ }
+
+ suspended = host->dev->power.runtime_status != RPM_ACTIVE;
+ seq_printf(s, "runtime state\t%s\n", (suspended ? "idle" : "active"));
+ seq_printf(s, "ctx_loss:\t%d\n", host->context_loss);
+
+ pm_runtime_get_sync(host->dev);
+ seq_puts(s, "\nregs:\n");
seq_printf(s, "CON:\t\t0x%08x\n",
OMAP_HSMMC_READ(host->base, CON));
+ seq_printf(s, "PSTATE:\t\t0x%08x\n",
+ OMAP_HSMMC_READ(host->base, PSTATE));
seq_printf(s, "HCTL:\t\t0x%08x\n",
OMAP_HSMMC_READ(host->base, HCTL));
seq_printf(s, "SYSCTL:\t\t0x%08x\n",
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v11 4/7] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state
2014-05-08 23:20 ` [PATCH v11 4/7] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state Andreas Fenkart
@ 2014-05-09 17:10 ` Balaji T K
0 siblings, 0 replies; 14+ messages in thread
From: Balaji T K @ 2014-05-09 17:10 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
On Friday 09 May 2014 04:50 AM, Andreas Fenkart wrote:
> Add SDIO IRQ entries to debugfs entry. Note that PSTATE shows current
> state of data lines, incl. SDIO IRQ pending
>
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
>
Looks good to me
Acked-by: Balaji T K <balajitk@ti.com>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index f76462d..14857d7 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -83,6 +83,7 @@ static void apply_clk_hack(struct device *dev)
> #define OMAP_HSMMC_RSP54 0x0118
> #define OMAP_HSMMC_RSP76 0x011C
> #define OMAP_HSMMC_DATA 0x0120
> +#define OMAP_HSMMC_PSTATE 0x0124
> #define OMAP_HSMMC_HCTL 0x0128
> #define OMAP_HSMMC_SYSCTL 0x012C
> #define OMAP_HSMMC_STAT 0x0130
> @@ -1854,14 +1855,29 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
> {
> struct mmc_host *mmc = s->private;
> struct omap_hsmmc_host *host = mmc_priv(mmc);
> + bool suspended;
>
> - seq_printf(s, "mmc%d:\n ctx_loss:\t%d\n\nregs:\n",
> - mmc->index, host->context_loss);
> + seq_printf(s, "mmc%d:\n", mmc->index);
> + seq_printf(s, "sdio irq mode\t%s\n",
> + (mmc->caps & MMC_CAP_SDIO_IRQ) ? "interrupt" : "polling");
>
> - pm_runtime_get_sync(host->dev);
> + if (mmc->caps & MMC_CAP_SDIO_IRQ) {
> + seq_printf(s, "sdio irq \t%s\n",
> + (host->flags & HSMMC_SDIO_IRQ_ENABLED) ? "enabled"
> + : "disabled");
> + }
> +
> + suspended = host->dev->power.runtime_status != RPM_ACTIVE;
> + seq_printf(s, "runtime state\t%s\n", (suspended ? "idle" : "active"));
>
> + seq_printf(s, "ctx_loss:\t%d\n", host->context_loss);
> +
> + pm_runtime_get_sync(host->dev);
> + seq_puts(s, "\nregs:\n");
> seq_printf(s, "CON:\t\t0x%08x\n",
> OMAP_HSMMC_READ(host->base, CON));
> + seq_printf(s, "PSTATE:\t\t0x%08x\n",
> + OMAP_HSMMC_READ(host->base, PSTATE));
> seq_printf(s, "HCTL:\t\t0x%08x\n",
> OMAP_HSMMC_READ(host->base, HCTL));
> seq_printf(s, "SYSCTL:\t\t0x%08x\n",
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v11 5/7] mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
` (2 preceding siblings ...)
2014-05-08 23:20 ` [PATCH v11 4/7] mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-09 17:10 ` Balaji T K
2014-05-08 23:20 ` [PATCH v11 6/7] mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks Andreas Fenkart
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap,
Andreas Fenkart
On multicores, an sdio irq handler could be running in parallel to
runtime suspend. In the worst case it could be waiting for the spinlock
held by the runtime suspend. When runtime suspend is complete and the
functional clock (fclk) turned off, the irq handler will continue and
cause a SIGBUS on the first register access.
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 14857d7..47a5982 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -134,6 +134,9 @@ static void apply_clk_hack(struct device *dev)
#define SRD (1 << 26)
#define SOFTRESET (1 << 1)
+/* PSTATE */
+#define DLEV_DAT(x) (1 << (20 + (x)))
+
/* Interrupt masks for IE and ISE register */
#define CC_EN (1 << 0)
#define TC_EN (1 << 1)
@@ -2455,6 +2458,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
{
struct omap_hsmmc_host *host;
unsigned long flags;
+ int ret = 0;
host = platform_get_drvdata(to_platform_device(dev));
omap_hsmmc_context_save(host);
@@ -2466,14 +2470,29 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
/* disable sdio irq handling to prevent race */
OMAP_HSMMC_WRITE(host->base, ISE, 0);
OMAP_HSMMC_WRITE(host->base, IE, 0);
- OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+
+ if (!(OMAP_HSMMC_READ(host->base, PSTATE) & DLEV_DAT(1))) {
+ /*
+ * dat1 line low, pending sdio irq
+ * race condition: possible irq handler running on
+ * multi-core, abort
+ */
+ dev_dbg(dev, "pending sdio irq, abort suspend\n");
+ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+ OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
+ OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
+ pm_runtime_mark_last_busy(dev);
+ ret = -EBUSY;
+ goto abort;
+ }
WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
enable_irq(host->wake_irq);
host->flags |= HSMMC_WAKE_IRQ_ENABLED;
}
+abort:
spin_unlock_irqrestore(&host->irq_lock, flags);
- return 0;
+ return ret;
}
static int omap_hsmmc_runtime_resume(struct device *dev)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v11 5/7] mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected
2014-05-08 23:20 ` [PATCH v11 5/7] mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected Andreas Fenkart
@ 2014-05-09 17:10 ` Balaji T K
0 siblings, 0 replies; 14+ messages in thread
From: Balaji T K @ 2014-05-09 17:10 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
On Friday 09 May 2014 04:50 AM, Andreas Fenkart wrote:
> On multicores, an sdio irq handler could be running in parallel to
> runtime suspend. In the worst case it could be waiting for the spinlock
> held by the runtime suspend. When runtime suspend is complete and the
> functional clock (fclk) turned off, the irq handler will continue and
> cause a SIGBUS on the first register access.
>
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
>
Acked-by: Balaji T K <balajitk@ti.com>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 14857d7..47a5982 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -134,6 +134,9 @@ static void apply_clk_hack(struct device *dev)
> #define SRD (1 << 26)
> #define SOFTRESET (1 << 1)
>
> +/* PSTATE */
> +#define DLEV_DAT(x) (1 << (20 + (x)))
> +
> /* Interrupt masks for IE and ISE register */
> #define CC_EN (1 << 0)
> #define TC_EN (1 << 1)
> @@ -2455,6 +2458,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
> {
> struct omap_hsmmc_host *host;
> unsigned long flags;
> + int ret = 0;
>
> host = platform_get_drvdata(to_platform_device(dev));
> omap_hsmmc_context_save(host);
> @@ -2466,14 +2470,29 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
> /* disable sdio irq handling to prevent race */
> OMAP_HSMMC_WRITE(host->base, ISE, 0);
> OMAP_HSMMC_WRITE(host->base, IE, 0);
> - OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> +
> + if (!(OMAP_HSMMC_READ(host->base, PSTATE) & DLEV_DAT(1))) {
> + /*
> + * dat1 line low, pending sdio irq
> + * race condition: possible irq handler running on
> + * multi-core, abort
> + */
> + dev_dbg(dev, "pending sdio irq, abort suspend\n");
> + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> + OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
> + OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
> + pm_runtime_mark_last_busy(dev);
> + ret = -EBUSY;
> + goto abort;
> + }
>
> WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
> enable_irq(host->wake_irq);
> host->flags |= HSMMC_WAKE_IRQ_ENABLED;
> }
> +abort:
> spin_unlock_irqrestore(&host->irq_lock, flags);
> - return 0;
> + return ret;
> }
>
> static int omap_hsmmc_runtime_resume(struct device *dev)
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v11 6/7] mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
` (3 preceding siblings ...)
2014-05-08 23:20 ` [PATCH v11 5/7] mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-09 17:11 ` Balaji T K
2014-05-08 23:20 ` [PATCH v11 7/7] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x Andreas Fenkart
2014-05-08 23:48 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Sebastian Reichel
6 siblings, 1 reply; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap,
Andreas Fenkart
These are predefined states of the driver model. When not present,
as if not set in the device tree, they become no-ops.
Explicitly selecting the default state is not needed since the
device core layer sets pin mux to "default" state before probe.
This is not the simplest implementation, on AM335x at least, we could
switch to idle at any point in the suspend hook, only the default state
needs to be set before writing to the irq registers or an IRQ might get
lost.
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 47a5982..5a321f98 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2032,7 +2032,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
const struct of_device_id *match;
dma_cap_mask_t mask;
unsigned tx_req, rx_req;
- struct pinctrl *pinctrl;
const struct omap_mmc_of_data *data;
apply_clk_hack(&pdev->dev);
@@ -2258,11 +2257,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
omap_hsmmc_disable_irq(host);
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev,
- "pins are not configured from the driver\n");
-
/*
* For now, only support SDIO interrupt if we have a separate
* wake-up interrupt configured from device tree. This is because
@@ -2486,10 +2480,15 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
goto abort;
}
+ pinctrl_pm_select_idle_state(dev);
+
WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
enable_irq(host->wake_irq);
host->flags |= HSMMC_WAKE_IRQ_ENABLED;
+ } else {
+ pinctrl_pm_select_idle_state(dev);
}
+
abort:
spin_unlock_irqrestore(&host->irq_lock, flags);
return ret;
@@ -2513,9 +2512,14 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
}
+ pinctrl_pm_select_default_state(host->dev);
+
+ /* irq lost, if pinmux incorrect */
OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
+ } else {
+ pinctrl_pm_select_default_state(host->dev);
}
spin_unlock_irqrestore(&host->irq_lock, flags);
return 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v11 6/7] mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks
2014-05-08 23:20 ` [PATCH v11 6/7] mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks Andreas Fenkart
@ 2014-05-09 17:11 ` Balaji T K
0 siblings, 0 replies; 14+ messages in thread
From: Balaji T K @ 2014-05-09 17:11 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
On Friday 09 May 2014 04:50 AM, Andreas Fenkart wrote:
> These are predefined states of the driver model. When not present,
> as if not set in the device tree, they become no-ops.
> Explicitly selecting the default state is not needed since the
> device core layer sets pin mux to "default" state before probe.
> This is not the simplest implementation, on AM335x at least, we could
> switch to idle at any point in the suspend hook, only the default state
> needs to be set before writing to the irq registers or an IRQ might get
> lost.
>
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 47a5982..5a321f98 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -2032,7 +2032,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
> const struct of_device_id *match;
> dma_cap_mask_t mask;
> unsigned tx_req, rx_req;
> - struct pinctrl *pinctrl;
> const struct omap_mmc_of_data *data;
>
> apply_clk_hack(&pdev->dev);
Looks like this patches is not based on mmc-next[1]
Can you please rebase to mmc-next
[1] http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc.git/log/?id=refs/heads/mmc-next
Other than that:
Acked-by: Balaji T K <balajitk@ti.com>
> @@ -2258,11 +2257,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
>
> omap_hsmmc_disable_irq(host);
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl))
> - dev_warn(&pdev->dev,
> - "pins are not configured from the driver\n");
> -
> /*
> * For now, only support SDIO interrupt if we have a separate
> * wake-up interrupt configured from device tree. This is because
> @@ -2486,10 +2480,15 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
> goto abort;
> }
>
> + pinctrl_pm_select_idle_state(dev);
> +
> WARN_ON(host->flags & HSMMC_WAKE_IRQ_ENABLED);
> enable_irq(host->wake_irq);
> host->flags |= HSMMC_WAKE_IRQ_ENABLED;
> + } else {
> + pinctrl_pm_select_idle_state(dev);
> }
> +
> abort:
> spin_unlock_irqrestore(&host->irq_lock, flags);
> return ret;
> @@ -2513,9 +2512,14 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
> host->flags &= ~HSMMC_WAKE_IRQ_ENABLED;
> }
>
> + pinctrl_pm_select_default_state(host->dev);
> +
> + /* irq lost, if pinmux incorrect */
> OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
> OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);
> OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);
> + } else {
> + pinctrl_pm_select_default_state(host->dev);
> }
> spin_unlock_irqrestore(&host->irq_lock, flags);
> return 0;
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v11 7/7] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
` (4 preceding siblings ...)
2014-05-08 23:20 ` [PATCH v11 6/7] mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks Andreas Fenkart
@ 2014-05-08 23:20 ` Andreas Fenkart
2014-05-09 17:11 ` Balaji T K
2014-05-08 23:48 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Sebastian Reichel
6 siblings, 1 reply; 14+ messages in thread
From: Andreas Fenkart @ 2014-05-08 23:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap,
Andreas Fenkart
The am335x can't detect pending cirq in PM runtime suspend.
This patch reconfigures dat1 as a GPIO before going to suspend.
SDIO interrupts are detected with the GPIO, the GPIO will only wake
the module from suspend, SDIO irq detection will still happen through the
IP block.
Idea of remuxing the pins by Tony Lindgren. Code contributions from
Tony Lindgren and Balaji T K <balajitk@ti.com>
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Conflicts:
drivers/mmc/host/omap_hsmmc.c
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index ce80561..946bc5f 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -56,3 +56,56 @@ Examples:
&edma 25>;
dma-names = "tx", "rx";
};
+
+[workaround for missing swakeup on am33xx]
+
+This SOC is missing the swakeup line, it will not detect SDIO irq
+while in suspend.
+
+ ------
+ | PRCM |
+ ------
+ ^ |
+ swakeup | | fclk
+ | v
+ ------ ------- -----
+ | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU |
+ ------ ------- -----
+
+In suspend the fclk is off and the module is disfunctional. Even register reads
+will fail. A small logic in the host will request fclk restore, when an
+external event is detected. Once the clock is restored, the host detects the
+event normally. Since am33xx doesn't have this line it never wakes from
+suspend.
+
+The workaround is to reconfigure the dat1 line as a GPIO upon suspend. To make
+this work, we need to set the named pinctrl states "default" and "idle".
+Prepare idle to remux dat1 as a gpio, and default to remux it back as sdio
+dat1. The MMC driver will then toggle between idle and default state during
+runtime.
+
+In summary:
+1. select matching 'compatible' section, see example below.
+2. specify pinctrl states "default" and "idle", "sleep" is optional.
+3. specify the gpio irq used for detecting sdio irq in suspend
+
+If configuration is incomplete, a warning message is emitted "falling back to
+polling". Also check the "sdio irq mode" in /sys/kernel/debug/mmc0/regs. Mind
+not every application needs SDIO irq, e.g. MMC cards.
+
+ mmc1: mmc@48060100 {
+ compatible = "ti,am33xx-hsmmc";
+ ...
+ pinctrl-names = "default", "idle", "sleep"
+ pinctrl-0 = <&mmc1_pins>;
+ pinctrl-1 = <&mmc1_idle>;
+ pinctrl-2 = <&mmc1_sleep>;
+ ...
+ interrupts-extended = <&intc 64 &gpio2 28 0>;
+ };
+
+ mmc1_idle : pinmux_cirq_pin {
+ pinctrl-single,pins = <
+ 0x0f8 0x3f /* GPIO2_28 */
+ >;
+ };
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 5a321f98..497b2fc 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1782,15 +1782,25 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
* and need to remux SDIO DAT1 to GPIO for wake-up from idle.
*/
if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {
- ret = -ENODEV;
- devm_free_irq(host->dev, host->wake_irq, host);
- goto err;
+ if (IS_ERR(host->dev->pins->default_state)) {
+ dev_info(host->dev, "missing default pinctrl state\n");
+ ret = -EINVAL;
+ goto err_free_irq;
+ }
+
+ if (IS_ERR(host->dev->pins->idle_state)) {
+ dev_info(host->dev, "missing idle pinctrl state\n");
+ ret = -EINVAL;
+ goto err_free_irq;
+ }
}
OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) | IWE);
return 0;
+err_free_irq:
+ devm_free_irq(host->dev, host->wake_irq, host);
err:
dev_warn(host->dev, "no SDIO IRQ support, falling back to polling\n");
host->wake_irq = 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v11 7/7] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x
2014-05-08 23:20 ` [PATCH v11 7/7] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x Andreas Fenkart
@ 2014-05-09 17:11 ` Balaji T K
0 siblings, 0 replies; 14+ messages in thread
From: Balaji T K @ 2014-05-09 17:11 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
On Friday 09 May 2014 04:50 AM, Andreas Fenkart wrote:
> The am335x can't detect pending cirq in PM runtime suspend.
> This patch reconfigures dat1 as a GPIO before going to suspend.
> SDIO interrupts are detected with the GPIO, the GPIO will only wake
> the module from suspend, SDIO irq detection will still happen through the
> IP block.
>
> Idea of remuxing the pins by Tony Lindgren. Code contributions from
> Tony Lindgren and Balaji T K <balajitk@ti.com>
>
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> Conflicts:
> drivers/mmc/host/omap_hsmmc.c
Remove above 2 lines
Acked-by: Balaji T K <balajitk@ti.com>
>
> diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> index ce80561..946bc5f 100644
> --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
> @@ -56,3 +56,56 @@ Examples:
> &edma 25>;
> dma-names = "tx", "rx";
> };
> +
> +[workaround for missing swakeup on am33xx]
> +
> +This SOC is missing the swakeup line, it will not detect SDIO irq
> +while in suspend.
> +
> + ------
> + | PRCM |
> + ------
> + ^ |
> + swakeup | | fclk
> + | v
> + ------ ------- -----
> + | card | -- CIRQ --> | hsmmc | -- IRQ --> | CPU |
> + ------ ------- -----
> +
> +In suspend the fclk is off and the module is disfunctional. Even register reads
> +will fail. A small logic in the host will request fclk restore, when an
> +external event is detected. Once the clock is restored, the host detects the
> +event normally. Since am33xx doesn't have this line it never wakes from
> +suspend.
> +
> +The workaround is to reconfigure the dat1 line as a GPIO upon suspend. To make
> +this work, we need to set the named pinctrl states "default" and "idle".
> +Prepare idle to remux dat1 as a gpio, and default to remux it back as sdio
> +dat1. The MMC driver will then toggle between idle and default state during
> +runtime.
> +
> +In summary:
> +1. select matching 'compatible' section, see example below.
> +2. specify pinctrl states "default" and "idle", "sleep" is optional.
> +3. specify the gpio irq used for detecting sdio irq in suspend
> +
> +If configuration is incomplete, a warning message is emitted "falling back to
> +polling". Also check the "sdio irq mode" in /sys/kernel/debug/mmc0/regs. Mind
> +not every application needs SDIO irq, e.g. MMC cards.
> +
> + mmc1: mmc@48060100 {
> + compatible = "ti,am33xx-hsmmc";
> + ...
> + pinctrl-names = "default", "idle", "sleep"
> + pinctrl-0 = <&mmc1_pins>;
> + pinctrl-1 = <&mmc1_idle>;
> + pinctrl-2 = <&mmc1_sleep>;
> + ...
> + interrupts-extended = <&intc 64 &gpio2 28 0>;
> + };
> +
> + mmc1_idle : pinmux_cirq_pin {
> + pinctrl-single,pins = <
> + 0x0f8 0x3f /* GPIO2_28 */
> + >;
> + };
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 5a321f98..497b2fc 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1782,15 +1782,25 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host)
> * and need to remux SDIO DAT1 to GPIO for wake-up from idle.
> */
> if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {
> - ret = -ENODEV;
> - devm_free_irq(host->dev, host->wake_irq, host);
> - goto err;
> + if (IS_ERR(host->dev->pins->default_state)) {
> + dev_info(host->dev, "missing default pinctrl state\n");
> + ret = -EINVAL;
> + goto err_free_irq;
> + }
> +
> + if (IS_ERR(host->dev->pins->idle_state)) {
> + dev_info(host->dev, "missing idle pinctrl state\n");
> + ret = -EINVAL;
> + goto err_free_irq;
> + }
> }
>
> OMAP_HSMMC_WRITE(host->base, HCTL,
> OMAP_HSMMC_READ(host->base, HCTL) | IWE);
> return 0;
>
> +err_free_irq:
> + devm_free_irq(host->dev, host->wake_irq, host);
> err:
> dev_warn(host->dev, "no SDIO IRQ support, falling back to polling\n");
> host->wake_irq = 0;
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build
2014-05-08 23:20 ` [PATCH v11 1/7] mmc: omap_hsmmc: compile fix for !CONFIG_OF build Andreas Fenkart
` (5 preceding siblings ...)
2014-05-08 23:20 ` [PATCH v11 7/7] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x Andreas Fenkart
@ 2014-05-08 23:48 ` Sebastian Reichel
6 siblings, 0 replies; 14+ messages in thread
From: Sebastian Reichel @ 2014-05-08 23:48 UTC (permalink / raw)
To: Andreas Fenkart
Cc: Tony Lindgren, Chris Ball, Grant Likely, Felipe Balbi, Balaji T K,
Andreas Mueller, zonque, galak, linux-doc, linux-mmc, linux-omap
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
On Fri, May 09, 2014 at 01:20:28AM +0200, Andreas Fenkart wrote:
> Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 8d07e2b..5042a15 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1864,6 +1864,7 @@ static inline struct omap_mmc_platform_data
> {
> return ERR_PTR(-EINVAL);
> }
> +#define omap_mmc_of_match NULL
> #endif
>
> static int omap_hsmmc_probe(struct platform_device *pdev)
What do you need this for? omap_hsmmc.c uses of_match_ptr() to
access omap_mmc_of_match, which is a macro returning NULL for
!CONFIG_OF.
-- Sebastian
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread