Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cae167d3 authored by Yutaro Ebihara's avatar Yutaro Ebihara Committed by Paul Mundt
Browse files

serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF. 



There was an off-by-1 in the SCRFDR calculation that caused writes over
128-bytes to hang in the FIFO. Fix it up.

Signed-off-by: default avatarYutaro Ebihara <ebiharaml@si-linux.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2f44bbb4

drivers/serial/sh-sci.c

+2 −2
Original line number Diff line number Diff line
@@ -414,12 +414,12 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag) 
    defined(CONFIG_CPU_SUBTYPE_SH7785)

static inline int scif_txroom(struct uart_port *port)

{

	return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);

	return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0xff);

}



static inline int scif_rxroom(struct uart_port *port)

{

	return sci_in(port, SCRFDR) & 0x7f;

	return sci_in(port, SCRFDR) & 0xff;

}

#else

static inline int scif_txroom(struct uart_port *port)