Update DIMM mux_select to match their OCMB counterparts

During swift bringup we realized that we had the MUX_SELECT wrong on
all of the OCMB/DIMM targets in our simics xml. Basically we were
OR'ing a 0x08 to the value that we should not have. The fix was to
add the OR'ing of the 0x08 to the code, and subtract 0x08 from what
we had set in the xml we use for simics. The net result was nothing
but this makes our XML more correct. For some reason this change
was not propgated to the dimms. This commit subtracts 0x08 from
the MUX_SELECT of the dimms in the simics xml for Axone.

Change-Id: I915d1f51d66bf0089346afa7f8c491de69bb1498
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83205
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>

1 files changed, 16 insertions, 32 deletions

diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
index e6013460f..bc2dbc676 100644
--- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -19069,8 +19069,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x08</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x00</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19121,8 +19120,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x09</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x01</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19173,8 +19171,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0A</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x02</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19225,8 +19222,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0B</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x03</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19277,8 +19273,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0C</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x04</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19329,8 +19324,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0D</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x05</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19381,8 +19375,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0E</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x06</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19433,8 +19426,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0F</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x07</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field>
         </default>
     </attribute>
@@ -19897,8 +19889,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x08</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x00</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -19949,8 +19940,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x09</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x01</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20001,8 +19991,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0A</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x02</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20053,8 +20042,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0B</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x03</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20105,8 +20093,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0C</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x04</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20157,8 +20144,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0D</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x05</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20209,8 +20195,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0E</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x06</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>
@@ -20261,8 +20246,7 @@
             <field><id>maxMemorySizeKB</id><value>0x4</value></field>
             <field><id>writeCycleTime</id><value>05</value></field>
             <field><id>writePageSize</id><value>0x20</value></field>
-            <!-- Valid Mux Bus Selections are 0x08-0x0F -->
-            <field><id>i2cMuxBusSelector</id><value>0x0F</value></field>
+            <field><id>i2cMuxBusSelector</id><value>0x07</value></field>
             <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-2</value></field>
         </default>
     </attribute>