2013-09-09 17:27:39 +02:00
|
|
|
# Commit 9e2c5938246546a5b3f698b7421640d85602b994
|
|
|
|
|
# Date 2013-08-28 10:18:39 +0200
|
|
|
|
|
# Author Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
|
|
|
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
|
|
|
Fix inactive timer list corruption on second S3 resume
|
|
|
|
|
|
|
|
|
|
init_timer cannot be safely called multiple times on same timer since it does memset(0)
|
|
|
|
|
on the structure, erasing the auxiliary member used by linked list code. This breaks
|
|
|
|
|
inactive timer list in common/timer.c.
|
|
|
|
|
|
|
|
|
|
Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
|
|
|
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
|
|
2013-10-03 00:41:46 +02:00
|
|
|
--- a/xen/drivers/char/ns16550.c
|
|
|
|
|
+++ b/xen/drivers/char/ns16550.c
|
2013-09-09 17:27:39 +02:00
|
|
|
@@ -128,6 +128,8 @@ static struct ns16550 {
|
|
|
|
|
#define RESUME_DELAY MILLISECS(10)
|
|
|
|
|
#define RESUME_RETRIES 100
|
|
|
|
|
|
|
|
|
|
+static void ns16550_delayed_resume(void *data);
|
|
|
|
|
+
|
|
|
|
|
static char ns_read_reg(struct ns16550 *uart, int reg)
|
|
|
|
|
{
|
|
|
|
|
if ( uart->remapped_io_base == NULL )
|
|
|
|
|
@@ -323,6 +325,7 @@ static void __init ns16550_init_postirq(
|
|
|
|
|
serial_async_transmit(port);
|
|
|
|
|
|
|
|
|
|
init_timer(&uart->timer, ns16550_poll, port, 0);
|
|
|
|
|
+ init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0);
|
|
|
|
|
|
|
|
|
|
/* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */
|
|
|
|
|
bits = uart->data_bits + uart->stop_bits + !!uart->parity;
|
|
|
|
|
@@ -413,7 +416,6 @@ static void ns16550_resume(struct serial
|
|
|
|
|
if ( ns16550_ioport_invalid(uart) )
|
|
|
|
|
{
|
|
|
|
|
delayed_resume_tries = RESUME_RETRIES;
|
|
|
|
|
- init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0);
|
|
|
|
|
set_timer(&uart->resume_timer, NOW() + RESUME_DELAY);
|
|
|
|
|
}
|
|
|
|
|
else
|
