]>
Commit | Line | Data |
---|---|---|
2bb7416c GKH |
1 | From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001 |
2 | From: Heiko Carstens <heiko.carstens@de.ibm.com> | |
3 | Date: Fri, 13 Apr 2018 14:04:24 +0200 | |
4 | Subject: s390: add support for IBM z14 Model ZR1 | |
5 | ||
6 | From: Heiko Carstens <heiko.carstens@de.ibm.com> | |
7 | ||
8 | commit 451239eb3d397bd197a79cc3aab943da41ba0905 upstream. | |
9 | ||
10 | Just add the new machine type number to the two places that matter. | |
11 | ||
12 | Cc: <stable@vger.kernel.org> # v4.14+ | |
13 | Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> | |
14 | Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | ||
17 | --- | |
18 | arch/s390/Kconfig | 8 ++++---- | |
19 | arch/s390/kernel/perf_cpum_cf_events.c | 1 + | |
20 | arch/s390/kernel/setup.c | 1 + | |
21 | 3 files changed, 6 insertions(+), 4 deletions(-) | |
22 | ||
23 | --- a/arch/s390/Kconfig | |
24 | +++ b/arch/s390/Kconfig | |
25 | @@ -289,12 +289,12 @@ config MARCH_Z13 | |
26 | older machines. | |
27 | ||
28 | config MARCH_Z14 | |
29 | - bool "IBM z14" | |
30 | + bool "IBM z14 ZR1 and z14" | |
31 | select HAVE_MARCH_Z14_FEATURES | |
32 | help | |
33 | - Select this to enable optimizations for IBM z14 (3906 series). | |
34 | - The kernel will be slightly faster but will not work on older | |
35 | - machines. | |
36 | + Select this to enable optimizations for IBM z14 ZR1 and z14 (3907 | |
37 | + and 3906 series). The kernel will be slightly faster but will not | |
38 | + work on older machines. | |
39 | ||
40 | endchoice | |
41 | ||
42 | --- a/arch/s390/kernel/perf_cpum_cf_events.c | |
43 | +++ b/arch/s390/kernel/perf_cpum_cf_events.c | |
44 | @@ -583,6 +583,7 @@ __init const struct attribute_group **cp | |
45 | model = cpumcf_z13_pmu_event_attr; | |
46 | break; | |
47 | case 0x3906: | |
48 | + case 0x3907: | |
49 | model = cpumcf_z14_pmu_event_attr; | |
50 | break; | |
51 | default: | |
52 | --- a/arch/s390/kernel/setup.c | |
53 | +++ b/arch/s390/kernel/setup.c | |
54 | @@ -819,6 +819,7 @@ static int __init setup_hwcaps(void) | |
55 | strcpy(elf_platform, "z13"); | |
56 | break; | |
57 | case 0x3906: | |
58 | + case 0x3907: | |
59 | strcpy(elf_platform, "z14"); | |
60 | break; | |
61 | } |