mmc: omap_hsmmc: enable SDIO IRQ.
Subsystems (3)
v5 cover mmc: omap_hsmmc: enable SDIO IRQ.
v5:
- fix compile error introduced by last minute fix
v4:
- switch to interrupts-extended format
- drop ti,swakeup-missing flag convert to comaptible section
v3:
- removed gpio_irq from platform_data
v2:
- incorparated changes as suggested by reviewers
- simplified workaround for am335x, gpio will now only wake the module from runtime suspend, not handle the sdio irq itself
Andreas Fenkart (3):
mmc: omap_hsmmc: Enable SDIO IRQ.
mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on
AM335x.
mmc: omap_hsmmc: Extend debugfs for SDIO IRQ, GPIO and pinmux.
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 50 ++++ drivers/mmc/host/omap_hsmmc.c | 305 ++++++++++++++++++-- include/linux/platform_data/mmc-omap.h | 1 + 3 files changed, 332 insertions(+), 24 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v5 1/3 mmc: omap_hsmmc: Enable SDIO IRQ.
For now, only support SDIO interrupt if we are booted with DT. This is because 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.
--- drivers/mmc/host/omap_hsmmc.c | 109 ++++++++++++++++++++++++++++---- include/linux/platform_data/mmc-omap.h | 1 + 2 files changed, 97 insertions(+), 13 deletions(-)
drivers/mmc/host/omap_hsmmc.c +96 -13
@@ -131,6 +131,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)
@@ -215,6 +216,9 @@ struct omap_hsmmc_host {int reqs_blocked;int use_reg;int req_in_progress; +int flags; +#define HSMMC_SDIO_IRQ_ENABLED (1 << 0)/* SDIO irq enabled */ +struct omap_hsmmc_next next_data;struct omap_mmc_platform_data *pdata; };
@@ -495,27 +499,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 */ +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, need to signal 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 */
@@ -1078,8 +1095,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 );
@@ -1591,6 +1612,37 @@ 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 void omap_hsmmc_conf_bus_power (struct omap_hsmmc_host *host) {u32 hctl, capa, value;
@@ -1643,7 +1695,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
@@ -1705,7 +1757,18 @@ static void omap_hsmmc_debugfs(struct mmc_host *mmc)#endif #ifdef CONFIG_OF -static u16 omap4_reg_offset = 0x100; +struct of_data { + u16 offset; + int flags; +}; + +static struct of_data omap4_data = { + .offset = 0x100, +}; +static struct of_data am33xx_data = { + .offset = 0x100, + .flags = OMAP_HSMMC_SWAKEUP_MISSING, +}; static const struct of_device_id omap_mmc_of_match[] = { {
@@ -1716,7 +1779,11 @@ static const struct of_device_id omap_mmc_of_match[] = { }, { .compatible = "ti,omap4-hsmmc", - .data = &omap4_reg_offset, + .data = &omap4_data, + }, + { + .compatible = "ti,am33xx-hsmmc", + .data = &am33xx_data, }, {}, };
@@ -1801,8 +1868,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)return PTR_ERR (pdata);if (match->data) { -const u16 *offsetp = match->data; - pdata->reg_offset = *offsetp; +const struct of_data *d = match->data; + pdata->reg_offset = d->offset; + pdata->controller_flags |= d->flags; } }
@@ -2020,6 +2088,21 @@ 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 are booted with +* DT. This is because 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. +*/ +if (pdev->dev.of_node) { + mmc->caps |=MMC_CAP_SDIO_IRQ ; +if (pdata->controller_flags &OMAP_HSMMC_SWAKEUP_MISSING ) { +/* no wakeup from deeper power states, use polling */ + mmc->caps &= ~MMC_CAP_SDIO_IRQ ; + } + } +omap_hsmmc_protect_card (host);mmc_add_host (mmc);
include/linux/platform_data/mmc-omap.h +1 -0
@@ -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 ;
Signature · 1 line
1.7.10.4
PATCH v5 2/3 mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.
In reply to Andreas FenkartThe 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 as well as the implementation of omap_hsmmc_pin_init.
--- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 50 ++++++ drivers/mmc/host/omap_hsmmc.c | 186 ++++++++++++++++++-- 2 files changed, 224 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +50 -0
@@ -55,3 +55,53 @@ 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 1) the compatible +section, 2) the named pinctrl states "default", "active" and +"idle " and 3) the gpio detecting sdio irq in suspend, see +example below. The MMC driver will then then toggle between +active and idle during the runtime. If configuration is +incomplete, log message is emitted "falling back to polling". +Mind not every application needs SDIO irq, e.g. MMC cards +Affected chips are am335x, probably others + + + mmc1: mmc@48060100 { + compatible = "ti,am33xx-hsmmc"; + ... + interrupts-extended = <&intc 64 &gpio2 28 0>; + ... + pinctrl-names = "default", "active", "idle" + pinctrl-0 = <&mmc1_pins>; + pinctrl-1 = <&mmc1_pins>; + pinctrl-2 = <&mmc1_cirq_pin>; + ... + }; + + mmc1_cirq_pin: pinmux_cirq_pin { + pinctrl-single,pins = < + 0x0f8 0x3f /* GPIO2_28 */ + >; + };
drivers/mmc/host/omap_hsmmc.c +174 -12
305 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v5 3/3 mmc: omap_hsmmc: Extend debugfs for SDIO IRQ, GPIO and pinmux.
In reply to Andreas FenkartAdd SDIO IRQ entries to debugfs entry. Note that PSTATE shows current state of data lines, incl. SDIO IRQ pending
--- drivers/mmc/host/omap_hsmmc.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/mmc/host/omap_hsmmc.c +13 -1
@@ -82,6 +82,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
@@ -1789,14 +1790,25 @@ 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_puts (s,"\n" ); +seq_printf (s,"sdio irq\t%s\n" , ((host->flags &HSMMC_SDIO_IRQ_ENABLED ) + ?"enabled" :"disabled" )); + suspended = host->dev->power.runtime_status !=RPM_ACTIVE ; +if (host->flags &HSMMC_SWAKEUP_QUIRK ) +seq_printf (s,"pinmux config\t%s\n" , (suspended ? +"gpio" :"sdio" ));seq_printf (s,"mmc%d:\n ctx_loss:\t%d\n\nregs:\n" , mmc->index, 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",
Signature · 1 line
1.7.10.4