Add OMI BAR calculations to MRW scripts

Need to set the OMI attribute OMI_INBAND_BAR_BASE_ADDR_OFFSET
The algorithm to determine this attribute is explained in
src/usr/mmio/mmio.C
Each OMI BAR is an offset from the base (0x0006030200000000)
The offset for an even OMI is every 8 gigabytes
The offset for an odd OMI is 2 gigabytes after the preceding
even OMI

Change-Id: I08973e0b2952a6ea32dbf4b95ad00cf5bbe92484
RTC: 210315
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77742
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>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 45 insertions, 4 deletions

diff --git a/src/usr/mmio/mmio.C b/src/usr/mmio/mmio.C
index fffdacbc6..d464f4e45 100644
--- a/src/usr/mmio/mmio.C
+++ b/src/usr/mmio/mmio.C
@@ -142,10 +142,10 @@ errlHndl_t mmioSetup()
                 // paired OCMB spaces get interleaved as follows :
                 //       ocmb  |  BAR ATTRIBUTE     | Type | Base reg           - end addr           | size | sub-ch
                 //       +-----+--------------------+------+-----------------------------------------+------+-------
-                //       ocmb0 | 0x0006030200000000 | cnfg | 0x0006030200000000 - 0x000603027FFFFFFF | 2GB  | 0
-                //       ocmb1 | 0x0006030280000000 | cnfg | 0x0006030280000000 - 0x00060302FFFFFFFF | 2GB  | 1
-                //       ocmb0 | N/A                | mmio | 0x0006030300000000 - 0x000603037FFFFFFF | 2GB  | 0
-                //       ocmb1 | N/A                | mmio | 0x0006030380000000 - 0x00060303FFFFFFFF | 2GB  | 1
+                //       ocmb0 | 0xYYYYYYY000000000 | cnfg | 0xYYYYYYY000000000 - 0xYYYYYYY07FFFFFFF | 2GB  | 0
+                //       ocmb1 | 0xYYYYYYY080000000 | cnfg | 0xYYYYYYY080000000 - 0xYYYYYYY0FFFFFFFF | 2GB  | 1
+                //       ocmb0 | N/A                | mmio | 0xYYYYYYY100000000 - 0xYYYYYYY17FFFFFFF | 2GB  | 0
+                //       ocmb1 | N/A                | mmio | 0xYYYYYYY180000000 - 0xYYYYYYY1FFFFFFFF | 2GB  | 1
                 //       +-----+--------------------+------+-----------------------------------------+------+-------
 
                 // Calculate CNFG space BAR to write to OCMB attribute
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index fc8c74b18..f0aaf4518 100755
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -1764,6 +1764,38 @@ sub processOmi
     my $num = $fapi_pos % $numberOfOmiPerProc;
     $value = "physical:sys-0/node-0/proc-$proc_num/" . $omi_map{$num};
     $targetObj->setAttribute($target, "OMIC_PARENT", $value);
+
+    my $omi = Math::BigInt->new($targetObj->getAttribute($target,"FAPI_POS"));
+    # Base omi bar offset
+    # We use this base address in simics_AXONE.system.xml and want our
+    # addresses to match the ones in that xml
+    my $base = 0x30400000000;
+    my $gigabyte = 0x40000000;
+    my $value = 0;
+
+    # This algorithm is explained in src/usr/mmio/mmio.C
+    if ($omi % 2 eq 0)
+    {
+        $value = $base + $omi * 4 * $gigabyte;
+    }
+    else
+    {
+        $value = $base + (($omi - 1) * 4 + 2) * $gigabyte;
+    }
+
+    $value = sprintf("0x%016s", substr(($value)->as_hex(),2));
+    $targetObj->setAttribute($target, "OMI_INBAND_BAR_BASE_ADDR_OFFSET",
+        $value);
+
+    # Set the parent MC BAR value to value of first OMI unit
+    if ($omi % 8 eq 0)
+    {
+        my $parent_mcc = $targetObj->getTargetParent($target);
+        my $parent_mi = $targetObj->getTargetParent($parent_mcc);
+        my $parent_mc = $targetObj->getTargetParent($parent_mi);
+        $targetObj->setAttribute($parent_mc, "OMI_INBAND_BAR_BASE_ADDR_OFFSET",
+            $value);
+    }
 }
 
 #--------------------------------------------------
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 99519fd94..97927aecc 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2636,6 +2636,9 @@
       <id>MODEL</id>
       <default>AXONE</default>
     </attribute>
+    <attribute>
+      <id>OMI_INBAND_BAR_BASE_ADDR_OFFSET</id>
+    </attribute>
   </targetType>
 
   <targetType>
@@ -3518,6 +3521,12 @@
       <default>AXONE</default>
       <id>MODEL</id>
     </attribute>
+    <attribute>
+      <id>OMI_INBAND_BAR_BASE_ADDR_OFFSET</id>
+    </attribute>
+    <attribute>
+      <id>ORDINAL_ID</id>
+    </attribute>
   </targetType>
 
   <!-- OMI (Special has two parents)