180-earlycon-initialize-port-uartclk-based-on-clock-frequency-property.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 814453adea7d081ad8917aa0f32d6a14165a3563 Mon Sep 17 00:00:00 2001
  2. From: Michal Simek <[email protected]>
  3. Date: Tue, 10 Apr 2018 15:32:28 +0200
  4. Subject: earlycon: Initialize port->uartclk based on clock-frequency property
  5. From: Michal Simek <[email protected]>
  6. commit 814453adea7d081ad8917aa0f32d6a14165a3563 upstream.
  7. On DT based platforms when current-speed property is present baudrate
  8. is setup. Also port->uartclk is initialized to bogus BASE_BAUD * 16
  9. value. Drivers like uartps/ns16550 contain logic when baudrate and
  10. uartclk is used for baudrate calculation.
  11. The patch is reading optional clock-frequency property to replace bogus
  12. BASE_BAUD * 16 calculation to have proper baudrate calculation.
  13. [-stable comment: commit 31cb9a8575ca ("earlycon: initialise baud field
  14. of earlycon device structure") has changed 8250_early.c behavior which
  15. now tries to setup UART speed. Ignoring clock-frequency results in
  16. wrong value of calculated divisor & malformed early console output.]
  17. Fixes: 31cb9a8575ca ("earlycon: initialise baud field of earlycon device structure")
  18. Signed-off-by: Michal Simek <[email protected]>
  19. [rmilecki: add -stable comment and Fixes tag]
  20. Signed-off-by: Rafał Miłecki <[email protected]>
  21. Signed-off-by: Greg Kroah-Hartman <[email protected]>
  22. ---
  23. drivers/tty/serial/earlycon.c | 4 ++++
  24. 1 file changed, 4 insertions(+)
  25. --- a/drivers/tty/serial/earlycon.c
  26. +++ b/drivers/tty/serial/earlycon.c
  27. @@ -289,6 +289,10 @@ int __init of_setup_earlycon(const struc
  28. if (val)
  29. early_console_dev.baud = be32_to_cpu(*val);
  30. + val = of_get_flat_dt_prop(node, "clock-frequency", NULL);
  31. + if (val)
  32. + port->uartclk = be32_to_cpu(*val);
  33. +
  34. if (options) {
  35. early_console_dev.baud = simple_strtoul(options, NULL, 0);
  36. strlcpy(early_console_dev.options, options,