2007-02-05 21:18:37 +01:00
|
|
|
/*
|
2009-06-16 10:30:52 +02:00
|
|
|
* Copyright IBM Corp. 2007, 2009
|
2007-02-05 21:18:37 +01:00
|
|
|
* Author(s): Hongjie Yang <hongjie@us.ibm.com>,
|
|
|
|
* Heiko Carstens <heiko.carstens@de.ibm.com>
|
|
|
|
*/
|
|
|
|
|
2009-09-11 10:28:53 +02:00
|
|
|
#define KMSG_COMPONENT "setup"
|
|
|
|
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
|
|
|
|
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
#include <linux/compiler.h>
|
2007-02-05 21:18:37 +01:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <linux/lockdep.h>
|
2016-09-19 17:54:56 -04:00
|
|
|
#include <linux/extable.h>
|
2007-02-05 21:18:37 +01:00
|
|
|
#include <linux/pfn.h>
|
|
|
|
#include <linux/uaccess.h>
|
2009-09-11 10:28:53 +02:00
|
|
|
#include <linux/kernel.h>
|
2015-08-20 17:28:44 +02:00
|
|
|
#include <asm/diag.h>
|
2008-07-14 09:59:09 +02:00
|
|
|
#include <asm/ebcdic.h>
|
2007-02-21 10:55:21 +01:00
|
|
|
#include <asm/ipl.h>
|
2007-02-05 21:18:37 +01:00
|
|
|
#include <asm/lowcore.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/sections.h>
|
|
|
|
#include <asm/setup.h>
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
#include <asm/sysinfo.h>
|
2007-02-05 21:18:37 +01:00
|
|
|
#include <asm/cpcmd.h>
|
|
|
|
#include <asm/sclp.h>
|
2012-03-28 18:30:02 +01:00
|
|
|
#include <asm/facility.h>
|
2008-04-17 07:46:26 +02:00
|
|
|
#include "entry.h"
|
2007-02-05 21:18:37 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a Kernel NSS if the SAVESYS= parameter is defined
|
|
|
|
*/
|
2008-07-14 09:59:09 +02:00
|
|
|
#define DEFSYS_CMD_SIZE 128
|
2007-02-05 21:18:37 +01:00
|
|
|
#define SAVESYS_CMD_SIZE 32
|
|
|
|
|
|
|
|
char kernel_nss_name[NSS_NAME_SIZE + 1];
|
|
|
|
|
2008-07-14 09:59:09 +02:00
|
|
|
static void __init setup_boot_command_line(void);
|
|
|
|
|
2009-04-14 15:36:28 +02:00
|
|
|
/*
|
|
|
|
* Get the TOD clock running.
|
|
|
|
*/
|
|
|
|
static void __init reset_tod_clock(void)
|
|
|
|
{
|
|
|
|
u64 time;
|
|
|
|
|
2013-01-30 09:49:40 +01:00
|
|
|
if (store_tod_clock(&time) == 0)
|
2009-04-14 15:36:28 +02:00
|
|
|
return;
|
|
|
|
/* TOD clock not running. Set the clock to Unix Epoch. */
|
2013-01-30 09:49:40 +01:00
|
|
|
if (set_tod_clock(TOD_UNIX_EPOCH) != 0 || store_tod_clock(&time) != 0)
|
2009-04-14 15:36:28 +02:00
|
|
|
disabled_wait(0);
|
|
|
|
|
|
|
|
sched_clock_base_cc = TOD_UNIX_EPOCH;
|
2009-11-13 15:43:52 +01:00
|
|
|
S390_lowcore.last_update_clock = sched_clock_base_cc;
|
2009-04-14 15:36:28 +02:00
|
|
|
}
|
2008-07-14 09:59:09 +02:00
|
|
|
|
2007-02-05 21:18:37 +01:00
|
|
|
#ifdef CONFIG_SHARED_KERNEL
|
2008-07-14 09:59:09 +02:00
|
|
|
int __init savesys_ipl_nss(char *cmd, const int cmdlen);
|
|
|
|
|
|
|
|
asm(
|
|
|
|
" .section .init.text,\"ax\",@progbits\n"
|
|
|
|
" .align 4\n"
|
|
|
|
" .type savesys_ipl_nss, @function\n"
|
|
|
|
"savesys_ipl_nss:\n"
|
|
|
|
" stmg 6,15,48(15)\n"
|
|
|
|
" lgr 14,3\n"
|
|
|
|
" sam31\n"
|
|
|
|
" diag 2,14,0x8\n"
|
|
|
|
" sam64\n"
|
|
|
|
" lgr 2,14\n"
|
|
|
|
" lmg 6,15,48(15)\n"
|
|
|
|
" br 14\n"
|
2010-04-09 13:43:03 +02:00
|
|
|
" .size savesys_ipl_nss, .-savesys_ipl_nss\n"
|
|
|
|
" .previous\n");
|
2008-07-14 09:59:09 +02:00
|
|
|
|
2009-09-11 10:28:40 +02:00
|
|
|
static __initdata char upper_command_line[COMMAND_LINE_SIZE];
|
|
|
|
|
2007-02-05 21:18:37 +01:00
|
|
|
static noinline __init void create_kernel_nss(void)
|
|
|
|
{
|
|
|
|
unsigned int i, stext_pfn, eshared_pfn, end_pfn, min_size;
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
unsigned int sinitrd_pfn, einitrd_pfn;
|
|
|
|
#endif
|
|
|
|
int response;
|
2011-03-23 10:14:58 +01:00
|
|
|
int hlen;
|
2008-07-14 09:59:09 +02:00
|
|
|
size_t len;
|
2007-02-05 21:18:37 +01:00
|
|
|
char *savesys_ptr;
|
|
|
|
char defsys_cmd[DEFSYS_CMD_SIZE];
|
|
|
|
char savesys_cmd[SAVESYS_CMD_SIZE];
|
|
|
|
|
|
|
|
/* Do nothing if we are not running under VM */
|
|
|
|
if (!MACHINE_IS_VM)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Convert COMMAND_LINE to upper case */
|
2008-07-14 09:59:09 +02:00
|
|
|
for (i = 0; i < strlen(boot_command_line); i++)
|
|
|
|
upper_command_line[i] = toupper(boot_command_line[i]);
|
2007-02-05 21:18:37 +01:00
|
|
|
|
|
|
|
savesys_ptr = strstr(upper_command_line, "SAVESYS=");
|
|
|
|
|
|
|
|
if (!savesys_ptr)
|
|
|
|
return;
|
|
|
|
|
|
|
|
savesys_ptr += 8; /* Point to the beginning of the NSS name */
|
|
|
|
for (i = 0; i < NSS_NAME_SIZE; i++) {
|
|
|
|
if (savesys_ptr[i] == ' ' || savesys_ptr[i] == '\0')
|
|
|
|
break;
|
|
|
|
kernel_nss_name[i] = savesys_ptr[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
stext_pfn = PFN_DOWN(__pa(&_stext));
|
|
|
|
eshared_pfn = PFN_DOWN(__pa(&_eshared));
|
|
|
|
end_pfn = PFN_UP(__pa(&_end));
|
|
|
|
min_size = end_pfn << 2;
|
|
|
|
|
2011-03-23 10:14:58 +01:00
|
|
|
hlen = snprintf(defsys_cmd, DEFSYS_CMD_SIZE,
|
|
|
|
"DEFSYS %s 00000-%.5X EW %.5X-%.5X SR %.5X-%.5X",
|
|
|
|
kernel_nss_name, stext_pfn - 1, stext_pfn,
|
|
|
|
eshared_pfn - 1, eshared_pfn, end_pfn);
|
2007-02-05 21:18:37 +01:00
|
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
if (INITRD_START && INITRD_SIZE) {
|
|
|
|
sinitrd_pfn = PFN_DOWN(__pa(INITRD_START));
|
|
|
|
einitrd_pfn = PFN_UP(__pa(INITRD_START + INITRD_SIZE));
|
|
|
|
min_size = einitrd_pfn << 2;
|
2011-03-23 10:14:58 +01:00
|
|
|
hlen += snprintf(defsys_cmd + hlen, DEFSYS_CMD_SIZE - hlen,
|
|
|
|
" EW %.5X-%.5X", sinitrd_pfn, einitrd_pfn);
|
2007-02-05 21:18:37 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-03-23 10:14:58 +01:00
|
|
|
snprintf(defsys_cmd + hlen, DEFSYS_CMD_SIZE - hlen,
|
|
|
|
" EW MINSIZE=%.7iK PARMREGS=0-13", min_size);
|
|
|
|
defsys_cmd[DEFSYS_CMD_SIZE - 1] = '\0';
|
2011-03-23 10:14:59 +01:00
|
|
|
snprintf(savesys_cmd, SAVESYS_CMD_SIZE, "SAVESYS %s \n IPL %s",
|
|
|
|
kernel_nss_name, kernel_nss_name);
|
|
|
|
savesys_cmd[SAVESYS_CMD_SIZE - 1] = '\0';
|
2007-02-05 21:18:37 +01:00
|
|
|
|
|
|
|
__cpcmd(defsys_cmd, NULL, 0, &response);
|
|
|
|
|
2008-03-05 12:37:16 +01:00
|
|
|
if (response != 0) {
|
2009-09-11 10:28:53 +02:00
|
|
|
pr_err("Defining the Linux kernel NSS failed with rc=%d\n",
|
|
|
|
response);
|
2008-03-05 12:37:16 +01:00
|
|
|
kernel_nss_name[0] = '\0';
|
2007-02-05 21:18:37 +01:00
|
|
|
return;
|
2008-03-05 12:37:16 +01:00
|
|
|
}
|
2007-02-05 21:18:37 +01:00
|
|
|
|
2008-07-14 09:59:09 +02:00
|
|
|
len = strlen(savesys_cmd);
|
|
|
|
ASCEBC(savesys_cmd, len);
|
|
|
|
response = savesys_ipl_nss(savesys_cmd, len);
|
2007-02-05 21:18:37 +01:00
|
|
|
|
2008-07-14 09:59:09 +02:00
|
|
|
/* On success: response is equal to the command size,
|
|
|
|
* max SAVESYS_CMD_SIZE
|
|
|
|
* On error: response contains the numeric portion of cp error message.
|
|
|
|
* for SAVESYS it will be >= 263
|
2009-09-11 10:28:53 +02:00
|
|
|
* for missing privilege class, it will be 1
|
2008-07-14 09:59:09 +02:00
|
|
|
*/
|
2009-09-11 10:28:53 +02:00
|
|
|
if (response > SAVESYS_CMD_SIZE || response == 1) {
|
|
|
|
pr_err("Saving the Linux kernel NSS failed with rc=%d\n",
|
|
|
|
response);
|
2008-03-05 12:37:16 +01:00
|
|
|
kernel_nss_name[0] = '\0';
|
2007-02-05 21:18:37 +01:00
|
|
|
return;
|
2008-03-05 12:37:16 +01:00
|
|
|
}
|
2007-02-05 21:18:37 +01:00
|
|
|
|
2009-11-13 15:43:52 +01:00
|
|
|
/* re-initialize cputime accounting. */
|
2013-01-30 09:49:40 +01:00
|
|
|
sched_clock_base_cc = get_tod_clock();
|
2009-11-13 15:43:52 +01:00
|
|
|
S390_lowcore.last_update_clock = sched_clock_base_cc;
|
|
|
|
S390_lowcore.last_update_timer = 0x7fffffffffffffffULL;
|
|
|
|
S390_lowcore.user_timer = 0;
|
|
|
|
S390_lowcore.system_timer = 0;
|
|
|
|
asm volatile("SPT 0(%0)" : : "a" (&S390_lowcore.last_update_timer));
|
|
|
|
|
2008-07-14 09:59:09 +02:00
|
|
|
/* re-setup boot command line with new ipl vm parms */
|
|
|
|
ipl_update_parameters();
|
|
|
|
setup_boot_command_line();
|
|
|
|
|
2007-02-05 21:18:37 +01:00
|
|
|
ipl_flags = IPL_NSS_VALID;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* CONFIG_SHARED_KERNEL */
|
|
|
|
|
|
|
|
static inline void create_kernel_nss(void) { }
|
|
|
|
|
|
|
|
#endif /* CONFIG_SHARED_KERNEL */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear bss memory
|
|
|
|
*/
|
|
|
|
static noinline __init void clear_bss_section(void)
|
|
|
|
{
|
2007-02-21 10:55:29 +01:00
|
|
|
memset(__bss_start, 0, __bss_stop - __bss_start);
|
2007-02-05 21:18:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize storage key for kernel pages
|
|
|
|
*/
|
|
|
|
static noinline __init void init_kernel_storage_key(void)
|
|
|
|
{
|
2013-10-07 12:12:32 +02:00
|
|
|
#if PAGE_DEFAULT_KEY
|
2007-02-05 21:18:37 +01:00
|
|
|
unsigned long end_pfn, init_pfn;
|
|
|
|
|
|
|
|
end_pfn = PFN_UP(__pa(&_end));
|
|
|
|
|
|
|
|
for (init_pfn = 0 ; init_pfn < end_pfn; init_pfn++)
|
2010-10-25 16:10:14 +02:00
|
|
|
page_set_storage_key(init_pfn << PAGE_SHIFT,
|
|
|
|
PAGE_DEFAULT_KEY, 0);
|
2013-10-07 12:12:32 +02:00
|
|
|
#endif
|
2007-02-05 21:18:37 +01:00
|
|
|
}
|
|
|
|
|
2012-09-04 14:26:03 +02:00
|
|
|
static __initdata char sysinfo_page[PAGE_SIZE] __aligned(PAGE_SIZE);
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
|
2007-02-05 21:18:37 +01:00
|
|
|
static noinline __init void detect_machine_type(void)
|
|
|
|
{
|
2012-09-04 14:26:03 +02:00
|
|
|
struct sysinfo_3_2_2 *vmms = (struct sysinfo_3_2_2 *)&sysinfo_page;
|
|
|
|
|
2010-02-26 22:37:38 +01:00
|
|
|
/* Check current-configuration-level */
|
2012-09-06 14:42:13 +02:00
|
|
|
if (stsi(NULL, 0, 0, 0) <= 2) {
|
2010-02-26 22:37:38 +01:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_LPAR;
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
return;
|
2010-02-26 22:37:38 +01:00
|
|
|
}
|
|
|
|
/* Get virtual-machine cpu information. */
|
2012-09-06 14:42:13 +02:00
|
|
|
if (stsi(vmms, 3, 2, 2) || !vmms->count)
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
return;
|
2007-02-05 21:18:37 +01:00
|
|
|
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
/* Running under KVM? If not we assume z/VM */
|
2012-09-04 14:26:03 +02:00
|
|
|
if (!memcmp(vmms->vm[0].cpi, "\xd2\xe5\xd4", 3))
|
2009-09-11 10:28:45 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_KVM;
|
[S390] Fix hypervisor detection for KVM
Currently we use the cpuid (via STIDP instruction) to recognize LPAR,
z/VM and KVM.
The architecture states, that bit 0-7 of STIDP returns all zero, and
if STIDP is executed in a virtual machine, the VM operating system
will replace bits 0-7 with FF.
KVM should not use FE to distinguish z/VM from KVM for interested
guests. The proper way to detect the hypervisor is the STSI (Store
System Information) instruction, which return information about the
hypervisors via function code 3, selector1=2, selector2=2.
This patch changes the detection routine of Linux to use STSI instead
of STIDP. This detection is earlier than bootmem, we have to use a
static buffer. Since STSI expects a 4kb block (4kb aligned) this
patch also changes the init.data alignment for s390. As this section
will be freed during boot, this should be no problem.
Patch is tested with LPAR, z/VM, KVM on LPAR, and KVM under z/VM.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2009-03-26 15:23:58 +01:00
|
|
|
else
|
2009-09-11 10:28:45 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_VM;
|
2007-02-05 21:18:37 +01:00
|
|
|
}
|
|
|
|
|
2016-05-24 15:23:20 +02:00
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
2012-09-04 14:26:03 +02:00
|
|
|
static __init void setup_topology(void)
|
|
|
|
{
|
|
|
|
int max_mnest;
|
|
|
|
|
|
|
|
if (!test_facility(11))
|
|
|
|
return;
|
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_TOPOLOGY;
|
|
|
|
for (max_mnest = 6; max_mnest > 1; max_mnest--) {
|
2012-09-06 14:42:13 +02:00
|
|
|
if (stsi(&sysinfo_page, 15, 1, max_mnest) == 0)
|
2012-09-04 14:26:03 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
topology_max_mnest = max_mnest;
|
|
|
|
}
|
|
|
|
|
2012-05-21 18:11:29 +02:00
|
|
|
static void early_pgm_check_handler(void)
|
2007-02-05 21:18:37 +01:00
|
|
|
{
|
|
|
|
const struct exception_table_entry *fixup;
|
2014-01-29 18:16:01 +01:00
|
|
|
unsigned long cr0, cr0_new;
|
2012-09-05 13:26:11 +02:00
|
|
|
unsigned long addr;
|
2007-02-05 21:18:37 +01:00
|
|
|
|
|
|
|
addr = S390_lowcore.program_old_psw.addr;
|
2016-01-18 13:12:19 +01:00
|
|
|
fixup = search_exception_tables(addr);
|
2007-02-05 21:18:37 +01:00
|
|
|
if (!fixup)
|
|
|
|
disabled_wait(0);
|
2014-01-29 18:16:01 +01:00
|
|
|
/* Disable low address protection before storing into lowcore. */
|
|
|
|
__ctl_store(cr0, 0, 0);
|
|
|
|
cr0_new = cr0 & ~(1UL << 28);
|
|
|
|
__ctl_load(cr0_new, 0, 0);
|
2016-01-18 12:49:44 +01:00
|
|
|
S390_lowcore.program_old_psw.addr = extable_fixup(fixup);
|
2014-01-29 18:16:01 +01:00
|
|
|
__ctl_load(cr0, 0, 0);
|
2007-02-05 21:18:37 +01:00
|
|
|
}
|
|
|
|
|
2009-07-24 12:39:49 +02:00
|
|
|
static noinline __init void setup_lowcore_early(void)
|
2007-02-05 21:18:37 +01:00
|
|
|
{
|
|
|
|
psw_t psw;
|
|
|
|
|
2011-10-30 15:16:50 +01:00
|
|
|
psw.mask = PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA;
|
2016-01-18 12:49:44 +01:00
|
|
|
psw.addr = (unsigned long) s390_base_ext_handler;
|
2007-02-05 21:18:37 +01:00
|
|
|
S390_lowcore.external_new_psw = psw;
|
2016-01-18 12:49:44 +01:00
|
|
|
psw.addr = (unsigned long) s390_base_pgm_handler;
|
2007-02-05 21:18:37 +01:00
|
|
|
S390_lowcore.program_new_psw = psw;
|
|
|
|
s390_base_pgm_handler_fn = early_pgm_check_handler;
|
|
|
|
}
|
|
|
|
|
2010-10-25 16:10:51 +02:00
|
|
|
static noinline __init void setup_facility_list(void)
|
|
|
|
{
|
2012-03-11 11:59:32 -04:00
|
|
|
stfle(S390_lowcore.stfle_fac_list,
|
|
|
|
ARRAY_SIZE(S390_lowcore.stfle_fac_list));
|
2010-10-25 16:10:51 +02:00
|
|
|
}
|
|
|
|
|
2008-04-30 13:38:45 +02:00
|
|
|
static __init void detect_diag9c(void)
|
|
|
|
{
|
|
|
|
unsigned int cpu_address;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
cpu_address = stap();
|
2015-08-20 17:28:44 +02:00
|
|
|
diag_stat_inc(DIAG_STAT_X09C);
|
2008-04-30 13:38:45 +02:00
|
|
|
asm volatile(
|
|
|
|
" diag %2,0,0x9c\n"
|
|
|
|
"0: la %0,0\n"
|
|
|
|
"1:\n"
|
|
|
|
EX_TABLE(0b,1b)
|
|
|
|
: "=d" (rc) : "0" (-EOPNOTSUPP), "d" (cpu_address) : "cc");
|
|
|
|
if (!rc)
|
2009-09-11 10:28:45 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_DIAG9C;
|
2008-04-30 13:38:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static __init void detect_diag44(void)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
2015-08-20 17:28:44 +02:00
|
|
|
diag_stat_inc(DIAG_STAT_X044);
|
2008-04-30 13:38:45 +02:00
|
|
|
asm volatile(
|
|
|
|
" diag 0,0,0x44\n"
|
|
|
|
"0: la %0,0\n"
|
|
|
|
"1:\n"
|
|
|
|
EX_TABLE(0b,1b)
|
|
|
|
: "=d" (rc) : "0" (-EOPNOTSUPP) : "cc");
|
|
|
|
if (!rc)
|
2009-09-11 10:28:45 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_DIAG44;
|
2008-04-30 13:38:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static __init void detect_machine_facilities(void)
|
|
|
|
{
|
2012-09-28 15:06:41 +02:00
|
|
|
if (test_facility(8)) {
|
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT1;
|
|
|
|
__ctl_set_bit(0, 23);
|
|
|
|
}
|
2012-09-27 10:45:06 +02:00
|
|
|
if (test_facility(78))
|
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_EDAT2;
|
2010-10-25 16:10:51 +02:00
|
|
|
if (test_facility(3))
|
2009-09-11 10:28:45 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE;
|
2010-10-25 16:10:51 +02:00
|
|
|
if (test_facility(40))
|
2013-02-11 18:11:09 +01:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_LPP;
|
s390: fix transactional execution control register handling
commit a1c5befc1c24eb9c1ee83f711e0f21ee79cbb556 upstream.
Dan Horák reported the following crash related to transactional execution:
User process fault: interruption code 0013 ilc:3 in libpthread-2.26.so[3ff93c00000+1b000]
CPU: 2 PID: 1 Comm: /init Not tainted 4.13.4-300.fc27.s390x #1
Hardware name: IBM 2827 H43 400 (z/VM 6.4.0)
task: 00000000fafc8000 task.stack: 00000000fafc4000
User PSW : 0705200180000000 000003ff93c14e70
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:1 AS:0 CC:2 PM:0 RI:0 EA:3
User GPRS: 0000000000000077 000003ff00000000 000003ff93144d48 000003ff93144d5e
0000000000000000 0000000000000002 0000000000000000 000003ff00000000
0000000000000000 0000000000000418 0000000000000000 000003ffcc9fe770
000003ff93d28f50 000003ff9310acf0 000003ff92b0319a 000003ffcc9fe6d0
User Code: 000003ff93c14e62: 60e0b030 std %f14,48(%r11)
000003ff93c14e66: 60f0b038 std %f15,56(%r11)
#000003ff93c14e6a: e5600000ff0e tbegin 0,65294
>000003ff93c14e70: a7740006 brc 7,3ff93c14e7c
000003ff93c14e74: a7080000 lhi %r0,0
000003ff93c14e78: a7f40023 brc 15,3ff93c14ebe
000003ff93c14e7c: b2220000 ipm %r0
000003ff93c14e80: 8800001c srl %r0,28
There are several bugs with control register handling with respect to
transactional execution:
- on task switch update_per_regs() is only called if the next task has
an mm (is not a kernel thread). This however is incorrect. This
breaks e.g. for user mode helper handling, where the kernel creates
a kernel thread and then execve's a user space program. Control
register contents related to transactional execution won't be
updated on execve. If the previous task ran with transactional
execution disabled then the new task will also run with
transactional execution disabled, which is incorrect. Therefore call
update_per_regs() unconditionally within switch_to().
- on startup the transactional execution facility is not enabled for
the idle thread. This is not really a bug, but an inconsistency to
other facilities. Therefore enable the facility if it is available.
- on fork the new thread's per_flags field is not cleared. This means
that a child process inherits the PER_FLAG_NO_TE flag. This flag can
be set with a ptrace request to disable transactional execution for
the current process. It should not be inherited by new child
processes in order to be consistent with the handling of all other
PER related debugging options. Therefore clear the per_flags field in
copy_thread_tls().
Reported-and-tested-by: Dan Horák <dan@danny.cz>
Fixes: d35339a42dd1 ("s390: add support for transactional memory")
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-09 12:29:34 +01:00
|
|
|
if (test_facility(50) && test_facility(73)) {
|
2012-07-31 11:03:04 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_TE;
|
s390: fix transactional execution control register handling
commit a1c5befc1c24eb9c1ee83f711e0f21ee79cbb556 upstream.
Dan Horák reported the following crash related to transactional execution:
User process fault: interruption code 0013 ilc:3 in libpthread-2.26.so[3ff93c00000+1b000]
CPU: 2 PID: 1 Comm: /init Not tainted 4.13.4-300.fc27.s390x #1
Hardware name: IBM 2827 H43 400 (z/VM 6.4.0)
task: 00000000fafc8000 task.stack: 00000000fafc4000
User PSW : 0705200180000000 000003ff93c14e70
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:1 AS:0 CC:2 PM:0 RI:0 EA:3
User GPRS: 0000000000000077 000003ff00000000 000003ff93144d48 000003ff93144d5e
0000000000000000 0000000000000002 0000000000000000 000003ff00000000
0000000000000000 0000000000000418 0000000000000000 000003ffcc9fe770
000003ff93d28f50 000003ff9310acf0 000003ff92b0319a 000003ffcc9fe6d0
User Code: 000003ff93c14e62: 60e0b030 std %f14,48(%r11)
000003ff93c14e66: 60f0b038 std %f15,56(%r11)
#000003ff93c14e6a: e5600000ff0e tbegin 0,65294
>000003ff93c14e70: a7740006 brc 7,3ff93c14e7c
000003ff93c14e74: a7080000 lhi %r0,0
000003ff93c14e78: a7f40023 brc 15,3ff93c14ebe
000003ff93c14e7c: b2220000 ipm %r0
000003ff93c14e80: 8800001c srl %r0,28
There are several bugs with control register handling with respect to
transactional execution:
- on task switch update_per_regs() is only called if the next task has
an mm (is not a kernel thread). This however is incorrect. This
breaks e.g. for user mode helper handling, where the kernel creates
a kernel thread and then execve's a user space program. Control
register contents related to transactional execution won't be
updated on execve. If the previous task ran with transactional
execution disabled then the new task will also run with
transactional execution disabled, which is incorrect. Therefore call
update_per_regs() unconditionally within switch_to().
- on startup the transactional execution facility is not enabled for
the idle thread. This is not really a bug, but an inconsistency to
other facilities. Therefore enable the facility if it is available.
- on fork the new thread's per_flags field is not cleared. This means
that a child process inherits the PER_FLAG_NO_TE flag. This flag can
be set with a ptrace request to disable transactional execution for
the current process. It should not be inherited by new child
processes in order to be consistent with the handling of all other
PER related debugging options. Therefore clear the per_flags field in
copy_thread_tls().
Reported-and-tested-by: Dan Horák <dan@danny.cz>
Fixes: d35339a42dd1 ("s390: add support for transactional memory")
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-09 12:29:34 +01:00
|
|
|
__ctl_set_bit(0, 55);
|
|
|
|
}
|
2014-04-03 13:55:01 +02:00
|
|
|
if (test_facility(51))
|
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC;
|
2015-09-29 10:04:41 +02:00
|
|
|
if (test_facility(129)) {
|
2014-10-06 17:53:53 +02:00
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_VX;
|
2015-09-29 10:04:41 +02:00
|
|
|
__ctl_set_bit(0, 17);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-29 10:28:26 +01:00
|
|
|
static inline void save_vector_registers(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_CRASH_DUMP
|
|
|
|
if (test_facility(129))
|
|
|
|
save_vx_regs(boot_cpu_vector_save_area);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-12-29 13:52:52 +01:00
|
|
|
static int __init topology_setup(char *str)
|
|
|
|
{
|
|
|
|
bool enabled;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = kstrtobool(str, &enabled);
|
|
|
|
if (!rc && !enabled)
|
|
|
|
S390_lowcore.machine_flags &= ~MACHINE_HAS_TOPOLOGY;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
early_param("topology", topology_setup);
|
|
|
|
|
2015-09-29 10:04:41 +02:00
|
|
|
static int __init disable_vector_extension(char *str)
|
|
|
|
{
|
|
|
|
S390_lowcore.machine_flags &= ~MACHINE_FLAG_VX;
|
|
|
|
__ctl_clear_bit(0, 17);
|
|
|
|
return 1;
|
2008-04-30 13:38:45 +02:00
|
|
|
}
|
2015-09-29 10:04:41 +02:00
|
|
|
early_param("novx", disable_vector_extension);
|
2008-04-30 13:38:45 +02:00
|
|
|
|
2015-02-19 17:53:16 +01:00
|
|
|
static int __init cad_setup(char *str)
|
2015-01-14 17:52:33 +01:00
|
|
|
{
|
2015-02-19 17:53:16 +01:00
|
|
|
int val;
|
|
|
|
|
|
|
|
get_option(&str, &val);
|
|
|
|
if (val && test_facility(128))
|
|
|
|
S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;
|
2015-01-14 17:52:33 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2015-02-19 17:53:16 +01:00
|
|
|
early_param("cad", cad_setup);
|
2015-01-14 17:52:33 +01:00
|
|
|
|
|
|
|
static int __init cad_init(void)
|
|
|
|
{
|
|
|
|
if (MACHINE_HAS_CAD)
|
|
|
|
/* Enable problem state CAD. */
|
|
|
|
__ctl_set_bit(2, 3);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_initcall(cad_init);
|
|
|
|
|
2008-07-14 09:58:55 +02:00
|
|
|
static __init void rescue_initrd(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
2011-08-24 17:15:09 +02:00
|
|
|
unsigned long min_initrd_addr = (unsigned long) _end + (4UL << 20);
|
2008-07-14 09:58:55 +02:00
|
|
|
/*
|
2011-08-24 17:15:09 +02:00
|
|
|
* Just like in case of IPL from VM reader we make sure there is a
|
|
|
|
* gap of 4MB between end of kernel and start of initrd.
|
|
|
|
* That way we can also be sure that saving an NSS will succeed,
|
|
|
|
* which however only requires different segments.
|
2008-07-14 09:58:55 +02:00
|
|
|
*/
|
|
|
|
if (!INITRD_START || !INITRD_SIZE)
|
|
|
|
return;
|
2011-08-24 17:15:09 +02:00
|
|
|
if (INITRD_START >= min_initrd_addr)
|
2008-07-14 09:58:55 +02:00
|
|
|
return;
|
2011-08-24 17:15:09 +02:00
|
|
|
memmove((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE);
|
|
|
|
INITRD_START = min_initrd_addr;
|
2008-07-14 09:58:55 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-07-14 09:59:09 +02:00
|
|
|
/* Set up boot command line */
|
2009-09-11 10:28:40 +02:00
|
|
|
static void __init append_to_cmdline(size_t (*ipl_data)(char *, size_t))
|
2008-07-14 09:59:09 +02:00
|
|
|
{
|
2009-09-11 10:28:40 +02:00
|
|
|
char *parm, *delim;
|
|
|
|
size_t rc, len;
|
|
|
|
|
|
|
|
len = strlen(boot_command_line);
|
2008-07-14 09:59:09 +02:00
|
|
|
|
2009-09-11 10:28:40 +02:00
|
|
|
delim = boot_command_line + len; /* '\0' character position */
|
|
|
|
parm = boot_command_line + len + 1; /* append right after '\0' */
|
|
|
|
|
|
|
|
rc = ipl_data(parm, COMMAND_LINE_SIZE - len - 1);
|
|
|
|
if (rc) {
|
|
|
|
if (*parm == '=')
|
|
|
|
memmove(boot_command_line, parm + 1, rc);
|
|
|
|
else
|
|
|
|
*delim = ' '; /* replace '\0' with space */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-27 11:25:46 +01:00
|
|
|
static inline int has_ebcdic_char(const char *str)
|
2009-09-11 10:28:40 +02:00
|
|
|
{
|
2010-02-26 22:37:51 +01:00
|
|
|
int i;
|
|
|
|
|
2011-12-27 11:25:46 +01:00
|
|
|
for (i = 0; str[i]; i++)
|
|
|
|
if (str[i] & 0x80)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
2010-02-26 22:37:51 +01:00
|
|
|
|
2011-12-27 11:25:46 +01:00
|
|
|
static void __init setup_boot_command_line(void)
|
|
|
|
{
|
|
|
|
COMMAND_LINE[ARCH_COMMAND_LINE_SIZE - 1] = 0;
|
|
|
|
/* convert arch command line to ascii if necessary */
|
|
|
|
if (has_ebcdic_char(COMMAND_LINE))
|
|
|
|
EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);
|
2008-07-14 09:59:09 +02:00
|
|
|
/* copy arch command line */
|
2010-02-26 22:37:51 +01:00
|
|
|
strlcpy(boot_command_line, strstrip(COMMAND_LINE),
|
|
|
|
ARCH_COMMAND_LINE_SIZE);
|
2008-07-14 09:59:09 +02:00
|
|
|
|
|
|
|
/* append IPL PARM data to the boot command line */
|
2009-09-11 10:28:40 +02:00
|
|
|
if (MACHINE_IS_VM)
|
|
|
|
append_to_cmdline(append_ipl_vmparm);
|
|
|
|
|
|
|
|
append_to_cmdline(append_ipl_scpdata);
|
2008-07-14 09:59:09 +02:00
|
|
|
}
|
|
|
|
|
2007-02-05 21:18:37 +01:00
|
|
|
/*
|
|
|
|
* Save ipl parameters, clear bss memory, initialize storage keys
|
|
|
|
* and create a kernel NSS at startup if the SAVESYS= parm is defined
|
|
|
|
*/
|
|
|
|
void __init startup_init(void)
|
|
|
|
{
|
2009-04-14 15:36:28 +02:00
|
|
|
reset_tod_clock();
|
2007-02-05 21:18:37 +01:00
|
|
|
ipl_save_parameters();
|
2008-07-14 09:58:55 +02:00
|
|
|
rescue_initrd();
|
2007-02-05 21:18:37 +01:00
|
|
|
clear_bss_section();
|
2016-05-31 10:16:24 +02:00
|
|
|
ptff_init();
|
2007-02-05 21:18:37 +01:00
|
|
|
init_kernel_storage_key();
|
|
|
|
lockdep_off();
|
|
|
|
setup_lowcore_early();
|
2010-10-25 16:10:51 +02:00
|
|
|
setup_facility_list();
|
2008-07-14 09:59:09 +02:00
|
|
|
detect_machine_type();
|
2016-05-24 15:23:20 +02:00
|
|
|
setup_arch_string();
|
2008-07-14 09:59:09 +02:00
|
|
|
ipl_update_parameters();
|
|
|
|
setup_boot_command_line();
|
|
|
|
create_kernel_nss();
|
2008-04-30 13:38:45 +02:00
|
|
|
detect_diag9c();
|
|
|
|
detect_diag44();
|
|
|
|
detect_machine_facilities();
|
2015-10-29 10:28:26 +01:00
|
|
|
save_vector_registers();
|
2012-09-04 14:26:03 +02:00
|
|
|
setup_topology();
|
2013-11-13 10:38:27 +01:00
|
|
|
sclp_early_detect();
|
2007-02-05 21:18:37 +01:00
|
|
|
lockdep_on();
|
|
|
|
}
|