From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Jiri Slaby <jslaby@suse.cz>, Rob Herring <robh@kernel.org>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH v3 -next 05/11] serial: 8250_early: Assume uart already initialized if no baud option
Date: Mon, 9 Mar 2015 16:27:16 -0400 [thread overview]
Message-ID: <1425932842-21812-6-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1425932842-21812-1-git-send-email-peter@hurleysoftware.com>
The <baud><parity><bit> option string is not supplied if the earlycon
is started via devicetree and OF_EARLYCON_DECLARE(). The option string
is also not required if started via kernel command line parameters of
the form:
earlycon=uart,mmio,<addr>
console=uart,mmio,<addr>
If earlycon_device->baud is 0, then an option string was not supplied.
In this case, assume the uart has already been initialized by the
bootloader or firmware.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/serial/8250/8250_early.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index d7b831b..1701d00 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -149,12 +149,18 @@ static int __init early_serial8250_setup(struct earlycon_device *device,
return 0;
if (!device->baud) {
+ struct uart_port *port = &device->port;
+ unsigned int ier;
+
device->baud = probe_baud(&device->port);
snprintf(device->options, sizeof(device->options), "%u",
device->baud);
- }
- init_port(device);
+ /* assume the device was initialized, only mask interrupts */
+ ier = serial8250_early_in(port, UART_IER);
+ serial8250_early_out(port, UART_IER, ier & UART_IER_UUE);
+ } else
+ init_port(device);
device->con->write = early_serial8250_write;
return 0;
--
2.3.1
next prev parent reply other threads:[~2015-03-09 20:29 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 20:27 [PATCH v3 -next 00/11] Extensible console matching & direct earlycon Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 01/11] console: Add extensible console matching Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 02/11] serial: core: Fix kernel doc for uart_console_write() Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 03/11] serial: 8250_early: Remove early_device variable Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 04/11] serial: earlycon: Move ->uartclk initialize Peter Hurley
2015-03-09 20:27 ` Peter Hurley [this message]
2015-03-09 20:27 ` [PATCH v3 -next 06/11] serial: 8250_early: Fix setup() error code Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 07/11] serial: earlycon: Ignore parse_options() " Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 08/11] serial: earlycon: Skip parse_options() if empty string Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 09/11] serial: earlycon: Refactor earlycon registration Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 10/11] serial: earlycon: Enable earlycon without command line param Peter Hurley
2015-03-09 20:27 ` [PATCH v3 -next 11/11] serial: 8250_early: Remove setup_early_serial8250_console() Peter Hurley
2015-04-02 2:04 ` Yinghai Lu
2015-04-02 3:22 ` Peter Hurley
2015-04-02 9:15 ` Yinghai Lu
2015-04-02 16:31 ` Peter Hurley
2015-04-02 17:23 ` Yinghai Lu
2015-04-02 22:12 ` Yinghai Lu
2015-04-02 22:36 ` Yinghai Lu
2015-04-03 0:02 ` Yinghai Lu
2015-04-03 0:22 ` Yinghai Lu
2015-04-03 2:38 ` Yinghai Lu
2015-04-03 10:37 ` Peter Hurley
2015-04-03 16:57 ` Yinghai Lu
2015-04-03 17:38 ` Peter Hurley
2015-04-03 17:44 ` Yinghai Lu
2015-04-03 18:27 ` Peter Hurley
2015-04-03 19:00 ` Greg Kroah-Hartman
2015-04-03 23:03 ` [PATCH] earlycon: 8250: Fix command line regression Peter Hurley
2015-04-04 0:04 ` [PATCH v2] " Peter Hurley
2015-04-04 2:19 ` Yinghai Lu
2015-04-04 2:29 ` Peter Hurley
2015-04-04 2:50 ` Peter Hurley
2015-04-04 3:00 ` Yinghai Lu
2015-04-04 2:56 ` Yinghai Lu
2015-04-04 3:09 ` Peter Hurley
2015-04-04 3:28 ` Yinghai Lu
2015-04-04 3:09 ` Yinghai Lu
2015-04-04 3:15 ` Peter Hurley
2015-04-04 3:24 ` Yinghai Lu
2015-04-04 3:31 ` Yinghai Lu
2015-04-04 3:32 ` Peter Hurley
2015-04-04 3:37 ` Yinghai Lu
2015-04-04 3:41 ` Peter Hurley
2015-04-04 6:05 ` Yinghai Lu
2015-04-04 14:27 ` [PATCH v3] " Peter Hurley
2015-04-04 16:09 ` Greg Kroah-Hartman
2015-04-04 16:23 ` Peter Hurley
2015-04-04 16:52 ` Greg Kroah-Hartman
2015-04-04 17:08 ` Peter Hurley
2015-04-04 17:19 ` [PATCH v4] " Peter Hurley
2015-04-04 17:24 ` Peter Hurley
2015-04-04 17:41 ` Greg Kroah-Hartman
2015-04-05 7:09 ` Yinghai Lu
2015-04-05 13:06 ` Peter Hurley
2015-04-05 20:14 ` Yinghai Lu
2015-04-05 14:52 ` [PATCH v5] " Peter Hurley
2015-04-05 20:02 ` Yinghai Lu
2015-04-06 14:48 ` [PATCH v6] " Peter Hurley
2015-04-04 0:52 ` [PATCH v3 -next 11/11] serial: 8250_early: Remove setup_early_serial8250_console() Yinghai Lu
2015-04-04 1:16 ` Peter Hurley
2015-04-04 0:58 ` Yinghai Lu
2015-03-26 17:13 ` [PATCH v3 -next 00/11] Extensible console matching & direct earlycon Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425932842-21812-6-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).