Skip to content

Commit

Permalink
serial: sh-sci: Increment the runtime usage counter for the earlycon …
Browse files Browse the repository at this point in the history
…device

commit 651dee0 upstream.

In the sh-sci driver, serial ports are mapped to the sci_ports[] array,
with earlycon mapped at index zero.

The uart_add_one_port() function eventually calls __device_attach(),
which, in turn, calls pm_request_idle(). The identified code path is as
follows:

uart_add_one_port() ->
  serial_ctrl_register_port() ->
    serial_core_register_port() ->
      serial_core_port_device_add() ->
        serial_base_port_add() ->
          device_add() ->
            bus_probe_device() ->
              device_initial_probe() ->
                __device_attach() ->
                  // ...
                  if (dev->p->dead) {
                    // ...
                  } else if (dev->driver) {
                    // ...
                  } else {
                    // ...
                    pm_request_idle(dev);
                    // ...
                  }

The earlycon device clocks are enabled by the bootloader. However, the
pm_request_idle() call in __device_attach() disables the SCI port clocks
while earlycon is still active.

The earlycon write function, serial_console_write(), calls
sci_poll_put_char() via serial_console_putchar(). If the SCI port clocks
are disabled, writing to earlycon may sometimes cause the SR.TDFE bit to
remain unset indefinitely, causing the while loop in sci_poll_put_char()
to never exit. On single-core SoCs, this can result in the system being
blocked during boot when this issue occurs.

To resolve this, increment the runtime PM usage counter for the earlycon
SCI device before registering the UART port.

Fixes: 0b0cced ("serial: sh-sci: Add CONFIG_SERIAL_EARLYCON support")
Cc: stable@vger.kernel.org
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://lore.kernel.org/r/20250116182249.3828577-6-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Claudiu Beznea authored and Greg Kroah-Hartman committed Jun 27, 2025
1 parent 6a579b0 commit 9c839c6
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -3358,6 +3358,22 @@ static int sci_probe_single(struct platform_device *dev,
}

if (sci_uart_earlycon && sci_ports[0].port.mapbase == sci_res->start) {
/*
* In case:
* - this is the earlycon port (mapped on index 0 in sci_ports[]) and
* - it now maps to an alias other than zero and
* - the earlycon is still alive (e.g., "earlycon keep_bootcon" is
* available in bootargs)
*
* we need to avoid disabling clocks and PM domains through the runtime
* PM APIs called in __device_attach(). For this, increment the runtime
* PM reference counter (the clocks and PM domains were already enabled
* by the bootloader). Otherwise the earlycon may access the HW when it
* has no clocks enabled leading to failures (infinite loop in
* sci_poll_put_char()).
*/
pm_runtime_get_noresume(&dev->dev);

/*
* Skip cleanup the sci_port[0] in early_console_exit(), this
* port is the same as the earlycon one.
Expand Down

0 comments on commit 9c839c6

Please sign in to comment.