[PATCH v5 22/22] gpio/omap: remove omap_gpio_save_context overhead

Tarun Kanti DebBarma
2011-08-04T11:05:22Z

Context is now saved dynamically in respective functions whenever and
whichever registers are modified. This avoid overhead of saving all
registers context in the runtime callback.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
---
drivers/gpio/gpio-omap.c | 66 ++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index eae955a..ee1726d 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -97,6 +97,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
else
l &= ~(1 << gpio);
__raw_writel(l, reg);
+ bank->context.oe = l;
}

@@ -127,6 +128,7 @@ static void _set_gpio_dataout_mask(struct gpio_bank *bank, int gpio, int enable)
else
l &= ~gpio_bit;
__raw_writel(l, reg);
+ bank->context.dataout = l;
}

static int _get_gpio_datain(struct gpio_bank *bank, int gpio)
@@ -216,9 +218,21 @@ static inline void set_gpio_trigger(struct gpio_bank *bank, int gpio,
_gpio_rmw(base, bank->regs->fallingdetect, gpio_bit,
trigger & IRQ_TYPE_EDGE_FALLING);

- if (likely(!(bank->non_wakeup_gpios & gpio_bit)))
+ bank->context.leveldetect0 =
+ __raw_readl(bank->base + bank->regs->leveldetect0);
+ bank->context.leveldetect1 =
+ __raw_readl(bank->base + bank->regs->leveldetect1);
+ bank->context.risingdetect =
+ __raw_readl(bank->base + bank->regs->risingdetect);
+ bank->context.fallingdetect =
+ __raw_readl(bank->base + bank->regs->fallingdetect);
+
+ if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
_gpio_rmw(base, bank->regs->wkup_status, gpio_bit,
trigger != 0);
+ bank->context.wake_en =
+ __raw_readl(bank->base + bank->regs->wkup_status);
+ }

/* This part needs to be executed always for OMAP34xx */
if (cpu_is_omap34xx() || (bank->non_wakeup_gpios & gpio_bit)) {
@@ -304,6 +318,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
l |= 1 << (gpio << 1);

_gpio_rmw(base, bank->regs->wkup_status, 1 << gpio, trigger);
+ bank->context.wake_en =
+ __raw_readl(bank->base + bank->regs->wkup_status);

__raw_writel(l, reg);
}
@@ -398,6 +414,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
}

__raw_writel(l, reg);
+ bank->context.irqenable1 = l;
}

static void _disable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
@@ -418,6 +435,7 @@ static void _disable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
}

__raw_writel(l, reg);
+ bank->context.irqenable1 = l;
}

static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int enable)
@@ -515,6 +533,7 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
/* 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;
@@ -532,9 +551,12 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)

spin_lock_irqsave(&bank->lock, flags);

- if (bank->regs->wkup_status)
+ if (bank->regs->wkup_status) {
/* Disable wake-up during idle for dynamic tick */
_gpio_rmw(base, bank->regs->wkup_status, 1 << offset, 0);
+ bank->context.wake_en =
+ __raw_readl(bank->base + bank->regs->wkup_status);
+ }

bank->mod_usage &= ~(1 << offset);

