Skip to content

Commit

Permalink
L3 updates -- p9_build_smp, p9_fbc_utils
Browse files Browse the repository at this point in the history 
p9_build_smp:
  constrain FFDC collection at 16 chips (current max size for P9 based systems)
  scrub node references, replace with group
  clarify X link requirements based on pump mode
  review and complete callouts

p9_fbc_utils:
  add feature attribute to support pb_init sampling on NDD2+
  replace locally defined bit constants with SCOM header file constants

Change-Id: Ib1f71488ffd07580a647709d9227112f7d73384f
CQ: HW328175
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40308
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: DHRUVARAJ SUBHASH CHANDRAN <dhruvaraj@in.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40310
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
  • Loading branch information
@jjmcgill @sgupta2m
jjmcgill authored and sgupta2m committed May 28, 2017
1 parent 8f86602 commit cc5c3a7
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 349 deletions.
61 changes: 33 additions & 28 deletions src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
// *HWP Team: Nest
// *HWP Level: 2
// *HWP Level: 3
// *HWP Consumed by: SBE,HB,FSP
//

Expand All @@ -48,72 +48,77 @@
//------------------------------------------------------------------------------
#include <p9_fbc_utils.H>
#include <p9_misc_scom_addresses.H>
#include <p9_misc_scom_addresses_fld.H>


//------------------------------------------------------------------------------
// Constant definitions
//------------------------------------------------------------------------------

// ADU PMisc Register field/bit definitions
const uint32_t ALTD_SND_MODE_DISABLE_CHECKSTOP_BIT = 19;
const uint32_t ALTD_SND_MODE_MANUAL_CLR_PB_STOP_BIT = 21;
const uint32_t ALTD_SND_MODE_PB_STOP_BIT = 22;

// FBC Mode Register field/bit definitions
const uint32_t PU_FBC_MODE_PB_INITIALIZED_BIT = 0;

// FBC base address determination constants
// system ID (large system)
const uint8_t FABRIC_ADDR_LS_SYSTEM_ID_START_BIT = 8;
const uint8_t FABRIC_ADDR_LS_SYSTEM_ID_END_BIT = 12;
// msel bits (large & small system)
const uint8_t FABRIC_ADDR_MSEL_START_BIT = 13;
const uint8_t FABRIC_ADDR_MSEL_END_BIT = 14;
// group ID (large system)
const uint8_t FABRIC_ADDR_LS_GROUP_ID_START_BIT = 15;
const uint8_t FABRIC_ADDR_LS_GROUP_ID_END_BIT = 18;
// chip ID (large system)
const uint8_t FABRIC_ADDR_LS_CHIP_ID_START_BIT = 19;
const uint8_t FABRIC_ADDR_LS_CHIP_ID_END_BIT = 21;
// msel bits (large & small system)
const uint8_t FABRIC_ADDR_MSEL_START_BIT = 13;
const uint8_t FABRIC_ADDR_MSEL_END_BIT = 14;


//------------------------------------------------------------------------------
// Function definitions
//------------------------------------------------------------------------------


// NOTE: see comments above function prototype in header
fapi2::ReturnCode p9_fbc_utils_get_fbc_state(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
bool& o_is_initialized,
bool& o_is_running)
{
FAPI_DBG("Start");

// TODO: HW328175
// fapi2::buffer<uint64_t> l_fbc_mode_data;
// FAPI_TRY(fapi2::getScom(i_target, PU_FBC_MODE_REG, l_fbc_mode_data),
// "Error reading FBC Mode Register");
// // fabric is initialized if PB_INITIALIZED bit is one/set
// o_is_initialized = l_fbc_mode_data.getBit<PU_FBC_MODE_PB_INITIALIZED_BIT>();
fapi2::ATTR_CHIP_EC_FEATURE_HW328175_Type l_hw328175;
fapi2::buffer<uint64_t> l_fbc_mode_data;
fapi2::buffer<uint64_t> l_pmisc_mode_data;

// currently, sampling FBC init from PB Mode register is unreliable
// as init can drop perodically at runtime (based on legacy sleep backoff)
// until this issue is fixed, just return true to caller
o_is_initialized = true;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW328175, i_target, l_hw328175),
"Error from FAPI_ATTR_GET (ATTR_CHIP_EC_FEATURE_HW328175");

if (l_hw328175)
{
// sampling FBC init from PB Mode register is unreliable
// as init can drop perodically at runtime (based on legacy sleep backoff),
// just return true to caller
o_is_initialized = true;
}
else
{
FAPI_TRY(fapi2::getScom(i_target, PU_PB_CENT_SM0_PB_CENT_MODE, l_fbc_mode_data),
"Error reading FBC Mode Register");
// fabric is initialized if PB_INITIALIZED bit is one/set
o_is_initialized = l_fbc_mode_data.getBit<PU_PB_CENT_SM0_PB_CENT_MODE_PB_CENT_PBIXXX_INIT>();
}

