Skip to content

Commit a44d267

Browse files
Michal Simekgregkh
authored andcommitted
earlycon: Initialize port->uartclk based on clock-frequency property
commit 814453a upstream. On DT based platforms when current-speed property is present baudrate is setup. Also port->uartclk is initialized to bogus BASE_BAUD * 16 value. Drivers like uartps/ns16550 contain logic when baudrate and uartclk is used for baudrate calculation. The patch is reading optional clock-frequency property to replace bogus BASE_BAUD * 16 calculation to have proper baudrate calculation. [-stable comment: commit 31cb9a8 ("earlycon: initialise baud field of earlycon device structure") has changed 8250_early.c behavior which now tries to setup UART speed. Ignoring clock-frequency results in wrong value of calculated divisor & malformed early console output.] Fixes: 31cb9a8 ("earlycon: initialise baud field of earlycon device structure") Signed-off-by: Michal Simek <[email protected]> [rmilecki: add -stable comment and Fixes tag] Signed-off-by: Rafał Miłecki <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 29068d2 commit a44d267

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/tty/serial/earlycon.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
289289
if (val)
290290
early_console_dev.baud = be32_to_cpu(*val);
291291

292+
val = of_get_flat_dt_prop(node, "clock-frequency", NULL);
293+
if (val)
294+
port->uartclk = be32_to_cpu(*val);
295+
292296
if (options) {
293297
early_console_dev.baud = simple_strtoul(options, NULL, 0);
294298
strlcpy(early_console_dev.options, options,

0 commit comments

Comments
 (0)