Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891AbdHORVs (ORCPT ); Tue, 15 Aug 2017 13:21:48 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:43430 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122AbdHORVq (ORCPT ); Tue, 15 Aug 2017 13:21:46 -0400 From: Eugeniy Paltsev To: linux-serial@vger.kernel.org Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby , Eugeniy Paltsev Subject: [PATCH] earlycon: initialise baud field of earlycon device structure Date: Tue, 15 Aug 2017 20:21:41 +0300 Message-Id: <20170815172141.29115-1-Eugeniy.Paltsev@synopsys.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1666 Lines: 51 For now baud field of earlycon structure device is't initialised at all in of_setup_earlycon (in oppositŠµ to register_earlycon). So when I use stdout-path to point earlycon device (like stdout-path = &serial or stdout-path = "serial:115200n8") baud field of earlycon device structure remains uninitialised and earlycon initialization is not performed correctly as of_setup_earlycon is used. When pass all arguments via bootargs (like bootargs = "earlycon=uart8250,mmio32,0xf0005000,115200n8") initialization is performed correctly as register_earlycon is used. So initialise baud field of earlycon device structure by baud value from device tree or from options (if they exist) when we use of_setup_earlycon Signed-off-by: Eugeniy Paltsev --- drivers/tty/serial/earlycon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index c365154..6c2e2b6 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -240,6 +240,7 @@ int __init of_setup_earlycon(const struct earlycon_id *match, { int err; struct uart_port *port = &early_console_dev.port; + unsigned long baud; const __be32 *val; bool big_endian; u64 addr; @@ -282,7 +283,15 @@ int __init of_setup_earlycon(const struct earlycon_id *match, } } + val = of_get_flat_dt_prop(node, "baud", NULL); + if (val) + early_console_dev.baud = be32_to_cpu(*val); + if (options) { + err = kstrtoul(options, 10, &baud); + if (!err) + early_console_dev.baud = baud; + strlcpy(early_console_dev.options, options, sizeof(early_console_dev.options)); } -- 2.9.3