// read ADU PMisc Mode Register state
fapi2::buffer<uint64_t> l_pmisc_mode_data;
FAPI_TRY(fapi2::getScom(i_target, PU_SND_MODE_REG, l_pmisc_mode_data),
"Error reading ADU PMisc Mode register");

// fabric is running if FBC_STOP bit is zero/clear
o_is_running = !(l_pmisc_mode_data.getBit<ALTD_SND_MODE_PB_STOP_BIT>());
o_is_running = !(l_pmisc_mode_data.getBit<PU_SND_MODE_REG_PB_STOP>());

fapi_try_exit:
FAPI_DBG("End");
return fapi2::current_err;
}


// NOTE: see comments above function prototype in header
fapi2::ReturnCode p9_fbc_utils_override_fbc_stop(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
{
Expand All @@ -125,12 +130,12 @@ fapi2::ReturnCode p9_fbc_utils_override_fbc_stop(
"Error reading ADU PMisc Mode register");

// set bit to disable checkstop forwarding and write back
l_pmisc_mode_data.setBit<ALTD_SND_MODE_DISABLE_CHECKSTOP_BIT>();
l_pmisc_mode_data.setBit<PU_SND_MODE_REG_DISABLE_CHECKSTOP>();
FAPI_TRY(fapi2::putScom(i_target, PU_SND_MODE_REG, l_pmisc_mode_data),
"Error writing ADU PMisc Mode register to disable checkstop forwarding to FBC");

// set bit to manually clear stop control and write back
l_pmisc_mode_data.setBit<ALTD_SND_MODE_MANUAL_CLR_PB_STOP_BIT>();
l_pmisc_mode_data.setBit<PU_SND_MODE_REG_MANUAL_CLR_PB_STOP>();
FAPI_TRY(fapi2::putScom(i_target, PU_SND_MODE_REG, l_pmisc_mode_data),
"Error writing ADU PMisc Mode register to manually clear FBC stop control");

Expand All @@ -140,6 +145,7 @@ fapi_try_exit:
}


// NOTE: see comments above function prototype in header
fapi2::ReturnCode p9_fbc_utils_get_chip_base_address(
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
const p9_fbc_utils_addr_mode_t i_addr_mode,
Expand All @@ -155,7 +161,6 @@ fapi2::ReturnCode p9_fbc_utils_get_chip_base_address(
fapi2::buffer<uint64_t> l_base_address;
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> FAPI_SYSTEM;


FAPI_DBG("Start");

// retreive attributes which statically determine chips position in memory map
Expand Down Expand Up @@ -186,7 +191,7 @@ fapi2::ReturnCode p9_fbc_utils_get_chip_base_address(
"Error from FAPI_ATTR_GET (ATTR_MEM_MIRROR_PLACEMENT_POLICY)");

// apply system ID
// occupies one field for large system map (three fields for small system map)
// occupies one field for large system map
l_base_address.insertFromRight < FABRIC_ADDR_LS_SYSTEM_ID_START_BIT,
(FABRIC_ADDR_LS_SYSTEM_ID_END_BIT - FABRIC_ADDR_LS_SYSTEM_ID_START_BIT + 1) > (l_fabric_system_id);

Expand Down
10 changes: 5 additions & 5 deletions src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
// *HWP Team: Nest
// *HWP Level: 2
// *HWP Level: 3
// *HWP Consumed by: SBE,HB,FSP
//

Expand Down Expand Up @@ -78,9 +78,9 @@ const uint64_t FABRIC_CACHELINE_SIZE = 0x80;
/// @brief Read FBC/ADU registers to determine state of fabric init and stop
/// control signals
///
/// @param[in] i_target Reference to processor chip target
/// @param[out] o_is_initialized State of fabric init signal
/// @param[out] o_is_running State of fabric pervasive stop control
/// @param[in] i_target Reference to processor chip target
/// @param[out] o_is_initialized State of fabric init signal
/// @param[out] o_is_running State of fabric pervasive stop control
/// @return fapi::ReturnCode, FAPI2_RC_SUCCESS if success, else error code.
///
fapi2::ReturnCode p9_fbc_utils_get_fbc_state(
Expand All @@ -92,7 +92,7 @@ fapi2::ReturnCode p9_fbc_utils_get_fbc_state(
/// @brief Use ADU pMisc Mode register to clear fabric stop signal, overriding
/// a stop condition caused by a checkstop
///
/// @param[in] i_target Reference to processor chip target
/// @param[in] i_target Reference to processor chip target
/// @return fapi::ReturnCode, FAPI2_RC_SUCCESS if success, else error code.
///
fapi2::ReturnCode p9_fbc_utils_override_fbc_stop(
Expand Down

0 comments on commit cc5c3a7

Please sign in to comment.