From d87f89544093cb6eabe7b68414d72500d63bad92 Mon Sep 17 00:00:00 2001 From: Prem Shanker Jha Date: Mon, 23 Oct 2017 09:39:00 -0500 Subject: Revert "STOP API: Increased max allowed SCOM restore entries for EQ." This reverts commit bff2f1adea4160eeec5a679ebb4885ce6283a6d9. which created a co-req situation between HB and HW Image. This commits reverts it. Changes done in original commit will be re-implemented to avoid the co-req scenario. Change-Id: Id29f6dc2533e30c8736435e5b73187b13fe4303a Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48690 Reviewed-by: Michael S. Floyd Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA Reviewed-by: Brian T. Vanderpool Tested-by: Jenkins Server Reviewed-by: Gregory S. Still --- import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H | 2 +- .../p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_cache_scomcust.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H b/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H index 5daead8b..367bb554 100644 --- a/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H +++ b/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H @@ -266,7 +266,7 @@ HCD_CONST(QUAD_SCOM_RESTORE_HOMER_OFFSET, HCD_CONST(MAX_L2_SCOM_ENTRIES, 16) HCD_CONST(MAX_L3_SCOM_ENTRIES, 16) -HCD_CONST(MAX_EQ_SCOM_ENTRIES, 31) +HCD_CONST(MAX_EQ_SCOM_ENTRIES, 15) HCD_CONST(QUAD_SCOM_RESTORE_REGS_PER_QUAD, (MAX_EQ_SCOM_ENTRIES + MAX_L2_SCOM_ENTRIES + MAX_L3_SCOM_ENTRIES + 1)) diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_cache_scomcust.c b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_cache_scomcust.c index bcbc7b21..6c756d1a 100644 --- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_cache_scomcust.c +++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_hcd_cache_scomcust.c @@ -42,7 +42,7 @@ p9_hcd_cache_scomcust(uint32_t quad, uint32_t m_ex, int is_stop8) // doing this instead of multiply since there is no multiply instruction with ppe. for(i = 0; i < quad; i++) { - qoffset += 0x400; + qoffset += 0x300; } // To access memory, need to set MSB of homer address -- cgit v1.2.3