Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e26f1db9 authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

tty/serial: fix generic earlycon option parsing 



Commit 9aac5887 (tty/serial: add generic serial earlycon) moved
console option parsing from 8250_early.c and converted to kstrto*
functions from simple_strtoul along the way. However, kstrto* functions
are not equivalent in that they do not allow non-convertible characters
at the end such as "115200n8". Fix this by changing back to
simple_strtoul and ignore what checkpatch.pl says.

Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe1cf8af

drivers/tty/serial/earlycon.c

+5 −13
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int __init parse_options(struct earlycon_device *device, 
				char *options)

{

	struct uart_port *port = &device->port;

	int mmio, mmio32, length, ret;

	int mmio, mmio32, length;

	unsigned long addr;



	if (!options)
@@ -64,25 +64,19 @@ static int __init parse_options(struct earlycon_device *device, 
	if (mmio || mmio32) {

		port->iotype = (mmio ? UPIO_MEM : UPIO_MEM32);

		options += mmio ? 5 : 7;

		ret = kstrtoul(options, 0, &addr);

		if (ret)

			return ret;

		addr = simple_strtoul(options, NULL, 0);

		port->mapbase = addr;

		if (mmio32)

			port->regshift = 2;

	} else if (!strncmp(options, "io,", 3)) {

		port->iotype = UPIO_PORT;

		options += 3;

		ret = kstrtoul(options, 0, &addr);

		if (ret)

			return ret;

		addr = simple_strtoul(options, NULL, 0);

		port->iobase = addr;

		mmio = 0;

	} else if (!strncmp(options, "0x", 2)) {

		port->iotype = UPIO_MEM;

		ret = kstrtoul(options, 0, &addr);

		if (ret)

			return ret;

		addr = simple_strtoul(options, NULL, 0);

		port->mapbase = addr;

	} else {

		return -EINVAL;
@@ -93,9 +87,7 @@ static int __init parse_options(struct earlycon_device *device, 
	options = strchr(options, ',');

	if (options) {

		options++;

		ret = kstrtouint(options, 0, &device->baud);

		if (ret)

			return ret;

		device->baud = simple_strtoul(options, NULL, 0);

		length = min(strcspn(options, " ") + 1,

			     (size_t)(sizeof(device->options)));

		strlcpy(device->options, options, length);