Skip to contentSkip to conversation

mmc: omap_hsmmc: Enable SDIO IRQ.

PATCH Superseded Andreas Fenkart 5 participants 16 messages Nov 18, 2013 – Jun 30, 2014

Subsystems (3)

v3 of 14 Superseded Latest is v14 →

lore
Share & tools
lore
#0 lore raw

v3 cover mmc: omap_hsmmc: Enable SDIO IRQ.

This a resend:
- no spin_lock during register access in pm_runtime suspend/resume
- reworked GPIO enable / disable logic, also suspend/resume

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      |   42 +++
 drivers/mmc/host/omap_hsmmc.c                      |  295 ++++++++++++++++++--
 include/linux/platform_data/mmc-omap.h             |    4 +
 3 files changed, 321 insertions(+), 20 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 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.

Broken hardware, missing the swakueup line, should fallback to polling, by setting 'ti,quirk-swakup-missing' in the device tree. Otherwise pending SDIO IRQ are not detected while in suspend. This affects am33xx processors.

For the DT-Binding portion:

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +18 -0
index ed271fc..1136e6b 100644
@@ -20,6 +20,24 @@ ti,dual-volt: boolean, supports dual voltage cards
 ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
+ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
+SDIO irq while in suspend. Fallback to polling. Affected chips are
+am335x,
+
+                            ------
+                            | 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.
 
 Example:
 	mmc1: mmc@0x4809c000 {
drivers/mmc/host/omap_hsmmc.c +77 -9

143 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v3 2/3 mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

In reply to 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 as well as the implementation of omap_hsmmc_pin_init.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +26 -2
index 1136e6b..146f3ad 100644
@@ -21,8 +21,11 @@ ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
 ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
-SDIO irq while in suspend. Fallback to polling. Affected chips are
-am335x,
+SDIO irq while in suspend. The workaround is to reconfigure the dat1 line as a
+GPIO upon suspend. Beyond this option and the GPIO config, you also need to set
+named pinctrl states "default", "active" and "idle ", see example below.  The
+MMC driver will then then toggle between default and idle during the runtime
+Affected chips are am335x,
 
                             ------
                             | PRCM |
@@ -49,3 +52,24 @@ Example:
 		vmmc-supply = <&vmmc>; /* phandle to regulator node */
 		ti,non-removable;
 	};
+
+[am335x with with gpio for sdio irq]
+
+	mmc1_cirq_pin: pinmux_cirq_pin {
+		pinctrl-single,pins = <
+			0x0f8 0x3f	/* MMC0_DAT1 as GPIO2_28 */
+		>;
+	};
+
+	mmc1: mmc@48060000 {
+		ti,non-removable;
+		bus-width = <4>;
+		vmmc-supply = <&ldo2_reg>;
+		vmmc_aux-supply = <&vmmc>;
+	        ti,quirk-swakeup-missing;
+		pinctrl-names = "default", "active", "idle";
+		pinctrl-0 = <&mmc1_pins>;
+		pinctrl-1 = <&mmc1_pins>;
+		pinctrl-2 = <&mmc1_cirq_pin>;
+		ti,cirq-gpio = <&gpio3 28 0>;
+	};
drivers/mmc/host/omap_hsmmc.c +182 -12

301 lines not on this page · raw message

include/linux/platform_data/mmc-omap.h +4 -0
index 2bf1b30..fd5fff5 100644
@@ -115,6 +115,7 @@ struct omap_mmc_platform_data {
 
 		int switch_pin;			/* gpio (card detect) */
 		int gpio_wp;			/* gpio (write protect) */
+		int gpio_cirq;			/* gpio (card irq) */
 
 		int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
 		int (*set_power)(struct device *dev, int slot,
@@ -145,6 +146,9 @@ struct omap_mmc_platform_data {
 		int card_detect_irq;
 		int (*card_detect)(struct device *dev, int slot);
 
+		/* SDIO IRQs */
+		int sdio_irq;
+
 		unsigned int ban_openended:1;
 
 	} slots[OMAP_MMC_MAX_SLOTS];
Signature · 1 line
1.7.10.4
#3 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Hi Andreas

Quoted 100 lines · 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 as well as the implementation of omap_hsmmc_pin_init.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +26 -2
index 1136e6b..146f3ad 100644
@@ -21,8 +21,11 @@ ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
 ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
-SDIO irq while in suspend. Fallback to polling. Affected chips are
-am335x,
+SDIO irq while in suspend. The workaround is to reconfigure the dat1 line as a
+GPIO upon suspend. Beyond this option and the GPIO config, you also need to set
+named pinctrl states "default", "active" and "idle ", see example below.  The
+MMC driver will then then toggle between default and idle during the runtime
+Affected chips are am335x,
 
                             ------
                             | PRCM |
@@ -49,3 +52,24 @@ Example:
                vmmc-supply = <&vmmc>; /* phandle to regulator node */
                ti,non-removable;
        };
+
+[am335x with with gpio for sdio irq]
+
+       mmc1_cirq_pin: pinmux_cirq_pin {
+               pinctrl-single,pins = <
+                       0x0f8 0x3f      /* MMC0_DAT1 as GPIO2_28 */
+               >;
+       };
+
+       mmc1: mmc@48060000 {
+               ti,non-removable;
+               bus-width = <4>;
+               vmmc-supply = <&ldo2_reg>;
+               vmmc_aux-supply = <&vmmc>;
+               ti,quirk-swakeup-missing;
+               pinctrl-names = "default", "active", "idle";
+               pinctrl-0 = <&mmc1_pins>;
+               pinctrl-1 = <&mmc1_pins>;
+               pinctrl-2 = <&mmc1_cirq_pin>;
+               ti,cirq-gpio = <&gpio3 28 0>;
+       };
drivers/mmc/host/omap_hsmmc.c +22 -0
index 6b0ec55..b94ab08 100644
@@ -36,6 +36,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>
@@ -213,11 +214,32 @@ struct omap_hsmmc_host {
        int                     req_in_progress;
        int                     flags;
 #define HSMMC_SDIO_IRQ_ENABLED (1 << 0)        /* SDIO irq enabled */
+#define HSMMC_SWAKEUP_QUIRK    (1 << 1)
+#define HSMMC_CIRQ_GPIO_ENABLED (1 << 2)
 
        struct omap_hsmmc_next  next_data;
+       struct pinctrl          *pinctrl;
+       struct pinctrl_state    *fixed, *active, *idle;
        struct  omap_mmc_platform_data  *pdata;
 };
 
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */
+
+       return IRQ_HANDLED;
+}
+
 static int omap_hsmmc_card_detect(struct device *dev, int slot)
 {
        struct omap_hsmmc_host *host = dev_get_drvdata(dev);

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) · line 479

Quoted 6 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
        } else
                pdata->slots[0].gpio_wp = -EINVAL;
 
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Quoted 91 lines
drivers/mmc/host/omap_hsmmc.c +76 -1
+               ret = gpio_request_one(pdata->slots[0].gpio_cirq, GPIOF_DIR_IN,
+                                      "sdio_cirq");
+               if (ret)
+                       goto err_free_ro;
+
+       } else {
+               pdata->slots[0].gpio_cirq = -EINVAL;
+       }
+
+
        return 0;
 
+err_free_ro:
+       if (gpio_is_valid(pdata->slots[0].gpio_wp))
 err_free_wp:
