Re: [PATCH v7 04/37] earlycon: add reg-offset to physical address before mapping

[Greg Kroah-Hartman]

On Thu, Feb 15, 2018 at 09:40:49AM -0600, Rob Herring wrote:
> On Tue, Feb 13, 2018 at 3:09 AM, Greentime Hu  wrote:
> > 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 
> > Acked-by: Arnd Bergmann 
> > Cc: Peter Hurley 
> > Cc: sta...@vger.kernel.org
> > Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT
> > properties")
> 
> This should get applied now rather than sit in numerous revisions of
> this series for nds32.
> 
> Acked-by: Rob Herring 
> 
> Greg, can you apply?

Yes, will queue it up now, thanks.

greg k-h

Re: [PATCH v7 04/37] earlycon: add reg-offset to physical address before mapping

[Rob Herring]

On Tue, Feb 13, 2018 at 3:09 AM, Greentime Hu  wrote:
> 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 
> Acked-by: Arnd Bergmann 
> Cc: Peter Hurley 
> Cc: sta...@vger.kernel.org
> Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT
> properties")

This should get applied now rather than sit in numerous revisions of
this series for nds32.

Acked-by: Rob Herring 

Greg, can you apply?

Rob

[PATCH v7 04/37] earlycon: add reg-offset to physical address before mapping

[Greentime Hu]

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 
Acked-by: Arnd Bergmann 
Cc: Peter Hurley 
Cc: sta...@vger.kernel.org
Fixes: 088da2a17619 ("of: earlycon: Initialize port fields from DT
properties")
---
 drivers/tty/serial/earlycon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 870e84fb6e39..a24278380fec 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -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);
-- 
2.16.1