diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2018-04-13 14:04:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-24 09:43:08 +0200 |
| commit | 010068656bec9d22eea696bc9a2ca36129a60e43 (patch) | |
| tree | d7b8308d5b16dc0bfe5b20bda60d35738cf8bd71 | |
| parent | 73b46af38e8e323c311d102f73bb2a3e332566cc (diff) | |
s390: add support for IBM z14 Model ZR1
commit 451239eb3d397bd197a79cc3aab943da41ba0905 upstream.
Just add the new machine type number to the two places that matter.
Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/s390/Kconfig | 8 | ||||
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf_events.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/setup.c | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index eaee7087886f..6e91e0d422ea 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -289,12 +289,12 @@ config MARCH_Z13 older machines. config MARCH_Z14 - bool "IBM z14" + bool "IBM z14 ZR1 and z14" select HAVE_MARCH_Z14_FEATURES help - Select this to enable optimizations for IBM z14 (3906 series). - The kernel will be slightly faster but will not work on older - machines. + Select this to enable optimizations for IBM z14 ZR1 and z14 (3907 + and 3906 series). The kernel will be slightly faster but will not + work on older machines. endchoice diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c index c5bc3f209652..5ee27dc9a10c 100644 --- a/arch/s390/kernel/perf_cpum_cf_events.c +++ b/arch/s390/kernel/perf_cpum_cf_events.c @@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void) model = cpumcf_z13_pmu_event_attr; break; case 0x3906: + case 0x3907: model = cpumcf_z14_pmu_event_attr; break; default: diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index a6a91f01a17a..ce5ff4c4d435 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -819,6 +819,7 @@ static int __init setup_hwcaps(void) strcpy(elf_platform, "z13"); break; case 0x3906: + case 0x3907: strcpy(elf_platform, "z14"); break; } |