Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 451239eb authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: add support for IBM z14 Model ZR1 



Just add the new machine type number to the two places that matter.

Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f43c426a

arch/s390/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -286,12 +286,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

arch/s390/kernel/perf_cpum_cf_events.c

+1 −0
Original line number Diff line number Diff line
@@ -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:

arch/s390/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ static int __init setup_hwcaps(void) 
		strcpy(elf_platform, "z13");

		break;

	case 0x3906:

	case 0x3907:

		strcpy(elf_platform, "z14");

		break;

	}