diff options
3 files changed, 232 insertions, 8 deletions
diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index 1d2e88e52..d95b5b680 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -521,7 +521,7 @@ <default>400,400,0,0,0,0,0,0,0,0,0,0,0, 400,400,400,400,0,0,0,0,0,0,0,0,0, 400,400,0,0,0,0,0,0,0,0,0,0,0, - 0,400,0,0,0,0,0,0,0,0,0,0,0</default> + 400,400,0,0,0,0,0,0,0,0,0,0,0</default> </attribute> <attribute> <id>MRU_ID</id> @@ -9403,7 +9403,7 @@ </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default> </attribute> <attribute> <id>FAPI_POS</id> @@ -9413,6 +9413,23 @@ <id>VPD_REC_NUM</id> <default>0</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>engine</id><value>3</value></field> + <!-- Engine 3 Port 1 is directly attached to DDIMM0 in the simics axone model --> + <field><id>port</id><value>1</value></field> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>maxMemorySizeKB</id><value>0x4</value></field> + <field><id>writeCycleTime</id><value>20</value></field> + <field><id>writePageSize</id><value>32</value></field> + <field><id>i2cMuxBusSelector</id><value>0xFF</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9443,6 +9460,24 @@ <id>VPD_REC_NUM</id> <default>1</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9473,6 +9508,24 @@ <id>VPD_REC_NUM</id> <default>2</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9503,6 +9556,24 @@ <id>VPD_REC_NUM</id> <default>3</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9533,6 +9604,24 @@ <id>VPD_REC_NUM</id> <default>4</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9563,6 +9652,24 @@ <id>VPD_REC_NUM</id> <default>5</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9593,6 +9700,24 @@ <id>VPD_REC_NUM</id> <default>6</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9623,6 +9748,24 @@ <id>VPD_REC_NUM</id> <default>7</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9653,6 +9796,24 @@ <id>VPD_REC_NUM</id> <default>8</default> </attribute> + <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>engine</id><value>3</value></field> + <field><id>byteAddrOffset</id><value>0x02</value></field> + <field><id>devAddr</id><value>0xA0</value></field> + <field><id>chipCount</id><value>0x01</value></field> + <!-- Engine 3 Port 0 connects to a 3 to 8 MUX attached to DDIMM1-8 in the simics axone model --> + <field><id>port</id><value>0</value></field> + <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>i2cMuxPath</id><value>physical:sys-0/node-0/i2c_mux-0</value></field> + </default> + </attribute> </targetInstance> <targetInstance> @@ -9683,6 +9844,8 @@ <id>VPD_REC_NUM</id> <default>9</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9713,6 +9876,8 @@ <id>VPD_REC_NUM</id> <default>10</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9743,6 +9908,8 @@ <id>VPD_REC_NUM</id> <default>11</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9773,6 +9940,8 @@ <id>VPD_REC_NUM</id> <default>12</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9803,6 +9972,8 @@ <id>VPD_REC_NUM</id> <default>13</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9833,6 +10004,8 @@ <id>VPD_REC_NUM</id> <default>14</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <targetInstance> @@ -9863,6 +10036,8 @@ <id>VPD_REC_NUM</id> <default>15</default> </attribute> + <!-- EEPROM_VPD_PRIMARY_INFO does not get set for dimms 9-15 in the axone simics model because + the simics model does not provide i2c address spaces for these targets--> </targetInstance> <!-- ===================================================================== --> @@ -12749,4 +12924,50 @@ </attribute> </targetInstance> +<!-- ===================================================================== --> +<!-- I2C_MUX --> +<!-- ===================================================================== --> +<targetInstance> + <id>sys0node0i2cmux0</id> + <type>i2c_mux_pca9847</type> + <attribute> + <id>HUID</id> + <default>0x004D0000</default> + </attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/i2c_mux-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/i2c_mux-0</default> + </attribute> + <attribute> + <id>PRIMARY_CAPABILITIES</id> + <default> + <field><id>reserved</id><value>0</value></field> + <field><id>supportsFsiScom</id><value>0</value></field> + <field><id>supportsInbandScom</id><value>0</value></field> + <field><id>supportsXscom</id><value>0</value></field> + </default> + </attribute> + <attribute> + <id>ORDINAL_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>FAPI_NAME</id> + <default>NA</default> + </attribute> + <attribute> + <id>I2C_MUX_INFO</id> + <default> + <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> + <field><id>port</id><value>0</value></field> + <field><id>devAddr</id><value>0xE0</value></field> + <field><id>engine</id><value>3</value></field> + </default> + </attribute> +</targetInstance> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index f5636ba4f..da2f8519e 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -367,6 +367,12 @@ <id>DECONFIG_GARDABLE</id> </attribute> <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_INFO</id> + </attribute> + <attribute> <id>FRU_ID</id> </attribute> <attribute> @@ -387,9 +393,6 @@ <id>chip-ocmb-explorer</id> <parent>chip-ocmb</parent> <attribute> - <id>FAPI_I2C_CONTROL_INFO</id> - </attribute> - <attribute> <default>EXPLORER</default> <id>MODEL</id> </attribute> @@ -998,6 +1001,9 @@ <id>EEPROM_NV_INFO</id> </attribute> <attribute> + <id>EEPROM_VPD_PRIMARY_INFO</id> + </attribute> + <attribute> <id>FRU_ID</id> </attribute> <attribute> diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml index 4f6bcbdfe..2caf21b8a 100644 --- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml @@ -117,9 +117,6 @@ <targetTypeExtension> <id>lcard-dimm</id> <attribute> - <id>EEPROM_VPD_PRIMARY_INFO</id> - </attribute> - <attribute> <id>IPMI_SENSORS</id> </attribute> </targetTypeExtension> |
