From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Valentin Vidic <vvidic@valentin-vidic.from.hr>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Sasha Levin <sashal@kernel.org>,
linux-s390@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 10/26] s390/sclp_vt220: fix console name to match device
Date: Fri, 9 Jul 2021 22:35:48 -0400 [thread overview]
Message-ID: <20210710023604.3172486-10-sashal@kernel.org> (raw)
In-Reply-To: <20210710023604.3172486-1-sashal@kernel.org>
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 ce49c2b9db7e..9939879f5f25 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -137,7 +137,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 68d6ee7ae504..3e8b5906548f 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -34,8 +34,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
next prev parent reply other threads:[~2021-07-10 2:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-10 2:35 [PATCH AUTOSEL 4.9 01/26] tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 02/26] misc/libmasm/module: Fix two use after free in ibmasm_init_one Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 03/26] Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 04/26] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw() Sasha Levin
2021-07-10 9:16 ` Sergey Shtylyov
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 05/26] scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 06/26] tty: serial: 8250: serial_cs: Fix a memory leak in error handling path Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 07/26] fs/jfs: Fix missing error code in lmLogInit() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 08/26] scsi: iscsi: Add iscsi_cls_conn refcount helpers Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 09/26] mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 2:35 ` Sasha Levin [this message]
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 11/26] USB: core: Avoid WARNings for 0-length descriptor requests Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 12/26] ALSA: sb: Fix potential double-free of CSP mixer elements Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 13/26] powerpc/ps3: Add dma_mask to ps3_dma_region Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 14/26] gpio: zynq: Check return value of pm_runtime_get_sync Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 15/26] ALSA: ppc: fix error return code in snd_pmac_probe() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 16/26] selftests/powerpc: Fix "no_handler" EBB selftest Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 17/26] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 18/26] ALSA: bebob: add support for ToneWeal FW66 Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 19/26] usb: gadget: f_hid: fix endianness issue with descriptors Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 20/26] usb: gadget: hid: fix error return code in hid_bind() Sasha Levin
2021-07-10 2:35 ` [PATCH AUTOSEL 4.9 21/26] powerpc/boot: Fixup device-tree on little endian Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 22/26] backlight: lm3630a: Fix return code of .update_status() callback Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 23/26] ALSA: hda: Add IRQ check for platform_get_irq() Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 24/26] jfs: fix GPF in diFree Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 25/26] i2c: core: Disable client irq on reboot/shutdown Sasha Levin
2021-07-10 2:36 ` [PATCH AUTOSEL 4.9 26/26] lib/decompress_unlz4.c: correctly handle zero-padding around initrds Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210710023604.3172486-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=vvidic@valentin-vidic.from.hr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox