2014-10-17 09:01:19

by Kumar Gala

Subject: [PATCH] tty/serial: earlycon: Fix print for implied MMIO case

For the case in which we just provide an address as an argument to the
earlycon console type like:

earlycon=msm_serial_dm,0xf991e000

We would report this as an IO port based mapping and not as MMIO. Simple
fix to use the port->iotype to decide which message to print.

Signed-off-by: Kumar Gala <[email protected]>
---
drivers/tty/serial/earlycon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index a514ee6..64fe25a 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -98,7 +98,7 @@ static int __init parse_options(struct earlycon_device *device,
strlcpy(device->options, options, length);
}

- if (mmio || mmio32)
+ if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM32)
pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n",
mmio32 ? "32" : "",
(unsigned long long)port->mapbase,
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

2014-10-22 13:49:15

by Mark Rutland

Subject: Re: [PATCH] tty/serial: earlycon: Fix print for implied MMIO case

On Fri, Oct 17, 2014 at 10:01:11AM +0100, Kumar Gala wrote:
> For the case in which we just provide an address as an argument to the
> earlycon console type like:
>
> earlycon=msm_serial_dm,0xf991e000

Personally it would be nice to see this when using pl011 as an earlyon.
Currently I get:

Early serial console at I/O port 0x0 (options '')

With this patch I get:

Early serial console at MMIO 0x7ff80000 (options '')

> We would report this as an IO port based mapping and not as MMIO. Simple
> fix to use the port->iotype to decide which message to print.
>
> Signed-off-by: Kumar Gala <[email protected]>

Acked-by: Mark RUtland <[email protected]>

Thanks,
Mark.

> ---
> drivers/tty/serial/earlycon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
> index a514ee6..64fe25a 100644
> --- a/drivers/tty/serial/earlycon.c
> +++ b/drivers/tty/serial/earlycon.c
> @@ -98,7 +98,7 @@ static int __init parse_options(struct earlycon_device *device,
> strlcpy(device->options, options, length);
> }
>
> - if (mmio || mmio32)
> + if (port->iotype == UPIO_MEM || port->iotype == UPIO_MEM32)
> pr_info("Early serial console at MMIO%s 0x%llx (options '%s')\n",
> mmio32 ? "32" : "",
> (unsigned long long)port->mapbase,
> --
> Qualcomm Innovation Center, Inc.
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>