diff options
| author | Luke Mulkey <lwmulkey@us.ibm.com> | 2017-01-04 13:55:33 -0600 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 17:01:33 -0500 |
| commit | 1682f279a2938352a51fb83d2da084d47b64acf4 (patch) | |
| tree | ae9640270fbdfbb23070d6243288166b096e57c9 /import/chips/centaur/common | |
| parent | 857e964fbbe3e0b6450274f1fb6a23823c207893 (diff) | |
| download | talos-hcode-1682f279a2938352a51fb83d2da084d47b64acf4.tar.gz talos-hcode-1682f279a2938352a51fb83d2da084d47b64acf4.zip | |
Edit ECID+Perv code to use new gen'd centaur scom headers
RTC 163585 - Done
Change-Id: I4fe900e3c1e919ff03158dd4cd02c268667dcbec
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34371
Dev-Ready: Brent Wieman <bwieman@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brent Wieman <bwieman@us.ibm.com>
Reviewed-by: Peng Fei Gou <shgoupf@cn.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Diffstat (limited to 'import/chips/centaur/common')
3 files changed, 34 insertions, 72 deletions
diff --git a/import/chips/centaur/common/include/cen_gen_scom_addresses.H b/import/chips/centaur/common/include/cen_gen_scom_addresses.H index df187b13..8023ee06 100644 --- a/import/chips/centaur/common/include/cen_gen_scom_addresses.H +++ b/import/chips/centaur/common/include/cen_gen_scom_addresses.H @@ -26,7 +26,6 @@ #define CEN_GEN_SCOM_ADDRESSES_H #include "cen_const_common.H" #include "cen_gen_scom_template.H" -#include "cen_gen_scom_addresses_fixes.H" CEN_REG32 (CEN_ADDR_TRAP_REG_PCB, RULL(0x01010003)); CEN_REG32 (CEN_ATOMIC_LOCK_REG_PCB, RULL(0x010103FF)); CEN_REG32 (CEN_BIT_SEL_REG_2, RULL(0x000F0008)); diff --git a/import/chips/centaur/common/include/cen_gen_scom_addresses_fixes.H b/import/chips/centaur/common/include/cen_gen_scom_addresses_fixes.H index 80541fe3..836f297b 100644 --- a/import/chips/centaur/common/include/cen_gen_scom_addresses_fixes.H +++ b/import/chips/centaur/common/include/cen_gen_scom_addresses_fixes.H @@ -25,3 +25,37 @@ //Example: To fix an existing definiton //CEN_FIXREG32 (CEN_MBA_1_CCS_INST_ARR0_10, RULL(0x01234567)); +#include <p9_const_common.H> +#include <p9_scom_template_consts.H> +#ifndef CEN_GEN_SCOM_ADDRESSES_FIXES_H +#define CEN_GEN_SCOM_ADDRESSES_FIXES_H + +REG64( CEN_WRITE_ALL_FUNC_GP3 , RULL(0x6B0F0012), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_WRITE_ALL_FUNC_GP3_AND , RULL(0x6B0F0013), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_WRITE_ALL_FUNC_GP3_OR , RULL(0x6B0F0014), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_WRITE_ALL_PCB_SLAVE_ERRREG , RULL(0x6B0F001F), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_PERV_LOCAL_FIR , RULL(0x0004000A), SH_UNT_PERV , SH_ACS_SCOM_RW ); +REG64( CEN_PERV_TP_LOCAL_FIR , RULL(0x0104000A), SH_UNT_PERV_1 , SH_ACS_SCOM_RW ); +REG64( CEN_PERV_LOCAL_FIR_AND , RULL(0x0004000B), SH_UNT_PERV , SH_ACS_SCOM1_AND ); +REG64( CEN_PERV_TP_LOCAL_FIR_AND , RULL(0x0104000B), SH_UNT_PERV_1 , SH_ACS_SCOM1_AND ); +REG64( CEN_PERV_LOCAL_FIR_OR , RULL(0x0004000C), SH_UNT_PERV , SH_ACS_SCOM2_OR ); +REG64( CEN_PERV_TP_LOCAL_FIR_OR , RULL(0x0104000C), SH_UNT_PERV_1 , SH_ACS_SCOM2_OR ); +REG64( CEN_PERV_LOCAL_FIR_MASK , RULL(0x0004000D), SH_UNT_PERV , SH_ACS_SCOM_RW ); +REG64( CEN_PERV_TP_LOCAL_FIR_MASK , RULL(0x0104000D), SH_UNT_PERV_1 , SH_ACS_SCOM_RW ); +REG64( CEN_PERV_LOCAL_FIR_MASK_AND , RULL(0x0004000E), SH_UNT_PERV , SH_ACS_SCOM1_AND ); +REG64( CEN_PERV_TP_LOCAL_FIR_MASK_AND , RULL(0x0104000E), SH_UNT_PERV_1 , SH_ACS_SCOM1_AND ); +REG64( CEN_PERV_LOCAL_FIR_MASK_OR , RULL(0x0004000F), SH_UNT_PERV , SH_ACS_SCOM2_OR ); +REG64( CEN_PERV_TP_LOCAL_FIR_MASK_OR , RULL(0x0104000F), SH_UNT_PERV_1 , SH_ACS_SCOM2_OR ); +REG64( CEN_GENERIC_GP1 , RULL(0x00000001), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_GP0_AND , RULL(0x00000004), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_GP0_OR , RULL(0x00000005), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_GP3_AND , RULL(0x000F0013), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_GP3_OR , RULL(0x000F0014), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_OPCG_CNTL0 , RULL(0x00030002), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_OPCG_CNTL2 , RULL(0x00030004), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_CLK_REGION , RULL(0x00030006), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_CLK_SCANSEL , RULL(0x00030007), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_CLK_STATUS , RULL(0x00030008), SH_UNT_PERV, SH_ACS_FSI ); +REG64( CEN_GENERIC_CLK_SCANDATA0 , RULL(0x00038000), SH_UNT_PERV, SH_ACS_FSI ); + +#endif diff --git a/import/chips/centaur/common/include/fapi_sbe_common.H b/import/chips/centaur/common/include/fapi_sbe_common.H deleted file mode 100644 index 2011dc71..00000000 --- a/import/chips/centaur/common/include/fapi_sbe_common.H +++ /dev/null @@ -1,71 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: import/chips/centaur/common/include/fapi_sbe_common.H $ */ -/* */ -/* OpenPOWER HCODE Project */ -/* */ -/* COPYRIGHT 2016,2017 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ -#ifndef __FAPI_SBE_COMMON_H -#define __FAPI_SBE_COMMON_H - -// $Id: fapi_sbe_common.H,v 840.0 2015/08/25 21:16:57 bwieman Exp $ -// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/fw840/procedures/fapi_sbe_common.H,v $ -//------------------------------------------------------------------------------ -// *! (C) Copyright International Business Machines Corp. 2011 -// *! All Rights Reserved -- Property of IBM -// *! *** IBM Confidential *** -//------------------------------------------------------------------------------ -// *! OWNER NAME : Email: - -/// \file fapi_sbe_common.H -/// \brief Definitions common to FAPI and SBE procedures -/// -/// Several preprocessor macros are required to have different definitions in -/// C, C++ and SBE assembly procedures. These common forms are collected here. - -#if defined __ASSEMBLER__ - - #define CONST_UINT8_T(name, expr) .set name, (expr) - #define CONST_UINT32_T(name, expr) .set name, (expr) - #define CONST_UINT64_T(name, expr) .set name, (expr) - - #define ULL(x) x - -#elif defined __cplusplus - - #include <stdint.h> - - #define CONST_UINT8_T(name, expr) const uint8_t name = (expr); - #define CONST_UINT32_T(name, expr) const uint32_t name = (expr); - #define CONST_UINT64_T(name, expr) const uint64_t name = (expr); - - #define ULL(x) x##ull - -#else // C code - - // CONST_UINT[8,3,64]_T() can't be used in C code/headers; Use - // - // #define <symbol> <value> [ or ULL(<value>) for 64-bit constants - - #define ULL(x) x##ull - -#endif // __ASSEMBLER__ - -#endif // __FAPI_SBE_COMMON_H |
