s390/time: LPAR offset handling

[mirror_ubuntu-zesty-kernel.git] / arch / s390 / kernel / early.c

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index a0684de5a93b99ae199f9bf6906327f4513f662e..717b03aa16b58f5dfb0898b3d25373f9220aee34 100644 (file)
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -231,6 +231,26 @@ static noinline __init void detect_machine_type(void)
                S390_lowcore.machine_flags |= MACHINE_FLAG_VM;
 }
 
+static noinline __init void setup_arch_string(void)
+{
+       struct sysinfo_1_1_1 *mach = (struct sysinfo_1_1_1 *)&sysinfo_page;
+
+       if (stsi(mach, 1, 1, 1))
+               return;
+       EBCASC(mach->manufacturer, sizeof(mach->manufacturer));
+       EBCASC(mach->type, sizeof(mach->type));
+       EBCASC(mach->model, sizeof(mach->model));
+       EBCASC(mach->model_capacity, sizeof(mach->model_capacity));
+       dump_stack_set_arch_desc("%-16.16s %-4.4s %-16.16s %-16.16s (%s)",
+                                mach->manufacturer,
+                                mach->type,
+                                mach->model,
+                                mach->model_capacity,
+                                MACHINE_IS_LPAR ? "LPAR" :
+                                MACHINE_IS_VM ? "z/VM" :
+                                MACHINE_IS_KVM ? "KVM" : "unknown");
+}
+
 static __init void setup_topology(void)
 {
        int max_mnest;
@@ -447,11 +467,13 @@ void __init startup_init(void)
        ipl_save_parameters();
        rescue_initrd();
        clear_bss_section();
+       ptff_init();
        init_kernel_storage_key();
        lockdep_off();
        setup_lowcore_early();
        setup_facility_list();
        detect_machine_type();
+       setup_arch_string();
        ipl_update_parameters();
        setup_boot_command_line();
        create_kernel_nss();