Update HB memory map to match PHYP/Saph

Change-Id: I5c4c94e0fc6dee237ffe0a209d5d170cb20f02bd
CQ: SW247135
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8924
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 162 insertions, 31 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index ae780c2a6..6fe2ab6cd 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -2057,8 +2057,20 @@ sub generate_proc
     printf( "        </default>\n" );
     printf( "    </attribute>\n" );
 
+    # Starts at 1024TB -0.5TB, 2GB per PHB (=8GB per proc)
+    printf( "    <attribute><id>PCI_BASE_ADDRS_32</id>\n" );
+    printf( "        <default>\n" );
+    printf( "            0x%016X,0x%016X,\n",
+       0x0003FF8000000000 + 0x800000000*$lognode + 0x200000000*$logid + 0x80000000*0,
+         0x0003FF8000000000 + 0x800000000*$lognode + 0x200000000*$logid + 0x80000000*1 );
+    printf( "            0x%016X,0x%016X\n",
+       0x0003FF8000000000 + 0x800000000*$lognode + 0x200000000*$logid + 0x80000000*2,
+         0x0003FF8000000000 + 0x800000000*$lognode + 0x200000000*$logid + 0x80000000*3 );
+    printf( "        </default>\n" );
+    printf( "    </attribute>\n" );
+
     # Starts at 976TB, 64GB per PHB (=256GB per proc)
