lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 024/109] earlycon: add reg-offset to physical address before mapping
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Greentime Hu <green.hu@gmail.com>

    commit 1f66dd36bb18437397ea0d7882c52f7e3c476e15 upstream.

    It will get the wrong virtual address because port->mapbase is not added
    the correct reg-offset yet. We have to update it before earlycon_map()
    is called

    Signed-off-by: Greentime Hu <greentime@andestech.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Cc: Peter Hurley <peter@hurleysoftware.com>
    Cc: stable@vger.kernel.org
    Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT properties")
    Acked-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/serial/earlycon.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/tty/serial/earlycon.c
    +++ b/drivers/tty/serial/earlycon.c
    @@ -253,11 +253,12 @@ int __init of_setup_earlycon(const struc
    }
    port->mapbase = addr;
    port->uartclk = BASE_BAUD * 16;
    - port->membase = earlycon_map(port->mapbase, SZ_4K);

    val = of_get_flat_dt_prop(node, "reg-offset", NULL);
    if (val)
    port->mapbase += be32_to_cpu(*val);
    + port->membase = earlycon_map(port->mapbase, SZ_4K);
    +
    val = of_get_flat_dt_prop(node, "reg-shift", NULL);
    if (val)
    port->regshift = be32_to_cpu(*val);

    \
     
     \ /
      Last update: 2018-03-16 16:35    [W:2.853 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site