Commit 59471227 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

s390: add support for IBM zBC12 machine

Just add the new model number where appropiate.

Cc: stable@vger.kernel.org # v3.10
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 79b6f7fb
...@@ -228,11 +228,12 @@ config MARCH_Z196 ...@@ -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
......
...@@ -994,6 +994,7 @@ static void __init setup_hwcaps(void) ...@@ -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;
} }
......
...@@ -69,6 +69,7 @@ static void __init setup_zero_pages(void) ...@@ -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;
......
...@@ -440,7 +440,7 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops) ...@@ -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;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment