summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsrc/usr/i2c/i2c.C15
-rw-r--r--src/usr/targeting/common/xmltohb/simics_AXONE.system.xml48
2 files changed, 37 insertions, 26 deletions
diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index bf0560e73..226b96acf 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -1293,11 +1293,22 @@ errlHndl_t i2cAccessMux( TARGETING::Target* i_masterTarget,
if (! (l_i2cMuxTarget->tryGetAttr<TARGETING::ATTR_FAPI_I2C_CONTROL_INFO>(l_muxData)) )
{
TRACFCOMP(g_trac_i2c,
- "i2cAccessMux(): get attributes failed");
+ "i2cAccessMux(): getting ATTR_FAPI_I2C_CONTROL_INFO failed");
break;
}
- uint8_t l_muxSelector = i_i2cMuxBusSelector;
+ TARGETING::ATTR_MODEL_type l_muxModel;
+ if (! (l_i2cMuxTarget->tryGetAttr<TARGETING::ATTR_MODEL>(l_muxModel)) )
+ {
+ TRACFCOMP(g_trac_i2c,
+ "i2cAccessMux(): getting ATTR_MODEL failed");
+ break;
+ }
+
+ assert(l_muxModel == TARGETING::MODEL_PCA9847, "Invalid model of mux detected");
+ const uint8_t PCA9847_ENABLE_BIT = 8;
+
+ uint8_t l_muxSelector = i_i2cMuxBusSelector | PCA9847_ENABLE_BIT;
uint8_t *l_ptrMuxSelector = &l_muxSelector;
size_t l_muxSelectorSize = sizeof(l_muxSelector);
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>
OpenPOWER on IntegriCloud