diff options
5 files changed, 99 insertions, 119 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_int_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_int_scom.C index bb7fc302c..b4b0f1c3a 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_int_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_int_scom.C @@ -89,10 +89,13 @@ fapi2::ReturnCode p9_int_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5013021ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x5013022ull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x5013022ull, l_scom_buffer )); - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0070000072040140 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x5013022ull, l_scom_buffer)); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0070000072040140 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x5013022ull, l_scom_buffer)); + } } { FAPI_TRY(fapi2::getScom( TGT0, 0x5013033ull, l_scom_buffer )); @@ -165,15 +168,14 @@ fapi2::ReturnCode p9_int_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5013179ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x501322dull, l_scom_buffer )); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { + FAPI_TRY(fapi2::getScom( TGT0, 0x501322dull, l_scom_buffer )); + constexpr auto l_INT_INT_VC_INT_VC_AIB_TX_ORDERING_TAG_2_RELAXED_WR_ORDERING_DMA_OFF = 0x0; l_scom_buffer.insert<22, 1, 63, uint64_t>(l_INT_INT_VC_INT_VC_AIB_TX_ORDERING_TAG_2_RELAXED_WR_ORDERING_DMA_OFF ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501322dull, l_scom_buffer)); } - - FAPI_TRY(fapi2::putScom(TGT0, 0x501322dull, l_scom_buffer)); } { FAPI_TRY(fapi2::getScom( TGT0, 0x5013270ull, l_scom_buffer )); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C index f4b43ff9c..2f3a6b890 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C @@ -173,16 +173,23 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0, { FAPI_TRY(fapi2::getScom( TGT0, 0x5010824ull, l_scom_buffer )); - l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 ); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0b0100 ); + } + l_scom_buffer.insert<50, 5, 59, uint64_t>(literal_0b11100 ); l_scom_buffer.insert<37, 3, 61, uint64_t>(literal_0b110 ); FAPI_TRY(fapi2::putScom(TGT0, 0x5010824ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x5010825ull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x5010825ull, l_scom_buffer )); - l_scom_buffer.insert<4, 25, 39, uint64_t>(literal_0b0000000000000000000000000 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x5010825ull, l_scom_buffer)); + l_scom_buffer.insert<4, 25, 39, uint64_t>(literal_0b0000000000000000000000000 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x5010825ull, l_scom_buffer)); + } } { FAPI_TRY(fapi2::getScom( TGT0, 0x5010826ull, l_scom_buffer )); @@ -333,7 +340,12 @@ fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0, FAPI_TRY(fapi2::getScom( TGT0, 0x701090eull, l_scom_buffer )); l_scom_buffer.insert<6, 1, 63, uint64_t>(l_TGT1_ATTR_MSS_REORDER_QUEUE_SETTING ); - l_scom_buffer.insert<24, 6, 58, uint64_t>(literal_0b011000 ); + + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + l_scom_buffer.insert<24, 6, 58, uint64_t>(literal_0b011000 ); + } + FAPI_TRY(fapi2::putScom(TGT0, 0x701090eull, l_scom_buffer)); } { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C index baaff4700..07fe70221 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C @@ -48,7 +48,11 @@ fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0, { FAPI_TRY(fapi2::getScom( TGT0, 0x5010810ull, l_scom_buffer )); - l_scom_buffer.insert<46, 4, 60, uint64_t>(literal_0b0111 ); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + l_scom_buffer.insert<46, 4, 60, uint64_t>(literal_0b0111 ); + } + l_scom_buffer.insert<62, 1, 63, uint64_t>(literal_0 ); if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) @@ -57,7 +61,11 @@ fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0, l_scom_buffer.insert<61, 1, 63, uint64_t>(l_MC01_PBI01_SCOMFIR_MCPERF1_ENABLE_PF_DROP_CMDLIST_ON ); } - l_scom_buffer.insert<32, 7, 57, uint64_t>(literal_8 ); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + l_scom_buffer.insert<32, 7, 57, uint64_t>(literal_8 ); + } + FAPI_TRY(fapi2::putScom(TGT0, 0x5010810ull, l_scom_buffer)); } { @@ -68,14 +76,17 @@ fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0, FAPI_TRY(fapi2::putScom(TGT0, 0x5010812ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x5010813ull, l_scom_buffer )); - - if ((l_TGT1_ATTR_RISK_LEVEL == literal_0)) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { - l_scom_buffer.insert<1, 13, 51, uint64_t>(literal_0b0001100000000 ); - } + FAPI_TRY(fapi2::getScom( TGT0, 0x5010813ull, l_scom_buffer )); + + if ((l_TGT1_ATTR_RISK_LEVEL == literal_0)) + { + l_scom_buffer.insert<1, 13, 51, uint64_t>(literal_0b0001100000000 ); + } - FAPI_TRY(fapi2::putScom(TGT0, 0x5010813ull, l_scom_buffer)); + FAPI_TRY(fapi2::putScom(TGT0, 0x5010813ull, l_scom_buffer)); + } } }; 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 fcc5c91e4..833b84e25 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 @@ -165,10 +165,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011008ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer )); - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer)); + l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer)); + } } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) @@ -408,15 +411,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { - FAPI_TRY(fapi2::getScom( TGT0, 0x501104bull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501104bull, l_scom_buffer)); - } - } - { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x501105bull, l_scom_buffer )); @@ -504,10 +498,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011068ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer )); - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer)); + l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer)); + } } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) @@ -672,15 +669,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x50110abull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x50110abull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x50110c0ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); @@ -1261,10 +1249,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011208ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer )); - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer)); + l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer)); + } } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) @@ -1560,15 +1551,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { - FAPI_TRY(fapi2::getScom( TGT0, 0x501124bull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501124bull, l_scom_buffer)); - } - } - { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { FAPI_TRY(fapi2::getScom( TGT0, 0x501125bull, l_scom_buffer )); @@ -1684,10 +1666,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x5011268ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer )); - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer)); + l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer)); + } } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) @@ -1852,15 +1837,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x50112abull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x50112abull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x50112c0ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); @@ -2186,15 +2162,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x501141bull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501141bull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x5011430ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); @@ -2342,15 +2309,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x501144bull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501144bull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x5011460ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); @@ -2455,15 +2413,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x501147bull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x501147bull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x5011490ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); @@ -2568,15 +2517,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) { - FAPI_TRY(fapi2::getScom( TGT0, 0x50114abull, l_scom_buffer )); - - l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x50114abull, l_scom_buffer)); - } - } - { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) - { FAPI_TRY(fapi2::getScom( TGT0, 0x50114c0ull, l_scom_buffer )); l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); 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 68b528b2f..72eba5872 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 @@ -65,34 +65,49 @@ fapi2::ReturnCode p9_vas_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& FAPI_TRY(fapi2::putScom(TGT0, 0x3011807ull, l_scom_buffer)); } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301180aull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301180aull, l_scom_buffer )); - l_scom_buffer.insert<8, 31, 8, uint64_t>(literal_0x0080000000000000 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301180aull, l_scom_buffer)); + l_scom_buffer.insert<8, 31, 8, uint64_t>(literal_0x0080000000000000 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301180aull, l_scom_buffer)); + } } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301180bull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301180bull, l_scom_buffer )); - l_scom_buffer.insert<8, 28, 8, uint64_t>(literal_0x0080000000000000 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301180bull, l_scom_buffer)); + l_scom_buffer.insert<8, 28, 8, uint64_t>(literal_0x0080000000000000 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301180bull, l_scom_buffer)); + } } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301180eull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301180eull, l_scom_buffer )); - l_scom_buffer.insert<8, 44, 8, uint64_t>(literal_0x0080000000000000 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301180eull, l_scom_buffer)); + l_scom_buffer.insert<8, 44, 8, uint64_t>(literal_0x0080000000000000 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301180eull, l_scom_buffer)); + } } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301180full, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301180full, l_scom_buffer )); - l_scom_buffer.insert<8, 44, 8, uint64_t>(literal_0x0080000000000000 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301180full, l_scom_buffer)); + l_scom_buffer.insert<8, 44, 8, uint64_t>(literal_0x0080000000000000 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301180full, l_scom_buffer)); + } } { - FAPI_TRY(fapi2::getScom( TGT0, 0x301184dull, l_scom_buffer )); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x301184dull, l_scom_buffer )); - l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0x1 ); - FAPI_TRY(fapi2::putScom(TGT0, 0x301184dull, l_scom_buffer)); + l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0x1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x301184dull, l_scom_buffer)); + } } { FAPI_TRY(fapi2::getScom( TGT0, 0x301184eull, l_scom_buffer )); |
