[PATCH] s390: vt220 console.

Add support for vt220 console over sclp.

arch/s390/defconfig

@@ -137,6 +137,7 @@ CONFIG_CCW_CONSOLE=y
 CONFIG_SCLP=y
 CONFIG_SCLP_TTY=y
 CONFIG_SCLP_CONSOLE=y
+# CONFIG_SCLP_VT220_TTY is not set
 CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
 

drivers/s390/Kconfig

@@ -101,6 +101,19 @@ config SCLP_CONSOLE
 	  Include support for using an IBM HWC line-mode terminal as the Linux
 	  system console.
 
+config SCLP_VT220_TTY
+	bool "Support for SCLP VT220-compatible terminal"
+	depends on SCLP
+	help
+	  Include support for an IBM SCLP VT220-compatible terminal.
+
+config SCLP_VT220_CONSOLE
+	bool "Support for console on SCLP VT220-compatible terminal"
+	depends on SCLP_VT220_TTY
+	help
+	  Include support for using an IBM SCLP VT220-compatible terminal as a
+	  Linux system console.
+
 config SCLP_CPI
 	tristate "Control-Program Identification"
 	depends on SCLP

drivers/s390/char/Makefile

@@ -11,6 +11,7 @@ obj-$(CONFIG_TN3215) += con3215.o
 obj-$(CONFIG_SCLP) += sclp.o sclp_rw.o
 obj-$(CONFIG_SCLP_TTY) += sclp_tty.o
 obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o
+obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o
 obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 obj-$(CONFIG_TN3270) += tub3270.o
 tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o

drivers/s390/char/sclp.h

@@ -26,6 +26,7 @@
 #define EvTyp_CntlProgOpCmd	0x20
 #define EvTyp_CntlProgIdent	0x0B
 #define EvTyp_SigQuiesce	0x1D
+#define EvTyp_VT220Msg		0x1A
 
 #define EvTyp_OpCmd_Mask	0x80000000
 #define EvTyp_Msg_Mask		0x40000000
@@ -34,6 +35,7 @@
 #define EvTyp_CtlProgOpCmd_Mask	0x00000001
 #define EvTyp_CtlProgIdent_Mask	0x00200000
 #define EvTyp_SigQuiesce_Mask	0x00000008
+#define EvTyp_VT220Msg_Mask	0x00000040
 
 #define GnrlMsgFlgs_DOM		0x8000
 #define GnrlMsgFlgs_SndAlrm	0x4000

drivers/s390/char/sclp_cpi.c

@@ -9,6 +9,7 @@
 #include <linux/version.h>
 #include <linux/kmod.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/string.h>
@@ -58,12 +59,12 @@ MODULE_DESCRIPTION(
 	"or zSeries hardware");
 
 static char *system_name = NULL;
-MODULE_PARM(system_name, "s");
+module_param(system_name, charp, 0);
 MODULE_PARM_DESC(system_name, "e.g. hostname - max. 8 characters");
 
 static char *sysplex_name = NULL;
 #ifdef ALLOW_SYSPLEX_NAME
-MODULE_PARM(sysplex_name, "s");
+module_param(sysplex_name, charp, 0);
 MODULE_PARM_DESC(sysplex_name, "if applicable - max. 8 characters");
 #endif
 

drivers/s390/char/sclp_tty.c

@@ -779,7 +779,7 @@ sclp_tty_init(void)
 
 	driver->owner = THIS_MODULE;
 	driver->driver_name = "sclp_line";
-	driver->name = "ttyS";
+	driver->name = "sclp_line";
 	driver->major = TTY_MAJOR;
 	driver->minor_start = 64;
 	driver->type = TTY_DRIVER_TYPE_SYSTEM;