Commit 8b2303de authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Greg Kroah-Hartman

serial: core: Fix handling of options after MMIO address

Guenter Roeck reported a regression caused by commit "serial: earlycon:
Extend earlycon command line option to support 64-bit addresses":

console= and earlycon= options have the following format:
...,<addr>,<options>

Historically used here simple_strtoul() had no problems with comma, but the
new and recommended kstrtoull() requires null-terminated string and returns
-EINVAL in case there are "options" at the end. There is no recommended to
use function currently that will support it, so stick to obsolete
simple_strtoull() variant.
Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e512d45
...@@ -1892,14 +1892,11 @@ uart_get_console(struct uart_port *ports, int nr, struct console *co) ...@@ -1892,14 +1892,11 @@ uart_get_console(struct uart_port *ports, int nr, struct console *co)
* console=<name>,0x<addr>,<options> * console=<name>,0x<addr>,<options>
* is also accepted; the returned @iotype will be UPIO_MEM. * is also accepted; the returned @iotype will be UPIO_MEM.
* *
* Returns 0 on success, -EINVAL or -ERANGE on failure * Returns 0 on success or -EINVAL on failure
*/ */
int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr, int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr,
char **options) char **options)
{ {
int ret;
unsigned long long tmp;
if (strncmp(p, "mmio,", 5) == 0) { if (strncmp(p, "mmio,", 5) == 0) {
*iotype = UPIO_MEM; *iotype = UPIO_MEM;
p += 5; p += 5;
...@@ -1925,10 +1922,11 @@ int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr, ...@@ -1925,10 +1922,11 @@ int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr,
return -EINVAL; return -EINVAL;
} }
ret = kstrtoull(p, 0, &tmp); /*
if (ret) * Before you replace it with kstrtoull(), think about options separator
return ret; * (',') it will not tolerate
*addr = tmp; */
*addr = simple_strtoull(p, NULL, 0);
p = strchr(p, ','); p = strchr(p, ',');
if (p) if (p)
p++; p++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment