Merge git://git.denx.de/u-boot-x86

3 files changed, 63 insertions, 127 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index a8e997834a..aeed538fa4 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -64,15 +64,20 @@ config DM_SERIAL
 	  implements serial_putc() etc. The uclass interface is
 	  defined in include/serial.h.
 
-config SERIAL_IRQ_BUFFER
-	bool "Enable RX interrupt buffer for serial input"
+config SERIAL_RX_BUFFER
+	bool "Enable RX buffer for serial input"
 	depends on DM_SERIAL
-	default n
 	help
-	  Enable RX interrupt buffer support for the serial driver.
-	  This enables pasting longer strings, even when the RX FIFO
-	  of the UART is not big enough (e.g. 16 bytes on the normal
-	  NS16550).
+	  Enable RX buffer support for the serial driver. This enables
+	  pasting longer strings, even when the RX FIFO of the UART is
+	  not big enough (e.g. 16 bytes on the normal NS16550).
+
+config SERIAL_RX_BUFFER_SIZE
+	int "RX buffer size"
+	depends on SERIAL_RX_BUFFER
+	default 256
+	help
+	  The size of the RX buffer (needs to be power of 2)
 
 config SPL_DM_SERIAL
 	bool "Enable Driver Model for serial drivers in SPL"
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 607a1b8c1d..c702304e79 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -314,80 +314,6 @@ DEBUG_UART_FUNCS
 #endif
 
 #ifdef CONFIG_DM_SERIAL
-
-#if CONFIG_IS_ENABLED(SERIAL_IRQ_BUFFER)
-
-#define BUF_COUNT	256
-
-static void rx_fifo_to_buf(struct udevice *dev)
-{
-	struct NS16550 *const com_port = dev_get_priv(dev);
-	struct ns16550_platdata *plat = dev->platdata;
-
-	/* Read all available chars into buffer */
-	while ((serial_in(&com_port->lsr) & UART_LSR_DR)) {
-		plat->buf[plat->wr_ptr++] = serial_in(&com_port->rbr);
-		plat->wr_ptr %= BUF_COUNT;
-	}
-}
-
-static int rx_pending(struct udevice *dev)
-{
-	struct ns16550_platdata *plat = dev->platdata;
-
-	/*
-	 * At startup it may happen, that some already received chars are
-	 * "stuck" in the RX FIFO, even with the interrupt enabled. This
-	 * RX FIFO flushing makes sure, that these chars are read out and
-	 * the RX interrupts works as expected.
-	 */
-	rx_fifo_to_buf(dev);
-
-	return plat->rd_ptr != plat->wr_ptr ? 1 : 0;
-}
-
-static int rx_get(struct udevice *dev)
-{
-	struct ns16550_platdata *plat = dev->platdata;
-	char val;
-
-	val = plat->buf[plat->rd_ptr++];
-	plat->rd_ptr %= BUF_COUNT;
-
-	return val;
-}
-
-void ns16550_handle_irq(void *data)
-{
-	struct udevice *dev = (struct udevice *)data;
-	struct NS16550 *const com_port = dev_get_priv(dev);
-
-	/* Check if interrupt is pending */
-	if (serial_in(&com_port->iir) & UART_IIR_NO_INT)
-		return;
-
-	/* Flush all available characters from the RX FIFO into the RX buffer */
-	rx_fifo_to_buf(dev);
-}
-
-#else /* CONFIG_SERIAL_IRQ_BUFFER */
-
-static int rx_pending(struct udevice *dev)
-{
-	struct NS16550 *const com_port = dev_get_priv(dev);
-
-	return serial_in(&com_port->lsr) & UART_LSR_DR ? 1 : 0;
-}
-
-static int rx_get(struct udevice *dev)
-{
-	struct NS16550 *const com_port = dev_get_priv(dev);
-
-	return serial_in(&com_port->rbr);
-}
-
-#endif /* CONFIG_SERIAL_IRQ_BUFFER */
-
 static int ns16550_serial_putc(struct udevice *dev, const char ch)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
@@ -413,17 +339,19 @@ static int ns16550_serial_pending(struct udevice *dev, bool input)
 	struct NS16550 *const com_port = dev_get_priv(dev);
 
 	if (input)
-		return rx_pending(dev);
+		return serial_in(&com_port->lsr) & UART_LSR_DR ? 1 : 0;
 	else
 		return serial_in(&com_port->lsr) & UART_LSR_THRE ? 0 : 1;
 }
 
 static int ns16550_serial_getc(struct udevice *dev)
 {
-	if (!ns16550_serial_pending(dev, true))
+	struct NS16550 *const com_port = dev_get_priv(dev);
+
+	if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
 		return -EAGAIN;
 
-	return rx_get(dev);
+	return serial_in(&com_port->rbr);
 }
 
 static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
