linux-kernel - Re: [DO NOT MERGE v8 20/36] serial: sh-sci: fix SH4 OF support.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <cb7a69949c08be858b107a2b8184d1da92d794a0.camel@physik.fu-berlin.de>
Date: Thu, 11 Jul 2024 14:57:18 +0200
From: John Paul Adrian Glaubitz <glaubitz@...sik.fu-berlin.de>
To: Yoshinori Sato <ysato@...rs.sourceforge.jp>, linux-sh@...r.kernel.org
Cc: Damien Le Moal <dlemoal@...nel.org>, Niklas Cassel <cassel@...nel.org>, 
 Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
 Conor Dooley <conor+dt@...nel.org>,  Geert Uytterhoeven
 <geert+renesas@...der.be>, Michael Turquette <mturquette@...libre.com>,
 Stephen Boyd <sboyd@...nel.org>,  David Airlie <airlied@...il.com>, Daniel
 Vetter <daniel@...ll.ch>, Maarten Lankhorst
 <maarten.lankhorst@...ux.intel.com>, Maxime Ripard <mripard@...nel.org>, 
 Thomas Zimmermann <tzimmermann@...e.de>, Thomas Gleixner
 <tglx@...utronix.de>, Bjorn Helgaas <bhelgaas@...gle.com>,  Lorenzo
 Pieralisi <lpieralisi@...nel.org>, Krzysztof Wilczyński
 <kw@...ux.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Jiri Slaby
 <jirislaby@...nel.org>, Magnus Damm <magnus.damm@...il.com>, Daniel Lezcano
 <daniel.lezcano@...aro.org>, Rich Felker <dalias@...c.org>, Lee Jones
 <lee@...nel.org>, Helge Deller <deller@....de>, Heiko Stuebner
 <heiko.stuebner@...rry.de>, Neil Armstrong <neil.armstrong@...aro.org>,
 Chris Morgan <macromorgan@...mail.com>, Sebastian Reichel <sre@...nel.org>,
 Linus Walleij <linus.walleij@...aro.org>, Arnd Bergmann <arnd@...db.de>,
 Masahiro Yamada <masahiroy@...nel.org>, Baoquan He <bhe@...hat.com>, Andrew
 Morton <akpm@...ux-foundation.org>, Guenter Roeck <linux@...ck-us.net>,
 Kefeng Wang <wangkefeng.wang@...wei.com>, Stephen Rothwell
 <sfr@...b.auug.org.au>, Azeem Shaikh <azeemshaikh38@...il.com>, Guo Ren
 <guoren@...nel.org>, Max Filippov <jcmvbkbc@...il.com>,  Jernej Skrabec
 <jernej.skrabec@...il.com>, Herve Codina <herve.codina@...tlin.com>, Andy
 Shevchenko <andriy.shevchenko@...ux.intel.com>, Anup Patel
 <apatel@...tanamicro.com>,  Jacky Huang <ychuang3@...oton.com>, Hugo
 Villeneuve <hvilleneuve@...onoff.com>, Jonathan Corbet <corbet@....net>,
 Wolfram Sang <wsa+renesas@...g-engineering.com>, Uwe
 Kleine-König <u.kleine-koenig@...gutronix.de>,
 Christophe JAILLET <christophe.jaillet@...adoo.fr>, Sam Ravnborg
 <sam@...nborg.org>, Javier Martinez Canillas <javierm@...hat.com>, Sergey
 Shtylyov <s.shtylyov@....ru>, Laurent Pinchart
 <laurent.pinchart+renesas@...asonboard.com>, linux-ide@...r.kernel.org, 
 devicetree@...r.kernel.org, linux-kernel@...r.kernel.org, 
 linux-renesas-soc@...r.kernel.org, linux-clk@...r.kernel.org, 
 dri-devel@...ts.freedesktop.org, linux-pci@...r.kernel.org, 
 linux-serial@...r.kernel.org, linux-fbdev@...r.kernel.org
Subject: Re: [DO NOT MERGE v8 20/36] serial: sh-sci: fix SH4 OF support.

Hi Yoshinori,

On Wed, 2024-05-29 at 17:01 +0900, Yoshinori Sato wrote:
> - Separated RZ's earlycon initialization from normal SCIF.
> - fix earlyprintk hung (NULL pointer reference).
> - fix SERIAL_SH_SCI_EARLYCON enablement

I feel like this could actually be split into three patches.

Adrian

> Signed-off-by: Yoshinori Sato <ysato@...rs.sourceforge.jp>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@...der.be>
> ---
>  drivers/tty/serial/Kconfig  | 2 +-
>  drivers/tty/serial/sh-sci.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 4fdd7857ef4d..eeb22b582470 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -664,7 +664,7 @@ config SERIAL_SH_SCI_EARLYCON
>  	depends on SERIAL_SH_SCI=y
>  	select SERIAL_CORE_CONSOLE
>  	select SERIAL_EARLYCON
> -	default ARCH_RENESAS
> +	default ARCH_RENESAS || SUPERH
>  
>  config SERIAL_SH_SCI_DMA
>  	bool "DMA support" if EXPERT
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index f738980a8b2c..068f483401e3 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -2723,7 +2723,7 @@ static int sci_remap_port(struct uart_port *port)
>  	if (port->membase)
>  		return 0;
>  
> -	if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
> +	if (dev_of_node(port->dev) || (port->flags & UPF_IOREMAP)) {
>  		port->membase = ioremap(port->mapbase, sport->reg_size);
>  		if (unlikely(!port->membase)) {
>  			dev_err(port->dev, "can't remap port#%d\n", port->line);
> @@ -3551,8 +3551,8 @@ static int __init hscif_early_console_setup(struct earlycon_device *device,
>  
>  OF_EARLYCON_DECLARE(sci, "renesas,sci", sci_early_console_setup);
>  OF_EARLYCON_DECLARE(scif, "renesas,scif", scif_early_console_setup);
> -OF_EARLYCON_DECLARE(scif, "renesas,scif-r7s9210", rzscifa_early_console_setup);
> -OF_EARLYCON_DECLARE(scif, "renesas,scif-r9a07g044", rzscifa_early_console_setup);
> +OF_EARLYCON_DECLARE(rzscifa, "renesas,scif-r7s9210", rzscifa_early_console_setup);
> +OF_EARLYCON_DECLARE(rzscifa, "renesas,scif-r9a07g044", rzscifa_early_console_setup);
>  OF_EARLYCON_DECLARE(scifa, "renesas,scifa", scifa_early_console_setup);
>  OF_EARLYCON_DECLARE(scifb, "renesas,scifb", scifb_early_console_setup);
>  OF_EARLYCON_DECLARE(hscif, "renesas,hscif", hscif_early_console_setup);

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913