From 0e4b3067a73c4797ad54cc635a0a340684155f76 Mon Sep 17 00:00:00 2001 From: Jenny Huynh Date: Thu, 15 Sep 2016 08:45:40 -0500 Subject: Various changes to INT/NX/MMU initfiles 1. Added HW372116 fix to INT initfile 2. Changes to NX FIR actions, fix to disable abc checker 3. Added Issue 632 fix to MMU initfile Change-Id: I4a886c5be7384ad374e884ffbe098727ffb7cc71 Original-Change-Id: I00a1b646738decefef9e540f655d5d9d0a825744 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29768 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Emmanuel Sacristan Reviewed-by: CHRISTOPHER D. HANUDEL Dev-Ready: CHRISTOPHER D. HANUDEL Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36652 Reviewed-by: Daniel M. Crowell Tested-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/initfiles/p9_nx_scom.C | 152 ++++++++++----------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C') diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C index 5cff7c75d..74996bde7 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C @@ -127,8 +127,8 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& } { - constexpr auto l_NX_DMA_SYM_CPB_CHECK_DISABLE_OFF = 0x0; - l_scom_buffer.insert (l_NX_DMA_SYM_CPB_CHECK_DISABLE_OFF, 48, 1, 63 ); + constexpr auto l_NX_DMA_SYM_CPB_CHECK_DISABLE_ON = 0x1; + l_scom_buffer.insert (l_NX_DMA_SYM_CPB_CHECK_DISABLE_ON, 48, 1, 63 ); } { @@ -255,27 +255,27 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 10, 1, 63 ); l_scom_buffer.insert (literal_0b0, 11, 1, 63 ); l_scom_buffer.insert (literal_0b0, 12, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 13, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 14, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 15, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 13, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 14, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 15, 1, 63 ); l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); l_scom_buffer.insert (literal_0b0, 17, 1, 63 ); l_scom_buffer.insert (literal_0b0, 18, 1, 63 ); l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); l_scom_buffer.insert (literal_0b0, 1, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 20, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); l_scom_buffer.insert (literal_0b0, 22, 1, 63 ); l_scom_buffer.insert (literal_0b0, 23, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 24, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 25, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 26, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 24, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 25, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 26, 1, 63 ); l_scom_buffer.insert (literal_0b0, 27, 1, 63 ); l_scom_buffer.insert (literal_0b0, 28, 1, 63 ); l_scom_buffer.insert (literal_0b0, 29, 1, 63 ); l_scom_buffer.insert (literal_0b0, 2, 1, 63 ); l_scom_buffer.insert (literal_0b1, 30, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 31, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 31, 1, 63 ); l_scom_buffer.insert (literal_0b0, 32, 1, 63 ); l_scom_buffer.insert (literal_0b0, 33, 1, 63 ); l_scom_buffer.insert (literal_0b0, 34, 1, 63 ); @@ -283,11 +283,11 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 36, 1, 63 ); l_scom_buffer.insert (literal_0b0, 37, 1, 63 ); l_scom_buffer.insert (literal_0b1, 38, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 39, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 39, 1, 63 ); l_scom_buffer.insert (literal_0b1, 3, 1, 63 ); l_scom_buffer.insert (literal_0b11, 40, 2, 62 ); l_scom_buffer.insert (literal_0b1, 42, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 43, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 43, 1, 63 ); l_scom_buffer.insert (literal_0b0, 4, 1, 63 ); l_scom_buffer.insert (literal_0b0, 5, 1, 63 ); l_scom_buffer.insert (literal_0b0, 6, 1, 63 ); @@ -317,34 +317,34 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 0, 1, 63 ); l_scom_buffer.insert (literal_0b0, 10, 1, 63 ); l_scom_buffer.insert (literal_0b0, 11, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 12, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 12, 1, 63 ); l_scom_buffer.insert (literal_0b0, 13, 1, 63 ); l_scom_buffer.insert (literal_0b0, 14, 1, 63 ); l_scom_buffer.insert (literal_0b0, 15, 1, 63 ); l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 17, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 17, 1, 63 ); l_scom_buffer.insert (literal_0b0, 18, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 19, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); l_scom_buffer.insert (literal_0b0, 1, 1, 63 ); l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 21, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 22, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 23, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 22, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 23, 1, 63 ); l_scom_buffer.insert (literal_0b0, 24, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 25, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 26, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 27, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 28, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 29, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 25, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 26, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 27, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 28, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 29, 1, 63 ); l_scom_buffer.insert (literal_0b0, 2, 1, 63 ); l_scom_buffer.insert (literal_0b0, 30, 1, 63 ); l_scom_buffer.insert (literal_0b0, 31, 1, 63 ); l_scom_buffer.insert (literal_0b0, 32, 1, 63 ); l_scom_buffer.insert (literal_0b0, 33, 1, 63 ); l_scom_buffer.insert (literal_0b0, 34, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 35, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 36, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 37, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 35, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 36, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 37, 1, 63 ); l_scom_buffer.insert (literal_0b0, 38, 1, 63 ); l_scom_buffer.insert (literal_0b0, 39, 1, 63 ); l_scom_buffer.insert (literal_0b0, 3, 1, 63 ); @@ -353,7 +353,7 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 43, 1, 63 ); l_scom_buffer.insert (literal_0b0, 4, 1, 63 ); l_scom_buffer.insert (literal_0b0, 5, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 6, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 6, 1, 63 ); l_scom_buffer.insert (literal_0b0, 7, 1, 63 ); l_scom_buffer.insert (literal_0b0, 8, 1, 63 ); l_scom_buffer.insert (literal_0b0, 9, 1, 63 ); @@ -380,34 +380,34 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 0, 1, 63 ); l_scom_buffer.insert (literal_0b0, 10, 1, 63 ); l_scom_buffer.insert (literal_0b1, 11, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 12, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 13, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 14, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 15, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 16, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 17, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 12, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 13, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 14, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 15, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 17, 1, 63 ); l_scom_buffer.insert (literal_0b1, 18, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 19, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); l_scom_buffer.insert (literal_0b1, 1, 1, 63 ); l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 21, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 22, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 23, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 22, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 23, 1, 63 ); l_scom_buffer.insert (literal_0b0, 24, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 25, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 26, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 27, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 28, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 29, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 25, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 26, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 27, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 28, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 29, 1, 63 ); l_scom_buffer.insert (literal_0b1, 2, 1, 63 ); l_scom_buffer.insert (literal_0b0, 30, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 31, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 31, 1, 63 ); l_scom_buffer.insert (literal_0b1, 32, 1, 63 ); l_scom_buffer.insert (literal_0b1, 33, 1, 63 ); l_scom_buffer.insert (literal_0b1, 34, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 35, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 36, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 37, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 35, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 36, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 37, 1, 63 ); l_scom_buffer.insert (literal_0b0, 38, 1, 63 ); l_scom_buffer.insert (literal_0b0, 39, 1, 63 ); l_scom_buffer.insert (literal_0b0, 3, 1, 63 ); @@ -416,7 +416,7 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 43, 1, 63 ); l_scom_buffer.insert (literal_0b1, 4, 1, 63 ); l_scom_buffer.insert (literal_0b1, 5, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 6, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 6, 1, 63 ); l_scom_buffer.insert (literal_0b0, 7, 1, 63 ); l_scom_buffer.insert (literal_0b0, 8, 1, 63 ); l_scom_buffer.insert (literal_0b0, 9, 1, 63 ); @@ -652,7 +652,7 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); l_scom_buffer.insert (literal_0b0, 17, 1, 63 ); l_scom_buffer.insert (literal_0b0, 18, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 19, 1, 63 ); l_scom_buffer.insert (literal_0b0, 1, 1, 63 ); l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); @@ -668,11 +668,11 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& l_scom_buffer.insert (literal_0b0, 35, 1, 63 ); l_scom_buffer.insert (literal_0b0, 36, 1, 63 ); l_scom_buffer.insert (literal_0b0, 37, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 38, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 39, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 38, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 39, 1, 63 ); l_scom_buffer.insert (literal_0b11111111, 40, 8, 56 ); - l_scom_buffer.insert (literal_0b0, 48, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 49, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 48, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 49, 1, 63 ); l_scom_buffer.insert (literal_0b0, 4, 1, 63 ); l_scom_buffer.insert (literal_0b0, 5, 1, 63 ); l_scom_buffer.insert (literal_0b0, 6, 1, 63 ); @@ -700,26 +700,26 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& } { - l_scom_buffer.insert (literal_0b1, 0, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 0, 1, 63 ); l_scom_buffer.insert (literal_0b0, 10, 1, 63 ); l_scom_buffer.insert (literal_0b0, 11, 1, 63 ); l_scom_buffer.insert (literal_0b0, 12, 1, 63 ); l_scom_buffer.insert (literal_0b0, 13, 1, 63 ); l_scom_buffer.insert (literal_0b0, 14, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 15, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 16, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 15, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); l_scom_buffer.insert (literal_0b0, 17, 1, 63 ); l_scom_buffer.insert (literal_0b0, 18, 1, 63 ); l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 1, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 20, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 21, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 22, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 23, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 24, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 1, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 22, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 23, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 24, 1, 63 ); l_scom_buffer.insert (literal_0b000000, 25, 6, 58 ); l_scom_buffer.insert (literal_0b00, 2, 2, 62 ); - l_scom_buffer.insert (literal_0b1, 31, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 31, 1, 63 ); l_scom_buffer.insert (literal_0b0, 32, 1, 63 ); l_scom_buffer.insert (literal_0b0, 33, 1, 63 ); l_scom_buffer.insert (literal_0b0, 34, 1, 63 ); @@ -758,34 +758,34 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target& } { - l_scom_buffer.insert (literal_0b1, 0, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 0, 1, 63 ); l_scom_buffer.insert (literal_0b1, 10, 1, 63 ); l_scom_buffer.insert (literal_0b1, 11, 1, 63 ); l_scom_buffer.insert (literal_0b1, 12, 1, 63 ); l_scom_buffer.insert (literal_0b1, 13, 1, 63 ); l_scom_buffer.insert (literal_0b0, 14, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 15, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 16, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 15, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 16, 1, 63 ); l_scom_buffer.insert (literal_0b1, 17, 1, 63 ); l_scom_buffer.insert (literal_0b1, 18, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 19, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 1, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 20, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 21, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 22, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 23, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 24, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 19, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 1, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 20, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 21, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 22, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 23, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 24, 1, 63 ); l_scom_buffer.insert (literal_0b000000, 25, 6, 58 ); l_scom_buffer.insert (literal_0b00, 2, 2, 62 ); - l_scom_buffer.insert (literal_0b1, 31, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 32, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 31, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 32, 1, 63 ); l_scom_buffer.insert (literal_0b0, 33, 1, 63 ); l_scom_buffer.insert (literal_0b1, 34, 1, 63 ); l_scom_buffer.insert (literal_0b1, 35, 1, 63 ); l_scom_buffer.insert (literal_0b1, 36, 1, 63 ); l_scom_buffer.insert (literal_0b1, 37, 1, 63 ); - l_scom_buffer.insert (literal_0b1, 38, 1, 63 ); - l_scom_buffer.insert (literal_0b0, 39, 1, 63 ); + l_scom_buffer.insert (literal_0b0, 38, 1, 63 ); + l_scom_buffer.insert (literal_0b1, 39, 1, 63 ); l_scom_buffer.insert (literal_0b00000000, 40, 8, 56 ); l_scom_buffer.insert (literal_0b0, 48, 1, 63 ); l_scom_buffer.insert (literal_0b0, 49, 1, 63 ); -- cgit v1.2.1