@@ -546,6 +568,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
/* 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);
@@ -912,6 +935,9 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
bank->regs->irqenable_inv == false);
_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);
_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);
+
+ bank->context.irqenable1 =
+ __raw_readl(bank->base + bank->regs->irqenable);
}

static __init void
@@ -1104,6 +1130,8 @@ static int omap_gpio_suspend(struct device *dev)
spin_lock_irqsave(&bank->lock, flags);
bank->saved_wakeup = __raw_readl(wake_status);
_gpio_rmw(base, bank->regs->wkup_status, bank->suspend_wakeup, 1);
+ bank->context.wake_en =
+ __raw_readl(bank->base + bank->regs->wkup_status);
spin_unlock_irqrestore(&bank->lock, flags);
pm_runtime_put_sync(dev);
return 0;
@@ -1122,6 +1150,8 @@ static int omap_gpio_resume(struct device *dev)
pm_runtime_get_sync(dev);
spin_lock_irqsave(&bank->lock, flags);
_gpio_rmw(base, bank->regs->wkup_status, bank->saved_wakeup, 1);
+ bank->context.wake_en =
+ __raw_readl(bank->base + bank->regs->wkup_status);
spin_unlock_irqrestore(&bank->lock, flags);

return 0;
@@ -1129,7 +1159,6 @@ static int omap_gpio_resume(struct device *dev)

#ifdef CONFIG_ARCH_OMAP2PLUS

-static void omap_gpio_save_context(struct gpio_bank *bank);
static void omap_gpio_restore_context(struct gpio_bank *bank);

static int omap_gpio_runtime_suspend(struct device *dev)
@@ -1149,7 +1178,7 @@ static int omap_gpio_runtime_suspend(struct device *dev)
* non-wakeup GPIOs. Otherwise spurious IRQs will be
* generated. See OMAP2420 Errata item 1.101. */
if (!(bank->enabled_non_wakeup_gpios))
- goto save_gpio_ctx;
+ goto update_gpio_ctx_cnt;

bank->saved_datain = __raw_readl(bank->base +
bank->regs->datain);
@@ -1163,11 +1192,12 @@ static int omap_gpio_runtime_suspend(struct device *dev)

__raw_writel(l1, bank->base + bank->regs->fallingdetect);
__raw_writel(l2, bank->base + bank->regs->risingdetect);
+ bank->context.fallingdetect = l1;
+ bank->context.risingdetect = l2;

-save_gpio_ctx:
+update_gpio_ctx_cnt:
if (bank->get_context_loss_count)
bank->ctx_loss_count = bank->get_context_loss_count(bank->dev);
- omap_gpio_save_context(bank);

return 0;
}
@@ -1203,6 +1233,8 @@ static int omap_gpio_runtime_resume(struct device *dev)
bank->base + bank->regs->fallingdetect);
__raw_writel(bank->saved_risingdetect,
bank->base + bank->regs->risingdetect);
+ bank->context.fallingdetect = bank->saved_fallingdetect;
+ bank->context.risingdetect = bank->saved_risingdetect;
l = __raw_readl(bank->base + bank->regs->datain);

/* Check if any of the non-wakeup interrupt GPIOs have changed
@@ -1246,6 +1278,8 @@ static int omap_gpio_runtime_resume(struct device *dev)
}
__raw_writel(old0, bank->base + bank->regs->leveldetect0);
__raw_writel(old1, bank->base + bank->regs->leveldetect1);
+ bank->context.leveldetect0 = old0;
+ bank->context.leveldetect1 = old1;
}

return 0;
@@ -1284,26 +1318,6 @@ void omap2_gpio_resume_after_idle(void)
}
}

-static void omap_gpio_save_context(struct gpio_bank *bank)
-{
- bank->context.irqenable1 =
- __raw_readl(bank->base + bank->regs->irqenable);
- bank->context.irqenable2 =
- __raw_readl(bank->base + bank->regs->irqenable2);
- bank->context.wake_en =
- __raw_readl(bank->base + bank->regs->wkup_status);
- bank->context.ctrl = __raw_readl(bank->base + bank->regs->ctrl);
- bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
- bank->context.leveldetect0 =
- __raw_readl(bank->base + bank->regs->leveldetect0);
- bank->context.leveldetect1 =
- __raw_readl(bank->base + bank->regs->leveldetect1);
- bank->context.risingdetect =
- __raw_readl(bank->base + bank->regs->risingdetect);
- bank->context.fallingdetect =
- bank->context.dataout = __raw_readl(bank->base + bank->regs->dataout);
-}
-
static void omap_gpio_restore_context(struct gpio_bank *bank)
{
__raw_writel(bank->context.irqenable1,
--
1.7.0.4