@@ -446,39 +374,8 @@ int ns16550_serial_probe(struct udevice *dev)
 	com_port->plat = dev_get_platdata(dev);
 	NS16550_init(com_port, -1);
 
-#if CONFIG_IS_ENABLED(SERIAL_IRQ_BUFFER)
-	if (gd->flags & GD_FLG_RELOC) {
-		struct ns16550_platdata *plat = dev->platdata;
-
-		/* Allocate the RX buffer */
-		plat->buf = malloc(BUF_COUNT);
-
-		/* Install the interrupt handler */
-		irq_install_handler(plat->irq, ns16550_handle_irq, dev);
-
-		/* Enable RX interrupts */
-		serial_out(UART_IER_RDI, &com_port->ier);
-	}
-#endif
-
-	return 0;
-}
-
-#if CONFIG_IS_ENABLED(SERIAL_PRESENT) && \
-	(!defined(CONFIG_TPL_BUILD) || defined(CONFIG_TPL_DM_SERIAL))
-static int ns16550_serial_remove(struct udevice *dev)
-{
-#if CONFIG_IS_ENABLED(SERIAL_IRQ_BUFFER)
-	if (gd->flags & GD_FLG_RELOC) {
-		struct ns16550_platdata *plat = dev->platdata;
-
-		irq_free_handler(plat->irq);
-	}
-#endif
-
 	return 0;
 }
-#endif
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 enum {
@@ -561,15 +458,6 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 	if (port_type == PORT_JZ4780)
 		plat->fcr |= UART_FCR_UME;
 
-#if CONFIG_IS_ENABLED(SERIAL_IRQ_BUFFER)
-	plat->irq = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
-				   "interrupts", 0);
-	if (!plat->irq) {
-		debug("ns16550 interrupt not provided\n");
-		return -EINVAL;
-	}
-#endif
-
 	return 0;
 }
 #endif
@@ -617,7 +505,6 @@ U_BOOT_DRIVER(ns16550_serial) = {
 #endif
 	.priv_auto_alloc_size = sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
-	.remove = ns16550_serial_remove,
 	.ops	= &ns16550_serial_ops,
 	.flags	= DM_FLAG_PRE_RELOC,
 };
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 998d372da6..2e5116f7ce 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -160,7 +160,7 @@ static void _serial_puts(struct udevice *dev, const char *str)
 		_serial_putc(dev, *str++);
 }
 
-static int _serial_getc(struct udevice *dev)
+static int __serial_getc(struct udevice *dev)
 {
 	struct dm_serial_ops *ops = serial_get_ops(dev);
 	int err;
@@ -174,7 +174,7 @@ static int _serial_getc(struct udevice *dev)
 	return err >= 0 ? err : 0;
 }
 
-static int _serial_tstc(struct udevice *dev)
+static int __serial_tstc(struct udevice *dev)
 {
 	struct dm_serial_ops *ops = serial_get_ops(dev);
 
@@ -184,6 +184,44 @@ static int _serial_tstc(struct udevice *dev)
 	return 1;
 }
 
+#if CONFIG_IS_ENABLED(SERIAL_RX_BUFFER)
+static int _serial_tstc(struct udevice *dev)
+{
+	struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
+
+	/* Read all available chars into the RX buffer */
+	while (__serial_tstc(dev)) {
+		upriv->buf[upriv->wr_ptr++] = __serial_getc(dev);
+		upriv->wr_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE;
+	}
+
+	return upriv->rd_ptr != upriv->wr_ptr ? 1 : 0;
+}
+
+static int _serial_getc(struct udevice *dev)
+{
+	struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
+	char val;
+
+	val = upriv->buf[upriv->rd_ptr++];
+	upriv->rd_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE;
+
+	return val;
+}
+
+#else /* CONFIG_IS_ENABLED(SERIAL_RX_BUFFER) */
+
+static int _serial_getc(struct udevice *dev)
+{
+	return __serial_getc(dev);
+}
+
+static int _serial_tstc(struct udevice *dev)
+{
+	return __serial_tstc(dev);
+}
+#endif /* CONFIG_IS_ENABLED(SERIAL_RX_BUFFER) */
+
 void serial_putc(char ch)
 {
 	if (gd->cur_serial_dev)
@@ -359,6 +397,12 @@ static int serial_post_probe(struct udevice *dev)
 	sdev.puts = serial_stub_puts;
 	sdev.getc = serial_stub_getc;
 	sdev.tstc = serial_stub_tstc;
+
+#if CONFIG_IS_ENABLED(SERIAL_RX_BUFFER)
+	/* Allocate the RX buffer */
+	upriv->buf = malloc(CONFIG_SERIAL_RX_BUFFER_SIZE);
+#endif
+
 	stdio_register_dev(&sdev, &upriv->sdev);
 #endif
 	return 0;