From c088a2fc7109212007f332d0cb79322e688a4493 Mon Sep 17 00:00:00 2001
From: Van Lee <vanlee@us.ibm.com>
Date: Fri, 30 Nov 2012 08:38:32 -0600
Subject: HWP: integrate opt_memmap into hostboot

Change-Id: I3c38143c5e4e8272dde94d7743f7e1f742178647
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2486
Tested-by: Jenkins Server
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 .../targeting/common/xmltohb/attribute_types.xml   |  8 ++--
 .../common/xmltohb/simics_MURANO.system.xml        | 24 ----------
 .../common/xmltohb/simics_VENICE.system.xml        | 54 ----------------------
 src/usr/targeting/common/xmltohb/vbu.system.xml    |  6 ---
 src/usr/targeting/xmltohb/genHwsvMrwXml.pl         | 11 -----
 5 files changed, 4 insertions(+), 99 deletions(-)

(limited to 'src/usr/targeting')

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 6b52c81cf..bded81ecf 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -4151,10 +4151,10 @@
     <description>Base Address for all mainstore behind this processor</description>
     <simpleType>
         <uint64_t>
-            <default>0xFFFFFFFFFFFFFFFF</default>
+            <default>0</default>
         </uint64_t>
     </simpleType>
-    <persistency>non-volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
@@ -4168,10 +4168,10 @@
     <description>Base Address for all mirrored mainstore behind this processor</description>
     <simpleType>
         <uint64_t>
-            <default>0xFFFFFFFFFFFFFFFF</default>
+            <default>0</default>
         </uint64_t>
     </simpleType>
-    <persistency>non-volatile</persistency>
+    <persistency>volatile-zeroed</persistency>
     <readable/>
     <writeable/>
     <hwpfToHbAttrMap>
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 2695b6ddc..d0c97d9ea 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -244,12 +244,6 @@
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000000000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002000000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -957,12 +951,6 @@
             0x0003D06000000000,0x0003D07000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000020000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002020000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>
@@ -1671,12 +1659,6 @@
             0x0003D0A000000000,0x0003D0B000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000040000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002040000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
@@ -2386,12 +2368,6 @@
             0x0003D0E000000000,0x0003D0F000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000060000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002060000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40003000</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 284c2c1f2..f387a3d5f 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -220,12 +220,6 @@
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000000000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002000000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -1284,12 +1278,6 @@
             0x0003D06000000000,0x0003D07000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000020000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002020000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>
@@ -2348,12 +2336,6 @@
             0x0003D0A000000000,0x0003D0B000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000040000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002040000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
@@ -3412,12 +3394,6 @@
             0x0003D0E000000000,0x0003D0F000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000060000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002060000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40003000</default>
     </attribute>
@@ -4474,12 +4450,6 @@
             0x0003D12000000000,0x0003D13000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000080000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002080000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40004000</default>
     </attribute>
@@ -5538,12 +5508,6 @@
             0x0003D16000000000,0x0003D17000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x00000A0000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x00020A0000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40005000</default>
     </attribute>
@@ -6600,12 +6564,6 @@
             0x0003D1A000000000,0x0003D1B000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x00000C0000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x00020C0000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40006000</default>
     </attribute>
@@ -7663,12 +7621,6 @@
             0x0003D1E000000000,0x0003D1F000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x00000E0000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x00020E0000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40007000</default>
     </attribute>
@@ -14939,12 +14891,6 @@
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000000000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002000000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu.system.xml b/src/usr/targeting/common/xmltohb/vbu.system.xml
index 6c5623166..31635a758 100644
--- a/src/usr/targeting/common/xmltohb/vbu.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu.system.xml
@@ -221,12 +221,6 @@
        0x0003D02000000000,0x0003D03000000000
     </default>
     </attribute>
-    <attribute><id>MEM_BASE</id>
-        <default>0x0000000000000000</default>
-    </attribute>
-    <attribute><id>MIRROR_BASE</id>
-        <default>0x0002000000000000</default>
-    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
index 0f93ae081..3307ef442 100755
--- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
+++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
@@ -1718,17 +1718,6 @@ sub generate_proc
     printf( "        </default>\n" );
     printf( "    </attribute>\n" );
 
-    # Starts at 0, 2TB per proc
-    printf( "    <attribute><id>MEM_BASE</id>\n" );
-    printf( "        <default>0x%016X</default>\n", 0x20000000000*$proc );
-    printf( "    </attribute>\n" );
-
-    # Starts at 512TB, 2TB per proc
-    printf( "    <attribute><id>MIRROR_BASE</id>\n" );
-    printf( "        <default>0x%016X</default>\n",
-       0x0002000000000000 + 0x20000000000*$proc );
-    printf( "    </attribute>\n" );
-
     # Starts at 1024TB - 3GB
     printf( "    <attribute><id>RNG_BASE_ADDR</id>\n" );
     printf( "        <default>0x%016X</default>\n",
-- 
cgit v1.2.1