-       gpio_free(pdata->slots[0].gpio_wp);
+               gpio_free(pdata->slots[0].gpio_wp);
 err_free_cd:
        if (gpio_is_valid(pdata->slots[0].switch_pin))
 err_free_sp:
@@ -469,6 +506,69 @@ static void omap_hsmmc_gpio_free(struct omap_mmc_platform_data *pdata)
                gpio_free(pdata->slots[0].gpio_wp);
        if (gpio_is_valid(pdata->slots[0].switch_pin))
                gpio_free(pdata->slots[0].switch_pin);
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq))
+               gpio_free(pdata->slots[0].gpio_cirq);
+}
+
+static int omap_hsmmc_pin_init(struct omap_hsmmc_host *host)
+{
+       int ret;
+
+       host->pinctrl = devm_pinctrl_get(host->dev);
+       if (IS_ERR(host->pinctrl)) {
+               dev_dbg(host->dev, "no pinctrl handle\n");
+               ret = 0;
+               goto out;
+       }
+
+       host->fixed = pinctrl_lookup_state(host->pinctrl,
+                                          PINCTRL_STATE_DEFAULT);
+       if (IS_ERR(host->fixed)) {
+               dev_dbg(host->dev,
+                        "pins are not configured from the driver\n");
+               host->fixed = NULL;
+               ret = 0;
+               goto out;
+       }
+
+       ret = pinctrl_select_state(host->pinctrl, host->fixed);
+       if (ret < 0)
+               goto err;
+
+       /* For most cases we don't have wake-ups, and exit after this */
+       host->active = pinctrl_lookup_state(host->pinctrl, "active");
+       if (IS_ERR(host->active)) {
+               ret = PTR_ERR(host->active);
+               host->active = NULL;
+               return 0;
+       }
+
+       host->idle = pinctrl_lookup_state(host->pinctrl,
+                                         PINCTRL_STATE_IDLE);
+       if (IS_ERR(host->idle)) {
+               ret = PTR_ERR(host->idle);
+               host->idle = NULL;
+               goto err;
+       }
+
+       /* Let's make sure the active and idle states work */
+       ret = pinctrl_select_state(host->pinctrl, host->idle);
+       if (ret < 0)
+               goto err;
+
+       ret = pinctrl_select_state(host->pinctrl, host->active);
+       if (ret < 0)
+               goto err;
+
+       dev_info(mmc_dev(host->mmc), "pins configured for wake-up events\n");
+
+       return 0;
+
+err:
+       dev_err(mmc_dev(host->mmc), "pins configuration error: %i\n", ret);
+
+out:
+       return ret;
 }
 
 /*

drivers/mmc/host/omap_hsmmc.c static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) · line 1894

Quoted 4 lines
drivers/mmc/host/omap_hsmmc.c +1 -0
@@ -1791,6 +1891,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
        pdata->nr_slots = 1;
        pdata->slots[0].switch_pin = cd_gpio;
        pdata->slots[0].gpio_wp = wp_gpio;
+       pdata->slots[0].gpio_cirq = of_get_named_gpio(np, "ti,cirq-gpio", 0);

I don't have the code in front but why this is assigned in a different way?

Michael

Quoted 200 lines
drivers/mmc/host/omap_hsmmc.c +80 -11
        if (of_find_property(np, "ti,non-removable", NULL)) {
                pdata->slots[0].nonremovable = true;
@@ -1837,7 +1938,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;
 
        match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
        if (match) {
@@ -2068,10 +2168,22 @@ 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");
+       ret = omap_hsmmc_pin_init(host);
+       if (ret)
+               goto err_pinctrl_state;
+
+       if ((mmc_slot(host).sdio_irq)) {
+               /* prevent auto-enabling of IRQ */
+               irq_set_status_flags(mmc_slot(host).sdio_irq, IRQ_NOAUTOEN);
+               ret = request_irq(mmc_slot(host).sdio_irq, omap_hsmmc_cirq,
+                                 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                 mmc_hostname(mmc), host);
+               if (ret) {
+                       dev_dbg(mmc_dev(host->mmc),
+                               "Unable to grab MMC SDIO IRQ\n");
+                       goto err_irq_sdio;
+               }
+       }
 
        /*
         * For now, only support SDIO interrupt if we are booted with
@@ -2084,8 +2196,14 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                mmc->caps |= MMC_CAP_SDIO_IRQ;
                if (of_find_property(host->dev->of_node,
                                     "ti,quirk-swakeup-missing", NULL)) {
-                       /* no wakeup from deeper power states, use polling */
-                       mmc->caps &= ~MMC_CAP_SDIO_IRQ;
+                       /* use GPIO to wakeup from deeper power states */
+                       if (!host->idle || !mmc_slot(host).sdio_irq) {
+                               dev_err(mmc_dev(host->mmc),
+                                       "Missing GPIO config or pinctrl idle state\n");
+                               goto err_irq_sdio;
+                       }
+
+                       host->flags |= HSMMC_SWAKEUP_QUIRK;
                }
        }
 
@@ -2113,7 +2231,13 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
 err_slot_name:
        mmc_remove_host(mmc);
-       free_irq(mmc_slot(host).card_detect_irq, host);
+err_irq_sdio:
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
+err_pinctrl_state:
+       devm_pinctrl_put(host->pinctrl);
+       if ((mmc_slot(host).card_detect_irq))
+               free_irq(mmc_slot(host).card_detect_irq, host);
 err_irq_cd:
        if (host->use_reg)
                omap_hsmmc_reg_put(host);
@@ -2158,13 +2282,15 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
        if (host->pdata->cleanup)
                host->pdata->cleanup(&pdev->dev);
        free_irq(host->irq, host);
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
        if (mmc_slot(host).card_detect_irq)
                free_irq(mmc_slot(host).card_detect_irq, host);
-
        if (host->tx_chan)
                dma_release_channel(host->tx_chan);
        if (host->rx_chan)
                dma_release_channel(host->rx_chan);
+       devm_pinctrl_put(host->pinctrl);
 
        pm_runtime_put_sync(host->dev);
        pm_runtime_disable(host->dev);
@@ -2231,6 +2357,9 @@ static int omap_hsmmc_suspend(struct device *dev)
                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
        }
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               disable_irq(mmc_slot(host).sdio_irq);
+
        if (host->dbclk)
                clk_disable_unprepare(host->dbclk);
 
@@ -2268,6 +2397,9 @@ static int omap_hsmmc_resume(struct device *dev)
        if (ret == 0)
                host->suspended = 0;
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               enable_irq(mmc_slot(host).sdio_irq);
+
        pm_runtime_mark_last_busy(host->dev);
        pm_runtime_put_autosuspend(host->dev);
 
@@ -2285,23 +2417,61 @@ 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;
+       int ret = 0;
 
        host = platform_get_drvdata(to_platform_device(dev));
        omap_hsmmc_context_save(host);
        dev_dbg(dev, "disabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+               OMAP_HSMMC_WRITE(host->base, ISE, 0);
+               OMAP_HSMMC_WRITE(host->base, IE, 0);
+               OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+
+               ret = pinctrl_select_state(host->pinctrl, host->idle);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select idle pinmux\n");
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_SDIO_IRQ_ENABLED) {
+                       enable_irq(mmc_slot(host).sdio_irq);
+                       host->flags |= HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+       }
+
+       return ret;
 }
 
 static int omap_hsmmc_runtime_resume(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_restore(host);
        dev_dbg(dev, "enabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+                       disable_irq_nosync(mmc_slot(host).sdio_irq);
+                       host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+
+               ret = pinctrl_select_state(host->pinctrl, host->active);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select active pinmux\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);
+       }
+       return ret;
 }
 
 static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
