serial: sifive: Convert sifive console to nbcon
Subsystems (4)
v3 cover serial: sifive: Convert sifive console to nbcon
Hi!
This series convert sifive console to nbcon.
The first patch fixes the issue which was pointed out by John [0] that the driver has been accessing SIFIVE_SERIAL_IE_OFFS register on its ->startup() and ->shutdown() without port lock synchronization against ->write().
The fix on the first patch still applies to the second patch which converts the console to nbcon as ->write_thread() holds port lock and ->write_atomic() checks for the console ownership.
Sincerely,
Ryo Takakura
[0] https://lore.kernel.org/lkml/[email protected]/
---
Changes since v1:
[1] https://lore.kernel.org/lkml/[email protected]/
- Thank you John for the feedback!
- Add a patch for synchronizing startup()/shutdown() vs write().
- Add <Reviewed-by> by John.
Changes since v2:
[2] https://lore.kernel.org/all/[email protected]/
- Add Cc stable for the first patch.
---
Ryo Takakura (2):
serial: sifive: lock port in startup()/shutdown() callbacks
serial: sifive: Switch to nbcon console
drivers/tty/serial/sifive.c | 93 +++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 13 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 serial: sifive: lock port in startup()/shutdown() callbacks
startup()/shutdown() callbacks access SIFIVE_SERIAL_IE_OFFS. The register is also accessed from write() callback.
If console were printing and startup()/shutdown() callback gets called, its access to the register could be overwritten.
Add port->lock to startup()/shutdown() callbacks to make sure their access to SIFIVE_SERIAL_IE_OFFS is synchronized against write() callback.
--- drivers/tty/serial/sifive.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/sifive.c +6 -0
@@ -563,8 +563,11 @@ static void sifive_serial_break_ctl(struct uart_port *port, int break_state)static int sifive_serial_startup (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_enable_rxwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags);return 0 ; }
@@ -572,9 +575,12 @@ static int sifive_serial_startup(struct uart_port *port)static void sifive_serial_shutdown (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_disable_rxwm (ssp);__ssp_disable_txwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags); }/**
Signature · 1 line
2.34.1
PATCH v3 2/2 serial: sifive: Switch to nbcon console
In reply to Ryo TakakuraAdd the necessary callbacks(write_atomic, write_thread, device_lock and device_unlock) and CON_NBCON flag to switch the sifive console driver to perform as nbcon console.
Both ->write_atomic() and ->write_thread() will check for console ownership whenever they are accessing registers.
The ->device_lock()/unlock() will provide the additional serilization necessary for ->write_thread() which is called from dedicated printing thread.
--- drivers/tty/serial/sifive.c | 87 +++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 13 deletions(-)
drivers/tty/serial/sifive.c +74 -13
@@ -151,6 +151,7 @@ struct sifive_serial_port {unsigned long baud_rate;struct clk *clk;struct notifier_block clk_notifier; +bool console_line_ended; };/*
@@ -785,33 +786,88 @@ static void sifive_serial_console_putchar(struct uart_port *port, unsigned char__ssp_wait_for_xmitr (ssp);__ssp_transmit_char (ssp, ch); + + ssp->console_line_ended = (ch =='\n' ); +} + +static void sifive_serial_device_lock (struct console *co,unsigned long *flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_lock_irqsave (up, flags); +} + +static void sifive_serial_device_unlock (struct console *co,unsigned long flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_unlock_irqrestore (up, flags); } -static void sifive_serial_console_write (struct console *co,const char *s, -unsigned int count) +static void sifive_serial_console_write_atomic (struct console *co, +struct nbcon_write_context *wctxt) {struct sifive_serial_port *ssp = sifive_serial_console_ports[co->index]; -unsigned long flags; +struct uart_port *port = &ssp->port;unsigned int ier; -int locked =1 ;if (!ssp)return ; -if (oops_in_progress) - locked =uart_port_trylock_irqsave (&ssp->port, &flags); -else -uart_port_lock_irqsave (&ssp->port, &flags); +if (!nbcon_enter_unsafe (wctxt)) +return ; ier =__ssp_readl (ssp,SIFIVE_SERIAL_IE_OFFS );__ssp_writel (0 ,SIFIVE_SERIAL_IE_OFFS , ssp); -uart_console_write (&ssp->port, s, count, sifive_serial_console_putchar); +if (!ssp->console_line_ended) +uart_console_write (port,"\n" ,1 , sifive_serial_console_putchar); +uart_console_write (port, wctxt->outbuf, wctxt->len, + sifive_serial_console_putchar);__ssp_writel (ier,SIFIVE_SERIAL_IE_OFFS , ssp); -if (locked) -uart_port_unlock_irqrestore (&ssp->port, flags); +nbcon_exit_unsafe (wctxt); +} + +static void sifive_serial_console_write_thread (struct console *co, +struct nbcon_write_context *wctxt) +{ +struct sifive_serial_port *ssp = sifive_serial_console_ports[co->index]; +struct uart_port *port = &ssp->port; +unsigned int ier; + +if (!ssp) +return ; + +if (!nbcon_enter_unsafe (wctxt)) +return ; + + ier =__ssp_readl (ssp,SIFIVE_SERIAL_IE_OFFS ); +__ssp_writel (0 ,SIFIVE_SERIAL_IE_OFFS , ssp); + +if (nbcon_exit_unsafe (wctxt)) { +int len =READ_ONCE (wctxt->len); +int i; + +for (i =0 ; i < len; i++) { +if (!nbcon_enter_unsafe (wctxt)) +break ; + +uart_console_write (port, wctxt->outbuf + i,1 , + sifive_serial_console_putchar); + +if (!nbcon_exit_unsafe (wctxt)) +break ; + } + } + +while (!nbcon_enter_unsafe (wctxt)) +nbcon_reacquire_nobuf (wctxt); + +__ssp_writel (ier,SIFIVE_SERIAL_IE_OFFS , ssp); + +nbcon_exit_unsafe (wctxt); }static int sifive_serial_console_setup (struct console *co,char *options)
@@ -829,6 +885,8 @@ static int sifive_serial_console_setup(struct console *co, char *options)if (!ssp)return -ENODEV ; + ssp->console_line_ended = true; +if (options)uart_parse_options (options, &baud, &parity, &bits, &flow);
@@ -839,10 +897,13 @@ static struct uart_driver sifive_serial_uart_driver;static struct console sifive_serial_console = { .name =SIFIVE_TTY_PREFIX , - .write = sifive_serial_console_write, + .write_atomic = sifive_serial_console_write_atomic, + .write_thread = sifive_serial_console_write_thread, + .device_lock = sifive_serial_device_lock, + .device_unlock = sifive_serial_device_unlock, .device = uart_console_device, .setup = sifive_serial_console_setup, - .flags =CON_PRINTBUFFER , + .flags =CON_PRINTBUFFER |CON_NBCON , .index =-1 , .data = &sifive_serial_uart_driver, };
Signature · 1 line
2.34.1
Re: [PATCH v3 2/2] serial: sifive: Switch to nbcon console
Quoted 5 lines · Ryo Takakura
drivers/tty/serial/sifive.c +0
-0@@ -785,33 +786,88 @@ static void sifive_serial_console_putchar(struct uart_port *port, unsigned char__ssp_wait_for_xmitr (ssp);
drivers/tty/serial/sifive.c static void sifive_serial_console_putchar(struct uart_port *port, unsigned char · line 797
Quoted 10 lines
drivers/tty/serial/sifive.c +9
-0__ssp_transmit_char (ssp, ch); + + ssp->console_line_ended = (ch =='\n' ); +} + +static void sifive_serial_device_lock (struct console *co,unsigned long *flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_lock_irqsave (up, flags);
this does look odd. A return statement in a return-void function. The imx driver started it…
drivers/tty/serial/sifive.c static void sifive_serial_console_putchar(struct uart_port *port, unsigned char · line 805
Quoted 8 lines
drivers/tty/serial/sifive.c +7
-0+} + +static void sifive_serial_device_unlock (struct console *co,unsigned long flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_unlock_irqrestore (up, flags); }
Sebastian
Re: [PATCH v3 2/2] serial: sifive: Switch to nbcon console
Hi Sebastian,
Quoted 5 lines · Sebastian Andrzej Siewior
Quoted 4 lines · Ryo Takakura
drivers/tty/serial/sifive.c +0
-0@@ -785,33 +786,88 @@ static void sifive_serial_console_putchar(struct uart_port *port, unsigned char
Quoted 14 lines
drivers/tty/serial/sifive.c static void sifive_serial_console_putchar(struct uart_port *port, unsigned char · line 797
Quoted 11 lines
drivers/tty/serial/sifive.c +9
-0__ssp_wait_for_xmitr (ssp);__ssp_transmit_char (ssp, ch); + + ssp->console_line_ended = (ch =='\n' ); +} + +static void sifive_serial_device_lock (struct console *co,unsigned long *flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_lock_irqsave (up, flags);this does look odd. A return statement in a return-void function. The imx driver started it…
Oh I see. I wasn't paying enough attetion to it... I'll fix it for the next version, Thanks!
Sincerely,
Ryo Takakura
Quoted 10 lines
drivers/tty/serial/sifive.c static void sifive_serial_console_putchar(struct uart_port *port, unsigned char · line 805
Quoted 8 lines
drivers/tty/serial/sifive.c +7
-0+} + +static void sifive_serial_device_unlock (struct console *co,unsigned long flags) +{ +struct uart_port *up = &sifive_serial_console_ports[co->index]->port; + +return __uart_port_unlock_irqrestore (up, flags); }Sebastian