Skip to content

Commit 659f7f8

Browse files
devenraodevenrao
committed
target: switch to rainier generated files
Test by switching to rainier auto-genrated files and dtb file. Signed-off-by: Marri Devender Rao <[email protected]> Change-Id: Ie48623bc697e01c3c9dd22a374deb98f04d7c7bd
1 parent 0ebe149 commit 659f7f8

File tree

10 files changed

+15419
-257
lines changed

10 files changed

+15419
-257
lines changed

‎target/targeting/common/entitypath.C‎

Lines changed: 162 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,174 @@ std::string EntityPath::pathElementTypeAsString(TYPE type) const
127127
return "Sys";
128128
case TYPE_NODE:
129129
return "Node";
130+
case TYPE_DIMM:
131+
return "DIMM";
132+
case TYPE_MEMBUF:
133+
return "Membuf";
130134
case TYPE_PROC:
131-
case TYPE_MI:
132-
return "MI";
135+
return "Proc";
136+
case TYPE_FC:
137+
return "FC";
138+
case TYPE_EX:
139+
return "EX";
140+
case TYPE_CORE:
141+
return "Core";
142+
case TYPE_L2:
143+
return "L2";
144+
case TYPE_L3:
145+
return "L3";
146+
case TYPE_L4:
147+
return "L4";
148+
case TYPE_MCS:
149+
return "MCS";
150+
case TYPE_MBA:
151+
return "MBA";
152+
case TYPE_XBUS:
153+
return "XBUS";
154+
case TYPE_ABUS:
155+
return "ABUS";
156+
case TYPE_PCI:
157+
return "PCI";
158+
case TYPE_DPSS:
159+
return "DPSS";
160+
case TYPE_APSS:
161+
return "APSS";
162+
case TYPE_OCC:
163+
return "OCC";
164+
case TYPE_PSI:
165+
return "PSI";
166+
case TYPE_FSP:
167+
return "FSP";
168+
case TYPE_PNOR:
169+
return "PNOR";
170+
case TYPE_OSC:
171+
return "OSC";
172+
case TYPE_MFREFCLK:
173+
return "MFREFClock";
174+
case TYPE_TODCLK:
175+
return "TodClock";
176+
case TYPE_CONTROL_NODE:
177+
return "Control Node";
178+
case TYPE_NX:
179+
return "NX";
180+
case TYPE_PORE:
181+
return "PORE";
182+
case TYPE_OSCREFCLK:
183+
return "OSCREFClock";
184+
case TYPE_OSCPCICLK:
185+
return "OSCPCIClock";
186+
case TYPE_REFCLKENDPT:
187+
return "REFClockEndPoint";
188+
case TYPE_PCICLKENDPT:
189+
return "PCIClockEndPoint";
190+
case TYPE_PCIESWITCH:
191+
return "PCIESWITCH";
192+
case TYPE_CAPP:
193+
return "CAPP";
194+
case TYPE_FSI:
195+
return "FSI";
196+
case TYPE_EQ:
197+
return "EQ";
198+
case TYPE_MCA:
199+
return "MCA";
200+
case TYPE_MCBIST:
201+
return "MCBIST";
133202
case TYPE_MC:
134203
return "MC";
135-
case TYPE_MCC:
136-
return "MCC";
204+
case TYPE_MI:
205+
return "MI";
206+
case TYPE_DMI:
207+
return "DMI";
208+
case TYPE_OBUS:
209+
return "OBUS";
210+
case TYPE_OBUS_BRICK:
211+
return "OBUS_BRICK";
212+
case TYPE_NPU:
213+
return "NPU";
214+
case TYPE_SBE:
215+
return "SBE";
216+
case TYPE_PPE:
217+
return "PPE";
218+
case TYPE_PERV:
219+
return "PERV";
220+
case TYPE_PEC:
221+
return "PEC";
222+
case TYPE_PHB:
223+
return "PHB";
224+
case TYPE_SYSREFCLKENDPT:
225+
return "SYSREFCLKENDPT";
226+
case TYPE_MFREFCLKENDPT:
227+
return "MFREFCLKENDPT";
228+
case TYPE_TPM:
229+
return "TPM";
230+
case TYPE_SP:
231+
return "SP";
232+
case TYPE_UART:
233+
return "UART";
234+
case TYPE_PS:
235+
return "PS";
236+
case TYPE_FAN:
237+
return "FAN";
238+
case TYPE_VRM:
239+
return "VRM";
240+
case TYPE_USB:
241+
return "USB";
242+
case TYPE_ETH:
243+
return "ETH";
244+
case TYPE_PANEL:
245+
return "PANEL";
246+
case TYPE_BMC:
247+
return "BMC";
248+
case TYPE_FLASH:
249+
return "FLASH";
250+
case TYPE_SEEPROM:
251+
return "SEEPROM";
252+
case TYPE_TMP:
253+
return "TMP";
254+
case TYPE_GPIO_EXPANDER:
255+
return "GPIO_EXPANDER";
256+
case TYPE_POWER_SEQUENCER:
257+
return "POWER_SEQUENCER";
258+
case TYPE_RTC:
259+
return "RTC";
260+
case TYPE_FANCTLR:
261+
return "FANCTLR";
262+
case TYPE_SMPGROUP:
263+
return "SMPGROUP";
137264
case TYPE_OMI:
138265
return "OMI";
266+
case TYPE_OMIC:
267+
return "OMIC";
268+
case TYPE_MCC:
269+
return "MCC";
139270
case TYPE_OCMB_CHIP:
140-
return "OCMB";
271+
return "OCMB_CHIP";
272+
case TYPE_MEM_PORT:
273+
return "MEM_PORT";
274+
case TYPE_I2C_MUX:
275+
return "I2C_MUX";
276+
case TYPE_PMIC:
277+
return "PMIC";
278+
case TYPE_NMMU:
279+
return "NMMU";
280+
case TYPE_PAU:
281+
return "PAU";
282+
case TYPE_IOHS:
283+
return "IOHS";
284+
case TYPE_PAUC:
285+
return "PAUC";
286+
case TYPE_LPCREFCLKENDPT:
287+
return "LPCREFCLKENDPT";
288+
case TYPE_GENERIC_I2C_DEVICE:
289+
return "GENERIC_I2C_DEVICE";
290+
case TYPE_MDS_CTLR:
291+
return "MDS_CTLR";
292+
case TYPE_DCM:
293+
return "DCM";
294+
case TYPE_TEMP_SENSOR:
295+
return "TEMP_SENSOR";
296+
case TYPE_POWER_IC:
297+
return "POWER_IC";
141298
default:
142299
return "Unknown path type";
143300
}