-    printf( "    <attribute><id>PCI_BASE_ADDRS</id>\n" );
+    printf( "    <attribute><id>PCI_BASE_ADDRS_64</id>\n" );
     printf( "        <default>\n" );
     printf( "            0x%016X,0x%016X,\n",
        0x0003D00000000000 + 0x10000000000*$lognode + 0x4000000000*$logid + 0x1000000000*0,
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 25551f230..18b8d3f29 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2716,18 +2716,22 @@
 </attribute>
 
 <attribute>
-    <id>PCI_BASE_ADDRS</id>
-    <description>Base Address of PCI Memory Space</description>
+    <id>PCI_BASE_ADDRS_64</id>
+    <description>Base Address of PCI 64 bit Memory Space</description>
+    <simpleType>
+        <uint64_t>
+        </uint64_t>
+        <array>4</array><!-- per PHB -->
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+</attribute>
+
+<attribute>
+    <id>PCI_BASE_ADDRS_32</id>
+    <description>Base Address of PCI 32 bit Memory Space</description>
     <simpleType>
         <uint64_t>
-            <!-- Starts at 976TB, 64GB per PHB (=256GB per proc) -->
-            <!-- 0x0003D00000000000 + 0x4000000000*procnum + 0x1000000000*phbnum -->
-            <default>
-                0x0003D00000000000,
-                0x0003FFFE40100000,
-                0x0003FFFE40200000,
-                0x0003FFFE40300000
-            </default>
         </uint64_t>
         <array>4</array><!-- per PHB -->
     </simpleType>
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 115e4e13b..c7914aa9e 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -415,12 +415,18 @@
             0x0003FFFE40200000,0x0003FFFE40300000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D00000000000,0x0003D01000000000,
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8000000000,0x0003FF8080000000,
+            0x0003FF8100000000,0x0003FF8180000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -1257,11 +1263,17 @@
             0x0003FFFE40600000,0x0003FFFE40700000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D04000000000,0x0003D05000000000,
             0x0003D06000000000,0x0003D07000000000
         </default>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8200000000,0x0003FF8280000000,
+            0x0003FF8300000000,0x0003FF8380000000
+        </default>
+    </attribute>
     </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
@@ -2101,12 +2113,18 @@
             0x0003FFFE40A00000,0x0003FFFE40B00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D08000000000,0x0003D09000000000,
             0x0003D0A000000000,0x0003D0B000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8400000000,0x0003FF8480000000,
+            0x0003FF8500000000,0x0003FF8580000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
@@ -2945,12 +2963,18 @@
             0x0003FFFE40E00000,0x0003FFFE40F00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D0C000000000,0x0003D0D000000000,
             0x0003D0E000000000,0x0003D0F000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8600000000,0x0003FF8680000000,
+            0x0003FF8700000000,0x0003FF8780000000
+        </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 98944204f..d4665bfc7 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -407,12 +407,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE40200000,0x0003FFFE40300000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D00000000000,0x0003D01000000000,
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8000000000,0x0003FF8080000000,
+            0x0003FF8100000000,0x0003FF8180000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -1612,12 +1618,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE40600000,0x0003FFFE40700000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D04000000000,0x0003D05000000000,
             0x0003D06000000000,0x0003D07000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8200000000,0x0003FF8280000000,
+            0x0003FF8300000000,0x0003FF8380000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>
@@ -2817,12 +2829,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE40A00000,0x0003FFFE40B00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D08000000000,0x0003D09000000000,
             0x0003D0A000000000,0x0003D0B000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8400000000,0x0003FF8480000000,
+            0x0003FF8500000000,0x0003FF8580000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40002000</default>
     </attribute>
@@ -4022,12 +4040,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE40E00000,0x0003FFFE40F00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D0C000000000,0x0003D0D000000000,
             0x0003D0E000000000,0x0003D0F000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8600000000,0x0003FF8680000000,
+            0x0003FF8700000000,0x0003FF8780000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40003000</default>
     </attribute>
@@ -5226,12 +5250,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE41200000,0x0003FFFE41300000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D10000000000,0x0003D11000000000,
             0x0003D12000000000,0x0003D13000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8800000000,0x0003FF8880000000,
+            0x0003FF8900000000,0x0003FF8980000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40004000</default>
     </attribute>
@@ -6399,12 +6429,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE41600000,0x0003FFFE41700000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D14000000000,0x0003D15000000000,
             0x0003D16000000000,0x0003D17000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8A00000000,0x0003FF8A80000000,
+            0x0003FF8B00000000,0x0003FF8B80000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40005000</default>
     </attribute>
@@ -7570,12 +7606,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE41A00000,0x0003FFFE41B00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D18000000000,0x0003D19000000000,
             0x0003D1A000000000,0x0003D1B000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8C00000000,0x0003FF8C80000000,
+            0x0003FF8D00000000,0x0003FF8D80000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40006000</default>
     </attribute>
@@ -8741,12 +8783,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE41E00000,0x0003FFFE41F00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D1C000000000,0x0003D1D000000000,
             0x0003D1E000000000,0x0003D1F000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8E00000000,0x0003FF8E80000000,
+            0x0003FF8F00000000,0x0003FF8F80000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40007000</default>
     </attribute>
@@ -17288,12 +17336,18 @@ po<!-- IBM_PROLOG_BEGIN_TAG                                                   --
             0x0003FFFE40200000,0x0003FFFE40300000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D00000000000,0x0003D01000000000,
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8000000000,0x0003FF8080000000,
+            0x0003FF8100000000,0x0003FF8180000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 2704220c5..b09865e14 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -467,7 +467,8 @@
     <attribute><id>PSI_BRIDGE_BASE_ADDR</id></attribute>
     <attribute><id>INTP_BASE_ADDR</id></attribute>
     <attribute><id>PHB_BASE_ADDRS</id></attribute>
-    <attribute><id>PCI_BASE_ADDRS</id></attribute>
+    <attribute><id>PCI_BASE_ADDRS_64</id></attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id></attribute>
     <attribute><id>MEM_BASE</id></attribute>
     <attribute><id>MIRROR_BASE</id></attribute>
     <attribute><id>RNG_BASE_ADDR</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
index 7e15b6f98..a6616c2ac 100644
--- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
@@ -396,12 +396,18 @@
     </default>
     </attribute>
     <attribute>
-    <id>PCI_BASE_ADDRS</id>
+    <id>PCI_BASE_ADDRS_64</id>
     <default>
        0x0003D00000000000,0x0003D01000000000,
        0x0003D02000000000,0x0003D03000000000
     </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8000000000,0x0003FF8080000000,
+            0x0003FF8100000000,0x0003FF8180000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -923,12 +929,18 @@
             0x0003FFFE40600000,0x0003FFFE40700000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D04000000000,0x0003D05000000000,
             0x0003D06000000000,0x0003D07000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8200000000,0x0003FF8280000000,
+            0x0003FF8300000000,0x0003FF8380000000
+        </default>
+    </attribute>
     <attribute><id>MEM_BASE</id>
         <default>0x0000020000000000</default>
     </attribute>
@@ -1341,12 +1353,18 @@
             0x0003FFFE40A00000,0x0003FFFE40B00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D08000000000,0x0003D09000000000,
             0x0003D0A000000000,0x0003D0B000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8400000000,0x0003FF8480000000,
+            0x0003FF8500000000,0x0003FF8580000000
+        </default>
+    </attribute>
     <attribute><id>MEM_BASE</id>
         <default>0x0000040000000000</default>
     </attribute>
@@ -1760,12 +1778,18 @@
             0x0003FFFE40E00000,0x0003FFFE40F00000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D0C000000000,0x0003D0D000000000,
             0x0003D0E000000000,0x0003D0F000000000
         </default>
     </attribute>
+        <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8600000000,0x0003FF8680000000,
+            0x0003FF8700000000,0x0003FF8780000000
+        </default>
+    </attribute>
     <attribute><id>MEM_BASE</id>
         <default>0x0000060000000000</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
index d2d9b8916..4b24e5261 100644
--- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
@@ -395,12 +395,18 @@
             0x0003FFFE40200000,0x0003FFFE40300000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D00000000000,0x0003D01000000000,
             0x0003D02000000000,0x0003D03000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8000000000,0x0003FF8080000000,
+            0x0003FF8100000000,0x0003FF8180000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40000000</default>
     </attribute>
@@ -1490,12 +1496,18 @@
             0x0003FFFE40600000,0x0003FFFE40700000
         </default>
     </attribute>
-    <attribute><id>PCI_BASE_ADDRS</id>
+    <attribute><id>PCI_BASE_ADDRS_64</id>
         <default>
             0x0003D04000000000,0x0003D05000000000,
             0x0003D06000000000,0x0003D07000000000
         </default>
     </attribute>
+    <attribute><id>PCI_BASE_ADDRS_32</id>
+        <default>
+            0x0003FF8200000000,0x0003FF8280000000,
+            0x0003FF8300000000,0x0003FF8380000000
+        </default>
+    </attribute>
     <attribute><id>RNG_BASE_ADDR</id>
         <default>0x0003FFFF40001000</default>
     </attribute>