Fix P9 expansion into bottom 512K cache

Change-Id: Ie7d8ab2ae3730b57448a07f0367c8715d61b6124
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26495
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>

2 files changed, 6 insertions, 10 deletions

diff --git a/src/kernel/misc.C b/src/kernel/misc.C
index 4d7f2a2cc..4343fe9c8 100644
--- a/src/kernel/misc.C
+++ b/src/kernel/misc.C
@@ -479,7 +479,7 @@ namespace KernelMisc
         }
 
         uint64_t startAddr = 512*KILOBYTE;
-        uint64_t endAddr = 4*MEGABYTE;
+        uint64_t endAddr = 1*MEGABYTE;
 
         size_t cache_columns = 0;
 
diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C
index 215094041..435ababfd 100644
--- a/src/usr/secureboot/base/service.C
+++ b/src/usr/secureboot/base/service.C
@@ -43,25 +43,21 @@ namespace SECUREBOOT
         do
         {
 
-// Don't blind purge in VPO
-#ifndef CONFIG_P9_VPO_COMPILE
-
             // Load original secureboot header.
             if (enabled())
             {
                 Singleton<Header>::instance().loadBaseHeader();
             }
 
-            // Run dcbz on the entire 10MB cache
-            assert(0 == mm_extend(MM_EXTEND_FULL_CACHE));
-#else
             // Extend memory footprint into lower portion of cache.
             assert(0 == mm_extend(MM_EXTEND_PARTIAL_CACHE));
 
-#endif
-
-// Disable SecureROM in VPO
+            // Don't extend more than 1/2 cache in VPO as fake PNOR is there
+            // Don't enable SecureROM in VPO
 #ifndef CONFIG_P9_VPO_COMPILE
+            // Run dcbz on the entire 10MB cache
+            assert(0 == mm_extend(MM_EXTEND_FULL_CACHE));
+
             // Initialize the Secure ROM
             l_errl = initializeSecureROM();
             if (l_errl)