From 5d33811c6f265463f502c19dd2a3173e1bbc38bc Mon Sep 17 00:00:00 2001 From: Corey Swenson Date: Mon, 11 May 2015 14:03:51 -0500 Subject: Base kernel changes for Nimbus/Cumulus Change-Id: Ic5dfde1e975453d760631335bab674919e1109e7 RTC: 126637 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18321 Tested-by: Jenkins Server Reviewed-by: Christian Geddes Reviewed-by: A. Patrick Williams III --- src/lib/syscall_misc.C | 8 +++++++- src/lib/syscall_mmio.C | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/syscall_misc.C b/src/lib/syscall_misc.C index 9d86bf937..285fb6091 100644 --- a/src/lib/syscall_misc.C +++ b/src/lib/syscall_misc.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -64,6 +66,10 @@ size_t cpu_thread_count() case CORE_POWER8_NAPLES: threads = 8; break; + case CORE_POWER9_NIMBUS: + case CORE_POWER9_CUMULUS: + threads = 4; + break; default: break; diff --git a/src/lib/syscall_mmio.C b/src/lib/syscall_mmio.C index 535e22d39..1a0de8a9f 100644 --- a/src/lib/syscall_mmio.C +++ b/src/lib/syscall_mmio.C @@ -66,12 +66,15 @@ void mmio_hmer_write(uint64_t value) */ static uint64_t mmio_scratch_base() { + // @todo-RTC:130438 Verify value for P9 ProcessorCoreType cpuType = CpuID::getCpuType(); switch (cpuType) { case CORE_POWER8_MURANO: case CORE_POWER8_VENICE: case CORE_POWER8_NAPLES: + case CORE_POWER9_NIMBUS: + case CORE_POWER9_CUMULUS: case CORE_UNKNOWN: default: return 0x40; -- cgit v1.2.1