patch "tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA" added to tty tree
NeilBrown
neilb at suse.de
Thu Feb 2 23:07:08 EST 2012
On Thu, 2 Feb 2012 13:03:01 -0700 (MST) Paul Walmsley <paul at pwsan.com> wrote:
> Hi Greg,
>
> On Thu, 26 Jan 2012, Paul Walmsley wrote:
>
> > On Thu, 26 Jan 2012, Greg KH wrote:
> >
> > > Ok, I've just reverted both of these patches for now, please send new
> > > ones when you have them.
> >
> > Thanks. A pull request is at the bottom of this message. The patches
> > are also available from the mailing list archives here:
> >
> > http://marc.info/?l=linux-arm-kernel&m=132754676014389&w=2
> > http://marc.info/?l=linux-arm-kernel&m=132754677914395&w=2
> > http://marc.info/?l=linux-arm-kernel&m=132754676014388&w=2
>
> Any comments on these?
Can I comment??... They are good but ....
I've tried two approaches to getting serial behaviour that I am happy with.
They are with and without runtime pm.
If I enable runtime pm by setting power/autosuspend_delay_ms (e.g. to 5000)
then CPUIDLE enters lower states and I think it uses less power but I
sometimes lose the first char I type (that is known) but also I sometimes get
corruption on output.
The problem seems to be that we turn off the clocks when the kernel's ring
buffer is empty rather than waiting for the UART's fifo to be empty.
So I get corruption near the end of a stream of output ... not right at the
end so something must be turning the clocks back on somehow.
I can remove this effect with:
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index f809041..c7ef760 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -440,7 +440,8 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
spin_lock_irqsave(&up->port.lock, flags);
ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
spin_unlock_irqrestore(&up->port.lock, flags);
- pm_runtime_put(&up->pdev->dev);
+ pm_runtime_mark_last_busy(&up->pdev->dev);
+ pm_runtime_put_autosuspend(&up->pdev->dev);
return ret;
}
i.e. when the tx buffer is empty, so turn the clocks off immediately, but
wait a while for the fifo to empty. Hopefully the auto-suspend time is
enough.
But I decided not to pursue this further as turning off the clocks seems like
the wrong thing to be doing. The OMAP UARTs have auto-suspend/auto-wake so
I would rather depend on that. And turning off the clocks loses that first
character at 115200 and above (not below).
So I explored leaving the runtime_pm setting as it was. This set a maximum
latency of 4444 usec (which should be 5555 as there are 10 bits per char)
so it didn't get very low down the CPUIDLE levels.
So I disabled the latency setting with hardware handshaking is used (as you
suggested once):
@@ -707,28 +708,37 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
unsigned char cval = 0;
unsigned char efr = 0;
unsigned long flags = 0;
- unsigned int baud, quot;
+ unsigned int baud, quot, bits;
switch (termios->c_cflag & CSIZE) {
case CS5:
cval = UART_LCR_WLEN5;
+ bits = 5;
break;
case CS6:
cval = UART_LCR_WLEN6;
+ bits = 6;
break;
case CS7:
cval = UART_LCR_WLEN7;
+ bits = 7;
break;
default:
case CS8:
cval = UART_LCR_WLEN8;
+ bits = 8;
break;
}
- if (termios->c_cflag & CSTOPB)
+ bits += 2; /* start bit plus stop bit */
+ if (termios->c_cflag & CSTOPB) {
cval |= UART_LCR_STOP;
- if (termios->c_cflag & PARENB)
+ bits++;
+ }
+ if (termios->c_cflag & PARENB) {
cval |= UART_LCR_PARITY;
+ bits++;
+ }
if (!(termios->c_cflag & PARODD))
cval |= UART_LCR_EPAR;
@@ -740,8 +750,12 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
quot = serial_omap_get_divisor(port, baud);
/* calculate wakeup latency constraint */
- up->calc_latency = (USEC_PER_SEC * up->port.fifosize) / (baud / 8);
+ if (termios->c_cflag & CRTSCTS)
+ up->calc_latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+ else
+ up->calc_latency = (USEC_PER_SEC * up->port.fifosize) / (baud / bits);
up->latency = up->calc_latency;
+ printk("Calc latency: %lld\n", (unsigned long long) up->calc_latency);
schedule_work(&up->qos_work);
up->dll = quot & 0xff;
and now CPUIDLE uses lower states (especially if I enable_off_mode).
However I am using a lot more power than in 3.2. That probably isn't all
UART-related, but there is one interesting observation.
If I watch /sys/kernel/debug/pm_debug/time and see where the time is spent
over a 30second period when the systems is mostly idle:
With runtime_pm disabled for UARTs, both PER and CORE are permanently ON,
and MPU is OFF nearly all the time. (This is with off_mode enabled).
If I then enabled runtime_pm with a 5 second autosuspend delay:
CORE is still permanently ON (I think the USB might be doing that).
PER is OFF (7 seconds) RET (15 seconds) and ON (8 seconds).
but more surprising
MPU is OFF (8 sec) RET (8 sec) INA (9 sec) ON (4 secs).
So we get to turn PER off at the cost of turning the MPU on a lot.
(the periods in each state are only repeatable to a precision of 20%-50%).
I understand that PER won't go OFF without runtime PM, but I would expect
it to at least go to INA as the UART is in smart-idle mode
The net result is that with runtime_pm enabled I'm seeing an extra 7mA (at
4V). That might not be very precise, but it is in the opposite direction to
my expectations.
So there is something odd here... ideas?
NeilBrown
p.s. who should I formally submit OMAP-UART patches to? I have a couple of
others such as the below that I should submit somewhere.
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 247d894..35a649f 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -54,11 +54,9 @@
struct omap_uart_state {
int num;
- int can_sleep;
struct list_head node;
struct omap_hwmod *oh;
- struct platform_device *pdev;
};
static LIST_HEAD(uart_list);
@@ -381,8 +379,6 @@ void __init omap_serial_init_port(struct omap_board_data *bd
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
- uart->pdev = pdev;
-
oh->dev_attr = uart;
if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120203/67d70dd4/attachment-0001.sig>
More information about the linux-arm-kernel
mailing list