From 067fae0102047de80cdd9953b7d11fd4fa7939c4 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Sat, 23 Jul 2016 06:54:00 -0500 Subject: scan HWP updates tested via Cronus platform putring implementation p9_sbe_attr_setup p9_setup_sbe_config adjust mailbox write/read logic to properly handle cache contained mode p9_sbe_gptr_time_initf remove unused MC mc_iom[01|23]_time rings add OBUS1/2 scans add PCI pci[0|1|2]_pll_gptr rings add N2 n2_psi_gptr ring p9_sbe_repr_initf remove unused MC mc_iom[01|23]_repr rings add OBUS1/2 scans p9_sbe_nest_initf skip MC iom[01|23]_fure scans which require DETERMINISTIC_TEST_EN p9_sbe_io_initf skip PCI pci[0|1|2]_fure scans which require DETERMINISTIC_TEST_EN remove DETERMINISTIC_TEST_EN application for XB p9_hcd_cache_initf remove explicit initfile invocation/ring caching in wrapper correct putring targeting add EX ex_l2_mode ring scan p9_hcd_core_initf remove explicit initfile invocation/ring caching in wrapper add EC ec_mode ring scan add DBG/ERR trace for all putRing calls remove unused *gptr_time_repr_initf HWPs and wrappers Change-Id: Iaeb6c60b552721c5867f1f14fea0beb8313dab0f Original-Change-Id: If1f8e9f5b327a6ab4f9b5271c53616ad20163b93 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27400 Tested-by: Jenkins Server Tested-by: Hostboot CI Tested-by: PPE CI Reviewed-by: Prachi Gupta Reviewed-by: Kevin F. Reick Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30606 Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- .../hwp/perv/p9_sbe_gptr_time_repr_initf.C | 130 --------------------- .../hwp/perv/p9_sbe_gptr_time_repr_initf.H | 61 ---------- .../hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C | 52 --------- .../hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H | 62 ---------- .../chips/p9/procedures/hwp/perv/pervfiles.mk | 1 - 5 files changed, 306 deletions(-) delete mode 100644 src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C delete mode 100644 src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H delete mode 100644 src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C delete mode 100644 src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H (limited to 'src/import') diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C deleted file mode 100644 index 0e5f382e..00000000 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C +++ /dev/null @@ -1,130 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C $ */ -/* */ -/* OpenPOWER sbe Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] 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 */ -//------------------------------------------------------------------------------ -/// @file p9_sbe_gptr_time_repr_initf.C -/// -/// @brief Scan0 and Load repair, time and GPTR rings for all enabled chiplets -//------------------------------------------------------------------------------ -// *HWP HW Owner : Abhishek Agarwal -// *HWP HW Backup Owner : Srinivas V Naga -// *HWP FW Owner : Brian Silver -// *HWP Team : Perv -// *HWP Level : 2 -// *HWP Consumed by : SBE -//------------------------------------------------------------------------------ - - -//## auto_generated -#include "p9_sbe_gptr_time_repr_initf.H" - -#include "p9_perv_scom_addresses.H" -#include "p9_perv_sbe_cmn.H" - - -enum P9_SBE_GPTR_TIME_REPR_INITF_Private_Constants -{ - REGIONS_EXCEPT_VITAL = 0x7FF, - SCAN_TYPES_TIME_GPTR_REPR = 0x230 -}; - -static fapi2::ReturnCode -p9_sbe_gptr_time_repr_initf_scan0_and_ring_module_function( - const fapi2::Target& i_target_chiplet); - -fapi2::ReturnCode p9_sbe_gptr_time_repr_initf(const - fapi2::Target& i_target_chip) -{ - auto l_perv_functional_vector = - i_target_chip.getChildren - (fapi2::TARGET_STATE_FUNCTIONAL); - FAPI_DBG("Entering ..."); - - for (auto l_chplt_trgt : l_perv_functional_vector) - { - uint8_t l_attr_chip_unit_pos = 0; //actual value is read in FAPI_ATTR_GET below - FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, l_chplt_trgt, - l_attr_chip_unit_pos)); - - if (!((l_attr_chip_unit_pos == 0x07 - || l_attr_chip_unit_pos == 0x08/* McChiplet */) || - (l_attr_chip_unit_pos == 0x02 || l_attr_chip_unit_pos == 0x03 - || l_attr_chip_unit_pos == 0x04 - || l_attr_chip_unit_pos == 0x05/* NestChiplet */) || - (l_attr_chip_unit_pos == 0x09 || l_attr_chip_unit_pos == 0x0A - || l_attr_chip_unit_pos == 0x0B - || l_attr_chip_unit_pos == 0x0C/* ObusChiplet */) || - (l_attr_chip_unit_pos == 0x0D || l_attr_chip_unit_pos == 0x0E - || l_attr_chip_unit_pos == 0x0F/* PcieChiplet */) || - (l_attr_chip_unit_pos == 0x06/* XbusChiplet */))) - { - continue; - } - - FAPI_INF("Call sbe_gptr_time_repr_initf_scan0_and_ring_module_function"); - FAPI_TRY(p9_sbe_gptr_time_repr_initf_scan0_and_ring_module_function( - l_chplt_trgt)); - } - - FAPI_DBG("Exiting ..."); - -fapi_try_exit: - return fapi2::current_err; - -} - -/// @brief Scan 0 on time, repair, gptr on all enabled chiplets -/// scan initialize GPTR,TIME and REPR Rings -/// -/// @param[in] i_target_chiplet Reference to TARGET_TYPE_PERV target -/// @return FAPI2_RC_SUCCESS if success, else error code. -static fapi2::ReturnCode -p9_sbe_gptr_time_repr_initf_scan0_and_ring_module_function( - const fapi2::Target& i_target_chiplet) -{ - bool l_read_reg = false; - fapi2::buffer l_data64; - FAPI_DBG("Entering ..."); - - FAPI_INF("Check for chiplet enable"); - //Getting NET_CTRL0 register value - FAPI_TRY(fapi2::getScom(i_target_chiplet, PERV_NET_CTRL0, l_data64)); - l_read_reg = l_data64.getBit<0>(); //l_read_reg = NET_CTRL0.CHIPLET_ENABLE - - if ( l_read_reg ) - { - FAPI_INF("run scan0 module for regions except vital scan types GPTR, TIME, REPR"); - FAPI_TRY(p9_perv_sbe_cmn_scan0_module(i_target_chiplet, REGIONS_EXCEPT_VITAL, - SCAN_TYPES_TIME_GPTR_REPR)); - - - //TODO:Load Ring Module : Scan initialize PLL BNDY chain - } - - FAPI_DBG("Exiting ..."); - -fapi_try_exit: - return fapi2::current_err; - -} diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H deleted file mode 100644 index 3760525a..00000000 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H +++ /dev/null @@ -1,61 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H $ */ -/* */ -/* OpenPOWER sbe Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] 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 */ -//------------------------------------------------------------------------------ -/// @file p9_sbe_gptr_time_repr_initf.H -/// -/// @brief Scan0 and Load repair, time and GPTR rings for all enabled chiplets -//------------------------------------------------------------------------------ -// *HWP HW Owner : Abhishek Agarwal -// *HWP HW Backup Owner : Srinivas V Naga -// *HWP FW Owner : Brian Silver -// *HWP Team : Perv -// *HWP Level : 2 -// *HWP Consumed by : SBE -//------------------------------------------------------------------------------ - - -#ifndef _P9_SBE_GPTR_TIME_REPR_INITF_H_ -#define _P9_SBE_GPTR_TIME_REPR_INITF_H_ - - -#include - - -typedef fapi2::ReturnCode (*p9_sbe_gptr_time_repr_initf_FP_t)( - const fapi2::Target&); - -/// @brief Scan 0 all rings on all enabled chiplets (except for TP) -/// Load Repair, Time and GPTR rings for all enabled chiplets -/// -- All chip customization data is within the repair and time rings -- array repair, DTS setting -/// -/// @param[in] i_target_chip Reference to TARGET_TYPE_PROC_CHIP target -/// @return FAPI2_RC_SUCCESS if success, else error code. -extern "C" -{ - fapi2::ReturnCode p9_sbe_gptr_time_repr_initf(const - fapi2::Target& i_target_chip); -} - -#endif diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C deleted file mode 100644 index 1950b315..00000000 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C +++ /dev/null @@ -1,52 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C $ */ -/* */ -/* OpenPOWER sbe Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] 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 */ -//------------------------------------------------------------------------------ -/// @file p9_sbe_tp_gptr_time_repr_initf.C -/// -/// @brief proc sbe tp gptr time repr initf -// *! -// *! OWNER NAME : Abhishek Agarwal Email: abagarw8@in.ibm.com -// *! BACKUP NAME : Email: -//------------------------------------------------------------------------------ -// *HWP HWP Owner : Abhishek Agarwal -// *HWP FW Owner : Brian Silver -// *HWP Team : Perv -// *HWP Level : 1 -// *HWP Consumed by : SBE -//------------------------------------------------------------------------------ - - -//## auto_generated -#include "p9_sbe_tp_gptr_time_repr_initf.H" -fapi2::ReturnCode p9_sbe_tp_gptr_time_repr_initf(const - fapi2::Target& i_target_chip) -{ - FAPI_DBG("p9_sbe_tp_gptr_time_repr_initf: Entering ..."); - - FAPI_DBG("p9_sbe_tp_gptr_time_repr_initf: Exiting ..."); - - return fapi2::FAPI2_RC_SUCCESS; - -} diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H deleted file mode 100644 index c682763b..00000000 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H +++ /dev/null @@ -1,62 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H $ */ -/* */ -/* OpenPOWER sbe Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] 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 */ -//------------------------------------------------------------------------------ -/// @file p9_sbe_tp_gptr_time_repr_initf.H -/// -/// @brief proc sbe tp gptr time repr initf -// *! -// *! OWNER NAME : Abhishek Agarwal Email: abagarw8@in.ibm.com -// *! BACKUP NAME : Email: -//------------------------------------------------------------------------------ -// *HWP HWP Owner : Abhishek Agarwal -// *HWP FW Owner : Brian Silver -// *HWP Team : Perv -// *HWP Level : 1 -// *HWP Consumed by : SBE -//------------------------------------------------------------------------------ - - -#ifndef _P9_SBE_TP_GPTR_TIME_REPR_INITF_H_ -#define _P9_SBE_TP_GPTR_TIME_REPR_INITF_H_ - - -#include - - -typedef fapi2::ReturnCode (*p9_sbe_tp_gptr_time_repr_initf_FP_t)( - const fapi2::Target&); - -/// @brief --Load Scan Repair, Time and GPTR for TP Chiplet -/// -/// -/// @param[in] i_target_chip Reference to TARGET_TYPE_PROC_CHIP target -/// @return FAPI2_RC_SUCCESS if success, else error code. -extern "C" -{ - fapi2::ReturnCode p9_sbe_tp_gptr_time_repr_initf(const - fapi2::Target& i_target_chip); -} - -#endif diff --git a/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk b/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk index 70d989d0..050d0f13 100644 --- a/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk +++ b/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk @@ -38,7 +38,6 @@ PERV-CPP-SOURCES +=p9_sbe_chiplet_pll_initf.C PERV-CPP-SOURCES +=p9_sbe_chiplet_pll_setup.C PERV-CPP-SOURCES +=p9_sbe_chiplet_reset.C PERV-CPP-SOURCES +=p9_sbe_enable_seeprom.C -PERV-CPP-SOURCES +=p9_sbe_gptr_time_repr_initf.C PERV-CPP-SOURCES +=p9_sbe_lpc_init.C PERV-CPP-SOURCES +=p9_sbe_nest_enable_ridi.C PERV-CPP-SOURCES +=p9_sbe_nest_initf.C -- cgit v1.2.1