include/linux/platform_data/mmc-omap.h +4 -1
index 2bf1b30..fd5fff5 100644
@@ -115,6 +115,7 @@ struct omap_mmc_platform_data {
 
                int switch_pin;                 /* gpio (card detect) */
                int gpio_wp;                    /* gpio (write protect) */
+               int gpio_cirq;                  /* gpio (card irq) */
 
                int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
                int (*set_power)(struct device *dev, int slot,
@@ -145,6 +146,9 @@ struct omap_mmc_platform_data {
                int card_detect_irq;
                int (*card_detect)(struct device *dev, int slot);
 
+               /* SDIO IRQs */
+               int sdio_irq;
+
                unsigned int ban_openended:1;
 
        } slots[OMAP_MMC_MAX_SLOTS];
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

2013/11/18 Michael Trimarchi <[email protected]>:

Quoted 106 lines

Hi Andreas

Quoted 103 lines · 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 as well as the implementation of omap_hsmmc_pin_init.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +26 -2
index 1136e6b..146f3ad 100644
@@ -21,8 +21,11 @@ ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
 ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
-SDIO irq while in suspend. Fallback to polling. Affected chips are
-am335x,
+SDIO irq while in suspend. The workaround is to reconfigure the dat1 line as a
+GPIO upon suspend. Beyond this option and the GPIO config, you also need to set
+named pinctrl states "default", "active" and "idle ", see example below.  The
+MMC driver will then then toggle between default and idle during the runtime
+Affected chips are am335x,
 
                             ------
                             | PRCM |
@@ -49,3 +52,24 @@ Example:
                vmmc-supply = <&vmmc>; /* phandle to regulator node */
                ti,non-removable;
        };
+
+[am335x with with gpio for sdio irq]
+
+       mmc1_cirq_pin: pinmux_cirq_pin {
+               pinctrl-single,pins = <
+                       0x0f8 0x3f      /* MMC0_DAT1 as GPIO2_28 */
+               >;
+       };
+
+       mmc1: mmc@48060000 {
+               ti,non-removable;
+               bus-width = <4>;
+               vmmc-supply = <&ldo2_reg>;
+               vmmc_aux-supply = <&vmmc>;
+               ti,quirk-swakeup-missing;
+               pinctrl-names = "default", "active", "idle";
+               pinctrl-0 = <&mmc1_pins>;
+               pinctrl-1 = <&mmc1_pins>;
+               pinctrl-2 = <&mmc1_cirq_pin>;
+               ti,cirq-gpio = <&gpio3 28 0>;
+       };
drivers/mmc/host/omap_hsmmc.c +22 -0
index 6b0ec55..b94ab08 100644
@@ -36,6 +36,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>
@@ -213,11 +214,32 @@ struct omap_hsmmc_host {
        int                     req_in_progress;
        int                     flags;
 #define HSMMC_SDIO_IRQ_ENABLED (1 << 0)        /* SDIO irq enabled */
+#define HSMMC_SWAKEUP_QUIRK    (1 << 1)
+#define HSMMC_CIRQ_GPIO_ENABLED (1 << 2)
 
        struct omap_hsmmc_next  next_data;
+       struct pinctrl          *pinctrl;
+       struct pinctrl_state    *fixed, *active, *idle;
        struct  omap_mmc_platform_data  *pdata;
 };
 
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */
+
+       return IRQ_HANDLED;
+}
+
 static int omap_hsmmc_card_detect(struct device *dev, int slot)
 {
        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
        } else
                pdata->slots[0].gpio_wp = -EINVAL;
 
Quoted 5 lines

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) · line 479

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Seems like, I didn't pay attention to this.
Simply kept in line how the write protection/read only pins are managed. I'd rather not change this part, or not changing it as part of adding sdio IRQ support it.

Maybe somebody else on the list can explain why the platform data contains elements
that are modified during runtime.

- set_power / get_ro function callbacks
- ocr_mask.

Quoted 90 lines
Quoted 90 lines
drivers/mmc/host/omap_hsmmc.c +76 -1
+               ret = gpio_request_one(pdata->slots[0].gpio_cirq, GPIOF_DIR_IN,
+                                      "sdio_cirq");
+               if (ret)
+                       goto err_free_ro;
+
+       } else {
+               pdata->slots[0].gpio_cirq = -EINVAL;
+       }
+
+
        return 0;
 
+err_free_ro:
+       if (gpio_is_valid(pdata->slots[0].gpio_wp))
 err_free_wp:
-       gpio_free(pdata->slots[0].gpio_wp);
+               gpio_free(pdata->slots[0].gpio_wp);
 err_free_cd:
        if (gpio_is_valid(pdata->slots[0].switch_pin))
 err_free_sp:
@@ -469,6 +506,69 @@ static void omap_hsmmc_gpio_free(struct omap_mmc_platform_data *pdata)
                gpio_free(pdata->slots[0].gpio_wp);
        if (gpio_is_valid(pdata->slots[0].switch_pin))
                gpio_free(pdata->slots[0].switch_pin);
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq))
+               gpio_free(pdata->slots[0].gpio_cirq);
+}
+
+static int omap_hsmmc_pin_init(struct omap_hsmmc_host *host)
+{
+       int ret;
+
+       host->pinctrl = devm_pinctrl_get(host->dev);
+       if (IS_ERR(host->pinctrl)) {
+               dev_dbg(host->dev, "no pinctrl handle\n");
+               ret = 0;
+               goto out;
+       }
+
+       host->fixed = pinctrl_lookup_state(host->pinctrl,
+                                          PINCTRL_STATE_DEFAULT);
+       if (IS_ERR(host->fixed)) {
+               dev_dbg(host->dev,
+                        "pins are not configured from the driver\n");
+               host->fixed = NULL;
+               ret = 0;
+               goto out;
+       }
+
+       ret = pinctrl_select_state(host->pinctrl, host->fixed);
+       if (ret < 0)
+               goto err;
+
+       /* For most cases we don't have wake-ups, and exit after this */
+       host->active = pinctrl_lookup_state(host->pinctrl, "active");
+       if (IS_ERR(host->active)) {
+               ret = PTR_ERR(host->active);
+               host->active = NULL;
+               return 0;
+       }
+
+       host->idle = pinctrl_lookup_state(host->pinctrl,
+                                         PINCTRL_STATE_IDLE);
+       if (IS_ERR(host->idle)) {
+               ret = PTR_ERR(host->idle);
+               host->idle = NULL;
+               goto err;
+       }
+
+       /* Let's make sure the active and idle states work */
+       ret = pinctrl_select_state(host->pinctrl, host->idle);
+       if (ret < 0)
+               goto err;
+
+       ret = pinctrl_select_state(host->pinctrl, host->active);
+       if (ret < 0)
+               goto err;
+
+       dev_info(mmc_dev(host->mmc), "pins configured for wake-up events\n");
+
+       return 0;
+
+err:
+       dev_err(mmc_dev(host->mmc), "pins configuration error: %i\n", ret);
+
+out:
+       return ret;
 }
 
