Skip to content

Commit 00ded24

Browse files
tmlindlinusw
tmlind
authored and
linusw
committed
gpio: gpio-omap: Revert deferred wakeup quirk handling for regressions
Commit ec0daae ("gpio: omap: Add level wakeup handling for omap4 based SoCs") attempted to fix omap4 GPIO wakeup handling as it was blocking deeper SoC idle states. However this caused a regression for GPIOs during runtime having over second long latencies for Ethernet GPIO interrupt as reportedy by Russell King <rmk+kernel@armlinux.org.uk>. Let's fix this issue by doing a partial revert of the breaking commit. We still want to keep the quirk handling around as it is also used for OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER. The real fix for omap4 GPIO wakeup handling involves fixes for omap_set_gpio_trigger() and omap_gpio_unmask_irq() and will be posted separately. And we must keep the wakeup bit enabled during runtime because of module doing clock autogating with autoidle configured. Reported-by: Russell King <rmk+kernel@armlinux.org.uk> Fixes: ec0daae ("gpio: omap: Add level wakeup handling for omap4 based SoCs") Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Keerthy <j-keerthy@ti.com> Cc: Ladislav Michl <ladis@linux-mips.org> Cc: Russell King <rmk+kernel@armlinux.org.uk> Cc: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent e59f5e0 commit 00ded24

File tree

1 file changed

+5
-59
lines changed

1 file changed

+5
-59
lines changed

‎drivers/gpio/gpio-omap.c

Lines changed: 5 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#define OMAP4_GPIO_DEBOUNCINGTIME_MASK 0xFF
3333

3434
#define OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER BIT(2)
35-
#define OMAP_GPIO_QUIRK_DEFERRED_WKUP_EN BIT(1)
3635

3736
struct gpio_regs {
3837
u32 irqenable1;
@@ -379,18 +378,9 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
379378
readl_relaxed(bank->base + bank->regs->fallingdetect);
380379

381380
if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
382-
/* Defer wkup_en register update until we idle? */
383-
if (bank->quirks & OMAP_GPIO_QUIRK_DEFERRED_WKUP_EN) {
384-
if (trigger)
385-
bank->context.wake_en |= gpio_bit;
386-
else
387-
bank->context.wake_en &= ~gpio_bit;
388-
} else {
389-
omap_gpio_rmw(base, bank->regs->wkup_en, gpio_bit,
390-
trigger != 0);
391-
bank->context.wake_en =
392-
readl_relaxed(bank->base + bank->regs->wkup_en);
393-
}
381+
omap_gpio_rmw(base, bank->regs->wkup_en, gpio_bit, trigger != 0);
382+
bank->context.wake_en =
383+
readl_relaxed(bank->base + bank->regs->wkup_en);
394384
}
395385

396386
/* This part needs to be executed always for OMAP{34xx, 44xx} */
@@ -942,44 +932,6 @@ omap2_gpio_disable_level_quirk(struct gpio_bank *bank)
942932
bank->base + bank->regs->risingdetect);
943933
}
944934

945-
/*
946-
* On omap4 and later SoC variants a level interrupt with wkup_en
947-
* enabled blocks the GPIO functional clock from idling until the GPIO
948-
* instance has been reset. To avoid that, we must set wkup_en only for
949-
* idle for level interrupts, and clear level registers for the duration
950-
* of idle. The level interrupts will be still there on wakeup by their
951-
* nature.
952-
*/
953-
static void __maybe_unused
954-
omap4_gpio_enable_level_quirk(struct gpio_bank *bank)
955-
{
956-
/* Update wake register for idle, edge bits might be already set */
957-
writel_relaxed(bank->context.wake_en,
958-
bank->base + bank->regs->wkup_en);
959-
960-
/* Clear level registers for idle */
961-
writel_relaxed(0, bank->base + bank->regs->leveldetect0);
962-
writel_relaxed(0, bank->base + bank->regs->leveldetect1);
963-
}
964-
965-
static void __maybe_unused
966-
omap4_gpio_disable_level_quirk(struct gpio_bank *bank)
967-
{
968-
/* Restore level registers after idle */
969-
writel_relaxed(bank->context.leveldetect0,
970-
bank->base + bank->regs->leveldetect0);
971-
writel_relaxed(bank->context.leveldetect1,
972-
bank->base + bank->regs->leveldetect1);
973-
974-
/* Clear saved wkup_en for level, it will be set for next idle again */
975-
bank->context.wake_en &= ~(bank->context.leveldetect0 |
976-
bank->context.leveldetect1);
977-
978-
/* Update wake with only edge configuration */
979-
writel_relaxed(bank->context.wake_en,
980-
bank->base + bank->regs->wkup_en);
981-
}
982-
983935
/*---------------------------------------------------------------------*/
984936

985937
static int omap_mpuio_suspend_noirq(struct device *dev)
@@ -1412,12 +1364,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
14121364
omap_set_gpio_dataout_mask_multiple;
14131365
}
14141366

1415-
if (bank->quirks & OMAP_GPIO_QUIRK_DEFERRED_WKUP_EN) {
1416-
bank->funcs.idle_enable_level_quirk =
1417-
omap4_gpio_enable_level_quirk;
1418-
bank->funcs.idle_disable_level_quirk =
1419-
omap4_gpio_disable_level_quirk;
1420-
} else if (bank->quirks & OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER) {
1367+
if (bank->quirks & OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER) {
14211368
bank->funcs.idle_enable_level_quirk =
14221369
omap2_gpio_enable_level_quirk;
14231370
bank->funcs.idle_disable_level_quirk =
@@ -1806,8 +1753,7 @@ static const struct omap_gpio_platform_data omap4_pdata = {
18061753
.regs = &omap4_gpio_regs,
18071754
.bank_width = 32,
18081755
.dbck_flag = true,
1809-
.quirks = OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER |
1810-
OMAP_GPIO_QUIRK_DEFERRED_WKUP_EN,
1756+
.quirks = OMAP_GPIO_QUIRK_IDLE_REMOVE_TRIGGER,
18111757
};
18121758

18131759
static const struct of_device_id omap_gpio_match[] = {

0 commit comments

Comments
 (0)