From 16ce1e16c3458b4ca5189fe4e9060164a7c12e7f Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Fri, 21 Apr 2017 16:40:59 -0500 Subject: EC_FEATURE attributes not working correctly in when==S case -The logic to exclude address based on ec level had been commented out by mistake using an INITCOMPILER_DEBUG compile flag. Change-Id: I8a46c7b55d817c969079ece6d299fc1d4765ae73 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39563 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Thi N. Tran Reviewed-by: Jenny Huynh Reviewed-by: Benjamin Gass Reviewed-by: Joseph J. McGill Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39564 Reviewed-by: Daniel M. Crowell Tested-by: Daniel M. Crowell --- .../p9/procedures/hwp/initfiles/p9_npu_scom.C | 108 +++++---------------- 1 file changed, 24 insertions(+), 84 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C') 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& 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)) ) @@ -407,15 +410,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011048ull, l_scom_buffer)); } } - { - 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)) ) { @@ -504,10 +498,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& 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)) ) @@ -669,15 +666,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011098ull, l_scom_buffer)); } } - { - 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)) ) { @@ -1261,10 +1249,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& 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)) ) @@ -1559,15 +1550,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011248ull, l_scom_buffer)); } } - { - 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)) ) { @@ -1684,10 +1666,13 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& 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)) ) @@ -1849,15 +1834,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011298ull, l_scom_buffer)); } } - { - 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)) ) { @@ -2183,15 +2159,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011408ull, l_scom_buffer)); } } - { - 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)) ) { @@ -2339,15 +2306,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011447ull, l_scom_buffer)); } } - { - 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)) ) { @@ -2452,15 +2410,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011468ull, l_scom_buffer)); } } - { - 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)) ) { @@ -2565,15 +2514,6 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011498ull, l_scom_buffer)); } } - { - 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)) ) { -- cgit v1.2.1