Quoted 3 lines

drivers/mmc/host/omap_hsmmc.c static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) · line 1891

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +0 -0
 /*
@@ -1791,6 +1891,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
        pdata->nr_slots = 1;
    int cd_gpio, wp_gpio;

    cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
    wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
Quoted 5 lines

drivers/mmc/host/omap_hsmmc.c static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev) · line 1894

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +1 -0
        pdata->slots[0].switch_pin = cd_gpio;
        pdata->slots[0].gpio_wp = wp_gpio;
+       pdata->slots[0].gpio_cirq = of_get_named_gpio(np, "ti,cirq-gpio", 0);

I don't have the code in front but why this is assigned in a different way?

it's shorter

Quoted 203 lines

Michael

Quoted 200 lines
drivers/mmc/host/omap_hsmmc.c +80 -11
        if (of_find_property(np, "ti,non-removable", NULL)) {
                pdata->slots[0].nonremovable = true;
@@ -1837,7 +1938,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;
 
        match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
        if (match) {
@@ -2068,10 +2168,22 @@ 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");
+       ret = omap_hsmmc_pin_init(host);
+       if (ret)
+               goto err_pinctrl_state;
+
+       if ((mmc_slot(host).sdio_irq)) {
+               /* prevent auto-enabling of IRQ */
+               irq_set_status_flags(mmc_slot(host).sdio_irq, IRQ_NOAUTOEN);
+               ret = request_irq(mmc_slot(host).sdio_irq, omap_hsmmc_cirq,
+                                 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                 mmc_hostname(mmc), host);
+               if (ret) {
+                       dev_dbg(mmc_dev(host->mmc),
+                               "Unable to grab MMC SDIO IRQ\n");
+                       goto err_irq_sdio;
+               }
+       }
 
        /*
         * For now, only support SDIO interrupt if we are booted with
@@ -2084,8 +2196,14 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                mmc->caps |= MMC_CAP_SDIO_IRQ;
                if (of_find_property(host->dev->of_node,
                                     "ti,quirk-swakeup-missing", NULL)) {
-                       /* no wakeup from deeper power states, use polling */
-                       mmc->caps &= ~MMC_CAP_SDIO_IRQ;
+                       /* use GPIO to wakeup from deeper power states */
+                       if (!host->idle || !mmc_slot(host).sdio_irq) {
+                               dev_err(mmc_dev(host->mmc),
+                                       "Missing GPIO config or pinctrl idle state\n");
+                               goto err_irq_sdio;
+                       }
+
+                       host->flags |= HSMMC_SWAKEUP_QUIRK;
                }
        }
 
@@ -2113,7 +2231,13 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
 err_slot_name:
        mmc_remove_host(mmc);
-       free_irq(mmc_slot(host).card_detect_irq, host);
+err_irq_sdio:
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
+err_pinctrl_state:
+       devm_pinctrl_put(host->pinctrl);
+       if ((mmc_slot(host).card_detect_irq))
+               free_irq(mmc_slot(host).card_detect_irq, host);
 err_irq_cd:
        if (host->use_reg)
                omap_hsmmc_reg_put(host);
@@ -2158,13 +2282,15 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
        if (host->pdata->cleanup)
                host->pdata->cleanup(&pdev->dev);
        free_irq(host->irq, host);
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
        if (mmc_slot(host).card_detect_irq)
                free_irq(mmc_slot(host).card_detect_irq, host);
-
        if (host->tx_chan)
                dma_release_channel(host->tx_chan);
        if (host->rx_chan)
                dma_release_channel(host->rx_chan);
+       devm_pinctrl_put(host->pinctrl);
 
        pm_runtime_put_sync(host->dev);
        pm_runtime_disable(host->dev);
@@ -2231,6 +2357,9 @@ static int omap_hsmmc_suspend(struct device *dev)
                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
        }
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               disable_irq(mmc_slot(host).sdio_irq);
+
        if (host->dbclk)
                clk_disable_unprepare(host->dbclk);
 
@@ -2268,6 +2397,9 @@ static int omap_hsmmc_resume(struct device *dev)
        if (ret == 0)
                host->suspended = 0;
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               enable_irq(mmc_slot(host).sdio_irq);
+
        pm_runtime_mark_last_busy(host->dev);
        pm_runtime_put_autosuspend(host->dev);
 
@@ -2285,23 +2417,61 @@ 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;
+       int ret = 0;
 
        host = platform_get_drvdata(to_platform_device(dev));
        omap_hsmmc_context_save(host);
        dev_dbg(dev, "disabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+               OMAP_HSMMC_WRITE(host->base, ISE, 0);
+               OMAP_HSMMC_WRITE(host->base, IE, 0);
+               OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+
+               ret = pinctrl_select_state(host->pinctrl, host->idle);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select idle pinmux\n");
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_SDIO_IRQ_ENABLED) {
+                       enable_irq(mmc_slot(host).sdio_irq);
+                       host->flags |= HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+       }
+
+       return ret;
 }
 
 static int omap_hsmmc_runtime_resume(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_restore(host);
        dev_dbg(dev, "enabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+                       disable_irq_nosync(mmc_slot(host).sdio_irq);
+                       host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+
+               ret = pinctrl_select_state(host->pinctrl, host->active);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select active pinmux\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);
+       }
+       return ret;
 }
 
 static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
