From ff63e77ce9a41aa6b5f3e441d9f1d241ff2bb745 Mon Sep 17 00:00:00 2001 From: Brian Vanderpool Date: Thu, 4 Jan 2018 16:12:10 -0600 Subject: Change CME BCE reads to always use VG scope. Key_Cronus_Test=PM_REGRESS Change-Id: I123eb4c5b81e1d157ebca315dd5141911dc20349 CQ: HW423589 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51493 Tested-by: Jenkins Server Reviewed-by: Joseph J. McGill Tested-by: FSP CI Jenkins Tested-by: Cronus HW CI Reviewed-by: YUE DU Reviewed-by: Gregory S. Still --- import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h | 11 ++++++++++- .../ppe_closed/sgpe/stop_gpe/p9_hcd_sgpe_boot_cme.c | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h b/import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h index 3aff625c..d9220186 100644 --- a/import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h +++ b/import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HCODE Project */ /* */ -/* COPYRIGHT 2015,2017 */ +/* COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -30,7 +30,16 @@ typedef enum { ENABLE_WR_SCOPE = 0x0000000000000010, + +// Due to HW423589, need to enable vector scope to all targets +#if NIMBUS_DD_LEVEL == 20 || NIMBUS_DD_LEVEL >= 22 + ENABLE_RD_SCOPE = 0x0000000000000020, + VG_TARGET_1S = 0x0000000000000008, +#else ENABLE_RD_SCOPE = 0x0000000000000040, + VG_TARGET_1S = 0x0000000000000000, +#endif + BLOCK_COPY_SIZE_1MB = 0x0000000000000001, START_BLOCK_COPY = 0x2000000000000000, RD_FROM_HOMER_TO_SRAM = 0x0800000000000000, diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_sgpe_boot_cme.c b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_sgpe_boot_cme.c index 5e2df674..da118509 100644 --- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_sgpe_boot_cme.c +++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_sgpe_boot_cme.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HCODE Project */ /* */ -/* COPYRIGHT 2015,2017 */ +/* COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -211,7 +211,7 @@ BootErrorCode_t boot_cme( uint16_t i_bootCme ) GPE_PUTSCOM(GPE_SCOM_ADDR_CME(CME_SCOM_BCEBAR0, (l_cmeIndex >> 1), (l_cmeIndex % 2)), ((l_cpmrAddr & 0x00FFFFFFFFF00000) | - (ENABLE_WR_SCOPE | ENABLE_RD_SCOPE | BLOCK_COPY_SIZE_1MB))); + (ENABLE_WR_SCOPE | ENABLE_RD_SCOPE | VG_TARGET_1S | BLOCK_COPY_SIZE_1MB))); // ----------------------------------------------------------------- // ----------------------------------------------------------------- @@ -221,7 +221,7 @@ BootErrorCode_t boot_cme( uint16_t i_bootCme ) GPE_PUTSCOM(GPE_SCOM_ADDR_CME(CME_SCOM_BCEBAR1, (l_cmeIndex >> 1), (l_cmeIndex % 2)), ((l_cpmrAddr & 0x00FFFFFFFFF00000) | - (ENABLE_WR_SCOPE | ENABLE_RD_SCOPE | BLOCK_COPY_SIZE_1MB))); + (ENABLE_WR_SCOPE | ENABLE_RD_SCOPE | VG_TARGET_1S | BLOCK_COPY_SIZE_1MB))); // ----------------------------------------------------------------- // ----------------------------------------------------------------- -- cgit v1.2.3