summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/usr/isteps/istep06list.H1
-rw-r--r--src/include/usr/isteps/istep08list.H30
-rw-r--r--src/include/usr/isteps/istep09list.H33
-rw-r--r--src/usr/isteps/istep08/call_host_p9_fbc_eff_config.C64
-rw-r--r--src/usr/isteps/istep08/call_host_p9_fbc_eff_config_links.C74
-rw-r--r--src/usr/isteps/istep08/makefile8
-rw-r--r--src/usr/isteps/istep09/call_host_fbc_eff_config_aggregate.C87
-rw-r--r--src/usr/isteps/istep09/makefile19
-rw-r--r--src/usr/targeting/attrsync.C5
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types.xml69
-rw-r--r--src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml4
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/target_types.xml31
12 files changed, 379 insertions, 46 deletions
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 0b346ea71..19c21176d 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -154,7 +154,6 @@ void* host_start_occ_xstop_handler (void * io_pArgs);
*/
void* call_host_voltage_config (void * io_pArgs);
-
};
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index 6f25fbb61..f9f568704 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -129,6 +129,24 @@ void* call_proc_check_slave_sbe_seeprom_complete(void *io_pArgs);
void* call_proc_cen_ref_clk_enable(void *io_pArgs);
/**
+ * @brief host_p9_fbc_eff_config
+ *
+ * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct,
+ * or NULL.
+ * return any error logs to istep
+ */
+void* call_host_p9_fbc_eff_config (void * io_pArgs);
+
+/**
+ * @brief host_p9_fbc_eff_config_links
+ *
+ * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct,
+ * or NULL.
+ * return any error logs to istep
+ */
+void* call_host_p9_fbc_eff_config_links (void * io_pArgs);
+
+/**
* @brief call_proc_attr_update
*
* Stub to enable platforms to override attributes
@@ -300,14 +318,14 @@ namespace INITSERVICE
{ NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
- ISTEPNAME(08,08,"host_p9_fbc_eff_config"), // @TODO-RTC:154376
- NULL,
- { NONE, EXT_IMAGE, IPL_NOOP, false }
+ ISTEPNAME(08,08,"host_p9_fbc_eff_config"),
+ ISTEP_08::call_host_p9_fbc_eff_config,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
- ISTEPNAME(08,09,"host_p9_eff_config_links"),// @TODO-RTC:154376
- NULL,
- { NONE, EXT_IMAGE, IPL_NOOP, false }
+ ISTEPNAME(08,09,"host_p9_eff_config_links"),
+ ISTEP_08::call_host_p9_fbc_eff_config_links,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(08,10,"proc_attr_update"),
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index 10b2b9c9b..41ec12237 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -70,7 +70,7 @@ namespace ISTEP_09
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_fabric_erepair( void *io_pArgs );
@@ -84,7 +84,7 @@ void* call_fabric_erepair( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_fabric_io_dccal( void *io_pArgs );
@@ -98,7 +98,7 @@ void* call_fabric_io_dccal( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_fabric_pre_trainadv( void *io_pArgs );
@@ -112,7 +112,7 @@ void* call_fabric_pre_trainadv( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_fabric_io_run_training( void *io_pArgs );
@@ -126,7 +126,7 @@ void* call_fabric_io_run_training( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_fabric_post_trainadv( void *io_pArgs );
@@ -152,7 +152,7 @@ void* call_proc_smp_link_layer( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_host_startprd_pbus( void *io_pArgs );
@@ -166,7 +166,7 @@ void* call_host_startprd_pbus( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_host_attnlisten_proc( void *io_pArgs );
@@ -180,12 +180,25 @@ void* call_host_attnlisten_proc( void *io_pArgs );
*
* param[in,out] - pointer to any arguments, usually NULL
*
- * return any errlogs to istep
+ * return any errlogs to istep
*
*/
void* call_proc_fab_iovalid( void *io_pArgs );
+
+/**
+ * @brief host_fbc_eff_config_aggregate
+ *
+ * Aggregate the FBC configuration
+ *
+ * param[in,out] - pointer to any arguments, usually NULL
+ *
+ * return any errlogs to istep
+ *
+ */
+void* call_host_fbc_eff_config_aggregate( void *io_pArgs );
+
}; // end namespace
@@ -235,8 +248,8 @@ namespace INITSERVICE
},
{
ISTEPNAME(09,08,"host_fbc_eff_config_aggregate"),
- NULL, // @TODO-RTC:154376
- { NONE, EXT_IMAGE, IPL_NOOP, false }
+ ISTEP_09::call_host_fbc_eff_config_aggregate,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
};
diff --git a/src/usr/isteps/istep08/call_host_p9_fbc_eff_config.C b/src/usr/isteps/istep08/call_host_p9_fbc_eff_config.C
new file mode 100644
index 000000000..75f8de7be
--- /dev/null
+++ b/src/usr/isteps/istep08/call_host_p9_fbc_eff_config.C
@@ -0,0 +1,64 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/isteps/istep08/call_host_p9_fbc_eff_config.C $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2016 */
+/* [+] 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 */
+#include <stdint.h>
+#include <trace/interface.H>
+#include <errl/errlentry.H>
+#include <errl/errlmanager.H>
+#include <initservice/taskargs.H>
+#include <initservice/isteps_trace.H>
+#include <initservice/initserviceif.H>
+#include <isteps/hwpisteperror.H>
+#include <fapi2/plat_hwp_invoker.H>
+#include <p9_fbc_eff_config.H>
+
+namespace ISTEP_08
+{
+
+void* call_host_p9_fbc_eff_config( void *io_pArgs )
+{
+ errlHndl_t l_errl = NULL;
+ ISTEP_ERROR::IStepError l_stepError;
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_p9_fbc_eff_config entry" );
+
+ FAPI_INVOKE_HWP(l_errl,p9_fbc_eff_config);
+ if(l_errl)
+ {
+ l_stepError.addErrorDetails(l_errl);
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "ERROR : call p9_fbc_eff_config, PLID=0x%x",
+ l_errl->plid() );
+ errlCommit(l_errl, HWPF_COMP_ID);
+ }
+
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_p9_fbc_eff_config exit" );
+
+ return l_stepError.getErrorHandle();
+}
+
+};
diff --git a/src/usr/isteps/istep08/call_host_p9_fbc_eff_config_links.C b/src/usr/isteps/istep08/call_host_p9_fbc_eff_config_links.C
new file mode 100644
index 000000000..9df8eb25b
--- /dev/null
+++ b/src/usr/isteps/istep08/call_host_p9_fbc_eff_config_links.C
@@ -0,0 +1,74 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/isteps/istep08/call_host_p9_fbc_eff_config_links.C $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2016 */
+/* [+] 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 */
+#include <stdint.h>
+#include <trace/interface.H>
+#include <errl/errlentry.H>
+#include <errl/errlmanager.H>
+#include <initservice/taskargs.H>
+#include <initservice/isteps_trace.H>
+#include <initservice/initserviceif.H>
+#include <isteps/hwpisteperror.H>
+#include <fapi2/plat_hwp_invoker.H>
+#include <fapi2/target.H>
+#include <p9_fbc_eff_config_links.H>
+
+namespace ISTEP_08
+{
+
+void* call_host_p9_fbc_eff_config_links( void *io_pArgs )
+{
+ errlHndl_t l_errl = NULL;
+ ISTEP_ERROR::IStepError l_stepError;
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_p9_fbc_eff_config_links entry" );
+
+ TARGETING::TargetHandleList l_procChips;
+ getAllChips( l_procChips, TARGETING::TYPE_PROC);
+ for (const auto & l_procChip: l_procChips)
+ {
+ fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>l_fapi2CpuTarget(l_procChip);
+ FAPI_INVOKE_HWP(l_errl,p9_fbc_eff_config_links,l_fapi2CpuTarget,
+ SMP_ACTIVATE_PHASE1,
+ true,false);
+ if(l_errl)
+ {
+ l_stepError.addErrorDetails(l_errl);
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "ERROR : call call_host_p9_fbc_eff_config_links, "
+ "PLID=0x%x",
+ l_errl->plid() );
+ errlCommit(l_errl, HWPF_COMP_ID);
+ }
+ }
+
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_p9_fbc_eff_config_links exit" );
+
+ return l_stepError.getErrorHandle();
+}
+
+};
diff --git a/src/usr/isteps/istep08/makefile b/src/usr/isteps/istep08/makefile
index d111bf8f4..9f797a793 100644
--- a/src/usr/isteps/istep08/makefile
+++ b/src/usr/isteps/istep08/makefile
@@ -44,6 +44,8 @@ OBJS += call_host_setup_sbe.o
OBJS += call_host_cbs_start.o
OBJS += call_proc_check_slave_sbe_seeprom_complete.o
OBJS += call_proc_cen_ref_clk_enable.o
+OBJS += call_host_p9_fbc_eff_config.o
+OBJS += call_host_p9_fbc_eff_config_links.o
OBJS += call_proc_attr_update.o
OBJS += call_proc_enable_osclite.o
OBJS += call_proc_chiplet_scominit.o
@@ -79,6 +81,12 @@ include ${PROCEDURES_PATH}/hwp/sbe/p9_get_sbe_msg_register.mk
# proc_cen_ref_clk_enable
# Cummulus only -- p9_cen_ref_clk_enable.mk not defined yet
+# host_p9_fbc_eff_config
+include ${PROCEDURES_PATH}/hwp/nest/p9_fbc_eff_config.mk
+
+# host_p9_fbc_eff_config_links
+include ${PROCEDURES_PATH}/hwp/nest/p9_fbc_eff_config_links.mk
+
# proc_attr_update: Proc ATTR Update
include ${PROCEDURES_PATH}/hwp/nest/p9_attr_update.mk
diff --git a/src/usr/isteps/istep09/call_host_fbc_eff_config_aggregate.C b/src/usr/isteps/istep09/call_host_fbc_eff_config_aggregate.C
new file mode 100644
index 000000000..b2a3d0751
--- /dev/null
+++ b/src/usr/isteps/istep09/call_host_fbc_eff_config_aggregate.C
@@ -0,0 +1,87 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/isteps/istep09/call_host_fbc_eff_config_aggregate.C $ */
+/* */
+/* OpenPOWER HostBoot Project */
+/* */
+/* Contributors Listed Below - COPYRIGHT 2016 */
+/* [+] 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 */
+/******************************************************************************/
+// Includes
+/******************************************************************************/
+#include <stdint.h>
+
+#include <trace/interface.H>
+#include <initservice/taskargs.H>
+#include <errl/errlentry.H>
+
+#include <isteps/hwpisteperror.H>
+#include <errl/errludtarget.H>
+
+#include <initservice/isteps_trace.H>
+
+// targeting support
+#include <targeting/common/commontargeting.H>
+#include <targeting/common/utilFilter.H>
+#include <targeting/common/trace.H>
+
+#include <fapi2/target.H>
+#include <fapi2/plat_hwp_invoker.H>
+#include <errl/errlmanager.H>
+
+#include <fapi2/target.H>
+#include <p9_fbc_eff_config_aggregate.H>
+
+namespace ISTEP_09
+{
+
+//
+// Wrapper function to call proc_fbc_eff_config_aggregate
+//
+void* call_host_fbc_eff_config_aggregate( void *io_pArgs )
+{
+ errlHndl_t l_errl = NULL;
+ ISTEP_ERROR::IStepError l_stepError;
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_fbc_eff_config_aggregate entry" );
+
+ TARGETING::TargetHandleList l_procChips;
+ getAllChips( l_procChips, TARGETING::TYPE_PROC);
+ for (const auto & l_procChip: l_procChips)
+ {
+ fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>l_fapi2CpuTarget(l_procChip);
+ FAPI_INVOKE_HWP(l_errl,p9_fbc_eff_config_aggregate,l_fapi2CpuTarget);
+ if(l_errl)
+ {
+ l_stepError.addErrorDetails(l_errl);
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "ERROR : call_proc_fbc_eff_config_aggregate, PLID=0x%x",
+ l_errl->plid() );
+ errlCommit(l_errl, HWPF_COMP_ID);
+ }
+ }
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call_host_fbc_eff_config_aggregate exit" );
+
+ return l_stepError.getErrorHandle();
+}
+
+};
diff --git a/src/usr/isteps/istep09/makefile b/src/usr/isteps/istep09/makefile
index de7302642..e13b7ec64 100644
--- a/src/usr/isteps/istep09/makefile
+++ b/src/usr/isteps/istep09/makefile
@@ -44,36 +44,37 @@ OBJS += call_proc_smp_link_layer.o
OBJS += call_host_startprd_pbus.o
OBJS += call_host_attnlisten_proc.o
OBJS += call_proc_fab_iovalid.o
+OBJS += call_host_fbc_eff_config_aggregate.o
VPATH += ${PROCEDURES_PATH}/hwp/nest/ ${PROCEDURES_PATH}/hwp/io/
include ${ROOTPATH}/procedure.rules.mk
#@TODO RTC:134079 Re-enable for l2 story
-# 9.1 fabric_erepair
+# fabric_erepair
# include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_restore_erepair.mk
# include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_pdwn_lanes.mk
-# 9.2 fabric_io_dccal
+# fabric_io_dccal
include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_dccal.mk
-# 9.3 fabric_pre_trainadv
+# fabric_pre_trainadv
include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_pre_trainadv.mk
#//@TODO RTC:134079 Re-enable for l2 story
-# 9.4 fabric_io_run_training
+# fabric_io_run_training
# include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_linktrain.mk
-# 9.5 fabric_post_trainadv
+# fabric_post_trainadv
include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_post_trainadv.mk
-# 9.6 proc_smp_link_layer : Start SMP link layer
+# proc_smp_link_layer : Start SMP link layer
include ${PROCEDURES_PATH}/hwp/nest/p9_smp_link_layer.mk
-# 9.7 & 9.8 - no hwp
-
-# 9.9 p9_fab_iovalid
+# p9_fab_iovalid
include ${PROCEDURES_PATH}/hwp/nest/p9_fab_iovalid.mk
+# p9_fbc_eff_config_aggregate
+include ${PROCEDURES_PATH}/hwp/nest/p9_fbc_eff_config_aggregate.mk
include ${ROOTPATH}/config.mk
diff --git a/src/usr/targeting/attrsync.C b/src/usr/targeting/attrsync.C
index eea1078dc..72dff620c 100644
--- a/src/usr/targeting/attrsync.C
+++ b/src/usr/targeting/attrsync.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -614,10 +614,7 @@ namespace TARGETING
//sys-sys-power9 - base
TARGETING::Target* l_pTopLevel = NULL;
TARGETING::targetService().getTopLevelTarget(l_pTopLevel);
- //l_pTopLevel->getAttr<ATTR_FREQ_A>(); //defaulted in attribute_types.xml
l_pTopLevel->setAttr<ATTR_FREQ_X>(0xfa0);
- //l_pTopLevel->setAttr<ATTR_MAX_MCS_PER_SYSTEM>(4); //defaulted in attribute_types.xml
- l_pTopLevel->setAttr<ATTR_NOMINAL_FREQ_MHZ>(0xf75);
//chip-base
PredicateCTM predEnc(CLASS_ENC);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 8c4df5a04..40fffc774 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -21482,46 +21482,95 @@ DEPRECATED!!!!
</attribute>
<attribute>
- <id>PROC_EPS_READ_CYCLES</id>
+ <id>PROC_EPS_READ_CYCLES_T0</id>
<!-- <targetType>TARGET_TYPE_SYSTEM</targetType> -->
<description>
- Calculated read epsilon protection count.
- Counter tier is index.
+ Calculated read tier0 epsilon protection count.
</description>
<simpleType>
<uint32_t></uint32_t>
- <array>3</array>
</simpleType>
<writeable/>
<readable/>
<persistency>volatile-zeroed</persistency>
<hwpfToHbAttrMap>
- <id>ATTR_PROC_EPS_READ_CYCLES</id>
+ <id>ATTR_PROC_EPS_READ_CYCLES_T0</id>
<macro>DIRECT</macro>
</hwpfToHbAttrMap>
</attribute>
<attribute>
- <id>PROC_EPS_WRITE_CYCLES</id>
+ <id>PROC_EPS_READ_CYCLES_T1</id>
<!-- <targetType>TARGET_TYPE_SYSTEM</targetType> -->
<description>
- Calculated write epsilon protection count.
- Counter tier is index.
+ Calculated read tier1 epsilon protection count.
</description>
<simpleType>
<uint32_t></uint32_t>
- <array>3</array>
</simpleType>
<writeable/>
<readable/>
<persistency>volatile-zeroed</persistency>
<hwpfToHbAttrMap>
- <id>ATTR_PROC_EPS_WRITE_CYCLES</id>
+ <id>ATTR_PROC_EPS_READ_CYCLES_T1</id>
<macro>DIRECT</macro>
</hwpfToHbAttrMap>
</attribute>
<attribute>
+ <id>PROC_EPS_READ_CYCLES_T2</id>
+ <!-- <targetType>TARGET_TYPE_SYSTEM</targetType> -->
+ <description>
+ Calculated read tier2 epsilon protection count.
+ </description>
+ <simpleType>
+ <uint32_t></uint32_t>
+ </simpleType>
+ <writeable/>
+ <readable/>
+ <persistency>volatile-zeroed</persistency>
+ <hwpfToHbAttrMap>
+ <id>ATTR_PROC_EPS_READ_CYCLES_T2</id>
+ <macro>DIRECT</macro>
+ </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+ <id>PROC_EPS_WRITE_CYCLES_T1</id>
+ <!-- <targetType>TARGET_TYPE_SYSTEM</targetType> -->
+ <description>
+ Calculated write tier1 epsilon protection count.
+ </description>
+ <simpleType>
+ <uint32_t></uint32_t>
+ </simpleType>
+ <writeable/>
+ <readable/>
+ <persistency>volatile-zeroed</persistency>
+ <hwpfToHbAttrMap>
+ <id>ATTR_PROC_EPS_WRITE_CYCLES_T1</id>
+ <macro>DIRECT</macro>
+ </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
+ <id>PROC_EPS_WRITE_CYCLES_T2</id>
+ <!-- <targetType>TARGET_TYPE_SYSTEM</targetType> -->
+ <description>
+ Calculated write tier2 epsilon protection count.
+ </description>
+ <simpleType>
+ <uint32_t></uint32_t>
+ </simpleType>
+ <writeable/>
+ <readable/>
+ <persistency>volatile-zeroed</persistency>
+ <hwpfToHbAttrMap>
+ <id>ATTR_PROC_EPS_WRITE_CYCLES_T2</id>
+ <macro>DIRECT</macro>
+ </hwpfToHbAttrMap>
+</attribute>
+<attribute>
<id>PROC_HTM_BAR_SIZES</id>
<!-- <targetType>TARGET_TYPE_PROC_CHIP</targetType> -->
<description> The amount of memory a user can reserve to store HTM traces.
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 0a70f1212..7a4a7b3e1 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -118,6 +118,10 @@
<id>TPM_REQUIRED</id>
<default>1</default>
</attribute>
+ <attribute>
+ <id>PROC_EPS_TABLE_TYPE</id>
+ <default>EPS_TYPE_LE</default>
+ </attribute>
</targetInstance>
<!-- System node 0 -->
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index d2a9ef988..0c791401f 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -165,10 +165,6 @@
<attribute><id>SYNC_BETWEEN_STEPS</id></attribute>
<attribute><id>SBE_IMAGE_MINIMUM_VALID_EXS</id></attribute>
<!-- End sbe_config_update attributes -->
- <!-- proc_select_boot_master attributes -->
- <attribute><id>PROC_SELECT_BOOT_MASTER</id></attribute>
- <attribute><id>PROC_SELECT_SEEPROM_IMAGE</id></attribute>
- <!-- End proc_select_boot_master attributes -->
<!-- Start erepair_thresholds.xml -->
<attribute><id>X_EREPAIR_THRESHOLD_FIELD</id></attribute>
<attribute><id>A_EREPAIR_THRESHOLD_FIELD</id></attribute>
@@ -585,6 +581,9 @@
<attribute><id>POUNDV_BUCKET_NUM</id><default>0</default></attribute>
<attribute><id>POUNDV_BUCKET_NUM_OVERRIDE</id><default>0</default></attribute>
<attribute><id>UNIT_TEST_MCA_MEMORY_SIZES</id></attribute>
+ <attribute><id>PROC_FABRIC_OPTICS_CONFIG_MODE</id></attribute>
+ <attribute><id>PROC_FABRIC_A_AGGREGATE</id></attribute>
+ <attribute><id>PROC_FABRIC_X_AGGREGATE</id></attribute>
</targetType>
@@ -2061,8 +2060,6 @@
<attribute><id>PROC_FABRIC_SMP_OPTICS_MODE</id></attribute>
<attribute><id>PROC_FABRIC_CAPI_MODE</id></attribute>
<attribute><id>PROC_FABRIC_ADDR_BAR_MODE</id></attribute>
- <attribute><id>PROC_EPS_READ_CYCLES</id></attribute>
- <attribute><id>PROC_EPS_WRITE_CYCLES</id></attribute>
<!-- HDAT Hostboot Runtime Data Info -->
<attribute><id>HDAT_HBRT_NUM_SECTIONS</id></attribute>
<attribute><id>HDAT_HBRT_SECTION_SIZE</id></attribute>
@@ -2109,6 +2106,16 @@
<attribute><id>PIBMEM_REPAIR0</id></attribute>
<attribute><id>PIBMEM_REPAIR1</id></attribute>
<attribute><id>PIBMEM_REPAIR2</id></attribute>
+ <!-- proc_fbc_eff_config -->
+ <attribute><id>PROC_FABRIC_CORE_FLOOR_RATIO</id></attribute>
+ <attribute><id>PROC_FABRIC_CORE_CEILING_RATIO</id></attribute>
+ <attribute><id>PROC_EPS_GB_PERCENTAGE</id></attribute>
+ <attribute><id>PROC_EPS_READ_CYCLES_T0</id></attribute>
+ <attribute><id>PROC_EPS_READ_CYCLES_T1</id></attribute>
+ <attribute><id>PROC_EPS_READ_CYCLES_T2</id></attribute>
+ <attribute><id>PROC_EPS_WRITE_CYCLES_T1</id></attribute>
+ <attribute><id>PROC_EPS_WRITE_CYCLES_T2</id></attribute>
+ <!-- End proc_fbc_eff_config -->
</targetType>
<!-- enc-node-power9 -->
@@ -2235,6 +2242,18 @@
<attribute><id>NHTM_TRACE_TYPE</id></attribute>
<attribute><id>CHTM_TRACE_TYPE</id></attribute>
<attribute><id>CDM_DOMAIN</id><default>FABRIC</default></attribute>
+ <!-- proc_fbc_eff_config_links -->
+ <attribute><id>PROC_FABRIC_X_ATTACHED_LINK_ID</id></attribute>
+ <attribute><id>PROC_FABRIC_X_ATTACHED_CHIP_ID</id></attribute>
+ <attribute><id>PROC_FABRIC_A_ATTACHED_LINK_ID</id></attribute>
+ <attribute><id>PROC_FABRIC_A_ATTACHED_CHIP_ID</id></attribute>
+ <attribute><id>PROC_FABRIC_X_LINK_DELAY</id></attribute>
+ <attribute><id>PROC_FABRIC_X_ADDR_DIS</id></attribute>
+ <attribute><id>PROC_FABRIC_X_AGGREGATE</id></attribute>
+ <attribute><id>PROC_FABRIC_A_LINK_DELAY</id></attribute>
+ <attribute><id>PROC_FABRIC_A_ADDR_DIS</id></attribute>
+ <attribute><id>PROC_FABRIC_A_AGGREGATE</id></attribute>
+ <!-- End proc_fbc_eff_config_links -->
</targetType>
<!-- chip-processor-nimbus -->
OpenPOWER on IntegriCloud