include/linux/platform_data/mmc-omap.h +4 -1
index 2bf1b30..fd5fff5 100644
@@ -115,6 +115,7 @@ struct omap_mmc_platform_data {
 
                int switch_pin;                 /* gpio (card detect) */
                int gpio_wp;                    /* gpio (write protect) */
+               int gpio_cirq;                  /* gpio (card irq) */
 
                int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
                int (*set_power)(struct device *dev, int slot,
@@ -145,6 +146,9 @@ struct omap_mmc_platform_data {
                int card_detect_irq;
                int (*card_detect)(struct device *dev, int slot);
 
+               /* SDIO IRQs */
+               int sdio_irq;
+
                unsigned int ban_openended:1;
 
        } slots[OMAP_MMC_MAX_SLOTS];
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 118 lines · Andreas Fenkart

2013/11/18 Michael Trimarchi <[email protected]>:

Quoted 106 lines

Hi Andreas

Quoted 103 lines · 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 as well as the implementation of omap_hsmmc_pin_init.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +26 -2
index 1136e6b..146f3ad 100644
@@ -21,8 +21,11 @@ ti,non-removable: non-removable slot (like eMMC)
  ti,needs-special-reset: Requires a special softreset sequence
  ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
  ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
-SDIO irq while in suspend. Fallback to polling. Affected chips are
-am335x,
+SDIO irq while in suspend. The workaround is to reconfigure the dat1 line as a
+GPIO upon suspend. Beyond this option and the GPIO config, you also need to set
+named pinctrl states "default", "active" and "idle ", see example below.  The
+MMC driver will then then toggle between default and idle during the runtime
+Affected chips are am335x,
 
                              ------
                              | PRCM |
@@ -49,3 +52,24 @@ Example:
                 vmmc-supply = <&vmmc>; /* phandle to regulator node */
                 ti,non-removable;
         };
+
+[am335x with with gpio for sdio irq]
+
+       mmc1_cirq_pin: pinmux_cirq_pin {
+               pinctrl-single,pins = <
+                       0x0f8 0x3f      /* MMC0_DAT1 as GPIO2_28 */
+               >;
+       };
+
+       mmc1: mmc@48060000 {
+               ti,non-removable;
+               bus-width = <4>;
+               vmmc-supply = <&ldo2_reg>;
+               vmmc_aux-supply = <&vmmc>;
+               ti,quirk-swakeup-missing;
+               pinctrl-names = "default", "active", "idle";
+               pinctrl-0 = <&mmc1_pins>;
+               pinctrl-1 = <&mmc1_pins>;
+               pinctrl-2 = <&mmc1_cirq_pin>;
+               ti,cirq-gpio = <&gpio3 28 0>;
+       };
drivers/mmc/host/omap_hsmmc.c +22 -0
index 6b0ec55..b94ab08 100644
@@ -36,6 +36,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>
@@ -213,11 +214,32 @@ struct omap_hsmmc_host {
         int                     req_in_progress;
         int                     flags;
  #define HSMMC_SDIO_IRQ_ENABLED (1 << 0)        /* SDIO irq enabled */
+#define HSMMC_SWAKEUP_QUIRK    (1 << 1)
+#define HSMMC_CIRQ_GPIO_ENABLED (1 << 2)
 
         struct omap_hsmmc_next  next_data;
+       struct pinctrl          *pinctrl;
+       struct pinctrl_state    *fixed, *active, *idle;
         struct  omap_mmc_platform_data  *pdata;
  };
 
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */
+
+       return IRQ_HANDLED;
+}
+
  static int omap_hsmmc_card_detect(struct device *dev, int slot)
  {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
         } else
                 pdata->slots[0].gpio_wp = -EINVAL;
 
Quoted 5 lines

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) · line 479

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Seems like, I didn't pay attention to this.
Simply kept in line how the write protection/read only pins are managed. I'd rather not change this part, or not changing it as part of adding sdio IRQ support it.

Quoted 7 lines

Maybe somebody else on the list can explain why the platform data contains elements
that are modified during runtime.

- set_power / get_ro function callbacks
- ocr_mask.

Hi,

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

#6 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 25 lines · Balaji T K
Quoted 24 lines · Andreas Fenkart

2013/11/18 Michael Trimarchi <[email protected]>:

Quoted 8 lines · Andreas Fenkart
Quoted 7 lines

static int omap_hsmmc_card_detect(struct device *dev, int slot)

 {
        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
drivers/mmc/host/omap_hsmmc.c +0 -0
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
        } else
                pdata->slots[0].gpio_wp = -EINVAL;
 
Quoted 5 lines

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) · line 479

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Seems like, I didn't pay attention to this.
Simply kept in line how the write protection/read only pins are managed. I'd rather not change this part, or not changing it as part of adding sdio IRQ support it.

Maybe somebody else on the list can explain why the platform data contains elements
that are modified during runtime.

Quoted 8 lines
Quoted 3 lines

- set_power / get_ro function callbacks
- ocr_mask.

Hi,

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

The issue of pdata tinkering needs to be fixed first as it will cause nasty issues when the module is reprobed.

Note that it's still possible to pass platform data in the device tree case as auxdata. And we probably need to do that for the pbias register handling until we have a driver for that.

Talking of the pbias driver, any news on it?

To recap, we basically we need a minimal separate driver that exposes the control module pbias register as a regulator to the hsmmc driver. I don't see that we can remove the platform data from the driver before that's done.

Regards,

Tony

#7 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 29 lines · Tony Lindgren
Quoted 28 lines · Balaji T K
Quoted 27 lines · Andreas Fenkart

2013/11/18 Michael Trimarchi <[email protected]>:

Quoted 8 lines · Andreas Fenkart
Quoted 7 lines
  static int omap_hsmmc_card_detect(struct device *dev, int slot)
  {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
drivers/mmc/host/omap_hsmmc.c +0 -0
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
         } else
                 pdata->slots[0].gpio_wp = -EINVAL;
 
Quoted 5 lines

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) · line 479

Quoted 3 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Seems like, I didn't pay attention to this.
Simply kept in line how the write protection/read only pins are managed. I'd rather not change this part, or not changing it as part of adding sdio IRQ support it.

Maybe somebody else on the list can explain why the platform data contains elements
that are modified during runtime.

- set_power / get_ro function callbacks
- ocr_mask.

Quoted 8 lines
Quoted 5 lines

Hi,

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

The issue of pdata tinkering needs to be fixed first as it will cause nasty issues when the module is reprobed.

Agree that pdata usage needs to be fixed, but currently module reprobe is working fine.

Quoted 6 lines

Note that it's still possible to pass platform data in the device tree case as auxdata. And we probably need to do that for the pbias register handling until we have a driver for that.

Talking of the pbias driver, any news on it?

Almost there, will post the patches soon.
Do you have a branch with updated board files, for me to base pbias patches on else I can base the patches on rc1 too.

Quoted 9 lines

To recap, we basically we need a minimal separate driver that exposes the control module pbias register as a regulator to the hsmmc driver. I don't see that we can remove the platform data from the driver before that's done.

Regards,

Tony

#8 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 7 lines · Balaji T K
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Balaji T K

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

Quoted 5 lines
Quoted 2 lines

The issue of pdata tinkering needs to be fixed first as it will cause nasty issues when the module is reprobed.

Agree that pdata usage needs to be fixed, but currently module reprobe is working fine.

OK. The sdio_irq should be just set in struct omap_hsmmc_host instead.

Quoted 9 lines
Quoted 5 lines

Note that it's still possible to pass platform data in the device tree case as auxdata. And we probably need to do that for the pbias register handling until we have a driver for that.

Talking of the pbias driver, any news on it?

Almost there, will post the patches soon.
Do you have a branch with updated board files, for me to base pbias patches on else I can base the patches on rc1 too.

Great. How about make the pbias driver DT only? Let's not touch the board-*.c files any longer as those will be going away for v3.14. We can probably keep the old callback support in place also, and then remove it for v3.15.

And after that it would certainly make sense to rip out the platform data fomr hsmmc driver just to get rid of the legacy support for multiplexing slots that's not needed in this driver. That would allow replacing all mmc->slots[0] accesses with something more standard.

Regards,

Tony

#9 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

2013/11/19 Tony Lindgren <[email protected]>:

Quoted 22 lines · Balaji T K
Quoted 7 lines · Tony Lindgren
Quoted 6 lines · Balaji T K
Quoted 4 lines

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

Quoted 5 lines
Quoted 2 lines

The issue of pdata tinkering needs to be fixed first as it will cause nasty issues when the module is reprobed.

Agree that pdata usage needs to be fixed, but currently module reprobe is working fine.

OK. The sdio_irq should be just set in struct omap_hsmmc_host instead.

Quoted 6 lines
Quoted 5 lines

Note that it's still possible to pass platform data in the device tree case as auxdata. And we probably need to do that for the pbias register handling until we have a driver for that.

Talking of the pbias driver, any news on it?

Quoted 7 lines
Quoted 3 lines

Almost there, will post the patches soon.
Do you have a branch with updated board files, for me to base pbias patches on else I can base the patches on rc1 too.

