From a92029aaf8ad8032c6c5f297787513ce1144ef35 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sat, 30 Sep 2017 14:56:01 -0500 Subject: update HWP level metadata for nest, common files Change-Id: I451695b8ae1d8f7d5ed6d512631992dea98b5ee8 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46967 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Benjamin Gass Reviewed-by: Thi N. Tran Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46969 Reviewed-by: Hostboot Team Reviewed-by: Sachin Gupta --- .../chips/p9/common/include/p9_const_common.H | 2 +- .../chips/p9/common/include/p9_mc_scom_addresses.H | 2 +- .../p9/common/include/p9_mc_scom_addresses_fixes.H | 2 +- .../p9/common/include/p9_mc_scom_addresses_fld.H | 4 +- .../include/p9_mc_scom_addresses_fld_fixes.H | 2 +- .../p9/common/include/p9_misc_scom_addresses.H | 2 +- .../common/include/p9_misc_scom_addresses_fixes.H | 2 +- .../p9/common/include/p9_misc_scom_addresses_fld.H | 4 +- .../include/p9_misc_scom_addresses_fld_fixes.H | 2 +- .../p9/common/include/p9_obus_scom_addresses.H | 4 +- .../common/include/p9_obus_scom_addresses_fixes.H | 2 +- .../p9/common/include/p9_obus_scom_addresses_fld.H | 4 +- .../include/p9_obus_scom_addresses_fld_fixes.H | 4 +- .../p9/common/include/p9_perv_scom_addresses.H | 4 +- .../common/include/p9_perv_scom_addresses_fixes.H | 4 +- .../p9/common/include/p9_perv_scom_addresses_fld.H | 4 +- .../include/p9_perv_scom_addresses_fld_fixes.H | 2 +- .../p9/common/include/p9_quad_scom_addresses.H | 4 +- .../common/include/p9_quad_scom_addresses_fixes.H | 4 +- .../p9/common/include/p9_quad_scom_addresses_fld.H | 4 +- .../include/p9_quad_scom_addresses_fld_fixes.H | 4 +- .../p9/common/include/p9_xbus_scom_addresses.H | 4 +- .../common/include/p9_xbus_scom_addresses_fixes.H | 4 +- .../p9/common/include/p9_xbus_scom_addresses_fld.H | 4 +- .../include/p9_xbus_scom_addresses_fld_fixes.H | 4 +- .../p9/common/include/p9n2_mc_scom_addresses.H | 2 +- .../p9/common/include/p9n2_mc_scom_addresses_fld.H | 2 +- .../p9/common/include/p9n2_misc_scom_addresses.H | 2 +- .../common/include/p9n2_misc_scom_addresses_fld.H | 2 +- .../p9/common/include/p9n2_obus_scom_addresses.H | 2 +- .../common/include/p9n2_obus_scom_addresses_fld.H | 2 +- .../p9/common/include/p9n2_perv_scom_addresses.H | 2 +- .../common/include/p9n2_perv_scom_addresses_fld.H | 2 +- .../p9/common/include/p9n2_quad_scom_addresses.H | 2 +- .../common/include/p9n2_quad_scom_addresses_fld.H | 2 +- .../p9/common/include/p9n2_xbus_scom_addresses.H | 2 +- .../common/include/p9n2_xbus_scom_addresses_fld.H | 2 +- .../p9/procedures/hwp/nest/p9_inject_local_xstop.C | 68 +++++++++++++--------- .../p9/procedures/hwp/nest/p9_inject_local_xstop.H | 55 ++++++++--------- 39 files changed, 117 insertions(+), 112 deletions(-) (limited to 'src/import/chips/p9') diff --git a/src/import/chips/p9/common/include/p9_const_common.H b/src/import/chips/p9/common/include/p9_const_common.H index ed405843..27a38a63 100644 --- a/src/import/chips/p9/common/include/p9_const_common.H +++ b/src/import/chips/p9/common/include/p9_const_common.H @@ -40,7 +40,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SoA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: XX:XX diff --git a/src/import/chips/p9/common/include/p9_mc_scom_addresses.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses.H index cbf4f112..e1830d41 100644 --- a/src/import/chips/p9/common/include/p9_mc_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H index 6b1ff94e..52ac6158 100644 --- a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_MC_SCOM_ADDRESSES_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H index 45f70471..25ec03b8 100644 --- a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H index 9ea1f76b..339d668e 100644 --- a/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_MC_SCOM_ADDRESSES_FLD_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_misc_scom_addresses.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses.H index 9bd97d9a..e7cba9e9 100644 --- a/src/import/chips/p9/common/include/p9_misc_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H index 43f78fc8..4f0e43fb 100644 --- a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: Infrastructure -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_MISC_SCOM_ADDRESSES_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H index 5dfc6a1c..0cba6e38 100644 --- a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H index b3e4e5f9..7e672561 100644 --- a/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_MISC_SCOM_ADDRESSES_FLD_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_obus_scom_addresses.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses.H index afb31b13..4e552f18 100644 --- a/src/import/chips/p9/common/include/p9_obus_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H index fb076562..2df74122 100644 --- a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H @@ -33,7 +33,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_OBUS_SCOM_ADDRESSES_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H index 2e4954d4..40ef60ea 100644 --- a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H index 92252694..411facac 100644 --- a/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_OBUS_SCOM_ADDRESSES_FLD_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_perv_scom_addresses.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses.H index 3ce196ba..cc535be2 100644 --- a/src/import/chips/p9/common/include/p9_perv_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H index ccb91a9c..2f595cee 100644 --- a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE diff --git a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H index 26860c30..1d9c11f4 100644 --- a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H index 23b63fbf..8851db85 100644 --- a/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_quad_scom_addresses.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses.H index a0b124d2..9a9a3752 100644 --- a/src/import/chips/p9/common/include/p9_quad_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H index 51463a2f..a0801631 100644 --- a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_QUAD_SCOM_ADDRESSES_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H index 44846c04..5c397f3f 100644 --- a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H index 2ed5532e..900eae7b 100644 --- a/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_QUAD_SCOM_ADDRESSES_FLD_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H index 9bdaba15..7e75dfa4 100644 --- a/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H index 625214c5..007e019d 100644 --- a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H +++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_XBUS_SCOM_ADDRESSES_FIXES_H diff --git a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H index 7c760664..a70a9eea 100644 --- a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #include diff --git a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H index 2f97b13b..7f583869 100644 --- a/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H +++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,7 +32,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: ? // *HWP Team: SAO -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9_XBUS_SCOM_ADDRESSES_FLD_FIXES_H diff --git a/src/import/chips/p9/common/include/p9n2_mc_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_mc_scom_addresses.H index 6b7ebe06..102a5052 100644 --- a/src/import/chips/p9/common/include/p9n2_mc_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_mc_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_mc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_mc_scom_addresses_fld.H index cee0cafc..6b690deb 100644 --- a/src/import/chips/p9/common/include/p9n2_mc_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_mc_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9N2_MC_SCOM_ADDRESSES_FLD_H diff --git a/src/import/chips/p9/common/include/p9n2_misc_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_misc_scom_addresses.H index e153e89b..49be7ed5 100644 --- a/src/import/chips/p9/common/include/p9n2_misc_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_misc_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_misc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_misc_scom_addresses_fld.H index e8baf756..cd07986e 100644 --- a/src/import/chips/p9/common/include/p9n2_misc_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_misc_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9N2_MISC_SCOM_ADDRESSES_FLD_H diff --git a/src/import/chips/p9/common/include/p9n2_obus_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_obus_scom_addresses.H index 4d08127e..5d209219 100644 --- a/src/import/chips/p9/common/include/p9n2_obus_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_obus_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_obus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_obus_scom_addresses_fld.H index 858138fe..87c83e86 100644 --- a/src/import/chips/p9/common/include/p9n2_obus_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_obus_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE diff --git a/src/import/chips/p9/common/include/p9n2_perv_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_perv_scom_addresses.H index 38af7b67..094c042b 100644 --- a/src/import/chips/p9/common/include/p9n2_perv_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_perv_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_perv_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_perv_scom_addresses_fld.H index c7fc4042..401cffa0 100644 --- a/src/import/chips/p9/common/include/p9n2_perv_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_perv_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9N2_PERV_SCOM_ADDRESSES_FLD_H diff --git a/src/import/chips/p9/common/include/p9n2_quad_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_quad_scom_addresses.H index 8292bfc0..900a2d42 100644 --- a/src/import/chips/p9/common/include/p9n2_quad_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_quad_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_quad_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_quad_scom_addresses_fld.H index b545e1b9..33bdcecb 100644 --- a/src/import/chips/p9/common/include/p9n2_quad_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_quad_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE diff --git a/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses.H b/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses.H index 89ae768e..5c9bb8b4 100644 --- a/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses.H +++ b/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE /*--------------------------------------------------------------- diff --git a/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses_fld.H index 76948074..c71ed8b6 100644 --- a/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses_fld.H +++ b/src/import/chips/p9/common/include/p9n2_xbus_scom_addresses_fld.H @@ -29,7 +29,7 @@ // *HWP HWP Owner: Ben Gass // *HWP FW Owner: Thi Tran // *HWP Team: SOA -// *HWP Level: 1 +// *HWP Level: 3 // *HWP Consumed by: FSP:HB:HS:OCC:SBE:CME:SGPE:PGPE:FPPE:IPPE #ifndef __P9N2_XBUS_SCOM_ADDRESSES_FLD_H diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.C b/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.C index dec1367e..e3b3ddd7 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,49 +22,63 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ + +/// +/// @file p9_inject_local_xstop.C +/// @brief Sets FIR registers to trigger local checkstop in the core +/// +/// @author Josh Hannan /// -// @file p9_inject_local_xstop.C -// @brief (eCMD) Sets FIR registers to trigger local checkstop in the core -// -// @author Josh Hannan -// + +// *HWP HWP Owner: Joshua Hannan jlhannan@us.ibm.com +// *HWP FW Owner: Thi Tran thi@us.ibm.com +// *HWP Team: Core +// *HWP Level: 3 +// *HWP Consumed by: SBE + //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "p9_inject_local_xstop.H" -#include +#include #include +//------------------------------------------------------------------------------ +// Constant Definitions +//------------------------------------------------------------------------------ const uint32_t CORE_LOCAL_XSTOP_BIT = 51; -fapi2::ReturnCode p9_inject_local_xstop(fapi2::Target& i_target) +//------------------------------------------------------------------------------ +// Function Definitions +//------------------------------------------------------------------------------ + +fapi2::ReturnCode +p9_inject_local_xstop(fapi2::Target& i_target) { - fapi2::buffer data; + fapi2::buffer l_data; // Clear Bit CORE_LOCAL_XSTOP_BIT of FIRMASK register so FIR is visible - data.flush<1>().clearBit(); - FAPI_TRY(fapi2::putScom(i_target, C_CORE_FIRMASK_AND, data), - "p9_inject_local_xstop: Could not write to FIR Mask Register"); + l_data.flush<1>().clearBit(); + FAPI_TRY(fapi2::putScom(i_target, C_CORE_FIRMASK_AND, l_data), + "Could not write to FIR Mask Register"); // Set bit CORE_LOCAL_XSTOP_BIT of Both Action Registers // This will perform a local checkstop when the fir bit is set - FAPI_TRY(fapi2::getScom(i_target, C_CORE_ACTION0, data), - "p9_inject_local_xstop: Error while performing getscom on FIR Action 0 Register"); - data.setBit(); - FAPI_TRY(fapi2::putScom(i_target, C_CORE_ACTION0, data), - "p9_inject_local_xstop: Error while performing putscom on FIR Action 0 Register"); - + FAPI_TRY(fapi2::getScom(i_target, C_CORE_ACTION0, l_data), + "Error while performing getscom on FIR Action 0 Register"); + l_data.setBit(); + FAPI_TRY(fapi2::putScom(i_target, C_CORE_ACTION0, l_data), + "Error while performing putscom on FIR Action 0 Register"); - FAPI_TRY(fapi2::getScom(i_target, C_CORE_ACTION1, data), - "p9_inject_local_xstop: Error while performing getscom on FIR Action 1 Register"); - data.setBit(); - FAPI_TRY(fapi2::putScom(i_target, C_CORE_ACTION1, data), - "p9_inject_local_xstop: Error while performing putscom on FIR Action 1 Register"); + FAPI_TRY(fapi2::getScom(i_target, C_CORE_ACTION1, l_data), + "Error while performing getscom on FIR Action 1 Register"); + l_data.setBit(); + FAPI_TRY(fapi2::putScom(i_target, C_CORE_ACTION1, l_data), + "Error while performing putscom on FIR Action 1 Register"); // Set bit CORE_LOCAL_XSTOP_BIT of FIR register to perform local checkstop - data.flush<0>().setBit(); - FAPI_TRY(fapi2::putScom(i_target, C_CORE_FIR_OR, data), - "p9_inject_local_xstop: Could not write to Fault Isolation Register"); + l_data.flush<0>().setBit(); + FAPI_TRY(fapi2::putScom(i_target, C_CORE_FIR_OR, l_data), + "Could not write to Fault Isolation Register"); fapi_try_exit: FAPI_DBG("Exiting..."); diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.H b/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.H index ffd55edd..c50e59a2 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.H +++ b/src/import/chips/p9/procedures/hwp/nest/p9_inject_local_xstop.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,58 +22,49 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -//----------------------------------------------------------------------------------- -// -// @file p9_inject_local_xstop.H -// @brief header file for triggering local checkstop in the core -// + +/// +/// @file p9_inject_local_xstop.H +/// @brief Sets FIR registers to trigger local checkstop in the core +/// +/// @author Josh Hannan +/// + // *HWP HWP Owner: Joshua Hannan jlhannan@us.ibm.com // *HWP FW Owner: Thi Tran thi@us.ibm.com // *HWP Team: Core -// *HWP Level: 2 +// *HWP Level: 3 // *HWP Consumed by: SBE -// ---------------------------------------------------------------------------------- -// -// *! ADDITIONAL COMMENTS : -// *! -// *! -// *! -//----------------------------------------------------------------------------------- #ifndef _P9_INJECT_LOCAL_XSTOP_H_ #define _P9_INJECT_LOCAL_XSTOP_H_ -//----------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ // Includes -//----------------------------------------------------------------------------------- - +//------------------------------------------------------------------------------ #include -//----------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ // Structure definitions -//----------------------------------------------------------------------------------- - +//------------------------------------------------------------------------------ //function pointer typedef definition for HWP call support -typedef fapi2::ReturnCode -(*p9_inject_local_xstop_FP_t) ( +typedef fapi2::ReturnCode (*p9_inject_local_xstop_FP_t) ( fapi2::Target& ); -//----------------------------------------------------------------------------------- -// Constant definitions -//----------------------------------------------------------------------------------- -extern "C" { - -//----------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ // Function prototype -//----------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ + +extern "C" { -/// @brief Clears bit 51 of FIRMASK register, sets bit 51 of FIR ACTION registers and -/// FIR register to generate a local checkstop +/// @brief Clears bit 51 of FIRMASK register, sets bit 51 of FIR ACTION +/// registers and FIR register to generate a local checkstop /// @param[in] i_target => Core target /// @return FAPI_RC_SUCCESS if the local checkstop completes successfully - fapi2::ReturnCode p9_inject_local_xstop(fapi2::Target& i_target); + fapi2::ReturnCode p9_inject_local_xstop( + fapi2::Target& i_target); } //extern "C" -- cgit v1.2.1