diff options
| author | Thi Tran <thi@us.ibm.com> | 2017-05-23 17:43:46 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-07 16:44:30 -0400 |
| commit | 60efe9859832b897e2a924900c7789db28572e35 (patch) | |
| tree | 967e1476ab3ab8a735ad2f05f644a919e7daab75 /src/import/chips | |
| parent | c42c2ea443c063c521462ce1647f1b6fd4e26843 (diff) | |
| download | talos-hostboot-60efe9859832b897e2a924900c7789db28572e35.tar.gz talos-hostboot-60efe9859832b897e2a924900c7789db28572e35.zip | |
P9 Cumulus InitCompiler supportis - Part 3
- Update *.mk files to support p9c chip ID
- Workaround some spy issues p9c 10 engd issues
- Fix bug to allow compilation without ENGD
Change-Id: Ie94b55c93081108668725d3ee9b88bd34eaa794f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40904
Tested-by: Jenkins Server <pfd-jenkins+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: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40953
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips')
10 files changed, 401 insertions, 367 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C index 7072d5413..23f6b7e83 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C @@ -51,7 +51,7 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0 { FAPI_TRY(fapi2::getScom( TGT0, 0x2010803ull, l_scom_buffer )); - l_scom_buffer.insert<0, 52, 0, uint64_t>(literal_0x801B1F98D8717000 ); + l_scom_buffer.insert<0, 53, 0, uint64_t>(literal_0x801B1F98D8717000 ); FAPI_TRY(fapi2::putScom(TGT0, 0x2010803ull, l_scom_buffer)); } { @@ -61,7 +61,7 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0 { l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x0000000000000 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x0000000000000 ); } @@ -75,7 +75,7 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0 { l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x2080000020080 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x2080000020080 ); } diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C index 6e84db92a..7b06eda83 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C @@ -351,189 +351,192 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_ FAPI_TRY(fapi2::putScom(TGT0, 0x90000f2005011c11ull, l_scom_buffer)); } { - l_scom_buffer.flush<0> (); - - if ((l_def_TRUE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 ); - } + l_scom_buffer.flush<0> (); - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 ); + } - if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1))) - { - l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 ); - } - else if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 ); - } + if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1))) + { + l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 ); + } + else if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_SAFE_MODE == literal_1)) - { - l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 ); - } - else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1)) - { - l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 ); - } - else if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_SAFE_MODE == literal_1)) + { + l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 ); + } + else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1)) + { + l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 ); + } + else if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_SAFE_MODE == literal_1)) - { - l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 ); - } - else if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 ); - } + if ((l_def_SAFE_MODE == literal_1)) + { + l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 ); + } + else if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 ); + } - if ((l_def_SAFE_MODE == literal_1)) - { - l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 ); - } - else if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_SAFE_MODE == literal_1)) + { + l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 ); + } + else if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 ); + } - if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1))) - { - l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 ); - } - else if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 ); - } + if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1))) + { + l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 ); + } + else if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 ); + } - if ((l_def_TRUE == literal_1)) - { - l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 ); - } + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 ); + } - FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer)); - FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer)); + if ((l_def_TRUE == literal_1)) + { + l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 ); + } + + FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer)); + FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer)); + } } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C index 1fb4a3144..6c119ca6c 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C @@ -69,7 +69,7 @@ fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS { l_scom_buffer.insert<8, 2, 62, uint64_t>(literal_0b11 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<8, 3, 61, uint64_t>(literal_0b11 ); } diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C index c96118188..ff7b43794 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C @@ -55,7 +55,7 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS FAPI_TRY(fapi2::putScom(TGT0, 0x901080aull, l_scom_buffer)); } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x901080cull, l_scom_buffer )); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C index 3076dccd5..4cc962724 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C @@ -313,7 +313,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1F ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS0_FBC_ENABLED) { @@ -328,7 +328,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS0_FBC_ENABLED) { @@ -343,7 +343,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS0_FBC_ENABLED) { @@ -358,7 +358,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS0_FBC_ENABLED) { @@ -475,7 +475,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x1C ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS3_FBC_ENABLED) { @@ -490,7 +490,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS3_FBC_ENABLED) { @@ -505,7 +505,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS3_FBC_ENABLED) { @@ -520,7 +520,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if (l_def_OBUS3_FBC_ENABLED) { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C index 94aa1adeb..20ced7335 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C @@ -112,7 +112,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<39, 1, 63, uint64_t>(l_NMMU_MM_FBC_CQ_WRAP_NXCQ_SCOM_CFG_PUMP_MODE_OFF ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<8, 3, 61, uint64_t>(literal_0x3 ); } @@ -120,7 +120,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5012c15ull, l_scom_buffer)); } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5012c1dull, l_scom_buffer )); @@ -180,10 +180,19 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x000 ); } - constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TW_RDX_PWC_DIS_ON = 0x1; - l_scom_buffer.insert<52, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TW_RDX_PWC_DIS_ON ); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + { + constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TW_RDX_PWC_DIS_ON = 0x1; + l_scom_buffer.insert<52, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TW_RDX_PWC_DIS_ON ); + } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) + { + constexpr auto l_NMMU_MM_CFG_NMMU_DD2_ISS734_FIX_MODE_OPT3_ENA_IGNORE_PWC_PTE_HIT = 0x3ffe; + l_scom_buffer.insert<52, 1, 50, uint64_t>(l_NMMU_MM_CFG_NMMU_DD2_ISS734_FIX_MODE_OPT3_ENA_IGNORE_PWC_PTE_HIT ); + } + + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TW_LCO_RDX_EN_ON = 0x1; l_scom_buffer.insert<44, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TW_LCO_RDX_EN_ON ); @@ -204,7 +213,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5012c53ull, l_scom_buffer)); } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5012c54ull, l_scom_buffer )); @@ -219,7 +228,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& constexpr auto l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON = 0x1; l_scom_buffer.insert<53, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TLB_ISS543B_FIX_EN_ON ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { constexpr auto l_NMMU_MM_MPSS_MODE_MPSS_ENA_PREF_PGSZ_ENA_G_64KB_H_64KB = 0x155; l_scom_buffer.insert<19, 1, 54, uint64_t>(l_NMMU_MM_MPSS_MODE_MPSS_ENA_PREF_PGSZ_ENA_G_64KB_H_64KB ); @@ -238,7 +247,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<21, 1, 63, uint64_t>(l_NMMU_MM_CFG_NMMU_CTL_TLB_HASH_PID_DIS_OFF ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { constexpr auto l_NMMU_MM_CFG_TWSM_SPLIT_MODE_TWSM_SPLIT_08_TLB_04_SLB = 0x0; l_scom_buffer.insert<57, 1, 63, uint64_t>(l_NMMU_MM_CFG_TWSM_SPLIT_MODE_TWSM_SPLIT_08_TLB_04_SLB ); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C index c7da8cd69..eb70caba1 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C @@ -239,15 +239,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011030ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -269,7 +272,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011032ull, l_scom_buffer )); @@ -302,7 +305,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011038ull, l_scom_buffer )); @@ -527,7 +530,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { FAPI_TRY(fapi2::getScom( TGT0, 0x5011090ull, l_scom_buffer )); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); } @@ -572,7 +575,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -580,7 +583,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -588,7 +591,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -599,7 +602,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011090ull, l_scom_buffer)); } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011092ull, l_scom_buffer )); @@ -632,7 +635,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011098ull, l_scom_buffer )); @@ -645,7 +648,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50110c0ull, l_scom_buffer )); @@ -685,7 +688,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50110d0ull, l_scom_buffer )); @@ -1340,15 +1343,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011230ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -1370,7 +1376,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011232ull, l_scom_buffer )); @@ -1403,7 +1409,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011238ull, l_scom_buffer )); @@ -1695,7 +1701,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { FAPI_TRY(fapi2::getScom( TGT0, 0x5011290ull, l_scom_buffer )); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); } @@ -1740,7 +1746,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1748,7 +1754,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1756,7 +1762,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1767,7 +1773,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011290ull, l_scom_buffer)); } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011292ull, l_scom_buffer )); @@ -1800,7 +1806,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011298ull, l_scom_buffer )); @@ -1813,7 +1819,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50112c0ull, l_scom_buffer )); @@ -1853,7 +1859,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50112d0ull, l_scom_buffer )); @@ -1987,15 +1993,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011400ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2017,7 +2026,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011402ull, l_scom_buffer )); @@ -2077,7 +2086,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -2085,7 +2094,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -2093,7 +2102,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -2101,7 +2110,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -2125,7 +2134,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011408ull, l_scom_buffer )); @@ -2138,15 +2147,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011430ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2168,7 +2180,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011432ull, l_scom_buffer )); @@ -2201,7 +2213,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011436ull, l_scom_buffer )); @@ -2229,7 +2241,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011438ull, l_scom_buffer )); @@ -2285,15 +2297,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011460ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2315,7 +2330,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011462ull, l_scom_buffer )); @@ -2348,7 +2363,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011466ull, l_scom_buffer )); @@ -2376,7 +2391,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011468ull, l_scom_buffer )); @@ -2389,15 +2404,18 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011490ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if ((l_def_NVLINK_ACTIVE == literal_1)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + if ((l_def_NVLINK_ACTIVE == literal_1)) + { + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); + } } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2419,7 +2437,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011492ull, l_scom_buffer )); @@ -2452,7 +2470,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011496ull, l_scom_buffer )); @@ -2480,7 +2498,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011498ull, l_scom_buffer )); @@ -2493,7 +2511,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50114c0ull, l_scom_buffer )); @@ -2533,7 +2551,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x50114d0ull, l_scom_buffer )); @@ -2561,7 +2579,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011645ull, l_scom_buffer )); @@ -2579,7 +2597,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011682ull, l_scom_buffer )); @@ -2602,7 +2620,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011683ull, l_scom_buffer )); @@ -2615,7 +2633,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5011689ull, l_scom_buffer )); @@ -2628,7 +2646,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x501168aull, l_scom_buffer )); @@ -2641,7 +2659,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x501168bull, l_scom_buffer )); @@ -2654,7 +2672,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x501168dull, l_scom_buffer )); @@ -2667,7 +2685,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c03ull, l_scom_buffer )); @@ -2684,7 +2702,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c06ull, l_scom_buffer )); @@ -2697,7 +2715,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c07ull, l_scom_buffer )); @@ -2710,7 +2728,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c43ull, l_scom_buffer )); @@ -2727,7 +2745,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c46ull, l_scom_buffer )); @@ -2740,7 +2758,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x5013c47ull, l_scom_buffer )); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C index f75cd813a..97f4333c8 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C @@ -1153,7 +1153,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1168,7 +1168,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1183,7 +1183,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1198,7 +1198,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1213,7 +1213,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1228,7 +1228,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1243,7 +1243,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1258,7 +1258,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1273,7 +1273,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1288,7 +1288,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1303,7 +1303,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1318,7 +1318,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1333,7 +1333,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1348,7 +1348,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1363,7 +1363,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1378,7 +1378,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1393,7 +1393,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1408,7 +1408,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1423,7 +1423,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1438,7 +1438,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1453,7 +1453,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1468,7 +1468,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1483,7 +1483,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1498,7 +1498,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } @@ -1705,12 +1705,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00009010c3full, l_scom_buffer)); } { @@ -1720,12 +1720,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00109010c3full, l_scom_buffer)); } { @@ -1735,12 +1735,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00209010c3full, l_scom_buffer)); } { @@ -1750,12 +1750,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00309010c3full, l_scom_buffer)); } { @@ -1765,12 +1765,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00409010c3full, l_scom_buffer)); } { @@ -1780,12 +1780,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00509010c3full, l_scom_buffer)); } { @@ -1795,12 +1795,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00609010c3full, l_scom_buffer)); } { @@ -1810,12 +1810,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00709010c3full, l_scom_buffer)); } { @@ -1825,12 +1825,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00809010c3full, l_scom_buffer)); } { @@ -1840,12 +1840,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00909010c3full, l_scom_buffer)); } { @@ -1855,12 +1855,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00a09010c3full, l_scom_buffer)); } { @@ -1870,12 +1870,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00b09010c3full, l_scom_buffer)); } { @@ -1885,12 +1885,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00c09010c3full, l_scom_buffer)); } { @@ -1900,12 +1900,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00d09010c3full, l_scom_buffer)); } { @@ -1915,12 +1915,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00e09010c3full, l_scom_buffer)); } { @@ -1930,12 +1930,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a00f09010c3full, l_scom_buffer)); } { @@ -1945,12 +1945,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01009010c3full, l_scom_buffer)); } { @@ -1960,12 +1960,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01109010c3full, l_scom_buffer)); } { @@ -1975,12 +1975,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01209010c3full, l_scom_buffer)); } { @@ -1990,12 +1990,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01309010c3full, l_scom_buffer)); } { @@ -2005,12 +2005,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01409010c3full, l_scom_buffer)); } { @@ -2020,12 +2020,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01509010c3full, l_scom_buffer)); } { @@ -2035,12 +2035,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01609010c3full, l_scom_buffer)); } { @@ -2050,12 +2050,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000a01709010c3full, l_scom_buffer)); } { @@ -2257,12 +2257,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80009010c3full, l_scom_buffer)); } { @@ -2272,12 +2272,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80109010c3full, l_scom_buffer)); } { @@ -2287,12 +2287,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80209010c3full, l_scom_buffer)); } { @@ -2302,12 +2302,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80309010c3full, l_scom_buffer)); } { @@ -2317,12 +2317,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80409010c3full, l_scom_buffer)); } { @@ -2332,12 +2332,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80509010c3full, l_scom_buffer)); } { @@ -2347,12 +2347,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80609010c3full, l_scom_buffer)); } { @@ -2362,12 +2362,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80709010c3full, l_scom_buffer)); } { @@ -2377,12 +2377,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80809010c3full, l_scom_buffer)); } { @@ -2392,12 +2392,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80909010c3full, l_scom_buffer)); } { @@ -2407,12 +2407,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80a09010c3full, l_scom_buffer)); } { @@ -2422,12 +2422,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80b09010c3full, l_scom_buffer)); } { @@ -2437,12 +2437,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80c09010c3full, l_scom_buffer)); } { @@ -2452,12 +2452,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80d09010c3full, l_scom_buffer)); } { @@ -2467,12 +2467,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80e09010c3full, l_scom_buffer)); } { @@ -2482,12 +2482,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c80f09010c3full, l_scom_buffer)); } { @@ -2497,12 +2497,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81009010c3full, l_scom_buffer)); } { @@ -2512,12 +2512,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81109010c3full, l_scom_buffer)); } { @@ -2527,12 +2527,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81209010c3full, l_scom_buffer)); } { @@ -2542,12 +2542,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81309010c3full, l_scom_buffer)); } { @@ -2557,12 +2557,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81409010c3full, l_scom_buffer)); } { @@ -2572,12 +2572,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81509010c3full, l_scom_buffer)); } { @@ -2587,12 +2587,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81609010c3full, l_scom_buffer)); } { @@ -2602,12 +2602,12 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0011 ); } - else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b0011 ); } - l_scom_buffer.insert<52, 4, 60, uint64_t>(literal_0b1010 ); + l_scom_buffer.insert<53, 4, 60, uint64_t>(literal_0b1010 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8000c81709010c3full, l_scom_buffer)); } { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C index 8e35abc61..539ad87fa 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C @@ -132,10 +132,13 @@ fapi2::ReturnCode p9_vas_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x301184eull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301184full, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301184full, l_scom_buffer )); - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_0x1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301184full, l_scom_buffer)); + l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_0x1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301184full, l_scom_buffer)); + } } }; diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml index 98fcf5ffd..d4aa1b441 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml @@ -3674,16 +3674,17 @@ </chip> </chipEcFeature> </attribute> - <!-- ********************************************************************* --> + <!-- ******************************************************************** --> <attribute> - <id>ATTR_CHIP_EC_FEATURE_HAS_DMI</id> + <id>ATTR_CHIP_EC_FEATURE_RTC_174656_SKIP_CUMULUS</id> <targetType>TARGET_TYPE_PROC_CHIP</targetType> <description> - Returns if a chip has a DMI link + Only apply spy to Nimbus, skip for Cumulus. + This is because p9c_10.spydef doesn't have the spy yet. </description> <chipEcFeature> <chip> - <name>ENUM_ATTR_NAME_CUMULUS</name> + <name>ENUM_ATTR_NAME_NIMBUS</name> <ec> <value>0x10</value> <test>GREATER_THAN_OR_EQUAL</test> |