Great. How about make the pbias driver DT only? Let's not touch the board-*.c files any longer as those will be going away for v3.14. We can probably keep the old callback support in place also, and then remove it for v3.15.

Is there a dependency on the patches from Balaji or can the SDIO IRQ patches go in already?

Quoted 6 lines

And after that it would certainly make sense to rip out the platform data fomr hsmmc driver just to get rid of the legacy support for multiplexing slots that's not needed in this driver. That would allow replacing all mmc->slots[0] accesses with something more standard.

rgds,
Andi

#10 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 16 lines · Andreas Fenkart

2013/11/19 Tony Lindgren <[email protected]>:

Quoted 15 lines · Balaji T K
Quoted 7 lines · Tony Lindgren
Quoted 6 lines · Balaji T K
Quoted 4 lines

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

Quoted 5 lines
Quoted 2 lines

The issue of pdata tinkering needs to be fixed first as it will cause nasty issues when the module is reprobed.

Agree that pdata usage needs to be fixed, but currently module reprobe is working fine.

OK. The sdio_irq should be just set in struct omap_hsmmc_host instead.

agree, sdio_irq should be cached in struct omap_hsmmc_host

Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 6 lines

Note that it's still possible to pass platform data in the device tree case as auxdata. And we probably need to do that for the pbias register handling until we have a driver for that.

Talking of the pbias driver, any news on it?

Almost there, will post the patches soon.
Do you have a branch with updated board files, for me to base pbias patches on else I can base the patches on rc1 too.

Quoted 7 lines
Quoted 3 lines

Great. How about make the pbias driver DT only? Let's not touch the board-*.c files any longer as those will be going away for v3.14. We can probably keep the old callback support in place also, and then remove it for v3.15.

Is there a dependency on the patches from Balaji or can the SDIO IRQ patches go in already?

Hi Andreas,

I could get sdio interrupt working on AM335x, will do more testing and get back to you.

Pbias shouldn't have create any dependency. Just add sdio_irq to struct omap_hsmmc_host as suggested by Tony.

Thanks and Regards,
Balaji T K

Quoted 11 lines
Quoted 6 lines

And after that it would certainly make sense to rip out the platform data fomr hsmmc driver just to get rid of the legacy support for multiplexing slots that's not needed in this driver. That would allow replacing all mmc->slots[0] accesses with something more standard.

rgds,
Andi

#11 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

In reply to Balaji T K

Hi,

2013-11-19 16:59 GMT+01:00 Balaji T K <[email protected]>:

Quoted 40 lines · Tony Lindgren
Quoted 39 lines · Balaji T K
Quoted 37 lines · Andreas Fenkart
Quoted 35 lines

2013/11/18 Michael Trimarchi <[email protected]>:

Quoted 12 lines
Quoted 9 lines · Andreas Fenkart
  static int omap_hsmmc_card_detect(struct device *dev, int slot)
  {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
drivers/mmc/host/omap_hsmmc.c +0 -0
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct
 omap_mmc_platform_data *pdata)
         } else
                 pdata->slots[0].gpio_wp = -EINVAL;
 
Quoted 7 lines

drivers/mmc/host/omap_hsmmc.c static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)

Quoted 4 lines
drivers/mmc/host/omap_hsmmc.c +3 -0
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+
 gpio_to_irq(pdata->slots[0].gpio_cirq);

What is this? re-assign the platform data?

Seems like, I didn't pay attention to this.
Simply kept in line how the write protection/read only pins are managed. I'd rather not change this part, or not changing it as part of adding sdio IRQ support it.

Maybe somebody else on the list can explain why the platform data contains elements
that are modified during runtime.

- set_power / get_ro function callbacks
- ocr_mask.

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines

Hi,

few params were passed via platform data in non-DT case and never cached in internal data structure, with non-dt support going away soon, I am planning to cleanup pdata usage in the driver when it gets to DT only support.

any news on this?

I'd like to reuse generic mmc_of_parse, kind of difficult with the current driver state

#12 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

In reply to Andreas Fenkart
Quoted 82 lines · 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 as well as the implementation of omap_hsmmc_pin_init.

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +26 -2
index 1136e6b..146f3ad 100644
@@ -21,8 +21,11 @@ ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
 ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed
 ti,quirk-swakup-missing: SOC missing the swakeup line, will not detect
-SDIO irq while in suspend. Fallback to polling. Affected chips are
-am335x,
+SDIO irq while in suspend. The workaround is to reconfigure the dat1 line as a
+GPIO upon suspend. Beyond this option and the GPIO config, you also need to set
+named pinctrl states "default", "active" and "idle ", see example below.  The
+MMC driver will then then toggle between default and idle during the runtime
+Affected chips are am335x,
 
                             ------
                             | PRCM |
@@ -49,3 +52,24 @@ Example:
                vmmc-supply = <&vmmc>; /* phandle to regulator node */
                ti,non-removable;
        };
+
+[am335x with with gpio for sdio irq]
+
+       mmc1_cirq_pin: pinmux_cirq_pin {
+               pinctrl-single,pins = <
+                       0x0f8 0x3f      /* MMC0_DAT1 as GPIO2_28 */
+               >;
+       };
+
+       mmc1: mmc@48060000 {
+               ti,non-removable;
+               bus-width = <4>;
+               vmmc-supply = <&ldo2_reg>;
+               vmmc_aux-supply = <&vmmc>;
+               ti,quirk-swakeup-missing;
+               pinctrl-names = "default", "active", "idle";
+               pinctrl-0 = <&mmc1_pins>;
+               pinctrl-1 = <&mmc1_pins>;
+               pinctrl-2 = <&mmc1_cirq_pin>;
+               ti,cirq-gpio = <&gpio3 28 0>;
+       };
drivers/mmc/host/omap_hsmmc.c +8 -0
index 6b0ec55..b94ab08 100644
@@ -36,6 +36,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>
@@ -213,11 +214,32 @@ struct omap_hsmmc_host {
        int                     req_in_progress;
        int                     flags;
 #define HSMMC_SDIO_IRQ_ENABLED (1 << 0)        /* SDIO irq enabled */
+#define HSMMC_SWAKEUP_QUIRK    (1 << 1)
+#define HSMMC_CIRQ_GPIO_ENABLED (1 << 2)
 
        struct omap_hsmmc_next  next_data;
+       struct pinctrl          *pinctrl;
+       struct pinctrl_state    *fixed, *active, *idle;
        struct  omap_mmc_platform_data  *pdata;
 };
 
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;

drivers/mmc/host/omap_hsmmc.c struct omap_hsmmc_host { · line 238

Quoted 10 lines
drivers/mmc/host/omap_hsmmc.c +10 -0
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */

In the case were you are not waking up from system suspend, but from runtime suspend, you likely want to signal the SDIO irq as soon as possible. Then you should use mmc_signal_sdio_irq instead.

In the other case, when waking up from system suspend, you should be able to completely rely on that the mmc_sdio_resume from the core layer, will handle the IRQ.

Kind regards
Ulf Hansson

Quoted 309 lines
drivers/mmc/host/omap_hsmmc.c +164 -12
+
+       return IRQ_HANDLED;
+}
+
 static int omap_hsmmc_card_detect(struct device *dev, int slot)
 {
        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -452,10 +474,25 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
        } else
                pdata->slots[0].gpio_wp = -EINVAL;
 
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq)) {
+               pdata->slots[0].sdio_irq =
+                               gpio_to_irq(pdata->slots[0].gpio_cirq);
+               ret = gpio_request_one(pdata->slots[0].gpio_cirq, GPIOF_DIR_IN,
+                                      "sdio_cirq");
+               if (ret)
+                       goto err_free_ro;
+
+       } else {
+               pdata->slots[0].gpio_cirq = -EINVAL;
+       }
+
+
        return 0;
 
