On Fri, Jun 26, 2020 at 1:01 PM Douglas Anderson <dianders@xxxxxxxxxxxx> wrote:
>
> The geni serial driver had the rather sketchy hack in it where it
> would adjust the number of bytes per RX FIFO word from 4 down to 1 if
> it detected that CONFIG_CONSOLE_POLL was enabled (for kgdb) and this
> was a console port (defined by the kernel directing output to this
> port via the "console=" command line argument).
>
> The problem with that sketchy hack is that it's possible to run kgdb
> over a serial port even if it isn't used for console.
>
> Let's avoid the hack by simply handling the 4-bytes-per-FIFO word case
> for kdb. We'll have to have a (very small) cache but that should be
> fine.
>
> A nice side effect of this patch is that an agetty (or similar)
> running on this port is less likely to drop characters. We'll
> have roughly 4 times the RX FIFO depth than we used to now.
>
> NOTE: the character cache here isn't shared between the polling API
> and the non-polling API. That means that, technically, the polling
> API could eat a few extra bytes. This doesn't seem to pose a huge
> problem in reality because we'll only get several characters per FIFO
> word if those characters are all received at nearly the same time and
> we don't really expect non-kgdb characters to be sent to the same port
> as kgdb at the exact same time we're exiting kgdb.
>
> ALSO NOTE: we still have the sketchy hack for setting the number of
> bytes per TX FIFO word in place, but that one is less bad. kgdb
> doesn't have any problem with this because it always just sends 1 byte
> at a time and waits for it to finish. The TX FIFO hack is only really
> needed for console output. In any case, a future patch will remove
> that hack, too.
>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> ---
>
> drivers/tty/serial/qcom_geni_serial.c | 80 ++++++++++++++++++---------
> 1 file changed, 55 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
> index 0300867eab7a..4610e391e886 100644
> --- a/drivers/tty/serial/qcom_geni_serial.c
> +++ b/drivers/tty/serial/qcom_geni_serial.c
> @@ -103,11 +103,13 @@
> #define DEFAULT_IO_MACRO_IO2_IO3_MASK GENMASK(15, 4)
> #define IO_MACRO_IO2_IO3_SWAP 0x4640
>
> -#ifdef CONFIG_CONSOLE_POLL
> -#define CONSOLE_RX_BYTES_PW 1
> -#else
> -#define CONSOLE_RX_BYTES_PW 4
> -#endif
> +struct qcom_geni_private_data {
> + /* NOTE: earlycon port will have NULL here */
> + struct uart_driver *drv;
> +
> + u32 poll_cached_bytes;
> + unsigned int poll_cached_bytes_cnt;
> +};
>
> struct qcom_geni_serial_port {
> struct uart_port uport;
> @@ -129,6 +131,8 @@ struct qcom_geni_serial_port {
> int wakeup_irq;
> bool rx_tx_swap;
> bool cts_rts_swap;
> +
> + struct qcom_geni_private_data private_data;
> };
>
> static const struct uart_ops qcom_geni_console_pops;
> @@ -264,8 +268,9 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport,
> unsigned int baud;
> unsigned int fifo_bits;
> unsigned long timeout_us = 20000;
> + struct qcom_geni_private_data *private_data = uport->private_data;
>
> - if (uport->private_data) {
> + if (private_data->drv) {
> port = to_dev_port(uport, uport);
> baud = port->baud;
> if (!baud)
> @@ -331,23 +336,42 @@ static void qcom_geni_serial_abort_rx(struct uart_port *uport)
> }
>
> #ifdef CONFIG_CONSOLE_POLL
> +
> static int qcom_geni_serial_get_char(struct uart_port *uport)
> {
> - u32 rx_fifo;
> + struct qcom_geni_private_data *private_data = uport->private_data;
> u32 status;
> + u32 word_cnt;
> + int ret;
> +
> + if (!private_data->poll_cached_bytes_cnt) {
> + status = readl(uport->membase + SE_GENI_M_IRQ_STATUS);
> + writel(status, uport->membase + SE_GENI_M_IRQ_CLEAR);
>
> - status = readl(uport->membase + SE_GENI_M_IRQ_STATUS);
> - writel(status, uport->membase + SE_GENI_M_IRQ_CLEAR);
> + status = readl(uport->membase + SE_GENI_S_IRQ_STATUS);
> + writel(status, uport->membase + SE_GENI_S_IRQ_CLEAR);
>
> - status = readl(uport->membase + SE_GENI_S_IRQ_STATUS);
> - writel(status, uport->membase + SE_GENI_S_IRQ_CLEAR);
> + status = readl(uport->membase + SE_GENI_RX_FIFO_STATUS);
> + word_cnt = status & RX_FIFO_WC_MSK;
> + if (!word_cnt)
> + return NO_POLL_CHAR;
>
> - status = readl(uport->membase + SE_GENI_RX_FIFO_STATUS);
> - if (!(status & RX_FIFO_WC_MSK))
> - return NO_POLL_CHAR;
> + if (word_cnt == 1 && (status & RX_LAST))
I forget how the partial word snapping works. Are you sure you want
word_cnt == 1? I see qcom_geni_serial_handle_rx() looks at RX_LAST
independently as long as word_cnt != 0. I'm worried the hardware
allows one FIFO entry with say 2 bytes in it and RX_LAST set, but then
also piles new stuff in the FIFO behind it, so that word_cnt can be
>1.
Also I mostly reviewed the change on Gerrit, they seemed to be the
same. In this case it was easier to understand the indentation
changes. If there were gotchas between the Gerrit version and this
patch, let me know.
-Evan
