summaryrefslogtreecommitdiffstats
path: root/src/import/hwpf
diff options
context:
space:
mode:
Diffstat (limited to 'src/import/hwpf')
-rw-r--r--src/import/hwpf/fapi2/include/error_info.H8
-rw-r--r--src/import/hwpf/fapi2/include/error_info_defs.H23
-rw-r--r--src/import/hwpf/fapi2/include/fapi2_hw_access.H3
-rw-r--r--src/import/hwpf/fapi2/include/target_types.H96
-rw-r--r--src/import/hwpf/fapi2/include/variable_buffer.H4
-rw-r--r--src/import/hwpf/fapi2/src/error_info.C15
-rwxr-xr-xsrc/import/hwpf/fapi2/tools/parseErrorInfo.pl13
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml5
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml17
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml54
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml101
-rw-r--r--src/import/hwpf/fapi2/xml/attribute_info/system_attributes.xml5
12 files changed, 246 insertions, 98 deletions
diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H
index c6717a3bb..e67e376e0 100644
--- a/src/import/hwpf/fapi2/include/error_info.H
+++ b/src/import/hwpf/fapi2/include/error_info.H
@@ -311,12 +311,14 @@ struct ErrorInfoCDG
/// @param[in] i_deconfigure True if Target should be deconfigured
/// @param[in] i_gard True if Target should be GARDed
/// @param[in] i_priority The priority of any callout
+ /// @param[in] i_gardType Type of GARD
///
ErrorInfoCDG(const Target<TARGET_TYPE_ALL>& i_target,
const bool i_callout,
const bool i_deconfigure,
const bool i_gard,
- const CalloutPriorities::CalloutPriority i_priority);
+ const CalloutPriorities::CalloutPriority i_priority,
+ const GardTypes::GardType i_gardType);
#ifdef FAPI_CUSTOM_MALLOC
///
@@ -348,6 +350,9 @@ struct ErrorInfoCDG
// GARD Information
bool iv_gard;
+
+ // GARD Type
+ GardTypes::GardType iv_gardType;
};
///
@@ -598,6 +603,7 @@ struct ErrorInfoEntryTargetCDG
uint8_t iv_deconfigure;
uint8_t iv_gard;
uint8_t iv_calloutPriority;
+ uint8_t iv_gardType;
void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
const void* const* i_object) const;
};
diff --git a/src/import/hwpf/fapi2/include/error_info_defs.H b/src/import/hwpf/fapi2/include/error_info_defs.H
index 3f8fc9de6..bed1add8e 100644
--- a/src/import/hwpf/fapi2/include/error_info_defs.H
+++ b/src/import/hwpf/fapi2/include/error_info_defs.H
@@ -278,6 +278,29 @@ enum CollectTrace
};
}
+///
+/// @enum gardType
+///
+/// This enumeration defines the possible gard types
+/// NOTE:This gardType is same as the gard types defined in HWAS
+/// so they should always be kept in sync.
+///
+namespace GardTypes
+{
+enum GardType
+{
+ GARD_NULL = 0x00,
+ GARD_User_Manual = 0xD2, //Manual Guard.
+ GARD_Unrecoverable = 0xE2, //TODO:RTC-76814
+ GARD_Fatal = 0xE3, //IPL Failures, and others.
+ GARD_Predictive = 0xE6, //Policy flag to disable.
+ GARD_Power = 0xE9, //Needed since EID is NOT passed in.
+ GARD_PHYP = 0xEA, //Needed since EID is NOT passed in.
+ GARD_Reconfig = 0xEB, //Force deconfig on reconfig loop
+ GARD_Void = 0xFF,
+};
+}
+
// @brief convert the processor relative sbe target instance into a fapi pos
//
// @param[in] i_targType - type of target from SBE FFDC buffer
diff --git a/src/import/hwpf/fapi2/include/fapi2_hw_access.H b/src/import/hwpf/fapi2/include/fapi2_hw_access.H
index 4c7142369..07bf77a08 100644
--- a/src/import/hwpf/fapi2/include/fapi2_hw_access.H
+++ b/src/import/hwpf/fapi2/include/fapi2_hw_access.H
@@ -91,6 +91,9 @@ inline OpModes getOpMode(void);
/// result in error.
/// i_mappings may contain an arbitrary amount of abstract/HW pairs, but the
/// function may return an error if too many mappings are specified.
+/// If the hardware supports a "broadcast" group, that must also be mapped
+/// explicitly via this function - platforms are not expected to map the
+/// broadcast group implicitly.
template< MulticastType M, typename V >
inline ReturnCode setMulticastGroupMap(const Target<TARGET_TYPE_PROC_CHIP, M, V>& i_chip,
const std::vector< MulticastGroupMapping >& i_mappings);
diff --git a/src/import/hwpf/fapi2/include/target_types.H b/src/import/hwpf/fapi2/include/target_types.H
index 16d0f9305..0eccb41a1 100644
--- a/src/import/hwpf/fapi2/include/target_types.H
+++ b/src/import/hwpf/fapi2/include/target_types.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2019 */
+/* Contributors Listed Below - COPYRIGHT 2015,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -49,46 +49,48 @@ namespace fapi2
/// Target Kind
enum TargetType : uint64_t
{
- TARGET_TYPE_NONE = 0x0000000000000000, ///< No type
- TARGET_TYPE_SYSTEM = 0x0000000000000001, ///< System type
- TARGET_TYPE_DIMM = 0x0000000000000002, ///< DIMM type
- TARGET_TYPE_PROC_CHIP = 0x0000000000000004, ///< Processor type
- TARGET_TYPE_MEMBUF_CHIP = 0x0000000000000008, ///< Membuf type
- TARGET_TYPE_EX = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
- TARGET_TYPE_MBA = 0x0000000000000020, ///< MBA type
- TARGET_TYPE_MCS = 0x0000000000000040, ///< MCS type
- TARGET_TYPE_XBUS = 0x0000000000000080, ///< XBUS type
- TARGET_TYPE_ABUS = 0x0000000000000100, ///< ABUS type
- TARGET_TYPE_L4 = 0x0000000000000200, ///< L4 type
- TARGET_TYPE_CORE = 0x0000000000000400, ///< Core
- TARGET_TYPE_EQ = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
- TARGET_TYPE_MCA = 0x0000000000001000, ///< MCA type
- TARGET_TYPE_MCBIST = 0x0000000000002000, ///< MCBIST type
- TARGET_TYPE_MI = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
- TARGET_TYPE_CAPP = 0x0000000000008000, ///< CAPP target
- TARGET_TYPE_DMI = 0x0000000000010000, ///< DMI type
- TARGET_TYPE_OBUS = 0x0000000000020000, ///< OBUS type
- TARGET_TYPE_OBUS_BRICK = 0x0000000000040000, ///< OBUS BRICK type
- TARGET_TYPE_SBE = 0x0000000000080000, ///< SBE type
- TARGET_TYPE_PPE = 0x0000000000100000, ///< PPE type
- TARGET_TYPE_PERV = 0x0000000000200000, ///< Pervasive type
- TARGET_TYPE_PEC = 0x0000000000400000, ///< PEC type
- TARGET_TYPE_PHB = 0x0000000000800000, ///< PHB type
- TARGET_TYPE_MC = 0x0000000001000000, ///< MC type
- TARGET_TYPE_OMI = 0x0000000002000000, ///< OMI type
- TARGET_TYPE_OMIC = 0x0000000004000000, ///< OMIC type
- TARGET_TYPE_MCC = 0x0000000008000000, ///< MCC type
- TARGET_TYPE_OCMB_CHIP = 0x0000000010000000, ///< OCMB type
- TARGET_TYPE_MEM_PORT = 0x0000000020000000, ///< MEM_PORT type
- TARGET_TYPE_NMMU = 0x0000000040000000, ///< NEST MMU type
- TARGET_TYPE_RESERVED = 0x0000000080000000, ///< Reserved for Cronus (Z)
- TARGET_TYPE_PAU = 0x0000000100000000, ///< PAU type
- TARGET_TYPE_IOHS = 0x0000000200000000, ///< IOHS type
- TARGET_TYPE_FC = 0x0000000400000000, ///< Fused Core type
- TARGET_TYPE_PMIC = 0x0000000800000000, ///< PMIC type
- TARGET_TYPE_MULTICAST = 0x8000000000000000, ///< MULTICAST type
- TARGET_TYPE_ALL = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
- TARGET_TYPE_ALL_MC = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
+ TARGET_TYPE_NONE = 0x0000000000000000, ///< No type
+ TARGET_TYPE_SYSTEM = 0x0000000000000001, ///< System type
+ TARGET_TYPE_DIMM = 0x0000000000000002, ///< DIMM type
+ TARGET_TYPE_PROC_CHIP = 0x0000000000000004, ///< Processor type
+ TARGET_TYPE_MEMBUF_CHIP = 0x0000000000000008, ///< Membuf type
+ TARGET_TYPE_EX = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
+ TARGET_TYPE_MBA = 0x0000000000000020, ///< MBA type
+ TARGET_TYPE_MCS = 0x0000000000000040, ///< MCS type
+ TARGET_TYPE_XBUS = 0x0000000000000080, ///< XBUS type
+ TARGET_TYPE_ABUS = 0x0000000000000100, ///< ABUS type
+ TARGET_TYPE_L4 = 0x0000000000000200, ///< L4 type
+ TARGET_TYPE_CORE = 0x0000000000000400, ///< Core
+ TARGET_TYPE_EQ = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
+ TARGET_TYPE_MCA = 0x0000000000001000, ///< MCA type
+ TARGET_TYPE_MCBIST = 0x0000000000002000, ///< MCBIST type
+ TARGET_TYPE_MI = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
+ TARGET_TYPE_CAPP = 0x0000000000008000, ///< CAPP target
+ TARGET_TYPE_DMI = 0x0000000000010000, ///< DMI type
+ TARGET_TYPE_OBUS = 0x0000000000020000, ///< OBUS type
+ TARGET_TYPE_OBUS_BRICK = 0x0000000000040000, ///< OBUS BRICK type
+ TARGET_TYPE_SBE = 0x0000000000080000, ///< SBE type
+ TARGET_TYPE_PPE = 0x0000000000100000, ///< PPE type
+ TARGET_TYPE_PERV = 0x0000000000200000, ///< Pervasive type
+ TARGET_TYPE_PEC = 0x0000000000400000, ///< PEC type
+ TARGET_TYPE_PHB = 0x0000000000800000, ///< PHB type
+ TARGET_TYPE_MC = 0x0000000001000000, ///< MC type
+ TARGET_TYPE_OMI = 0x0000000002000000, ///< OMI type
+ TARGET_TYPE_OMIC = 0x0000000004000000, ///< OMIC type
+ TARGET_TYPE_MCC = 0x0000000008000000, ///< MCC type
+ TARGET_TYPE_OCMB_CHIP = 0x0000000010000000, ///< OCMB type
+ TARGET_TYPE_MEM_PORT = 0x0000000020000000, ///< MEM_PORT type
+ TARGET_TYPE_NMMU = 0x0000000040000000, ///< NEST MMU type
+ TARGET_TYPE_RESERVED = 0x0000000080000000, ///< Reserved for Cronus (Z)
+ TARGET_TYPE_PAU = 0x0000000100000000, ///< PAU type
+ TARGET_TYPE_IOHS = 0x0000000200000000, ///< IOHS type
+ TARGET_TYPE_FC = 0x0000000400000000, ///< Fused Core type
+ TARGET_TYPE_PMIC = 0x0000000800000000, ///< PMIC type
+ TARGET_TYPE_PAUC = 0x0000001000000000, ///< PAUC type
+ TARGET_TYPE_GENERICI2CSLAVE = 0x0000002000000000, ///< GENERICI2CSLAVE type
+ TARGET_TYPE_MULTICAST = 0x8000000000000000, ///< MULTICAST type
+ TARGET_TYPE_ALL = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
+ TARGET_TYPE_ALL_MC = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
// Compound target types
TARGET_TYPE_CHIPS = TARGET_TYPE_PROC_CHIP |
@@ -122,14 +124,16 @@ enum TargetType : uint64_t
TARGET_TYPE_NMMU |
TARGET_TYPE_PAU |
TARGET_TYPE_IOHS |
- TARGET_TYPE_FC,
+ TARGET_TYPE_FC |
+ TARGET_TYPE_PAUC,
TARGET_TYPE_MULTICASTABLE = TARGET_TYPE_CORE |
TARGET_TYPE_EQ |
- TARGET_TYPE_MCBIST |
- TARGET_TYPE_OBUS |
- TARGET_TYPE_PERV |
- TARGET_TYPE_PEC,
+ TARGET_TYPE_IOHS |
+ TARGET_TYPE_MC |
+ TARGET_TYPE_PAUC |
+ TARGET_TYPE_PEC |
+ TARGET_TYPE_PERV,
// Mappings to target types found in the error xml files
TARGET_TYPE_EX_CHIPLET = TARGET_TYPE_EX,
diff --git a/src/import/hwpf/fapi2/include/variable_buffer.H b/src/import/hwpf/fapi2/include/variable_buffer.H
index 0c1414486..5b31937d4 100644
--- a/src/import/hwpf/fapi2/include/variable_buffer.H
+++ b/src/import/hwpf/fapi2/include/variable_buffer.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2017 */
+/* Contributors Listed Below - COPYRIGHT 2015,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -475,7 +475,7 @@ class variable_buffer
///
inline fapi2::ReturnCodes flipBit( bits_type SB, bits_type L = 1)
{
- ReturnCodes rc;
+ ReturnCodes rc = FAPI2_RC_SUCCESS;
// make sure we are within our container
if((SB + L) <= this->iv_perceived_bit_length)
diff --git a/src/import/hwpf/fapi2/src/error_info.C b/src/import/hwpf/fapi2/src/error_info.C
index a3ee3c8c6..861393eb5 100644
--- a/src/import/hwpf/fapi2/src/error_info.C
+++ b/src/import/hwpf/fapi2/src/error_info.C
@@ -118,18 +118,21 @@ ErrorInfoBusCallout::ErrorInfoBusCallout(
/// @param[in] i_deconfigure True if Target should be deconfigured
/// @param[in] i_gard True if Target should be GARDed
/// @param[in] i_priority The priority of any callout
+/// @param[in] i_gardType Type of GARD
///
ErrorInfoCDG::ErrorInfoCDG(
const Target<TARGET_TYPE_ALL>& i_target,
const bool i_callout,
const bool i_deconfigure,
const bool i_gard,
- const CalloutPriorities::CalloutPriority i_priority):
+ const CalloutPriorities::CalloutPriority i_priority,
+ const GardTypes::GardType i_gardType):
iv_target(i_target),
iv_callout(i_callout),
iv_calloutPriority(i_priority),
iv_deconfigure(i_deconfigure),
- iv_gard(i_gard)
+ iv_gard(i_gard),
+ iv_gardType(i_gardType)
{}
///
@@ -336,13 +339,15 @@ void ErrorInfoEntryTargetCDG::addErrorInfo(
iv_deconfigure,
iv_gard,
static_cast<CalloutPriorities::CalloutPriority>
- (iv_calloutPriority)
+ (iv_calloutPriority),
+ static_cast<GardTypes::GardType>(iv_gardType)
);
- FAPI_DBG("addErrorInfo: Adding target 0x%lx cdg (%d:%d:%d), pri: %d",
+ FAPI_INF("addErrorInfo: Adding target 0x%lx cdg (%d:%d:%d), pri: %d, gtyp: %d",
ei->iv_target.get(),
ei->iv_callout, ei->iv_deconfigure,
- ei->iv_gard, ei->iv_calloutPriority);
+ ei->iv_gard, ei->iv_calloutPriority,
+ ei->iv_gardType);
// Add the ErrorInfo
i_info->iv_CDGs.push_back(std::shared_ptr<ErrorInfoCDG>(ei));
diff --git a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl
index c6044e5b8..75c3fe2fd 100755
--- a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl
+++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl
@@ -513,6 +513,7 @@ print CRFILE "#include <p9_quad_scom_addresses.H>\n";
print CRFILE "#include <p9_xbus_scom_addresses.H>\n";
print CRFILE "#include <cen_gen_scom_addresses.H>\n";
print CRFILE "#include <centaur_misc_constants.H>\n";
+print CRFILE "#include <explorer_scom_addresses.H>\n";
print CRFILE "namespace fapi2\n";
print CRFILE "{\n";
print CRFILE "void getAddressData(const fapi2::HwpFfdcId i_ffdcId,\n";
@@ -1266,6 +1267,10 @@ foreach my $argnum ( 0 .. $#ARGV )
# Add the Target to cdgTargetHash to be processed with any
# callout and deconfigure requests
$cdgTargetHash{ $gard->{target} }{gard} = 1;
+ if ( exists $gard->{gardType} )
+ {
+ $cdgTargetHash{ $gard->{target} }{gardType} = $gard->{gardType};
+ }
$elementsFound++;
}
if ( exists $gard->{childTargets} )
@@ -1323,6 +1328,7 @@ foreach my $argnum ( 0 .. $#ARGV )
my $priority = 'NONE';
my $deconf = 0;
my $gard = 0;
+ my $gardType = 'GARD_Fatal';
if ( exists $cdgTargetHash{$cdg}->{callout} )
{
@@ -1339,6 +1345,11 @@ foreach my $argnum ( 0 .. $#ARGV )
if ( exists $cdgTargetHash{$cdg}->{gard} )
{
$gard = 1;
+
+ if ( exists $cdgTargetHash{$cdg}->{gardType} )
+ {
+ $gardType = $cdgTargetHash{$cdg}->{gardType};
+ }
}
# Add the Target to the objectlist if it doesn't already exist
@@ -1355,6 +1366,8 @@ foreach my $argnum ( 0 .. $#ARGV )
$eiEntryStr .= " l_entries[$eiEntryCount].target_cdg.iv_gard = $gard; \\\n";
$eiEntryStr .=
" l_entries[$eiEntryCount].target_cdg.iv_calloutPriority = fapi2::CalloutPriorities::$priority; \\\n";
+ $eiEntryStr .=
+ " l_entries[$eiEntryCount].target_cdg.iv_gardType = fapi2::GardTypes::$gardType; \\\n";
$eiEntryCount++;
}
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
index e131d9065..ed6f06f2e 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
@@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2018 -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2019 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
@@ -42,7 +42,8 @@
NIMBUS = 0x5,
CUMULUS = 0x6,
AXONE = 0x7,
- EXPLORER = 0x8
+ EXPLORER = 0x8,
+ GEMINI = 0x9
</enum>
<platInit/>
<privileged/>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
index 4a97f47db..54488b163 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
@@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2019 -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2020 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
@@ -41,7 +41,8 @@
TARGET_TYPE_DIMM,
TARGET_TYPE_L4,TARGET_TYPE_MC,
TARGET_TYPE_MEM_PORT,
- TARGET_TYPE_PMIC
+ TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
1 if the target is functional, else 0. Set by the platform.
@@ -58,7 +59,8 @@
<id>ATTR_POS</id>
<targetType>
TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP,
- TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC
+ TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
Physical position of chip/dimm within drawer
@@ -81,7 +83,8 @@
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4, TARGET_TYPE_MC,
- TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
Logical position of target within a system. This is derived from the SMP location
@@ -112,7 +115,8 @@
TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4,
TARGET_TYPE_MEM_PORT,
TARGET_TYPE_DIMM,
- TARGET_TYPE_PMIC
+ TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
A target's position relative to its immediate parent target.
@@ -129,7 +133,8 @@
PROC - MC - MI - DMI
PROC - MC - MI - MCC - OMI
(OMIC - OMI is not supported)
- PROC - PMIC
+ OCMB - PMIC
+ OCMB - GENERICI2CSLAVE
MEMBUF - MBA - DIMM
MEMBUF - L4
OCMB - MEM_PORT - DIMM
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml
new file mode 100644
index 000000000..2f8356261
--- /dev/null
+++ b/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml
@@ -0,0 +1,54 @@
+<!-- IBM_PROLOG_BEGIN_TAG -->
+<!-- This is an automatically generated prolog. -->
+<!-- -->
+<!-- $Source: src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml $ -->
+<!-- -->
+<!-- OpenPOWER HostBoot Project -->
+<!-- -->
+<!-- Contributors Listed Below - COPYRIGHT 2020 -->
+<!-- [+] 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 -->
+<attributes>
+ <!-- ******************************************************************************** -->
+ <attribute>
+ <id>ATTR_I2C_DEV_TYPE</id>
+ <targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
+ <description>
+ Device type of I2C slave device
+ </description>
+ <enum>
+ ADS7138_ADC,
+ PCA9554A_GPIO_EXPANDER
+ </enum>
+ <valueType>uint8</valueType>
+ <platInit/>
+ <default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
+ </attribute>
+ <!-- ******************************************************************************** -->
+ <attribute>
+ <id>ATTR_I2C_SUB_POS</id>
+ <targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
+ <description>
+ Represents the ordinal position of this target compared to other peer
+ GENERICI2CSLAVE targets with the same ATTR_I2C_DEV_TYPE
+ </description>
+ <valueType>uint8</valueType>
+ <platInit/>
+ <default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
+ </attribute>
+ <!-- ******************************************************************************** -->
+</attributes>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
index 7af9c5474..5d5087b29 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
@@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2019 -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2020 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
@@ -40,7 +40,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
Scratch uint8_t attribute.
@@ -59,7 +60,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -79,7 +81,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -99,7 +102,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -119,7 +123,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -139,7 +144,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -159,7 +165,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -179,7 +186,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -200,7 +208,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -221,7 +230,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -242,7 +252,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -263,7 +274,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -284,7 +296,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -305,7 +318,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -326,7 +340,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -347,7 +362,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -369,7 +385,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -389,7 +406,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -409,7 +427,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -429,7 +448,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -449,7 +469,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -469,7 +490,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -489,7 +511,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -509,7 +532,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -530,7 +554,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -551,7 +576,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -572,7 +598,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -593,7 +620,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -614,7 +642,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -635,7 +664,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -656,7 +686,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -677,7 +708,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
@@ -699,7 +731,8 @@
TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
- TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+ TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+ TARGET_TYPE_GENERICI2CSLAVE
</targetType>
<description>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/system_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/system_attributes.xml
index 94b8a15ea..ea374136c 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/system_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/system_attributes.xml
@@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2018 -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2019 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
@@ -91,7 +91,8 @@
<enum>
DECONFIGURE = 0x1,
BAD_DQ_BIT_SET = 0x2,
- RCD_PARITY_ERROR = 0x4
+ RCD_PARITY_ERROR = 0x4,
+ OCMB_FW_UPDATE = 0x8
</enum>
<writeable/>
</attribute>
OpenPOWER on IntegriCloud