Hi Kevin,
On Tue, Mar 27, 2012 at 6:04 AM, Kevin Hilman <khilman@xxxxxx> wrote:
> +Govindraj,
>
> "Joe Woodward" <jw@xxxxxxxxxxxxxx> writes:
>
>> Right, I've stepped back a bit and dug out a GUSMTIX Palo43 carrier
>> board on which to test the Overo OMAP3530 COM and I've found:
>> - Running a stock 3.3 (with absolutely no changes) does indeed suspend correctly.
>> - Running the 3.3 kernel with my (minor) board modifications
>> (basically defining some buttons) suspends correctly as well.
>>
>> Then I went back to my original board and the 3.3 still wakes up from
>> suspend immediately. So I had a think, and the only real differences
>> between my board the the GUMSTIX Palo43 board is that I am using
>> multiple UARTs.
>>
>> Up to this point I've only wanted to wake on the console (ttyO2), and
>> not any other UARTs so I've stopped them waking with:
>> echo disabled > /sys/devices/platform/omap/omap_uart.0/power/wakeup
>> echo disabled > /sys/devices/platform/omap/omap_uart.1/power/wakeup
>>
>> I wanted to check that this still worked, so tried disabling wakeup on
>> the console (ttyO2):
>> echo disabled > /sys/devices/platform/omap/omap_uart.2/power/wakeup
>>
>> And if I do "echo mem > /sys/power/state" I was expecting to stay in
>> suspend when I typed on my keyboard... However, the kernel still woke
>> from suspend, which leads me to believe that the UART wakeup hasn't
>> been disabled?
>
> Just to confirm: did the above work for you before v3.3?
>
>> Could you test if this is also the case your end?
>
> Yes, I get the same behavior, which is indeed broken.
>
> Govindraj, can you look into this?
>
> A quick glance suggests that disabling wakeups via the sysfs file is
> only disabling runtime PM, but not actually disabling wakups at the
> module-level or at the IO ring.
>
I have started looking into this, disabling and enabling of wake-ups
from .runtime_suspend needs some changes as in here[1] with that I see pad
wakeup getting disabled and it doesn't wake up after enabling off mode
and suspending.
If clocks left enabled form uart driver during system wide suspend
-> _od_suspend_noirq
-> .runtime_suspend from uart driver (with [1])
-> omap_hwmod_disable_wakeup
-> omap_device_idle
But module level wakeup from sysc reg also needs to be disabled,
with which I see some strange behavior, even though _disable_wakeup
updates sysc reg it seem to wakeup, but removing SYSC_HAS_ENAWAKEUP
flag from .sysc flags from hmwod data I see module level wakeup failing after
disabling wakeup. Still checking on this.
--
Thanks,
Govindraj.R
[1]:
>From 7f92f73006a82fdd7328fe7906fbf094b503cd13 Mon Sep 17 00:00:00 2001
From: "Govindraj.R" <govindraj.raja@xxxxxx>
Date: Tue, 27 Mar 2012 18:55:00 +0530
Subject: [PATCH] OMAP2+: UART: Correct the wakeup enable mechanism
The module level wakeups are enabled by default during bootup
init from hmwod framework and pad wakeup will be disabled.
Correct the condition check in uart runtime suspend path to
enable/disable wakeups.
Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx>
---
arch/arm/plat-omap/include/plat/omap-serial.h | 3 ++-
drivers/tty/serial/omap-serial.c | 16 ++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h
b/arch/arm/plat-omap/include/plat/omap-serial.h
index 9ff4444..386a25b 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -130,7 +130,8 @@ struct uart_omap_port {
unsigned long port_activity;
u32 context_loss_cnt;
u32 errata;
- u8 wakeups_enabled;
+ u8 pad_wakeups_enabled;
+ u8 module_wakeups_enabled;
struct pm_qos_request pm_qos_request;
u32 latency;
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 0121486..0a35b7e 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1458,6 +1458,12 @@ static int serial_omap_probe(struct
platform_device *pdev)
up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;
}
+ /* Module level wakeup from sysc(BIT[2])
+ * will be enabled during boot
+ * from hwmod framework.
+ */
+ up->module_wakeups_enabled = true;
+
up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
up->calc_latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
pm_qos_add_request(&up->pm_qos_request,
@@ -1586,14 +1592,16 @@ static int serial_omap_runtime_suspend(struct
device *dev)
up->context_loss_cnt = pdata->get_context_loss_count(dev);
if (device_may_wakeup(dev)) {
- if (!up->wakeups_enabled) {
+ if (!up->pad_wakeups_enabled || !up->module_wakeups_enabled) {
pdata->enable_wakeup(up->pdev, true);
- up->wakeups_enabled = true;
+ up->module_wakeups_enabled = true;
+ up->pad_wakeups_enabled = true;
}
} else {
- if (up->wakeups_enabled) {
+ if (up->pad_wakeups_enabled || up->module_wakeups_enabled) {
pdata->enable_wakeup(up->pdev, false);
- up->wakeups_enabled = false;
+ up->module_wakeups_enabled = false;
+ up->pad_wakeups_enabled = false;
}
}
--
1.7.5.4
--
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
