[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1347972050-3509-1-git-send-email-sourav.poddar@ti.com>
Date: Tue, 18 Sep 2012 18:10:50 +0530
From: Sourav Poddar <sourav.poddar@...com>
To: <gregkh@...uxfoundation.org>
CC: <alan@...ux.intel.com>, <tony@...mide.com>, <khilman@...com>,
<linux-omap@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-serial@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<santosh.shilimkar@...com>, <balbi@...com>, <paul@...an.com>,
Sourav Poddar <sourav.poddar@...com>
Subject: [RFT/PATCH] serial: omap: prevent resume if device is not suspended.
Greg's tty-next is not booting on 2420 based N800. The failure is
observed at serial init itself. The reason might be that n800 tries to
resume even though it is not suspended before.
Reported-by: Paul Walmsley <paul@...an.com>
Signed-off-by: Sourav Poddar <sourav.poddar@...com>
---
This patch is developed on top of greg's tty-next branch
CommitId: e740d8f tty: serial: Samsung: Fix return value +
the following patch which I have already posted to the mailing list.
http://comments.gmane.org/gmane.linux.ports.arm.omap/84729
drivers/tty/serial/omap-serial.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 3c05c5e..bc355f2 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -110,6 +110,7 @@ struct uart_omap_port {
u32 calc_latency;
struct work_struct qos_work;
struct pinctrl *pins;
+ unsigned int suspended:1;
};
#define to_uart_omap_port(p) ((container_of((p), struct uart_omap_port, port)))
@@ -1545,14 +1546,20 @@ static int serial_omap_runtime_suspend(struct device *dev)
up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
schedule_work(&up->qos_work);
+ up->suspended = true;
+
return 0;
}
static int serial_omap_runtime_resume(struct device *dev)
{
struct uart_omap_port *up = dev_get_drvdata(dev);
+ u32 loss_cnt;
+
+ if (!up->suspended)
+ return 0;
- u32 loss_cnt = serial_omap_get_context_loss_count(up);
+ loss_cnt = serial_omap_get_context_loss_count(up);
if (up->context_loss_cnt != loss_cnt)
serial_omap_restore_context(up);
@@ -1560,6 +1567,8 @@ static int serial_omap_runtime_resume(struct device *dev)
up->latency = up->calc_latency;
schedule_work(&up->qos_work);
+ up->suspended = false;
+
return 0;
}
#endif
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists