| From b4f3b31c2a8f84d4af643081270e72844938f432 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 27 Apr 2021 21:40:10 +0200 |
| Subject: s390/sclp_vt220: fix console name to match device |
| |
| From: Valentin Vidic <vvidic@valentin-vidic.from.hr> |
| |
| [ Upstream commit b7d91d230a119fdcc334d10c9889ce9c5e15118b ] |
| |
| Console name reported in /proc/consoles: |
| |
| ttyS1 -W- (EC p ) 4:65 |
| |
| does not match the char device name: |
| |
| crw--w---- 1 root root 4, 65 May 17 12:18 /dev/ttysclp0 |
| |
| so debian-installer inside a QEMU s390x instance gets confused and fails |
| to start with the following error: |
| |
| steal-ctty: No such file or directory |
| |
| Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr> |
| Link: https://lore.kernel.org/r/20210427194010.9330-1-vvidic@valentin-vidic.from.hr |
| Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/kernel/setup.c | 2 +- |
| drivers/s390/char/sclp_vt220.c | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c |
| index 382d73da134c..93538e63fa03 100644 |
| --- a/arch/s390/kernel/setup.c |
| +++ b/arch/s390/kernel/setup.c |
| @@ -165,7 +165,7 @@ static void __init set_preferred_console(void) |
| else if (CONSOLE_IS_3270) |
| add_preferred_console("tty3270", 0, NULL); |
| else if (CONSOLE_IS_VT220) |
| - add_preferred_console("ttyS", 1, NULL); |
| + add_preferred_console("ttysclp", 0, NULL); |
| else if (CONSOLE_IS_HVC) |
| add_preferred_console("hvc", 0, NULL); |
| } |
| diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c |
| index 047f812d1a1c..71ed1bf15598 100644 |
| --- a/drivers/s390/char/sclp_vt220.c |
| +++ b/drivers/s390/char/sclp_vt220.c |
| @@ -35,8 +35,8 @@ |
| #define SCLP_VT220_MINOR 65 |
| #define SCLP_VT220_DRIVER_NAME "sclp_vt220" |
| #define SCLP_VT220_DEVICE_NAME "ttysclp" |
| -#define SCLP_VT220_CONSOLE_NAME "ttyS" |
| -#define SCLP_VT220_CONSOLE_INDEX 1 /* console=ttyS1 */ |
| +#define SCLP_VT220_CONSOLE_NAME "ttysclp" |
| +#define SCLP_VT220_CONSOLE_INDEX 0 /* console=ttysclp0 */ |
| |
| /* Representation of a single write request */ |
| struct sclp_vt220_request { |
| -- |
| 2.30.2 |
| |
