From 7623a9095db4ab06a7981a0016186c7287a19bed Mon Sep 17 00:00:00 2001 From: "Luke C. Murray" Date: Wed, 6 Dec 2017 10:48:04 -0600 Subject: Increase cache data timeout values The PCIe timeout have increased to 66-100ms, so we need to double the NCU master timeouts to be above these timeouts. This has a chain effect causing the L2/L3 master timeouts to increase which causes the tlbie snooper to increase which causes the tlbie master to increase. This would also ususally cause the core timeout to increas, but the core is already at around 13 seconds, so there is headroom there. Change-Id: I5930076151267a9bfa66e24edef0985c165db0b7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50582 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: FSP CI Jenkins Reviewed-by: LUKE MURRAY Reviewed-by: Joseph J. McGill Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50602 Reviewed-by: Hostboot Team Reviewed-by: Sachin Gupta --- src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C | 4 ++-- src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C | 4 ++-- src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C index a7f9f751..7406aa21 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C @@ -30,7 +30,7 @@ using namespace fapi2; constexpr uint64_t literal_0b0001 = 0b0001; -constexpr uint64_t literal_0b0100 = 0b0100; +constexpr uint64_t literal_0b1000 = 0b1000; constexpr uint64_t literal_1 = 1; constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0b0000 = 0b0000; @@ -105,7 +105,7 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target& TGT0, } l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0001 ); - l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b0100 ); + l_scom_buffer.insert<8, 4, 60, uint64_t>(literal_0b1000 ); FAPI_TRY(fapi2::putScom(TGT0, 0x1001080bull, l_scom_buffer)); } { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C index eef022a4..3292c867 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C @@ -35,7 +35,7 @@ constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0b0 = 0b0; constexpr uint64_t literal_0b0000 = 0b0000; constexpr uint64_t literal_0b0001 = 0b0001; -constexpr uint64_t literal_0b0100 = 0b0100; +constexpr uint64_t literal_0b1000 = 0b1000; fapi2::ReturnCode p9_l3_scom(const fapi2::Target& TGT0, const fapi2::Target& TGT1, const fapi2::Target& TGT2) @@ -176,7 +176,7 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target& TGT0, } l_scom_buffer.insert<14, 4, 60, uint64_t>(literal_0b0001 ); - l_scom_buffer.insert<18, 4, 60, uint64_t>(literal_0b0100 ); + l_scom_buffer.insert<18, 4, 60, uint64_t>(literal_0b1000 ); FAPI_TRY(fapi2::putScom(TGT0, 0x1001182bull, l_scom_buffer)); } diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C index b5dbc975..171f8dd1 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C @@ -32,9 +32,10 @@ using namespace fapi2; constexpr uint64_t literal_0x3 = 0x3; constexpr uint64_t literal_0x4 = 0x4; constexpr uint64_t literal_0b0001 = 0b0001; -constexpr uint64_t literal_0b0100 = 0b0100; +constexpr uint64_t literal_0b1000 = 0b1000; +constexpr uint64_t literal_0x10 = 0x10; +constexpr uint64_t literal_0x40 = 0x40; constexpr uint64_t literal_0x8 = 0x8; -constexpr uint64_t literal_0x20 = 0x20; constexpr uint64_t literal_6 = 6; constexpr uint64_t literal_4 = 4; constexpr uint64_t literal_0x0F = 0x0F; @@ -113,9 +114,9 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target& TGT0, FAPI_TRY(fapi2::getScom( TGT0, 0x1001100bull, l_scom_buffer )); l_scom_buffer.insert<0, 4, 60, uint64_t>(literal_0b0001 ); - l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b0100 ); - l_scom_buffer.insert<8, 10, 54, uint64_t>(literal_0x8 ); - l_scom_buffer.insert<26, 10, 54, uint64_t>(literal_0x20 ); + l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0b1000 ); + l_scom_buffer.insert<8, 10, 54, uint64_t>(literal_0x10 ); + l_scom_buffer.insert<26, 10, 54, uint64_t>(literal_0x40 ); l_scom_buffer.insert<18, 4, 60, uint64_t>(literal_0x8 ); l_scom_buffer.insert<22, 4, 60, uint64_t>(literal_0x8 ); FAPI_TRY(fapi2::putScom(TGT0, 0x1001100bull, l_scom_buffer)); -- cgit v1.2.1