aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorHeinz Graalfs <graalfs@linux.vnet.ibm.com>2012-06-11 10:06:59 -0400
committerMarcelo Tosatti <mtosatti@redhat.com>2012-06-13 19:53:45 -0400
commitcd1834591fe9564720ac4b0193bf1c790fe89f0d (patch)
treed705284edf49d5054f6558db3c1f827179984bc4 /arch/s390/kernel/setup.c
parent61bde82caee95426bf1ad53fefc8dc691b8ba37c (diff)
KVM: s390: Perform early event mask processing during boot
For processing under KVM it is required to detect the actual SCLP console type in order to set it as preferred console. Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r--arch/s390/kernel/setup.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 489d1d8d96b0..e86bca6f975c 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -63,6 +63,7 @@
63#include <asm/kvm_virtio.h> 63#include <asm/kvm_virtio.h>
64#include <asm/diag.h> 64#include <asm/diag.h>
65#include <asm/os_info.h> 65#include <asm/os_info.h>
66#include <asm/sclp.h>
66#include "entry.h" 67#include "entry.h"
67 68
68long psw_kernel_bits = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_PRIMARY | 69long psw_kernel_bits = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_PRIMARY |
@@ -138,9 +139,14 @@ __setup("condev=", condev_setup);
138 139
139static void __init set_preferred_console(void) 140static void __init set_preferred_console(void)
140{ 141{
141 if (MACHINE_IS_KVM) 142 if (MACHINE_IS_KVM) {
142 add_preferred_console("hvc", 0, NULL); 143 if (sclp_has_vt220())
143 else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP) 144 add_preferred_console("ttyS", 1, NULL);
145 else if (sclp_has_linemode())
146 add_preferred_console("ttyS", 0, NULL);
147 else
148 add_preferred_console("hvc", 0, NULL);
149 } else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
144 add_preferred_console("ttyS", 0, NULL); 150 add_preferred_console("ttyS", 0, NULL);
145 else if (CONSOLE_IS_3270) 151 else if (CONSOLE_IS_3270)
146 add_preferred_console("tty3270", 0, NULL); 152 add_preferred_console("tty3270", 0, NULL);