diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2018-12-17 14:01:45 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-01-08 15:51:26 -0600 |
commit | 756a8239c0619b26c5f4951d26adac634994bbef (patch) | |
tree | b6590487fd9a4f6a04931852be2195574fda231c /src/usr/targeting/common/xmltohb | |
parent | c8c73af1c713d19e7a2f5e776b5691da8d17b7cd (diff) | |
download | talos-hostboot-756a8239c0619b26c5f4951d26adac634994bbef.tar.gz talos-hostboot-756a8239c0619b26c5f4951d26adac634994bbef.zip |
Real OCMB presence detection support for Axone simics
Previously a hacked up copy of OCMB presence detection that always
returned that the OCMB was present. This commit will actually look up
the VPD to determine if the OCMB is present or not.
Change-Id: Id8c51587b9e5c63dfd68d2463f24aa419426d9ab
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69905
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: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/common/xmltohb')
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_AXONE.system.xml | 370 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_hb.xml | 5 |
2 files changed, 358 insertions, 17 deletions
diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index d95b5b680..d6920ad53 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -8478,10 +8478,42 @@ <id>POSITION</id> <default>0</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>0</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>0</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0xFF</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0</value></field> + </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> @@ -8511,10 +8543,43 @@ <id>POSITION</id> <default>1</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>1</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>1</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>0</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x08</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8544,10 +8609,43 @@ <id>POSITION</id> <default>2</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>2</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>2</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x09</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8577,10 +8675,43 @@ <id>POSITION</id> <default>3</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>3</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>3</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0A</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8610,10 +8741,43 @@ <id>POSITION</id> <default>4</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>4</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>4</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0B</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8643,10 +8807,43 @@ <id>POSITION</id> <default>5</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>5</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>5</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0C</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8676,10 +8873,43 @@ <id>POSITION</id> <default>6</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>6</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>6</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0D</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8709,10 +8939,43 @@ <id>POSITION</id> <default>7</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>7</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>7</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0E</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8742,10 +9005,43 @@ <id>POSITION</id> <default>8</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>8</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>8</default> + </attribute> + <attribute> + <id>FAPI_I2C_CONTROL_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>port</id><value>1</value></field> + <field><id>devAddr</id><value>0xD0</value></field> + <field><id>i2cMuxBusSelector</id><value>0x0F</value></field> + <field><id>i2cMuxPath</id><value>physical:sys-0/node-0/proc-0/i2c_mux-0</value></field> + </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> @@ -8775,10 +9071,16 @@ <id>POSITION</id> <default>9</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>9</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>9</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8808,10 +9110,16 @@ <id>POSITION</id> <default>10</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>10</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>10</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8841,10 +9149,16 @@ <id>POSITION</id> <default>11</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>11</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>11</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8874,10 +9188,16 @@ <id>POSITION</id> <default>12</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>12</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>12</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8907,10 +9227,16 @@ <id>POSITION</id> <default>13</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>13</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>13</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8940,10 +9266,16 @@ <id>POSITION</id> <default>14</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>14</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>14</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <targetInstance> @@ -8973,10 +9305,16 @@ <id>POSITION</id> <default>15</default> </attribute> - <attribute> + <attribute> <id>VPD_REC_NUM</id> <default>15</default> </attribute> + <attribute> + <id>FAPI_POS</id> + <default>15</default> + </attribute> + <!-- No valid I2C connections to OCMB 9-15 in the Axone simics model + Skip setting EEPROM_VPD_PRIMARY_INFO and FAPI_I2C_CONTROL_INFO--> </targetInstance> <!-- ===================================================================== --> diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index c1217328d..61d744c4d 100644 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2012,2018 --> +<!-- Contributors Listed Below - COPYRIGHT 2012,2019 --> <!-- [+] Google Inc. --> <!-- [+] International Business Machines Corp. --> <!-- --> @@ -90,6 +90,9 @@ <default>0</default> <id>MMIO_VM_ADDR</id> </attribute> + <attribute> + <id>VPD_SWITCHES</id> + </attribute> </targetTypeExtension> <targetTypeExtension> |