Update Core Scratch Reg 6 with L3 vs Mainstore for FSP to query

RTC:64829
Change-Id: Ic8e7983f6838b79c359c4cee2647b7676493cb1e
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3564
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 61 insertions, 15 deletions

diff --git a/src/kernel/basesegment.C b/src/kernel/basesegment.C
index 0b4ad5969..5317d2a25 100644
--- a/src/kernel/basesegment.C
+++ b/src/kernel/basesegment.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -32,6 +32,7 @@
 #include <kernel/console.H>
 #include <kernel/pagemgr.H>
 #include <kernel/spte.H>
+#include <kernel/memstate.H>
 
 BaseSegment::~BaseSegment()
 {
@@ -280,6 +281,11 @@ int BaseSegment::_mmExtend(void)
     // block size to the physical mem size.
     iv_physMemSize += VMM_EXTEND_BLOCK_SIZE;
 
+
+    // Call to set the Hostboot MemSize and location needed for DUMP.
+    KernelMemState::setMemScratchReg(KernelMemState::MEM_CONTAINED_MS,
+                                     KernelMemState::MS_32MEG);
+
     return 0;
 }
 
diff --git a/src/kernel/misc.C b/src/kernel/misc.C
index 629a474de..f73bf2947 100644
--- a/src/kernel/misc.C
+++ b/src/kernel/misc.C
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <kernel/pagemgr.H>
 #include <kernel/vmmmgr.H>              // INITIAL_MEM_SIZE
+#include <kernel/memstate.H>
 
 extern "C"
     void kernel_shutdown(size_t, uint64_t, uint64_t, uint64_t) NO_RETURN;
@@ -65,20 +66,9 @@ namespace KernelMisc
                        status);
             }
 
-            register uint64_t scratch_address = 0; // Values from PervSpec
-            switch(CpuID::getCpuType())
-            {
-              case CORE_POWER8_MURANO:
-              case CORE_POWER8_VENICE:
-              case CORE_UNKNOWN:
-                scratch_address = 0x40;
-                break;
-            }
+            // Call to set the Core Scratch Reg 0 with the status 
+            updateScratchReg(MMIO_SCRATCH_PROGRESS_CODE, status);
 
-            asm volatile("mtspr 276, %0\n"
-                         "isync\n"
-                         "mtspr 277, %1"
-                         :: "r" (scratch_address), "r" (status));
         }
 
         // If the Shutdown was called with a status of GOOD then
@@ -269,6 +259,10 @@ namespace KernelMisc
         }
 
         executed = true;
+
+        KernelMemState::setMemScratchReg(KernelMemState::MEM_CONTAINED_L3,
+                                         KernelMemState::FULL_CACHE);
+
         return 0;
     }
 
@@ -282,4 +276,45 @@ namespace KernelMisc
             i_start += cache_line_size;
         }
     }
+
+    void updateScratchReg(MMIO_Scratch_Register scratch_addr,
+                          uint64_t data)
+    {
+
+        uint64_t l_scratch_addr = static_cast<uint64_t>(scratch_addr);
+
+        switch(CpuID::getCpuType())
+        {
+          case CORE_POWER8_MURANO:
+          case CORE_POWER8_VENICE:
+          case CORE_UNKNOWN:
+            l_scratch_addr = l_scratch_addr + 0x40;
+            break;
+        }
+
+        writeScratchReg(l_scratch_addr, data);
+    };
+
+
+};
+
+namespace KernelMemState
+{
+
+    void setMemScratchReg(MemLocation i_location,
+                         MemSize i_size)
+    {
+        mem_location l_MemData;
+
+        l_MemData.memMode = i_location;
+        l_MemData.reserved = 0;
+        l_MemData.memSize = i_size;
+
+        KernelMisc::updateScratchReg(MMIO_SCRATCH_MEMORY_STATE,
+                                   l_MemData.Scratch6Data);
+
+    }
+
+
+
 };
diff --git a/src/kernel/pagemgr.C b/src/kernel/pagemgr.C
index f1a1f2976..f1e74c695 100644
--- a/src/kernel/pagemgr.C
+++ b/src/kernel/pagemgr.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2010,2012              */
+/* COPYRIGHT International Business Machines Corp. 2010,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -33,6 +33,8 @@
 #include <kernel/misc.H>
 #include <sys/syscall.h>
 #include <assert.h>
+#include <kernel/memstate.H>
+
 
 size_t PageManager::cv_coalesce_count = 0;
 size_t PageManager::cv_low_page_count = -1;
@@ -209,6 +211,9 @@ PageManager::PageManager()
 
     iv_heap.addMemory( addr, length );
 
+    KernelMemState::setMemScratchReg(KernelMemState::MEM_CONTAINED_L3,
+                                     KernelMemState::HALF_CACHE);
+
     // Statistics
     iv_pagesTotal = length;
     iv_pagesAvail = length;