* [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 1:32 ` Andrew Jeffery
2019-12-13 0:06 ` [PATCH 06/58] tty/serial: Migrate bcm63xx_uart " Dmitry Safonov
` (10 subsequent siblings)
11 siblings, 1 reply; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, linux-aspeed, Dmitry Safonov, Andrew Jeffery,
Greg Kroah-Hartman, Dmitry Safonov, Joel Stanley, linux-serial,
Jiri Slaby, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-aspeed@lists.ozlabs.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/8250/8250_aspeed_vuart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c
index 6e67fd89445a..d657aa14c3e4 100644
--- a/drivers/tty/serial/8250/8250_aspeed_vuart.c
+++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c
@@ -5,10 +5,6 @@
* Copyright (C) 2016 Jeremy Kerr <jk@ozlabs.org>, IBM Corp.
* Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>, IBM Corp.
*/
-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/device.h>
#include <linux/module.h>
#include <linux/of_address.h>
@@ -406,6 +402,7 @@ static int aspeed_vuart_probe(struct platform_device *pdev)
port.port.unthrottle = aspeed_vuart_unthrottle;
port.port.status = UPSTAT_SYNC_FIFO;
port.port.dev = &pdev->dev;
+ port.port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_8250_CONSOLE);
rc = sysfs_create_group(&vuart->dev->kobj, &aspeed_vuart_attr_group);
if (rc < 0)
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/58] tty/serial: Migrate bcm63xx_uart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
2019-12-13 0:06 ` [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 12/58] tty/serial: Migrate atmel_serial " Dmitry Safonov
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Dmitry Safonov, Greg Kroah-Hartman,
Dmitry Safonov, Florian Fainelli, bcm-kernel-feedback-list,
linux-serial, Jiri Slaby, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/bcm63xx_uart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index b7adc6127b3d..5674da2b76f0 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -10,10 +10,6 @@
* my board.
*/
-#if defined(CONFIG_SERIAL_BCM63XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/init.h>
@@ -858,6 +854,7 @@ static int bcm_uart_probe(struct platform_device *pdev)
port->fifosize = 16;
port->uartclk = clk_get_rate(clk) / 2;
port->line = pdev->id;
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_BCM63XX_CONSOLE);
clk_put(clk);
ret = uart_add_one_port(&bcm_uart_driver, port);
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 12/58] tty/serial: Migrate atmel_serial to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
2019-12-13 0:06 ` [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq Dmitry Safonov
2019-12-13 0:06 ` [PATCH 06/58] tty/serial: Migrate bcm63xx_uart " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 13/58] tty/serial: Migrate clps711x " Dmitry Safonov
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Alexandre Belloni, Vasiliy Khoruzhick, Dmitry Safonov,
Richard Genoud, Greg Kroah-Hartman, Dmitry Safonov,
Ludovic Desroches, linux-serial, Jiri Slaby, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
While at it, remove forward-declaration of atmel_console - it wasn't
needed even at the moment the driver was first time introduced:
commit 1e6c9c2878c9 ("[ARM] 3242/2: AT91RM9200 support for 2.6 (Serial)")
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Richard Genoud <richard.genoud@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/atmel_serial.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index a8dc8af83f39..4020fc8ceb49 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -51,10 +51,6 @@
#define ATMEL_RTS_HIGH_OFFSET 16
#define ATMEL_RTS_LOW_OFFSET 20
-#if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/serial_core.h>
#include "serial_mctrl_gpio.h"
@@ -196,10 +192,6 @@ struct atmel_uart_port {
static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART];
static DECLARE_BITMAP(atmel_ports_in_use, ATMEL_MAX_UART);
-#ifdef SUPPORT_SYSRQ
-static struct console atmel_console;
-#endif
-
#if defined(CONFIG_OF)
static const struct of_device_id atmel_serial_dt_ids[] = {
{ .compatible = "atmel,at91rm9200-usart-serial" },
@@ -2877,6 +2869,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
atmel_port = &atmel_ports[ret];
atmel_port->backup_imr = 0;
atmel_port->uart.line = ret;
+ atmel_port->uart.has_sysrq = IS_ENABLED(CONFIG_SERIAL_ATMEL_CONSOLE);
atmel_serial_probe_fifos(atmel_port, pdev);
atomic_set(&atmel_port->tasklet_shutdown, 0);
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 13/58] tty/serial: Migrate clps711x to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (2 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 12/58] tty/serial: Migrate atmel_serial " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 16/58] tty/serial: Migrate efm32-uart " Dmitry Safonov
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Alexander Shiyan, Dmitry Safonov,
Greg Kroah-Hartman, Dmitry Safonov, linux-serial, Jiri Slaby,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/clps711x.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 061590795680..95abc6faa3d5 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -8,10 +8,6 @@
* Copyright (C) 2000 Deep Blue Solutions Ltd.
*/
-#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/module.h>
#include <linux/device.h>
#include <linux/console.h>
@@ -479,6 +475,7 @@ static int uart_clps711x_probe(struct platform_device *pdev)
s->port.mapbase = res->start;
s->port.type = PORT_CLPS711X;
s->port.fifosize = 16;
+ s->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_CLPS711X_CONSOLE);
s->port.flags = UPF_SKIP_TEST | UPF_FIXED_TYPE;
s->port.uartclk = clk_get_rate(uart_clk);
s->port.ops = &uart_clps711x_ops;
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 16/58] tty/serial: Migrate efm32-uart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (3 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 13/58] tty/serial: Migrate clps711x " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 19/58] tty/serial: Migrate imx " Dmitry Safonov
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Pengutronix Kernel Team, Dmitry Safonov,
Greg Kroah-Hartman, Uwe Kleine-König, Dmitry Safonov,
linux-serial, Jiri Slaby, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/efm32-uart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index d6b5e5463746..2ac87128d7fd 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -1,8 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
-#if defined(CONFIG_SERIAL_EFM32_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
@@ -748,6 +744,7 @@ static int efm32_uart_probe(struct platform_device *pdev)
efm_port->port.type = PORT_EFMUART;
efm_port->port.iotype = UPIO_MEM32;
efm_port->port.fifosize = 2;
+ efm_port->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_EFM32_UART_CONSOLE);
efm_port->port.ops = &efm32_uart_pops;
efm_port->port.flags = UPF_BOOT_AUTOCONF;
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 19/58] tty/serial: Migrate imx to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (4 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 16/58] tty/serial: Migrate efm32-uart " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 21/58] tty/serial: Migrate meson_uart " Dmitry Safonov
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Pengutronix Kernel Team, Dmitry Safonov,
Greg Kroah-Hartman, Sascha Hauer, Dmitry Safonov, NXP Linux Team,
linux-serial, Jiri Slaby, Shawn Guo, Fabio Estevam,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/imx.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a9e20e6c63ad..83c6e2ac0e8d 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -8,10 +8,6 @@
* Copyright (C) 2004 Pengutronix
*/
-#if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/module.h>
#include <linux/ioport.h>
#include <linux/init.h>
@@ -779,9 +775,7 @@ static irqreturn_t imx_uart_rxint(int irq, void *dev_id)
if (rx & URXD_OVRRUN)
flg = TTY_OVERRUN;
-#ifdef SUPPORT_SYSRQ
sport->port.sysrq = 0;
-#endif
}
if (sport->port.ignore_status_mask & URXD_DUMMY_READ)
@@ -2231,6 +2225,7 @@ static int imx_uart_probe(struct platform_device *pdev)
sport->port.iotype = UPIO_MEM;
sport->port.irq = rxirq;
sport->port.fifosize = 32;
+ sport->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_IMX_CONSOLE);
sport->port.ops = &imx_uart_pops;
sport->port.rs485_config = imx_uart_rs485_config;
sport->port.flags = UPF_BOOT_AUTOCONF;
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 21/58] tty/serial: Migrate meson_uart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (5 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 19/58] tty/serial: Migrate imx " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 27/58] tty/serial: Migrate mxs-auart " Dmitry Safonov
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Dmitry Safonov, Greg Kroah-Hartman,
Dmitry Safonov, Kevin Hilman, linux-serial, Jiri Slaby,
linux-amlogic, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/meson_uart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index fbc5bc022a39..12e15358554c 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -5,10 +5,6 @@
* Copyright (C) 2014 Carlo Caione <carlo@caione.org>
*/
-#if defined(CONFIG_SERIAL_MESON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/clk.h>
#include <linux/console.h>
#include <linux/delay.h>
@@ -703,6 +699,7 @@ static int meson_uart_probe(struct platform_device *pdev)
port->mapsize = resource_size(res_mem);
port->irq = res_irq->start;
port->flags = UPF_BOOT_AUTOCONF | UPF_LOW_LATENCY;
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_MESON_CONSOLE);
port->dev = &pdev->dev;
port->line = pdev->id;
port->type = PORT_MESON;
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 27/58] tty/serial: Migrate mxs-auart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (6 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 21/58] tty/serial: Migrate meson_uart " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 43/58] tty/serial: Migrate st-asc " Dmitry Safonov
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Pengutronix Kernel Team, Dmitry Safonov,
Greg Kroah-Hartman, Sascha Hauer, Dmitry Safonov, NXP Linux Team,
linux-serial, Jiri Slaby, Shawn Guo, Fabio Estevam,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/mxs-auart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index e34525970682..b4f835e7de23 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -12,10 +12,6 @@
* Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
*/
-#if defined(CONFIG_SERIAL_MXS_AUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@ -1693,6 +1689,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
s->port.fifosize = MXS_AUART_FIFO_SIZE;
s->port.uartclk = clk_get_rate(s->clk);
s->port.type = PORT_IMX;
+ s->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_MXS_AUART_CONSOLE);
mxs_init_regs(s);
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 43/58] tty/serial: Migrate st-asc to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (7 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 27/58] tty/serial: Migrate mxs-auart " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 44/58] tty/serial: Migrate stm32-usart " Dmitry Safonov
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Dmitry Safonov, Greg Kroah-Hartman,
Dmitry Safonov, Patrice Chotard, linux-serial, Jiri Slaby,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/st-asc.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index 7971997cdead..fb6bbb5e2234 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -5,10 +5,6 @@
* Copyright (C) 2003-2013 STMicroelectronics (R&D) Limited
*/
-#if defined(CONFIG_SERIAL_ST_ASC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/module.h>
#include <linux/serial.h>
#include <linux/console.h>
@@ -730,6 +726,7 @@ static int asc_init_port(struct asc_port *ascport,
port->fifosize = ASC_FIFO_SIZE;
port->dev = &pdev->dev;
port->irq = platform_get_irq(pdev, 0);
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_ST_ASC_CONSOLE);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
port->membase = devm_ioremap_resource(&pdev->dev, res);
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 44/58] tty/serial: Migrate stm32-usart to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (8 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 43/58] tty/serial: Migrate st-asc " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 51/58] tty/serial: Migrate vt8500_serial " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 52/58] tty/serial: Migrate xilinx_uartps " Dmitry Safonov
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Maxime Coquelin, Vasiliy Khoruzhick, Alexandre Torgue,
Dmitry Safonov, Greg Kroah-Hartman, Dmitry Safonov, linux-serial,
Jiri Slaby, linux-stm32, linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/stm32-usart.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 2f72514d63ed..5e93e8d40f59 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -8,10 +8,6 @@
* Inspired by st-asc.c from STMicroelectronics (c)
*/
-#if defined(CONFIG_SERIAL_STM32_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/clk.h>
#include <linux/console.h>
#include <linux/delay.h>
@@ -926,6 +922,7 @@ static int stm32_init_port(struct stm32_port *stm32port,
port->ops = &stm32_uart_ops;
port->dev = &pdev->dev;
port->fifosize = stm32port->info->cfg.fifosize;
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_STM32_CONSOLE);
ret = platform_get_irq(pdev, 0);
if (ret <= 0)
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 51/58] tty/serial: Migrate vt8500_serial to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (9 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 44/58] tty/serial: Migrate stm32-usart " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
2019-12-13 0:06 ` [PATCH 52/58] tty/serial: Migrate xilinx_uartps " Dmitry Safonov
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Dmitry Safonov, Greg Kroah-Hartman,
Dmitry Safonov, Tony Prisk, linux-serial, Jiri Slaby,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/vt8500_serial.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 3d58e9b34553..764e992438b2 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -7,10 +7,6 @@
* Author: Robert Love <rlove@google.com>
*/
-#if defined(CONFIG_SERIAL_VT8500_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-# define SUPPORT_SYSRQ
-#endif
-
#include <linux/hrtimer.h>
#include <linux/delay.h>
#include <linux/io.h>
@@ -703,6 +699,7 @@ static int vt8500_serial_probe(struct platform_device *pdev)
vt8500_port->uart.line = port;
vt8500_port->uart.dev = &pdev->dev;
vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
+ vt8500_port->uart.has_sysrq = IS_ENABLED(CONFIG_SERIAL_VT8500_CONSOLE);
/* Serial core uses the magic "16" everywhere - adjust for it */
vt8500_port->uart.uartclk = 16 * clk_get_rate(vt8500_port->clk) /
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 52/58] tty/serial: Migrate xilinx_uartps to use has_sysrq
[not found] <20191213000657.931618-1-dima@arista.com>
` (10 preceding siblings ...)
2019-12-13 0:06 ` [PATCH 51/58] tty/serial: Migrate vt8500_serial " Dmitry Safonov
@ 2019-12-13 0:06 ` Dmitry Safonov
11 siblings, 0 replies; 13+ messages in thread
From: Dmitry Safonov @ 2019-12-13 0:06 UTC (permalink / raw)
To: linux-kernel
Cc: Vasiliy Khoruzhick, Dmitry Safonov, Greg Kroah-Hartman,
Dmitry Safonov, Michal Simek, linux-serial, Jiri Slaby,
linux-arm-kernel
The SUPPORT_SYSRQ ifdeffery is not nice as:
- May create misunderstanding about sizeof(struct uart_port) between
different objects
- Prevents moving functions from serial_core.h
- Reduces readability (well, it's ifdeffery - it's hard to follow)
In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
Initialise it in driver's probe and remove ifdeffery.
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/serial/xilinx_uartps.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 4e55bc327a54..2b5606469bed 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -9,10 +9,6 @@
* in the code.
*/
-#if defined(CONFIG_SERIAL_XILINX_PS_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/platform_device.h>
#include <linux/serial.h>
#include <linux/console.h>
@@ -1634,6 +1630,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
port->flags = UPF_BOOT_AUTOCONF;
port->ops = &cdns_uart_ops;
port->fifosize = CDNS_UART_FIFO_SIZE;
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_XILINX_PS_UART_CONSOLE);
/*
* Register the port.
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq
2019-12-13 0:06 ` [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq Dmitry Safonov
@ 2019-12-13 1:32 ` Andrew Jeffery
0 siblings, 0 replies; 13+ messages in thread
From: Andrew Jeffery @ 2019-12-13 1:32 UTC (permalink / raw)
To: Dmitry Safonov, linux-kernel
Cc: Vasiliy Khoruzhick, linux-aspeed, Greg Kroah-Hartman,
Dmitry Safonov, Joel Stanley, linux-serial, Jiri Slaby,
linux-arm-kernel
On Fri, 13 Dec 2019, at 10:36, Dmitry Safonov wrote:
> The SUPPORT_SYSRQ ifdeffery is not nice as:
> - May create misunderstanding about sizeof(struct uart_port) between
> different objects
> - Prevents moving functions from serial_core.h
> - Reduces readability (well, it's ifdeffery - it's hard to follow)
>
> In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added.
> Initialise it in driver's probe and remove ifdeffery.
>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-aspeed@lists.ozlabs.org
> Signed-off-by: Dmitry Safonov <dima@arista.com>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-12-13 1:30 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20191213000657.931618-1-dima@arista.com>
2019-12-13 0:06 ` [PATCH 04/58] tty/serial: Migrate aspeed_vuart to use has_sysrq Dmitry Safonov
2019-12-13 1:32 ` Andrew Jeffery
2019-12-13 0:06 ` [PATCH 06/58] tty/serial: Migrate bcm63xx_uart " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 12/58] tty/serial: Migrate atmel_serial " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 13/58] tty/serial: Migrate clps711x " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 16/58] tty/serial: Migrate efm32-uart " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 19/58] tty/serial: Migrate imx " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 21/58] tty/serial: Migrate meson_uart " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 27/58] tty/serial: Migrate mxs-auart " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 43/58] tty/serial: Migrate st-asc " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 44/58] tty/serial: Migrate stm32-usart " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 51/58] tty/serial: Migrate vt8500_serial " Dmitry Safonov
2019-12-13 0:06 ` [PATCH 52/58] tty/serial: Migrate xilinx_uartps " Dmitry Safonov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).