diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2015-05-11 14:03:51 -0500 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 13:56:27 -0600 |
| commit | 5d33811c6f265463f502c19dd2a3173e1bbc38bc (patch) | |
| tree | 978fca6284a12f15d4084559317c034775813ac2 /src/include | |
| parent | 12bdd1a279cf7913b5da2010c8cbbc7ccfacf0a6 (diff) | |
| download | talos-hostboot-5d33811c6f265463f502c19dd2a3173e1bbc38bc.tar.gz talos-hostboot-5d33811c6f265463f502c19dd2a3173e1bbc38bc.zip | |
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 <crgeddes@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/arch/ppc.H | 5 | ||||
| -rw-r--r-- | src/include/sys/misc.h | 8 | ||||
| -rw-r--r-- | src/include/usr/vmmconst.h | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/include/arch/ppc.H b/src/include/arch/ppc.H index 8d22c0790..54c9e8774 100644 --- a/src/include/arch/ppc.H +++ b/src/include/arch/ppc.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2011,2015 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -322,7 +322,8 @@ inline void icbi(void* _ptr) ALWAYS_INLINE inline void nap() { - asm volatile("nap"); + // @todo-RTC:130186 Add new stop command support + //asm volatile("nap"); } ALWAYS_INLINE diff --git a/src/include/sys/misc.h b/src/include/sys/misc.h index f3388e9a4..625b1a78b 100644 --- a/src/include/sys/misc.h +++ b/src/include/sys/misc.h @@ -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. */ @@ -117,6 +119,10 @@ enum ProcessorCoreType CORE_POWER8_VENICE, /** Power8 "Naples" core */ CORE_POWER8_NAPLES, + /** Power9 "NIMBUS" (scale-out) core */ + CORE_POWER9_NIMBUS, + /** Power9 "CUMULUS" (scale-up) core */ + CORE_POWER9_CUMULUS, CORE_UNKNOWN, }; diff --git a/src/include/usr/vmmconst.h b/src/include/usr/vmmconst.h index b78c675b8..0079e0e4f 100644 --- a/src/include/usr/vmmconst.h +++ b/src/include/usr/vmmconst.h @@ -31,6 +31,7 @@ */ #include <limits.h> +#include <config.h> /** * Segments @@ -60,7 +61,11 @@ #define VMM_ADDR_BASE_BLOCK 0 /** Base Segment Base Block size */ +#ifdef CONFIG_P9_SYSTEM +#define VMM_BASE_BLOCK_SIZE (10*MEGABYTE) +#else #define VMM_BASE_BLOCK_SIZE (8*MEGABYTE) +#endif /** Base Segment Extended Memory Block Base Address */ #define VMM_ADDR_EXTEND_BLOCK (VMM_ADDR_BASE_BLOCK + VMM_BASE_BLOCK_SIZE) |
