Adds support for configuring the omap-gpio driver use autosuspend for
runtime power management. This can reduce the latency in using it by
not suspending the device immediately on idle. If another access takes
place before the autosuspend timeout (2 secs), the call to resume the
device can return immediately saving some save/ restore cycles.
This removes also the bank->mod_usage counter, because this is already
handled in pm_runtime.
I use a gpio to monitor a spi transfer which occurs every 250µs. The
suspend overhead is to high, so almost every second transfer is lost.
This patch fixes that.
Signed-off-by: Tim Niemeyer <tim.niemeyer@xxxxxxxxxxxxx>
---
drivers/gpio/gpio-omap.c | 81 ++++++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 94cbc84..708d5a9 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -31,6 +31,7 @@
#include <asm/mach/irq.h>
#define OFF_MODE 1
+#define GPIO_AUTOSUSPEND_TIMEOUT 2000
static LIST_HEAD(omap_gpio_list);
@@ -64,7 +65,6 @@ struct gpio_bank {
spinlock_t lock;
struct gpio_chip chip;
struct clk *dbck;
- u32 mod_usage;
u32 dbck_enable_mask;
bool dbck_enabled;
struct device *dev;
@@ -557,10 +557,9 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
/*
* If this is the first gpio_request for the bank,
- * enable the bank module.
+ * resume the bank module.
*/
- if (!bank->mod_usage)
- pm_runtime_get_sync(bank->dev);
+ pm_runtime_get_sync(bank->dev);
spin_lock_irqsave(&bank->lock, flags);
/* Set trigger to none. You need to enable the desired trigger with
@@ -575,19 +574,6 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
__raw_writel(__raw_readl(reg) | (1 << offset), reg);
}
- if (bank->regs->ctrl && !bank->mod_usage) {
- void __iomem *reg = bank->base + bank->regs->ctrl;
- u32 ctrl;
-
- ctrl = __raw_readl(reg);
- /* Module is enabled, clocks are not gated */
- ctrl &= ~GPIO_MOD_CTRL_BIT;
- __raw_writel(ctrl, reg);
- bank->context.ctrl = ctrl;
- }
-
- bank->mod_usage |= 1 << offset;
-
spin_unlock_irqrestore(&bank->lock, flags);
return 0;
@@ -608,28 +594,15 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
__raw_readl(bank->base + bank->regs->wkup_en);
}
- bank->mod_usage &= ~(1 << offset);
-
- if (bank->regs->ctrl && !bank->mod_usage) {
- void __iomem *reg = bank->base + bank->regs->ctrl;
- u32 ctrl;
-
- ctrl = __raw_readl(reg);
- /* Module is disabled, clocks are gated */
- ctrl |= GPIO_MOD_CTRL_BIT;
- __raw_writel(ctrl, reg);
- bank->context.ctrl = ctrl;
- }
-
_reset_gpio(bank, bank->chip.base + offset);
spin_unlock_irqrestore(&bank->lock, flags);
/*
* If this is the last gpio to be freed in the bank,
- * disable the bank module.
+ * put the bank module into suspend.
*/
- if (!bank->mod_usage)
- pm_runtime_put(bank->dev);
+ pm_runtime_mark_last_busy(bank->dev);
+ pm_runtime_put_autosuspend(bank->dev);
}
/*
@@ -715,7 +688,8 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
exit:
if (!unmasked)
chained_irq_exit(chip, desc);
- pm_runtime_put(bank->dev);
+ pm_runtime_mark_last_busy(bank->dev);
+ pm_runtime_put_autosuspend(bank->dev);
}
static void gpio_irq_shutdown(struct irq_data *d)
@@ -1132,6 +1106,8 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, bank);
+ pm_runtime_use_autosuspend(bank->dev);
+ pm_runtime_set_autosuspend_delay(bank->dev, GPIO_AUTOSUSPEND_TIMEOUT);
pm_runtime_enable(bank->dev);
pm_runtime_irq_safe(bank->dev);
pm_runtime_get_sync(bank->dev);
@@ -1146,7 +1122,8 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
if (bank->loses_context)
bank->get_context_loss_count = pdata->get_context_loss_count;
- pm_runtime_put(bank->dev);
+ pm_runtime_mark_last_busy(bank->dev);
+ pm_runtime_put_autosuspend(bank->dev);
list_add_tail(&bank->node, &omap_gpio_list);
@@ -1168,6 +1145,17 @@ static int omap_gpio_runtime_suspend(struct device *dev)
spin_lock_irqsave(&bank->lock, flags);
+ if (bank->regs->ctrl) {
+ void __iomem *reg = bank->base + bank->regs->ctrl;
+ u32 ctrl;
+
+ ctrl = __raw_readl(reg);
+ /* Module is disabled, clocks are gated */
+ ctrl |= GPIO_MOD_CTRL_BIT;
+ __raw_writel(ctrl, reg);
+ bank->context.ctrl = ctrl;
+ }
+
/*
* Only edges can generate a wakeup event to the PRCM.
*
@@ -1316,6 +1304,17 @@ static int omap_gpio_runtime_resume(struct device *dev)
__raw_writel(old1, bank->base + bank->regs->leveldetect1);
}
+ if (bank->regs->ctrl) {
+ void __iomem *reg = bank->base + bank->regs->ctrl;
+ u32 ctrl;
+
+ ctrl = __raw_readl(reg);
+ /* Module is enabled, clocks are not gated */
+ ctrl &= ~GPIO_MOD_CTRL_BIT;
+ __raw_writel(ctrl, reg);
+ bank->context.ctrl = ctrl;
+ }
+
bank->workaround_enabled = false;
spin_unlock_irqrestore(&bank->lock, flags);
@@ -1328,12 +1327,18 @@ void omap2_gpio_prepare_for_idle(int pwr_mode)
struct gpio_bank *bank;
list_for_each_entry(bank, &omap_gpio_list, node) {
- if (!bank->mod_usage || !bank->loses_context)
+ if (!bank->loses_context)
continue;
bank->power_mode = pwr_mode;
- pm_runtime_put_sync_suspend(bank->dev);
+ /* direct pm_runtime on pwroff */
+ if (pwr_mode) {
+ pm_runtime_put_sync_suspend(bank->dev);
+ } else {
+ pm_runtime_mark_last_busy(bank->dev);
+ pm_runtime_put_sync_autosuspend(bank->dev);
+ }
}
}
@@ -1342,7 +1347,7 @@ void omap2_gpio_resume_after_idle(void)
struct gpio_bank *bank;
list_for_each_entry(bank, &omap_gpio_list, node) {
- if (!bank->mod_usage || !bank->loses_context)
+ if (!bank->loses_context)
continue;
pm_runtime_get_sync(bank->dev);
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
