From 63c767d5679c1c3068e5e8f96e5e264b5744b177 Mon Sep 17 00:00:00 2001 From: Ryan Black Date: Thu, 8 Mar 2018 01:57:25 -0600 Subject: reduce number of non-zero npu error collection registers Change-Id: Ib11f19abd7ceb68dfc0f7bd6977cee472f974d81 CQ: HW441288 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55236 Reviewed-by: Joseph J. McGill Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: Camille R. Mann Tested-by: Hostboot CI Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55254 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../p9/procedures/hwp/initfiles/p9_npu_scom.C | 204 +++++++++++++++++++++ 1 file changed, 204 insertions(+) (limited to 'src/import/chips/p9/procedures') 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 611fdb0d5..a5ecd3fee 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 @@ -433,6 +433,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011010ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501101aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501101aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) @@ -770,6 +781,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011038ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501103aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501103aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -955,6 +975,17 @@ 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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501104aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501104aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -1004,6 +1035,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011050ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501105aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501105aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -1290,6 +1330,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011070ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501107aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501107aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) @@ -1574,6 +1625,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x50110a0ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x50110aaull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x50110aaull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -1858,6 +1920,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011110ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501111aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501111aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -2120,6 +2191,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011130ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501113aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501113aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -2288,6 +2368,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011150ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501115aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501115aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -2467,6 +2556,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011170ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501117aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501117aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -2931,6 +3029,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011210ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501121aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501121aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) @@ -3268,6 +3377,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011238ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501123aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501123aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -3453,6 +3571,17 @@ 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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501124aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501124aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -3491,6 +3620,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011250ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501125aull, l_scom_buffer )); + + l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501125aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) { @@ -3762,6 +3900,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011270ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501127aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501127aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) @@ -4046,6 +4195,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x50112a0ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x50112aaull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x50112aaull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -4676,6 +4836,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011410ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501141aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501141aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -4913,6 +5084,17 @@ 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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501144aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501144aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -5224,6 +5406,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x5011470ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x501147aull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x501147aull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) @@ -5406,6 +5599,17 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target& FAPI_TRY(fapi2::putScom(TGT0, 0x50114a0ull, l_scom_buffer)); } } + { + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) + && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) + || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) + { + FAPI_TRY(fapi2::getScom( TGT0, 0x50114aaull, l_scom_buffer )); + + l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x50114aaull, l_scom_buffer)); + } + } { if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x22)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) -- cgit v1.2.1