openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tty: serial: uartlite: Use read_poll_timeout for a polling loop 

read_poll_timeout was recently introduced, and can be used to simplify
our console polling loop. This results in a slight reduction in code.
early_uartlite_putc can't get the same treatment, because it can be
called before udelay is set up.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20210826192549.3203071-1-sean.anderson@seco.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sean Anderson 2021-08-26 15:25:49 -04:00 committed by Greg Kroah-Hartman
parent 3620a89b7d
commit 2e5f3a69b6
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/tty/serial/uartlite.c
View File

@ -17,6 +17,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_device.h> #include <linux/of_device.h>
@ -454,24 +455,15 @@ static const struct uart_ops ulite_ops = {
static void ulite_console_wait_tx(struct uart_port *port) static void ulite_console_wait_tx(struct uart_port *port)
{ {
u8 val; u8 val;
unsigned long timeout;
/* /*
* Spin waiting for TX fifo to have space available. * Spin waiting for TX fifo to have space available.
* When using the Microblaze Debug Module this can take up to 1s * When using the Microblaze Debug Module this can take up to 1s
*/ */
timeout = jiffies + msecs_to_jiffies(1000); if (read_poll_timeout_atomic(uart_in32, val, !(val & ULITE_STATUS_TXFULL),
while (1) { 0, 1000000, false, ULITE_STATUS, port))
val = uart_in32(ULITE_STATUS, port); dev_warn(port->dev,
if ((val & ULITE_STATUS_TXFULL) == 0) "timeout waiting for TX buffer empty\n");
break;
if (time_after(jiffies, timeout)) {
dev_warn(port->dev,
"timeout waiting for TX buffer empty\n");
break;
}
cpu_relax();
}
} }
static void ulite_console_putchar(struct uart_port *port, int ch) static void ulite_console_putchar(struct uart_port *port, int ch)