FAILED: patch "[PATCH] earlycon: add reg-offset to physical address before mapping" failed to apply to 4.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
f572a034d9e07157dd07d2b6be3a1459b5574b58Mon Sep 17 00:00:00 2001
From: Greentime Hu <[email protected]>
Date: Thu, 16 Nov 2017 19:33:35 +0800
Subject: [PATCH] earlycon: add reg-offset to physical address before mapping
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 <[email protected]>
Acked-by Arnd Bergmann <[email protected]>
Acked-by Rob Herring <[email protected]>
Cc Peter Hurley <[email protected]>
Fixes 088da2a17619 ("of: earlycon: Initialize port fields from DT
properties")
drivers/tty/serial/earlycon.c +2 -1
@@ -245,11 +245,12 @@ int __init of_setup_earlycon(const struct earlycon_id *match, } 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);