+err_free_ro:
+       if (gpio_is_valid(pdata->slots[0].gpio_wp))
 err_free_wp:
-       gpio_free(pdata->slots[0].gpio_wp);
+               gpio_free(pdata->slots[0].gpio_wp);
 err_free_cd:
        if (gpio_is_valid(pdata->slots[0].switch_pin))
 err_free_sp:
@@ -469,6 +506,69 @@ static void omap_hsmmc_gpio_free(struct omap_mmc_platform_data *pdata)
                gpio_free(pdata->slots[0].gpio_wp);
        if (gpio_is_valid(pdata->slots[0].switch_pin))
                gpio_free(pdata->slots[0].switch_pin);
+       if (gpio_is_valid(pdata->slots[0].gpio_cirq))
+               gpio_free(pdata->slots[0].gpio_cirq);
+}
+
+static int omap_hsmmc_pin_init(struct omap_hsmmc_host *host)
+{
+       int ret;
+
+       host->pinctrl = devm_pinctrl_get(host->dev);
+       if (IS_ERR(host->pinctrl)) {
+               dev_dbg(host->dev, "no pinctrl handle\n");
+               ret = 0;
+               goto out;
+       }
+
+       host->fixed = pinctrl_lookup_state(host->pinctrl,
+                                          PINCTRL_STATE_DEFAULT);
+       if (IS_ERR(host->fixed)) {
+               dev_dbg(host->dev,
+                        "pins are not configured from the driver\n");
+               host->fixed = NULL;
+               ret = 0;
+               goto out;
+       }
+
+       ret = pinctrl_select_state(host->pinctrl, host->fixed);
+       if (ret < 0)
+               goto err;
+
+       /* For most cases we don't have wake-ups, and exit after this */
+       host->active = pinctrl_lookup_state(host->pinctrl, "active");
+       if (IS_ERR(host->active)) {
+               ret = PTR_ERR(host->active);
+               host->active = NULL;
+               return 0;
+       }
+
+       host->idle = pinctrl_lookup_state(host->pinctrl,
+                                         PINCTRL_STATE_IDLE);
+       if (IS_ERR(host->idle)) {
+               ret = PTR_ERR(host->idle);
+               host->idle = NULL;
+               goto err;
+       }
+
+       /* Let's make sure the active and idle states work */
+       ret = pinctrl_select_state(host->pinctrl, host->idle);
+       if (ret < 0)
+               goto err;
+
+       ret = pinctrl_select_state(host->pinctrl, host->active);
+       if (ret < 0)
+               goto err;
+
+       dev_info(mmc_dev(host->mmc), "pins configured for wake-up events\n");
+
+       return 0;
+
+err:
+       dev_err(mmc_dev(host->mmc), "pins configuration error: %i\n", ret);
+
+out:
+       return ret;
 }
 
 /*
@@ -1791,6 +1891,7 @@ static struct omap_mmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
        pdata->nr_slots = 1;
        pdata->slots[0].switch_pin = cd_gpio;
        pdata->slots[0].gpio_wp = wp_gpio;
+       pdata->slots[0].gpio_cirq = of_get_named_gpio(np, "ti,cirq-gpio", 0);
 
        if (of_find_property(np, "ti,non-removable", NULL)) {
                pdata->slots[0].nonremovable = true;
@@ -1837,7 +1938,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;
 
        match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
        if (match) {
@@ -2068,10 +2168,22 @@ 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");
+       ret = omap_hsmmc_pin_init(host);
+       if (ret)
+               goto err_pinctrl_state;
+
+       if ((mmc_slot(host).sdio_irq)) {
+               /* prevent auto-enabling of IRQ */
+               irq_set_status_flags(mmc_slot(host).sdio_irq, IRQ_NOAUTOEN);
+               ret = request_irq(mmc_slot(host).sdio_irq, omap_hsmmc_cirq,
+                                 IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                 mmc_hostname(mmc), host);
+               if (ret) {
+                       dev_dbg(mmc_dev(host->mmc),
+                               "Unable to grab MMC SDIO IRQ\n");
+                       goto err_irq_sdio;
+               }
+       }
 
        /*
         * For now, only support SDIO interrupt if we are booted with
@@ -2084,8 +2196,14 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                mmc->caps |= MMC_CAP_SDIO_IRQ;
                if (of_find_property(host->dev->of_node,
                                     "ti,quirk-swakeup-missing", NULL)) {
-                       /* no wakeup from deeper power states, use polling */
-                       mmc->caps &= ~MMC_CAP_SDIO_IRQ;
+                       /* use GPIO to wakeup from deeper power states */
+                       if (!host->idle || !mmc_slot(host).sdio_irq) {
+                               dev_err(mmc_dev(host->mmc),
+                                       "Missing GPIO config or pinctrl idle state\n");
+                               goto err_irq_sdio;
+                       }
+
+                       host->flags |= HSMMC_SWAKEUP_QUIRK;
                }
        }
 
@@ -2113,7 +2231,13 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
 err_slot_name:
        mmc_remove_host(mmc);
-       free_irq(mmc_slot(host).card_detect_irq, host);
+err_irq_sdio:
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
+err_pinctrl_state:
+       devm_pinctrl_put(host->pinctrl);
+       if ((mmc_slot(host).card_detect_irq))
+               free_irq(mmc_slot(host).card_detect_irq, host);
 err_irq_cd:
        if (host->use_reg)
                omap_hsmmc_reg_put(host);
@@ -2158,13 +2282,15 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
        if (host->pdata->cleanup)
                host->pdata->cleanup(&pdev->dev);
        free_irq(host->irq, host);
+       if ((mmc_slot(host).sdio_irq))
+               free_irq(mmc_slot(host).sdio_irq, host);
        if (mmc_slot(host).card_detect_irq)
                free_irq(mmc_slot(host).card_detect_irq, host);
-
        if (host->tx_chan)
                dma_release_channel(host->tx_chan);
        if (host->rx_chan)
                dma_release_channel(host->rx_chan);
+       devm_pinctrl_put(host->pinctrl);
 
        pm_runtime_put_sync(host->dev);
        pm_runtime_disable(host->dev);
@@ -2231,6 +2357,9 @@ static int omap_hsmmc_suspend(struct device *dev)
                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
        }
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               disable_irq(mmc_slot(host).sdio_irq);
+
        if (host->dbclk)
                clk_disable_unprepare(host->dbclk);
 
@@ -2268,6 +2397,9 @@ static int omap_hsmmc_resume(struct device *dev)
        if (ret == 0)
                host->suspended = 0;
 
+       if (host->flags & HSMMC_SWAKEUP_QUIRK)
+               enable_irq(mmc_slot(host).sdio_irq);
+
        pm_runtime_mark_last_busy(host->dev);
        pm_runtime_put_autosuspend(host->dev);
 