‎target/targeting/target.H‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class TargetDevtreeMap;
4141
* strings, fixed-size char arrays, entity paths, enums, etc.
4242
*/
4343
using AttributeValue =
44-
std::variant<uint8_t, uint32_t, uint16_t, std::string, std::array<char, 64>,
45-
EntityPath, HW_ACCESS_METHOD, TYPE, CLASS
44+
std::variant<uint8_t, uint32_t, uint16_t, uint64_t, std::string,
45+
std::array<char, 64>, EntityPath, HW_ACCESS_METHOD, TYPE, CLASS
4646
// Add more types as you specialize more traits
4747
>;
4848

‎target/targeting/target_tmpl.H‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ template <const ATTRIBUTE_ID A>
5353
typename AttributeTraits<A>::Type Target::getAttr() const
5454
{
5555
(void)AttributeTraits<A>::readable;
56-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
56+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
5757
{
5858
return getVolatileAttr<A>();
5959
}
@@ -70,7 +70,7 @@ template <const ATTRIBUTE_ID A>
7070
typename AttributeTraits<A>::TypeStdArr Target::getAttrAsArray() const
7171
{
7272
(void)AttributeTraits<A>::readable;
73-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
73+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
7474
{
7575
return getVolatileAttr<A>();
7676
}
@@ -87,7 +87,7 @@ template <const ATTRIBUTE_ID A>
8787
bool Target::tryGetAttr(typename AttributeTraits<A>::Type& o_attrValue) const
8888
{
8989
(void)AttributeTraits<A>::readable;
90-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
90+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
9191
{
9292
o_attrValue = getVolatileAttr<A>();
9393
return true;
@@ -100,7 +100,7 @@ bool Target::tryGetAttr(
100100
typename AttributeTraits<A>::TypeStdArr& o_attrValue) const
101101
{
102102
(void)AttributeTraits<A>::readable;
103-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
103+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
104104
{
105105
o_attrValue = getVolatileAttr<A>();
106106
return true;
@@ -112,7 +112,7 @@ template <const ATTRIBUTE_ID A>
112112
void Target::setAttr(const typename AttributeTraits<A>::Type& attrValue)
113113
{
114114
(void)AttributeTraits<A>::writeable;
115-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
115+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
116116
{
117117
setVolatileAttr<A>(attrValue);
118118
return;
@@ -124,7 +124,7 @@ template <const ATTRIBUTE_ID A>
124124
void Target::setAttr(const typename AttributeTraits<A>::TypeStdArr& attrValue)
125125
{
126126
(void)AttributeTraits<A>::writeable;
127-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
127+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
128128
{
129129
setVolatileAttr<A>(attrValue);
130130
return;
@@ -136,7 +136,7 @@ template <const ATTRIBUTE_ID A>
136136
bool Target::trySetAttr(const typename AttributeTraits<A>::Type& attrValue)
137137
{
138138
(void)AttributeTraits<A>::writeable;
139-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
139+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
140140
{
141141
setVolatileAttr<A>(attrValue);
142142
return true;
@@ -149,7 +149,7 @@ bool Target::trySetAttr(
149149
const typename AttributeTraits<A>::TypeStdArr& attrValue)
150150
{
151151
(void)AttributeTraits<A>::writeable;
152-
if constexpr (requires { AttributeTraits<A>::isvolatile; })
152+
if constexpr (requires { AttributeTraits<A>::isVolatile; })
153153
{
154154
setVolatileAttr<A>(attrValue);
155155
return true;
@@ -162,7 +162,7 @@ typename AttributeTraits<A>::Type Target::getVolatileAttr() const
162162
{
163163
// compile-time validation
164164
(void)AttributeTraits<A>::readable;
165-
(void)AttributeTraits<A>::isvolatile;
165+
(void)AttributeTraits<A>::isVolatile;
166166

167167
using AttrType = typename AttributeTraits<A>::Type;
168168

@@ -191,7 +191,7 @@ template <const ATTRIBUTE_ID A>
191191
void Target::setVolatileAttr(const typename AttributeTraits<A>::Type& attrValue)
192192
{
193193
(void)AttributeTraits<A>::writeable;
194-
(void)AttributeTraits<A>::isvolatile;
194+
(void)AttributeTraits<A>::isVolatile;
195195
if (!_volatileAttributes)
196196
{
197197
_volatileAttributes.emplace();

‎target/targeting/xmltohb/attributeenums.H‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ enum ATTRIBUTE_ID
6868
ATTR_FREQ_PCIE_MHZ = 0x82f58e6,
6969
ATTR_SPI_BUS_DIV_REF = 0x3df05de,
7070
ATTR_TPM_SPI_BUS_DIV = 0x9d0a4a8,
71+
ATTR_FREQ_PAU_VPD_MHZ = 0x968f7cc,
7172
ATTR_SYSTEM_IPL_PHASE = 0x6a47337,
7273
ATTR_CONTAINED_IPL_TYPE = 0x46189b8,
7374
ATTR_CONTAINED_LOAD_PATH = 0x32f9c30,
@@ -113,6 +114,7 @@ enum ATTRIBUTE_ID
113114
ATTR_AVSBUS_RAIL = 0xcc8bf2b,
114115
ATTR_POS = 0x1903f54,
115116
ATTR_FAPI_POS = 0x80817dc,
117+
ATTR_NAME = 0xad32e60,
116118
ATTR_AFFINITY_PATH = 0xb5afcd7,
117119
ATTR_CHIPLET_ID = 0x2e5f49c,
118120
ATTR_CHIP_ID = 0x6d3696b,
@@ -133,8 +135,6 @@ enum ATTRIBUTE_ID
133135
ATTR_TYPE = 0x9484951,
134136
ATTR_DISABLE_SECURITY = 0x945a086,
135137
ATTR_EQ_GARD = 0xb6c105c,
136-
ATTR_PHYS_DEV_PATH = 0x3399013,
137-
ATTR_PHYS_BIN_PATH = 0x9db6a76,
138138
ATTR_FSI_DEVICE_PATH = 0xa356132,
139139
ATTR_FSI_PORT = 0xf10849b,
140140
ATTR_DIRECT_ACCESS_DEVICE_PATH = 0x33dfc41,
@@ -2805,6 +2805,59 @@ enum FUNCTIONAL
28052805
FUNCTIONAL_INVALID = 0xFFFFFFFF,
28062806
};
28072807

2808+
/**
2809+
* @brief Product name of a chip target. Provided by the MRW.
2810+
*/
2811+
enum NAME
2812+
{
2813+
NAME_NONE = 0x00000000,
2814+
NAME_EXPLORER = 0x00000008,
2815+
NAME_ODYSSEY = 0x0000000B,
2816+
NAME_GEMINI = 0x00000009,
2817+
NAME_P10 = 0x0000000A,
2818+
NAME_INVALID = 0x000000FF,
2819+
};
2820+
2821+
/**
2822+
* @brief Specifies target chiplet ID for scan operations via
2823+
* fapi2::putRing. If set, this attribute will override the chiplet ID
2824+
* present in the RS4 encoded scan ring image.
2825+
*/
2826+
enum SCAN_CHIPLET_OVERRIDE
2827+
{
2828+
SCAN_CHIPLET_OVERRIDE_NONE = 0x00000000,
2829+
SCAN_CHIPLET_OVERRIDE_TP = 0x00000001,
2830+
SCAN_CHIPLET_OVERRIDE_N0 = 0x00000002,
2831+
SCAN_CHIPLET_OVERRIDE_N1 = 0x00000003,
2832+
SCAN_CHIPLET_OVERRIDE_PCI0 = 0x00000008,
2833+
SCAN_CHIPLET_OVERRIDE_PCI1 = 0x00000009,
2834+
SCAN_CHIPLET_OVERRIDE_MC0 = 0x0000000C,
2835+
SCAN_CHIPLET_OVERRIDE_MC1 = 0x0000000D,
2836+
SCAN_CHIPLET_OVERRIDE_MC2 = 0x0000000E,
2837+
SCAN_CHIPLET_OVERRIDE_MC3 = 0x0000000F,
2838+
SCAN_CHIPLET_OVERRIDE_PAU0 = 0x00000010,
2839+
SCAN_CHIPLET_OVERRIDE_PAU1 = 0x00000011,
2840+
SCAN_CHIPLET_OVERRIDE_PAU2 = 0x00000012,
2841+
SCAN_CHIPLET_OVERRIDE_PAU3 = 0x00000013,
2842+
SCAN_CHIPLET_OVERRIDE_IOHS0 = 0x00000018,
2843+
SCAN_CHIPLET_OVERRIDE_IOHS1 = 0x00000019,
2844+
SCAN_CHIPLET_OVERRIDE_IOHS2 = 0x0000001A,
2845+
SCAN_CHIPLET_OVERRIDE_IOHS3 = 0x0000001B,
2846+
SCAN_CHIPLET_OVERRIDE_IOHS4 = 0x0000001C,
2847+
SCAN_CHIPLET_OVERRIDE_IOHS5 = 0x0000001D,
2848+
SCAN_CHIPLET_OVERRIDE_IOHS6 = 0x0000001E,
2849+
SCAN_CHIPLET_OVERRIDE_IOHS7 = 0x0000001F,
2850+
SCAN_CHIPLET_OVERRIDE_EQ0 = 0x00000020,
2851+
SCAN_CHIPLET_OVERRIDE_EQ1 = 0x00000021,
2852+
SCAN_CHIPLET_OVERRIDE_EQ2 = 0x00000022,
2853+
SCAN_CHIPLET_OVERRIDE_EQ3 = 0x00000023,
2854+
SCAN_CHIPLET_OVERRIDE_EQ4 = 0x00000024,
2855+
SCAN_CHIPLET_OVERRIDE_EQ5 = 0x00000025,
2856+
SCAN_CHIPLET_OVERRIDE_EQ6 = 0x00000026,
2857+
SCAN_CHIPLET_OVERRIDE_EQ7 = 0x00000027,
2858+
SCAN_CHIPLET_OVERRIDE_INVALID = 0xFFFFFFFF,
2859+
};
2860+
28082861
/**
28092862
* @brief Enumeration specifying a target's CEC degraded mode domain
28102863
*/
@@ -3571,7 +3624,7 @@ enum HW_ACCESS_METHOD
35713624
{
35723625
HW_ACCESS_METHOD_SBEFIFO = 0x00000000,
35733626
HW_ACCESS_METHOD_DIRECT_ACCESS = 0x00000001,
3574-
HW_ACCESS_METHOD_INVALID = 0x000000FF,
3627+
HW_ACCESS_METHOD_INVALID = 0xFFFFFFFF,
35753628
};
35763629

35773630
} // End namespace TARGETING

‎target/targeting/xmltohb/attributestructs.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <stdlib.h>
1919

2020
// Targeting component
21-
#include <targeting/xmltohb/builtins.h>
21+
#include<targeting/xmltohb/builtins.h>
2222

2323
#include <targeting/common/entitypath.H>
2424

0 commit comments

Comments
 (0)