diff options
| author |   Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2018-01-24 16:19:53 +0100 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-02-02 10:47:15 +0100 |
| commit | 5260b0f50cf371d7a0920fd163571adfd80e2109 (patch) | |
| tree | 2c795f0a277e8dcf9c410c184ccd7572e135cafc | |
| parent | s390/docs: reword airq section (diff) | |
| download | linux-dev-5260b0f50cf371d7a0920fd163571adfd80e2109.tar.xz linux-dev-5260b0f50cf371d7a0920fd163571adfd80e2109.zip | |
s390/sysinfo: add and display licensed internal code identifier
With z14, the store system information instruction provides an
licensed internal code identifier. Display it in /proc/sysinfo.
For more information, see the z/Architecture Principles of Operation.
(SA22-7832-11).
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/include/asm/sysinfo.h | 3 | ||||
| -rw-r--r-- | arch/s390/kernel/sysinfo.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/asm/sysinfo.h b/arch/s390/include/asm/sysinfo.h index 25057c118d56..fe7b3f8f0791 100644 --- a/arch/s390/include/asm/sysinfo.h +++ b/arch/s390/include/asm/sysinfo.h @@ -21,7 +21,8 @@ struct sysinfo_1_1_1 { unsigned char :8; unsigned char ccr; unsigned char cai; - char reserved_0[28]; + char reserved_0[20]; + unsigned long lic; char manufacturer[16]; char type[4]; char reserved_1[12]; diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c index a441cba8d165..fc7e04c2195b 100644 --- a/arch/s390/kernel/sysinfo.c +++ b/arch/s390/kernel/sysinfo.c @@ -89,6 +89,8 @@ static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info) EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap)); seq_printf(m, "Manufacturer: %-16.16s\n", info->manufacturer); seq_printf(m, "Type: %-4.4s\n", info->type); + if (info->lic) + seq_printf(m, "LIC Identifier: %016lx\n", info->lic); /* * Sigh: the model field has been renamed with System z9 * to model_capacity and a new model field has been added |