From 962e9921c88bd00d79c4d77dbfbda9e5a3d3e208 Mon Sep 17 00:00:00 2001 From: Greg Still Date: Wed, 26 Sep 2018 12:40:03 -0500 Subject: SMF: clear HRMOR[15] in all modes so that secure mode won't hang core Key_Cronus_Test=PM_REGRESS Change-Id: I26a98dfce1eb8123c79b35f2f4dc1783e16e411e Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66687 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Cronus HW CI Dev-Ready: Gregory S. Still Reviewed-by: Prem Shanker Jha Reviewed-by: YUE DU Reviewed-by: Jennifer A. Stofer --- import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_exit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_exit.c b/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_exit.c index a5c3317d..9fbac710 100644 --- a/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_exit.c +++ b/import/chips/p9/procedures/ppe_closed/cme/stop_cme/p9_cme_stop_exit.c @@ -1151,6 +1151,8 @@ p9_cme_stop_exit() #else PK_TRACE_PERF("Core Wakes Up, Write HRMOR with HOMER address"); + // Must not set bit 15 in HRMOR + scom_data.words.upper = scom_data.words.upper & ~BIT32(15); CME_PUTSCOM(HRMOR, core, scom_data.value); #endif -- cgit v1.2.3