evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s390: add support for IBM zBC12 machine

Browse source 
Just add the new model number where appropiate.

Cc: stable@vger.kernel.org # v3.10
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2013-07-24 10:35:33 +02:00 • committed by Martin Schwidefsky
parent 79b6f7fbd1
commit 594712276e
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/s390/Kconfig
View file

@ -228,11 +228,12 @@ config MARCH_Z196
not work on older machines. not work on older machines.
config MARCH_ZEC12 config MARCH_ZEC12
bool "IBM zEC12" bool "IBM zBC12 and zEC12"
select HAVE_MARCH_ZEC12_FEATURES if 64BIT select HAVE_MARCH_ZEC12_FEATURES if 64BIT
help help
Select this to enable optimizations for IBM zEC12 (2827 series). The Select this to enable optimizations for IBM zBC12 and zEC12 (2828 and
kernel will be slightly faster but will not work on older machines. 2827 series). The kernel will be slightly faster but will not work on
older machines.
endchoice endchoice

1
arch/s390/kernel/setup.c
View file

@ -994,6 +994,7 @@ static void __init setup_hwcaps(void)
strcpy(elf_platform, "z196"); strcpy(elf_platform, "z196");
break; break;
case 0x2827: case 0x2827:
case 0x2828:
strcpy(elf_platform, "zEC12"); strcpy(elf_platform, "zEC12");
break; break;
} }

1
arch/s390/mm/init.c
View file

@ -69,6 +69,7 @@ static void __init setup_zero_pages(void)
order = 2; order = 2;
break; break;
case 0x2827: /* zEC12 */ case 0x2827: /* zEC12 */
case 0x2828: /* zEC12 */
default: default:
order = 5; order = 5;
break; break;

2
arch/s390/oprofile/init.c
View file

@ -440,7 +440,7 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops)
switch (id.machine) { switch (id.machine) {
case 0x2097: case 0x2098: ops->cpu_type = "s390/z10"; break; case 0x2097: case 0x2098: ops->cpu_type = "s390/z10"; break;
case 0x2817: case 0x2818: ops->cpu_type = "s390/z196"; break; case 0x2817: case 0x2818: ops->cpu_type = "s390/z196"; break;
case 0x2827: ops->cpu_type = "s390/zEC12"; break; case 0x2827: case 0x2828: ops->cpu_type = "s390/zEC12"; break;
default: return -ENODEV; default: return -ENODEV;
} }
} }