Skip to content

Commit be69d0c

Browse files
markypizzdcrowell77
markypizz
authored and
dcrowell77
committed
Add TARGET_TYPE_GENERICI2CSLAVE and relevant attributes
Change-Id: I7d7579f66aba39ab8a462215417e7ab7745f3a6b Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90321 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: Louis Stermole <stermole@us.ibm.com> Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90332 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
1 parent 20b285f commit be69d0c

File tree

4 files changed

+148
-81
lines changed

4 files changed

+148
-81
lines changed

‎src/import/hwpf/fapi2/include/target_types.H

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2019 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2020 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -49,47 +49,48 @@ namespace fapi2
4949
/// Target Kind
5050
enum TargetType : uint64_t
5151
{
52-
TARGET_TYPE_NONE = 0x0000000000000000, ///< No type
53-
TARGET_TYPE_SYSTEM = 0x0000000000000001, ///< System type
54-
TARGET_TYPE_DIMM = 0x0000000000000002, ///< DIMM type
55-
TARGET_TYPE_PROC_CHIP = 0x0000000000000004, ///< Processor type
56-
TARGET_TYPE_MEMBUF_CHIP = 0x0000000000000008, ///< Membuf type
57-
TARGET_TYPE_EX = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
58-
TARGET_TYPE_MBA = 0x0000000000000020, ///< MBA type
59-
TARGET_TYPE_MCS = 0x0000000000000040, ///< MCS type
60-
TARGET_TYPE_XBUS = 0x0000000000000080, ///< XBUS type
61-
TARGET_TYPE_ABUS = 0x0000000000000100, ///< ABUS type
62-
TARGET_TYPE_L4 = 0x0000000000000200, ///< L4 type
63-
TARGET_TYPE_CORE = 0x0000000000000400, ///< Core
64-
TARGET_TYPE_EQ = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
65-
TARGET_TYPE_MCA = 0x0000000000001000, ///< MCA type
66-
TARGET_TYPE_MCBIST = 0x0000000000002000, ///< MCBIST type
67-
TARGET_TYPE_MI = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
68-
TARGET_TYPE_CAPP = 0x0000000000008000, ///< CAPP target
69-
TARGET_TYPE_DMI = 0x0000000000010000, ///< DMI type
70-
TARGET_TYPE_OBUS = 0x0000000000020000, ///< OBUS type
71-
TARGET_TYPE_OBUS_BRICK = 0x0000000000040000, ///< OBUS BRICK type
72-
TARGET_TYPE_SBE = 0x0000000000080000, ///< SBE type
73-
TARGET_TYPE_PPE = 0x0000000000100000, ///< PPE type
74-
TARGET_TYPE_PERV = 0x0000000000200000, ///< Pervasive type
75-
TARGET_TYPE_PEC = 0x0000000000400000, ///< PEC type
76-
TARGET_TYPE_PHB = 0x0000000000800000, ///< PHB type
77-
TARGET_TYPE_MC = 0x0000000001000000, ///< MC type
78-
TARGET_TYPE_OMI = 0x0000000002000000, ///< OMI type
79-
TARGET_TYPE_OMIC = 0x0000000004000000, ///< OMIC type
80-
TARGET_TYPE_MCC = 0x0000000008000000, ///< MCC type
81-
TARGET_TYPE_OCMB_CHIP = 0x0000000010000000, ///< OCMB type
82-
TARGET_TYPE_MEM_PORT = 0x0000000020000000, ///< MEM_PORT type
83-
TARGET_TYPE_NMMU = 0x0000000040000000, ///< NEST MMU type
84-
TARGET_TYPE_RESERVED = 0x0000000080000000, ///< Reserved for Cronus (Z)
85-
TARGET_TYPE_PAU = 0x0000000100000000, ///< PAU type
86-
TARGET_TYPE_IOHS = 0x0000000200000000, ///< IOHS type
87-
TARGET_TYPE_FC = 0x0000000400000000, ///< Fused Core type
88-
TARGET_TYPE_PMIC = 0x0000000800000000, ///< PMIC type
89-
TARGET_TYPE_PAUC = 0x0000001000000000, ///< PAUC type
90-
TARGET_TYPE_MULTICAST = 0x8000000000000000, ///< MULTICAST type
91-
TARGET_TYPE_ALL = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
92-
TARGET_TYPE_ALL_MC = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
52+
TARGET_TYPE_NONE = 0x0000000000000000, ///< No type
53+
TARGET_TYPE_SYSTEM = 0x0000000000000001, ///< System type
54+
TARGET_TYPE_DIMM = 0x0000000000000002, ///< DIMM type
55+
TARGET_TYPE_PROC_CHIP = 0x0000000000000004, ///< Processor type
56+
TARGET_TYPE_MEMBUF_CHIP = 0x0000000000000008, ///< Membuf type
57+
TARGET_TYPE_EX = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
58+
TARGET_TYPE_MBA = 0x0000000000000020, ///< MBA type
59+
TARGET_TYPE_MCS = 0x0000000000000040, ///< MCS type
60+
TARGET_TYPE_XBUS = 0x0000000000000080, ///< XBUS type
61+
TARGET_TYPE_ABUS = 0x0000000000000100, ///< ABUS type
62+
TARGET_TYPE_L4 = 0x0000000000000200, ///< L4 type
63+
TARGET_TYPE_CORE = 0x0000000000000400, ///< Core
64+
TARGET_TYPE_EQ = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
65+
TARGET_TYPE_MCA = 0x0000000000001000, ///< MCA type
66+
TARGET_TYPE_MCBIST = 0x0000000000002000, ///< MCBIST type
67+
TARGET_TYPE_MI = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
68+
TARGET_TYPE_CAPP = 0x0000000000008000, ///< CAPP target
69+
TARGET_TYPE_DMI = 0x0000000000010000, ///< DMI type
70+
TARGET_TYPE_OBUS = 0x0000000000020000, ///< OBUS type
71+
TARGET_TYPE_OBUS_BRICK = 0x0000000000040000, ///< OBUS BRICK type
72+
TARGET_TYPE_SBE = 0x0000000000080000, ///< SBE type
73+
TARGET_TYPE_PPE = 0x0000000000100000, ///< PPE type
74+
TARGET_TYPE_PERV = 0x0000000000200000, ///< Pervasive type
75+
TARGET_TYPE_PEC = 0x0000000000400000, ///< PEC type
76+
TARGET_TYPE_PHB = 0x0000000000800000, ///< PHB type
77+
TARGET_TYPE_MC = 0x0000000001000000, ///< MC type
78+
TARGET_TYPE_OMI = 0x0000000002000000, ///< OMI type
79+
TARGET_TYPE_OMIC = 0x0000000004000000, ///< OMIC type
80+
TARGET_TYPE_MCC = 0x0000000008000000, ///< MCC type
81+
TARGET_TYPE_OCMB_CHIP = 0x0000000010000000, ///< OCMB type
82+
TARGET_TYPE_MEM_PORT = 0x0000000020000000, ///< MEM_PORT type
83+
TARGET_TYPE_NMMU = 0x0000000040000000, ///< NEST MMU type
84+
TARGET_TYPE_RESERVED = 0x0000000080000000, ///< Reserved for Cronus (Z)
85+
TARGET_TYPE_PAU = 0x0000000100000000, ///< PAU type
86+
TARGET_TYPE_IOHS = 0x0000000200000000, ///< IOHS type
87+
TARGET_TYPE_FC = 0x0000000400000000, ///< Fused Core type
88+
TARGET_TYPE_PMIC = 0x0000000800000000, ///< PMIC type
89+
TARGET_TYPE_PAUC = 0x0000001000000000, ///< PAUC type
90+
TARGET_TYPE_GENERICI2CSLAVE = 0x0000002000000000, ///< GENERICI2CSLAVE type
91+
TARGET_TYPE_MULTICAST = 0x8000000000000000, ///< MULTICAST type
92+
TARGET_TYPE_ALL = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
93+
TARGET_TYPE_ALL_MC = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
9394

9495
// Compound target types
9596
TARGET_TYPE_CHIPS = TARGET_TYPE_PROC_CHIP |

‎src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- -->
66
<!-- OpenPOWER HostBoot Project -->
77
<!-- -->
8-
<!-- Contributors Listed Below - COPYRIGHT 2015,2019 -->
8+
<!-- Contributors Listed Below - COPYRIGHT 2015,2020 -->
99
<!-- [+] International Business Machines Corp. -->
1010
<!-- -->
1111
<!-- -->
@@ -41,7 +41,8 @@
4141
TARGET_TYPE_DIMM,
4242
TARGET_TYPE_L4,TARGET_TYPE_MC,
4343
TARGET_TYPE_MEM_PORT,
44-
TARGET_TYPE_PMIC
44+
TARGET_TYPE_PMIC,
45+
TARGET_TYPE_GENERICI2CSLAVE
4546
</targetType>
4647
<description>
4748
1 if the target is functional, else 0. Set by the platform.
@@ -58,7 +59,8 @@
5859
<id>ATTR_POS</id>
5960
<targetType>
6061
TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP,
61-
TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC
62+
TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC,
63+
TARGET_TYPE_GENERICI2CSLAVE
6264
</targetType>
6365
<description>
6466
Physical position of chip/dimm within drawer
@@ -81,7 +83,8 @@
8183
TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
8284
TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
8385
TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4, TARGET_TYPE_MC,
84-
TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
86+
TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
87+
TARGET_TYPE_GENERICI2CSLAVE
8588
</targetType>
8689
<description>
8790
Logical position of target within a system. This is derived from the SMP location
@@ -112,7 +115,8 @@
112115
TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4,
113116
TARGET_TYPE_MEM_PORT,
114117
TARGET_TYPE_DIMM,
115-
TARGET_TYPE_PMIC
118+
TARGET_TYPE_PMIC,
119+
TARGET_TYPE_GENERICI2CSLAVE
116120
</targetType>
117121
<description>
118122
A target's position relative to its immediate parent target.
@@ -130,6 +134,7 @@
130134
PROC - MC - MI - MCC - OMI
131135
(OMIC - OMI is not supported)
132136
OCMB - PMIC
137+
OCMB - GENERICI2CSLAVE
133138
MEMBUF - MBA - DIMM
134139
MEMBUF - L4
135140
OCMB - MEM_PORT - DIMM

‎src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,32 @@
2323
<!-- -->
2424
<!-- IBM_PROLOG_END_TAG -->
2525
<attributes>
26+
<!-- ******************************************************************************** -->
27+
<attribute>
28+
<id>ATTR_I2C_DEV_TYPE</id>
29+
<targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
30+
<description>
31+
Device type of I2C slave device
32+
</description>
33+
<enum>
34+
ADS7138_ADC,
35+
PCA9554A_GPIO_EXPANDER
36+
</enum>
37+
<valueType>uint8</valueType>
38+
<platInit/>
39+
<default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
40+
</attribute>
41+
<!-- ******************************************************************************** -->
42+
<attribute>
43+
<id>ATTR_I2C_SUB_POS</id>
44+
<targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
45+
<description>
46+
Represents the ordinal position of this target compared to other peer
47+
GENERICI2CSLAVE targets with the same ATTR_I2C_DEV_TYPE
48+
</description>
49+
<valueType>uint8</valueType>
50+
<platInit/>
51+
<default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
52+
</attribute>
53+
<!-- ******************************************************************************** -->
2654
</attributes>

0 commit comments

Comments
 (0)