@@ -2285,23 +2417,61 @@ 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;
+       int ret = 0;
 
        host = platform_get_drvdata(to_platform_device(dev));
        omap_hsmmc_context_save(host);
        dev_dbg(dev, "disabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+               OMAP_HSMMC_WRITE(host->base, ISE, 0);
+               OMAP_HSMMC_WRITE(host->base, IE, 0);
+               OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
+
+               ret = pinctrl_select_state(host->pinctrl, host->idle);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select idle pinmux\n");
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_SDIO_IRQ_ENABLED) {
+                       enable_irq(mmc_slot(host).sdio_irq);
+                       host->flags |= HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+       }
+
+       return ret;
 }
 
 static int omap_hsmmc_runtime_resume(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_restore(host);
        dev_dbg(dev, "enabled\n");
 
-       return 0;
+       if (host->flags & HSMMC_SWAKEUP_QUIRK) {
+
+               spin_lock_irqsave(&host->irq_lock, flags);
+               if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+                       disable_irq_nosync(mmc_slot(host).sdio_irq);
+                       host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
+               }
+               spin_unlock_irqrestore(&host->irq_lock, flags);
+
+               ret = pinctrl_select_state(host->pinctrl, host->active);
+               if (ret < 0)
+                       dev_warn(mmc_dev(host->mmc), "Unable to select active pinmux\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);
+       }
+       return ret;
 }
 
 static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
include/linux/platform_data/mmc-omap.h +4 -1
index 2bf1b30..fd5fff5 100644
@@ -115,6 +115,7 @@ struct omap_mmc_platform_data {
 
                int switch_pin;                 /* gpio (card detect) */
                int gpio_wp;                    /* gpio (write protect) */
+               int gpio_cirq;                  /* gpio (card irq) */
 
                int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
                int (*set_power)(struct device *dev, int slot,
@@ -145,6 +146,9 @@ struct omap_mmc_platform_data {
                int card_detect_irq;
                int (*card_detect)(struct device *dev, int slot);
 
+               /* SDIO IRQs */
+               int sdio_irq;
+
                unsigned int ban_openended:1;
 
        } slots[OMAP_MMC_MAX_SLOTS];
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#13 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Hi Ulf,

2013/11/19 Ulf Hansson <[email protected]>:

Quoted 12 lines · Andreas Fenkart
Quoted 11 lines
drivers/mmc/host/omap_hsmmc.c +9 -0
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
Quoted 8 lines

drivers/mmc/host/omap_hsmmc.c struct omap_hsmmc_host { · line 238

Quoted 4 lines
drivers/mmc/host/omap_hsmmc.c +4 -0
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */

In the case were you are not waking up from system suspend, but from runtime suspend, you likely want to signal the SDIO irq as soon as possible. Then you should use mmc_signal_sdio_irq instead.

That was my intention first as well, and previous patches worked that way. SDIO IRQ while in pm_suspend is a rare event, compard to SDIO irq while in pm_active state.

cat /proc/interrupts
CPU0

 80:      68349      INTC  64  mmc0
236:       4352      GPIO  28  mmc0

Here the Wifi module is just connected, not being pinged or iperf running. So the benefit will not be as big as you imagine.

On the other side the optimisations is not without problems, while in pm_suspend the functional clock is off and you must not access the registers of the module.

But this is exactly whapt happens when you call mmc_signal_sdio_irq, it will call back into the drivers omap_hsmmc_enable_sdio_irq trying to disable the SDIO irq. So you must add special state machines there.

After all it's doable but error prone, and I consider not worth the troubles for no noticeable speedup.

Also have a look here, Balaji T K had a similar remark to yours
http://www.spinics.net/lists/linux-omap/msg99832.html

Quoted 8 lines

In the other case, when waking up from system suspend, you should be able to completely rely on that the mmc_sdio_resume from the core layer, will handle the IRQ.

Kind regards
Ulf Hansson

#14 lore raw

Re: [PATCH v3 2/3] mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x.

Quoted 28 lines · Andreas Fenkart

Hi Ulf,

2013/11/19 Ulf Hansson <[email protected]>:

Quoted 12 lines · Andreas Fenkart
Quoted 11 lines
drivers/mmc/host/omap_hsmmc.c +9 -0
+static irqreturn_t omap_hsmmc_cirq(int irq, void *dev_id)
+{
+       struct omap_hsmmc_host *host = dev_id;
+       unsigned long flags;
+
+       spin_lock_irqsave(&host->irq_lock, flags);
+       if (host->flags & HSMMC_CIRQ_GPIO_ENABLED) {
+               disable_irq_nosync(mmc_slot(host).sdio_irq);
+               host->flags &= ~HSMMC_CIRQ_GPIO_ENABLED;
Quoted 8 lines

drivers/mmc/host/omap_hsmmc.c struct omap_hsmmc_host { · line 238

Quoted 4 lines
drivers/mmc/host/omap_hsmmc.c +4 -0
+       }
+       spin_unlock_irqrestore(&host->irq_lock, flags);
+
+       pm_request_resume(host->dev); /* no use counter */

In the case were you are not waking up from system suspend, but from runtime suspend, you likely want to signal the SDIO irq as soon as possible. Then you should use mmc_signal_sdio_irq instead.

That was my intention first as well, and previous patches worked that way. SDIO IRQ while in pm_suspend is a rare event, compard to SDIO irq while in pm_active state.

Quoted 7 lines

cat /proc/interrupts
CPU0

 80:      68349      INTC  64  mmc0
236:       4352      GPIO  28  mmc0

Here the Wifi module is just connected, not being pinged or iperf running. So the benefit will not be as big as you imagine.

You are right.

Quoted 8 lines

On the other side the optimisations is not without problems, while in pm_suspend the functional clock is off and you must not access the registers of the module.

But this is exactly whapt happens when you call mmc_signal_sdio_irq, it will call back into the drivers omap_hsmmc_enable_sdio_irq trying to disable the SDIO irq. So you must add special state machines there.

Yes, it will be somewhat complicated - I guess.

Quoted 6 lines

After all it's doable but error prone, and I consider not worth the troubles for no noticeable speedup.

Also have a look here, Balaji T K had a similar remark to yours
http://www.spinics.net/lists/linux-omap/msg99832.html

Thanks, I should have looked that first. :-)

Kind regards
Ulf Hansson

Quoted 9 lines
Quoted 9 lines

In the other case, when waking up from system suspend, you should be able to completely rely on that the mmc_sdio_resume from the core layer, will handle the IRQ.

Kind regards
Ulf Hansson

#15 lore raw

PATCH v3 3/3 mmc: omap_hsmmc: Extend debugfs for SDIO IRQ, GPIO and pinmux.

In reply to Andreas Fenkart

Add 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 +18 -1
index b94ab08..d90b4a1 100644
@@ -81,6 +81,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
@@ -1796,6 +1797,20 @@ 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"));
+		if (suspended)
+			seq_printf(s, "sdio irq pin\t%s\n",
+				   gpio_get_value(mmc_slot(host).gpio_cirq) ?
+				   "high" : "low");
+	}
 
 	if (host->suspended) {
 		seq_printf(s, "host suspended, can't read registers\n");
@@ -1803,9 +1818,11 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
 	}
 
 	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