diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2019-07-30 15:34:28 -0500 |
---|---|---|
committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-08-01 16:50:52 -0500 |
commit | ed0430e908b272919b9bb5ac48bc8d9314b81238 (patch) | |
tree | a2447c3eb2f637262f3aaa8a7c83286dad3dc3df /src/usr/targeting | |
parent | 7e05c2e69bf8e9c94b7ab0da63b62546fe79796e (diff) | |
download | talos-hostboot-ed0430e908b272919b9bb5ac48bc8d9314b81238.tar.gz talos-hostboot-ed0430e908b272919b9bb5ac48bc8d9314b81238.zip |
OR mux select with the "enable" bit 0b1000 when making selection
During simics bringup we figured out that the mux selects needed to
be between 8-15. We learned during bringup this is because the real
0-7 select needs to be OR'ed with the enable bit for the model of
mux. This commit does the ORing correctly and subtracts 8 from all
of the muxSelects used in the simics xml so we match what the MRW
is doing.
Change-Id: I45faab455afdfc63ac05fc2637890f9d0137a444
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81397
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_AXONE.system.xml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index 342507e90..e789f5d38 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -8498,7 +8498,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8518,8 +8518,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8568,7 +8568,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8589,8 +8589,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8639,7 +8639,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <field><id>i2cMuxBusSelector</id><value>0x0A</value></field> + <field><id>i2cMuxBusSelector</id><value>0x2</value></field> <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> </default> </attribute> @@ -8659,8 +8659,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8709,7 +8709,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8729,8 +8729,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8779,7 +8779,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8798,8 +8798,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8848,7 +8848,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8867,8 +8867,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8917,7 +8917,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -8936,8 +8936,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> @@ -8986,7 +8986,7 @@ <!-- Engine 3 Port 1 connects to a 3 to 8 MUX attached to DDIMM0-7 in the simics axone model --> <field><id>port</id><value>1</value></field> <field><id>devAddr</id><value>0x40</value></field> - <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> @@ -9005,8 +9005,8 @@ <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> + <!-- Valid Mux Bus Selections are 0x00-0x07 --> + <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> |