Base Core/Kernel Changes to Support the Axone Processor Chip

  - Add the new cpu type, update the pvr checks and other
    miscellaneous changes to support a new Axone proc chip type

Change-Id: Ie2541bf826bdff65f6f11b0f16839855d69eb4d6
RTC: 173001
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64260
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

10 files changed, 26 insertions, 6 deletions

diff --git a/src/include/arch/pvrformat.H b/src/include/arch/pvrformat.H
index 3e233c50d..9d962e63d 100644
--- a/src/include/arch/pvrformat.H
+++ b/src/include/arch/pvrformat.H
@@ -113,13 +113,13 @@ struct PVR_t
      */
     enum
     {
-        NIMBUS_DD1_MASK = 0x00FF2F0F,
-        IS_NIMBUS_DD1   = 0x004E0100,
+        NIMBUS_DD1_MASK  = 0x00FF2F0F,
+        IS_NIMBUS_DD1    = 0x004E0100,
         IS_NIMBUS_DD20   = 0x004E0200,
         IS_NIMBUS_DD21   = 0x004E0201,
 
         // Field: chipType
-        NIMBUS_CHIP = 0,
+        NIMBUS_CHIP  = 0,
         CUMULUS_CHIP = 1,
 
         // Field: smt
@@ -130,7 +130,8 @@ struct PVR_t
         P8_MURANO = 0x4B,
         P8_NAPLES = 0x4C,
         P8_VENICE = 0x4D,
-        P9_ALL    = 0x4E,
+        P9_ALL    = 0x4E, //NIMBUS/CUMULUS
+        P9_AXONE  = 0x4F,
     };
 
     /**
diff --git a/src/include/sys/misc.h b/src/include/sys/misc.h
index b4001d501..4fe0d5e44 100644
--- a/src/include/sys/misc.h
+++ b/src/include/sys/misc.h
@@ -134,6 +134,8 @@ enum ProcessorCoreType
     CORE_POWER9_NIMBUS,
     /** Power9 "CUMULUS" (scale-up) core */
     CORE_POWER9_CUMULUS,
+    /** Power9' "AXONE" core */
+    CORE_POWER9_AXONE,
 
     CORE_UNKNOWN,
 };
diff --git a/src/kernel/basesegment.C b/src/kernel/basesegment.C
index 2574c8d6a..59e077b60 100644
--- a/src/kernel/basesegment.C
+++ b/src/kernel/basesegment.C
@@ -59,6 +59,7 @@ void BaseSegment::_init()
         case CORE_POWER8_NAPLES:
         case CORE_POWER9_NIMBUS:
         case CORE_POWER9_CUMULUS:
+        case CORE_POWER9_AXONE:
         default:
             iv_physMemSize = VMM_BASE_BLOCK_SIZE;
             break;
diff --git a/src/kernel/cpuid.C b/src/kernel/cpuid.C
index 8d3555eed..6a67e1516 100644
--- a/src/kernel/cpuid.C
+++ b/src/kernel/cpuid.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -67,6 +67,9 @@ namespace CpuID
                 }
             }
 
+            case PVR_t::P9_AXONE:
+               return CORE_POWER9_AXONE;
+
             default:
                 return CORE_UNKNOWN;
         }
diff --git a/src/kernel/cpumgr.C b/src/kernel/cpumgr.C
index 6ef08051c..c0c1be333 100644
--- a/src/kernel/cpumgr.C
+++ b/src/kernel/cpumgr.C
@@ -469,6 +469,7 @@ size_t CpuManager::getThreadCount()
 
         case CORE_POWER9_NIMBUS:
         case CORE_POWER9_CUMULUS:
+        case CORE_POWER9_AXONE:
             threads = 4;
             break;
 
diff --git a/src/kernel/exception.C b/src/kernel/exception.C
index 8dc4b53e3..d12b6da7d 100644
--- a/src/kernel/exception.C
+++ b/src/kernel/exception.C
@@ -301,6 +301,7 @@ void kernel_execute_softpatch()
             case CORE_POWER8_NAPLES:
             case CORE_POWER9_NIMBUS:
             case CORE_POWER9_CUMULUS:
+            case CORE_POWER9_AXONE:
             case CORE_UNKNOWN:
                 p8_softpatch_denorm_assist(t->fp_context);
                 break;
diff --git a/src/kernel/misc.C b/src/kernel/misc.C
index c770fc49f..ed964da79 100644
--- a/src/kernel/misc.C
+++ b/src/kernel/misc.C
@@ -510,6 +510,7 @@ namespace KernelMisc
             case CORE_POWER8_NAPLES:
             case CORE_POWER9_NIMBUS:
             case CORE_POWER9_CUMULUS:
+            case CORE_POWER9_AXONE:
                 startAddr = reinterpret_cast<uint64_t*>
                                          ( VmmManager::INITIAL_MEM_SIZE ) ;
                 endAddr = reinterpret_cast<uint64_t*>(i_expandSize);
@@ -574,6 +575,7 @@ namespace KernelMisc
               break;
           case CORE_POWER9_NIMBUS:
           case CORE_POWER9_CUMULUS:
+          case CORE_POWER9_AXONE:
           case CORE_UNKNOWN:
           default:
               // See EX07.EC.CC.PCC0.COMMON.SPR_COMMON.SCOMC in scomdef for
@@ -660,6 +662,7 @@ const char* ProcessorCoreTypeStrings[]
     "Naples",
     "Nimbus",
     "Cumulus",
+    "Axone",
     "Unknown"
 };
 
diff --git a/src/lib/syscall_misc.C b/src/lib/syscall_misc.C
index e15007f3b..ad6b204a6 100644
--- a/src/lib/syscall_misc.C
+++ b/src/lib/syscall_misc.C
@@ -71,6 +71,7 @@ size_t cpu_thread_count()
             break;
         case CORE_POWER9_NIMBUS:
         case CORE_POWER9_CUMULUS:
+        case CORE_POWER9_AXONE:
             threads = 4;
             break;
 
diff --git a/src/lib/syscall_mmio.C b/src/lib/syscall_mmio.C
index f7bce955b..8cc8ac65f 100644
--- a/src/lib/syscall_mmio.C
+++ b/src/lib/syscall_mmio.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2010,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2010,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -75,6 +75,7 @@ static uint64_t mmio_scratch_base()
             return 0x40;
         case CORE_POWER9_NIMBUS:
         case CORE_POWER9_CUMULUS:
+        case CORE_POWER9_AXONE:
         case CORE_UNKNOWN:
         default:
             // See misc.C - updateScratchReg() for more info on this
diff --git a/src/usr/targeting/targetservicestart.C b/src/usr/targeting/targetservicestart.C
index 77e602578..19bb77bd8 100755
--- a/src/usr/targeting/targetservicestart.C
+++ b/src/usr/targeting/targetservicestart.C
@@ -345,6 +345,12 @@ static void checkProcessorTargeting(TargetService& i_targetService)
                     l_haveOneCorrectProcessor = true;
                 }
                 break;
+            case MODEL_AXONE:
+                if(l_coreType == CORE_POWER9_AXONE)
+                {
+                    l_haveOneCorrectProcessor = true;
+                }
+                break;
 
             default:
                 break;