Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2936c01 authored by Valentin Vidic's avatar Valentin Vidic Committed by Greg Kroah-Hartman
Browse files

s390/sclp_vt220: fix console name to match device 



[ 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: default avatarValentin Vidic <vvidic@valentin-vidic.from.hr>
Link: https://lore.kernel.org/r/20210427194010.9330-1-vvidic@valentin-vidic.from.hr


Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2296b9c2

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,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);

}

drivers/s390/char/sclp_vt220.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {