Skip to contentSkip to conversation

OMAP/serial: Revert bad fix of Rx FIFO threshold granularity

PATCH New Alexey Pelykh 3 participants 3 messages Apr 3, 2013 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP/serial: Revert bad fix of Rx FIFO threshold granularity

From: Alexey Pelykh <[email protected]>

Partially reverts 1776fd059c40907297d6c26c51876575d63fd9e2 that introduced regression reported by Paul Walmsley.

This commit restores setting granularity in SCR register and adds note about comments below being inconsistent with actual code.

Cc Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc linux-serial at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-omap at vger.kernel.org

---

Paul, please confirm that this patch solves the regression.

drivers/tty/serial/omap-serial.c +11 -0
index 4dc4140..30d4f7a 100644
@@ -886,6 +886,17 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
 	serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
 	/* FIFO ENABLE, DMA MODE */
 
+	up->scr |= OMAP_UART_SCR_RX_TRIG_GRANU1_MASK;
+	/*
+	 * NOTE: Setting OMAP_UART_SCR_RX_TRIG_GRANU1_MASK
+	 * sets Enables the granularity of 1 for TRIGGER RX
+	 * level. Along with setting RX FIFO trigger level
+	 * to 1 (as noted below, 16 characters) and TLR[3:0]
+	 * to zero this will result RX FIFO threshold level
+	 * to 1 character, instead of 16 as noted in comment
+	 * below.
+	 */
+
 	/* Set receive FIFO threshold to 16 characters and
 	 * transmit FIFO threshold to 16 spaces
 	 */
#1 lore raw

PATCH 1/1 OMAP/serial: Revert bad fix of Rx FIFO threshold granularity

Hi Greg, Alexey,

Quoted 9 lines · Alexey Pelykh

From: Alexey Pelykh <[email protected]>

Partially reverts 1776fd059c40907297d6c26c51876575d63fd9e2 that introduced regression reported by Paul Walmsley.

This commit restores setting granularity in SCR register and adds note about comments below being inconsistent with actual code.

Quoted 7 lines
Cc Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc linux-serial at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-omap at vger.kernel.org

Thanks for the fast response and fix, Alexey.

Greg, is it possible for you to take this for v3.9-rc fixes?

- Paul

maintainer
#2 lore raw

PATCH 1/1 OMAP/serial: Revert bad fix of Rx FIFO threshold granularity

Quoted 21 lines · Paul Walmsley

Hi Greg, Alexey,

Quoted 9 lines · Alexey Pelykh

From: Alexey Pelykh <[email protected]>

Partially reverts 1776fd059c40907297d6c26c51876575d63fd9e2 that introduced regression reported by Paul Walmsley.

This commit restores setting granularity in SCR register and adds note about comments below being inconsistent with actual code.

Quoted 7 lines
Cc Paul Walmsley <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc linux-serial at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
Cc linux-omap at vger.kernel.org
Quoted 5 lines

Thanks for the fast response and fix, Alexey.

Greg, is it possible for you to take this for v3.9-rc fixes?

Will do, thanks.

greg k-h