summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting/common/xmltohb
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/targeting/common/xmltohb')
-rwxr-xr-x[-rw-r--r--]src/usr/targeting/common/xmltohb/common.mk3
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/simics_NIMBUS.mrw.xml26
-rw-r--r--src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml34
-rwxr-xr-x[-rw-r--r--]src/usr/targeting/common/xmltohb/target_types.xml24
-rwxr-xr-x[-rw-r--r--]src/usr/targeting/common/xmltohb/target_types_hb.xml201
-rwxr-xr-x[-rw-r--r--]src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml6
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/xmltohb.pl6
7 files changed, 283 insertions, 17 deletions
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index bdc529f20..c38b36672 100644..100755
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
# [+] International Business Machines Corp.
#
#
@@ -54,6 +54,7 @@ XMLTOHB_SYSTEM_BINARIES += vbu_NAPLES_targeting.bin
XMLTOHB_SYSTEM_BINARIES += simics_VENICE_targeting.bin
XMLTOHB_SYSTEM_BINARIES += simics_MURANO_targeting.bin
XMLTOHB_SYSTEM_BINARIES += simics_NAPLES_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += simics_NIMBUS_targeting.bin
XMLTOHB_TARGETS += ${XMLTOHB_HEADER_TARGETS}
XMLTOHB_TARGETS += ${XMLTOHB_SOURCE_TARGETS}
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.mrw.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.mrw.xml
new file mode 100755
index 000000000..18398d5d7
--- /dev/null
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.mrw.xml
@@ -0,0 +1,26 @@
+<!-- IBM_PROLOG_BEGIN_TAG -->
+<!-- This is an automatically generated prolog. -->
+<!-- -->
+<!-- $Source: src/usr/targeting/common/xmltohb/simics_NIMBUS.mrw.xml $ -->
+<!-- -->
+<!-- OpenPOWER HostBoot Project -->
+<!-- -->
+<!-- Contributors Listed Below - COPYRIGHT 2015 -->
+<!-- [+] International Business Machines Corp. -->
+<!-- -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!-- http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -->
+<!-- implied. See the License for the specific language governing -->
+<!-- permissions and limitations under the License. -->
+<!-- -->
+<!-- IBM_PROLOG_END_TAG -->
+
+
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index cdbee09e1..53df0adb8 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -42,7 +42,7 @@
* Each Nimbus has 2 OBUS (OB0 and OB3)
* Each Nimbus has 2 NVBUS
* Each Nimbus has 21 PPE units (including the SBE):
- * 1 SBE, 1 Powerbus/Fabric PPE, 4 GPEs, 12 CMEs, and 3 IO PPEs. *
+ * 1 SBE, 1 Powerbus/Fabric PPE, 4 GPEs, 12 CMEs, and 3 IO PPEs. *
* Each chiplet existing in a Nimbus has 1 equivalent PERV unit
* Each Nimbus has 2 CAPP units
* Each Nimbus has 1 SBE unit
@@ -70,6 +70,22 @@
<id>EXECUTION_PLATFORM</id>
<default>1</default>
</attribute>
+ <attribute>
+ <id>SP_FUNCTIONS</id>
+ <default>
+ <field><id>fsiSlaveInit</id><value>0</value></field>
+ <field><id>mailboxEnabled</id><value>0</value></field>
+ <field><id>fsiMasterInit</id><value>0</value></field>
+ <field><id>hardwareChangeDetection</id><value>0</value></field>
+ <field><id>powerLineDisturbance</id><value>0</value></field>
+ <field><id>baseServices</id><value>0</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>NEST_FREQ_MHZ</id>
+ <default>0x960</default>
+ </attribute>
</targetInstance>
<!-- System node 0 -->
@@ -99,8 +115,8 @@
<attribute><id>POSITION</id><default>4</default></attribute>
<attribute><id>SCOM_SWITCHES</id>
<default>
- <field><id>useFsiScom</id><value>1</value></field>
- <field><id>useXscom</id><value>0</value></field>
+ <field><id>useFsiScom</id><value>0</value></field>
+ <field><id>useXscom</id><value>1</value></field>
<field><id>useInbandScom</id><value>0</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
@@ -197,6 +213,10 @@
<attribute><id>PROC_DCM_INSTALLED</id>
<default>0</default>
</attribute>
+ <attribute>
+ <id>PROC_MASTER_TYPE</id>
+ <default>ACTING_MASTER</default>
+ </attribute>
</targetInstance>
<!-- Nimbus n0p0 EQ units -->
@@ -1805,10 +1825,10 @@
<id>CHIP_UNIT</id>
<default>0</default>
</attribute>
- <attribute>
+<!-- <attribute> // @FIXME RTC 127337
<id>PEER_TARGET</id>
<default>physical:sys-0/node-0/proc-1/xbus-1</default>
- </attribute>
+ </attribute> // @FIXME RTC 127337 -->
</targetInstance>
<targetInstance>
@@ -1827,10 +1847,10 @@
<id>CHIP_UNIT</id>
<default>0</default>
</attribute>
- <attribute>
+<!-- <attribute> // @FIXME RTC 127337
<id>PEER_TARGET</id>
<default>physical:sys-0/node-0/proc-2/xbus-1</default>
- </attribute>
+ </attribute> // @FIXME RTC 127337 -->
</targetInstance>
<!-- nimbus n0p0 CAPP units -->
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 8d1ed2eef..efb45894f 100644..100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -1854,6 +1854,7 @@
<id>IS_SIMULATION</id>
<default>0</default>
</attribute>
+ <attribute><id>HB_HRMOR_NODAL_BASE</id></attribute>
<!-- Max/min config attributes -->
<attribute><id>MAX_PROC_CHIPS_PER_NODE</id></attribute>
<attribute><id>MAX_EXS_PER_PROC_CHIP</id></attribute>
@@ -1948,9 +1949,6 @@
<attribute><id>OPT_MEMMAP_GROUP_POLICY</id></attribute>
<attribute><id>BRAZOS_RX_FIFO_OVERRIDE</id></attribute>
<attribute><id>MRW_MBA_CACHELINE_INTERLEAVE_MODE_CONTROL</id></attribute>
- <attribute><id>SP_FUNCTIONS</id></attribute>
- <attribute><id>HB_SETTINGS</id></attribute>
- <attribute><id>PAYLOAD_KIND</id></attribute>
<attribute><id>MAX_PROC_CHIPS_PER_NODE</id></attribute>
<attribute><id>MAX_EXS_PER_PROC_CHIP</id></attribute>
<attribute><id>MAX_MBAS_PER_MEMBUF_CHIP</id></attribute>
@@ -1960,6 +1958,26 @@
<attribute><id>MAX_MCS_PER_SYSTEM</id></attribute>
<attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id></attribute>
<attribute><id>RUN_MAX_MEM_PATTERNS</id></attribute>
+ <attribute><id>HIDDEN_ERRLOGS_ENABLE</id></attribute>
+ <attribute><id>SP_FUNCTIONS</id></attribute>
+ <attribute><id>HB_SETTINGS</id></attribute>
+ <attribute><id>CEC_IPL_TYPE</id></attribute>
+ <attribute><id>PAYLOAD_KIND</id></attribute>
+ <attribute><id>PAYLOAD_BASE</id></attribute>
+ <attribute><id>PAYLOAD_ENTRY</id></attribute>
+ <attribute><id>NEST_FREQ_MHZ</id></attribute>
+ <attribute><id>MFG_TRACE_ENABLE</id></attribute>
+ <attribute><id>ENABLED_THREADS</id></attribute>
+ <attribute><id>ISTEP_MODE</id></attribute>
+ <attribute><id>RECONFIG_LOOP_TESTS_ENABLE</id></attribute>
+ <attribute><id>ISTEP_PAUSE_ENABLE</id></attribute>
+ <attribute><id>ISTEP_PAUSE_CONFIG</id></attribute>
+ <attribute><id>CDM_POLICIES</id></attribute>
+ <attribute><id>NOMINAL_FREQ_MHZ</id></attribute>
+ <attribute><id>MNFG_FLAGS</id></attribute>
+ <attribute><id>FABRIC_TO_PHYSICAL_NODE_MAP</id></attribute>
+ <attribute><id>MFG_TRACE_ENABLE</id></attribute>
+
</targetType>
<!-- enc-node-power9 -->
diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml
index eb69105df..c8bd5f801 100644..100755
--- a/src/usr/targeting/common/xmltohb/target_types_hb.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml
@@ -41,6 +41,203 @@
</targetTypeExtension>
<targetTypeExtension>
+ <id>sys-sys-power9</id>
+ <attribute><id>IS_MPIPL_HB</id></attribute>
+ <attribute><id>IBSCOM_ENABLE_OVERRIDE</id></attribute>
+ <attribute><id>HB_MUTEX_TEST_LOCK</id></attribute>
+ <attribute><id>HB_EXISTING_IMAGE</id></attribute>
+ <attribute><id>ADC_CHANNEL_FUNC_IDS</id></attribute>
+ <attribute><id>ADC_CHANNEL_SENSOR_NUMBERS</id></attribute>
+ <attribute><id>ADC_CHANNEL_GNDS</id></attribute>
+ <attribute><id>ADC_CHANNEL_GAINS</id></attribute>
+ <attribute><id>ADC_CHANNEL_OFFSETS</id></attribute>
+ <attribute><id>APSS_GPIO_PORT_MODES</id></attribute>
+ <attribute><id>APSS_GPIO_PORT_PINS</id></attribute>
+ <attribute><id>OPEN_POWER_DIMM_THROTTLE_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_DIMM_ERROR_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_MEMCTRL_THROTTLE_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_PROC_DVFS_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_MEMCTRL_ERROR_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_N_BULK_POWER_LIMIT_WATTS</id></attribute>
+ <attribute><id>OPEN_POWER_N_MAX_MEM_POWER_WATTS</id></attribute>
+ <attribute><id>OPEN_POWER_MEMCTRL_READ_TIMEOUT_SEC</id></attribute>
+ <attribute><id>OPEN_POWER_DIMM_READ_TIMEOUT_SEC</id></attribute>
+ <attribute><id>OPEN_POWER_PROC_ERROR_TEMP_DEG_C</id></attribute>
+ <attribute><id>OPEN_POWER_MIN_MEM_UTILIZATION_THROTTLING</id></attribute>
+ <attribute><id>OPEN_POWER_PROC_READ_TIMEOUT_SEC</id></attribute>
+ <attribute><id>OPEN_POWER_REGULATOR_EFFICIENCY_FACTOR</id></attribute>
+ <attribute><id>OPEN_POWER_MIN_POWER_CAP_WATTS</id></attribute>
+ <attribute><id>OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS</id></attribute>
+ <attribute><id>OPEN_POWER_N_PLUS_ONE_MAX_MEM_POWER_WATTS</id></attribute>
+ <attribute><id>OPEN_POWER_TURBO_MODE_SUPPORTED</id></attribute>
+ <attribute><id>OCC_CONTROL_DATA</id></attribute>
+ <attribute><id>OPAL_MODEL</id></attribute>
+ <attribute><id>HTMGT_SAFEMODE</id></attribute>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>IPMI_MAX_BUFFER_SIZE</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>enc-node-power9</id>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>PART_NUMBER</id></attribute>
+ <attribute><id>SERIAL_NUMBER</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>chip-processor</id>
+ <attribute>
+ <id>FSI_MASTER_MUTEX</id>
+ </attribute>
+ <attribute>
+ <id>FSI_SCOM_MUTEX</id>
+ </attribute>
+ <attribute>
+ <id>SCOM_IND_MUTEX</id>
+ </attribute>
+ <attribute><id>SCAN_MUTEX</id></attribute>
+ <attribute>
+ <id>SLW_IMAGE_ADDR</id>
+ </attribute>
+ <attribute>
+ <id>SLW_IMAGE_SIZE</id>
+ </attribute>
+ <attribute>
+ <id>HOMER_PHYS_ADDR</id>
+ </attribute>
+ <attribute>
+ <id>HOMER_VIRT_ADDR</id>
+ </attribute>
+ <attribute>
+ <id>VPD_SWITCHES</id>
+ </attribute>
+ <attribute>
+ <id>SERIAL_NUMBER</id>
+ </attribute>
+ <attribute>
+ <id>PART_NUMBER</id>
+ </attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>chip-processor-power9</id>
+ <attribute>
+ <id>I2C_ENGINE_MUTEX_0</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>I2C_ENGINE_MUTEX_1</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>I2C_ENGINE_MUTEX_2</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>XSCOM_VIRTUAL_ADDR</id>
+ </attribute>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetTypeExtension>
+
+<!-- Centaur chip/DMI -->
+
+<targetTypeExtension>
+ <id>chip-membuf-centaur</id>
+ <attribute>
+ <id>FSI_SCOM_MUTEX</id>
+ </attribute>
+ <attribute>
+ <id>SCOM_IND_MUTEX</id>
+ </attribute>
+ <attribute><id>SCAN_MUTEX</id></attribute>
+ <attribute>
+ <id>IBSCOM_VIRTUAL_ADDR</id>
+ </attribute>
+ <attribute>
+ <id>IBSCOM_MUTEX</id>
+ </attribute>
+ <attribute>
+ <id>I2C_ENGINE_MUTEX_0</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>I2C_ENGINE_MUTEX_1</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>GPIO_INFO</id>
+ </attribute>
+ <attribute><id>VPD_SWITCHES</id></attribute>
+ <attribute>
+ <id>ISDIMM_MBVPD_INDEX</id>
+ </attribute>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>PART_NUMBER</id></attribute>
+ <attribute><id>SERIAL_NUMBER</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>unit-core-power9</id>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>unit-ex-power9</id>
+ <attribute>
+ <id>HB_PM_SPWUP_OHA_FLAG</id>
+ </attribute>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>enc-node-power9</id>
+ <attribute><id>VPD_SWITCHES</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>lcard-dimm</id>
+ <attribute><id>VPD_SWITCHES</id></attribute>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+ <attribute><id>PART_NUMBER</id></attribute>
+ <attribute><id>SERIAL_NUMBER</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>occ</id>
+ <attribute>
+ <id>PSTATE_TABLE</id>
+ </attribute>
+ <attribute><id>IPMI_SENSORS</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>unit-mba-power8</id>
+ <attribute><id>OT_MIN_N_PER_MBA</id></attribute>
+ <attribute><id>N_PLUS_ONE_N_PER_MBA</id></attribute>
+ <attribute><id>N_PLUS_ONE_N_PER_CHIP</id></attribute>
+ <attribute><id>OVERSUB_N_PER_MBA</id></attribute>
+ <attribute><id>OVERSUB_N_PER_CHIP</id></attribute>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetTypeExtension>
+
+<targetTypeExtension>
+ <id>unit-mcs-nimbus</id>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetTypeExtension>
+
+<targetType>
+ <id>unit-xbus-nimbus</id>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetType>
+
+<targetType>
+ <id>unit-abus-power8</id>
+ <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
+</targetType>
+
+<targetTypeExtension>
<id>sys-sys-power8</id>
<attribute><id>IS_MPIPL_HB</id></attribute>
<attribute><id>IBSCOM_ENABLE_OVERRIDE</id></attribute>
@@ -254,9 +451,5 @@
<attribute><id>HB_TARGET_SCOMABLE</id></attribute>
</targetType>
-<targetType>
- <id>unit-abus-power8</id>
- <attribute><id>HB_TARGET_SCOMABLE</id></attribute>
-</targetType>
</attributes>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml b/src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml
index 02b576858..35769bc38 100644..100755
--- a/src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml
@@ -1,11 +1,13 @@
<!-- IBM_PROLOG_BEGIN_TAG -->
<!-- This is an automatically generated prolog. -->
<!-- -->
-<!-- $Source: src/usr/targeting/common/xmltohb/vbu_MURANO.mrw.xml $ -->
+<!-- $Source: src/usr/targeting/common/xmltohb/vbu_NAPLES.mrw.xml $ -->
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014 -->
+<!-- Contributors Listed Below - COPYRIGHT 2014,2015 -->
+<!-- [+] International Business Machines Corp. -->
+<!-- -->
<!-- -->
<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
<!-- you may not use this file except in compliance with the License. -->
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index 53032d632..709271bc0 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -5111,6 +5111,12 @@ sub generateTargetingImage {
$targetNodeInstance = $targetInstance;
next;
}
+ elsif(($targetInstance->{type} eq "enc-node-power9") && ($targetNodeCnt == 0))
+ {
+ $targetNodeCnt = 1;
+ $targetNodeInstance = $targetInstance;
+ next;
+ }
push(@targetsAoH, $targetInstance);
}
unshift(@targetsAoH, $targetSystemInstance);
OpenPOWER on IntegriCloud