Skip to content

Commit

Permalink
PM Level 3 for multiple procedures
Browse files Browse the repository at this point in the history 
Commit itends to make following HWP level 3 ready
    - p9_pm_pfet_control
    - p9_pm_pfet_init
    - p9_common_poweronoff
    - p9_hcd_core_poweron
    - p9_hcd_cache_chiplet_reset
    - p9_hcd_cache_poweron
    - p9_pm_set_homer_bar
    - p9_query_stop_state
It also removes inclusion p9_common_poweronoff.C in C
files of many HWP.

Change-Id: I28a14ce4fe99630c4aa4a9044c2653763bbe35c5
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41795
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41798
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
Amit Kumar authored and dcrowell77 committed Sep 29, 2017
1 parent b850b55 commit 22edf15
Show file tree
Hide file tree
Showing 15 changed files with 691 additions and 636 deletions.
512 changes: 6 additions & 506 deletions src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.C
View file

Large diffs are not rendered by default.

490 changes: 489 additions & 1 deletion src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.H
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// *HWP HWP Owner : Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner : Sumit Kumar <sumit_kumar@in.ibm.com>
// *HWP Team : PM
// *HWP Level : 2
// *HWP Level : 3
// *HWP Consumed by : OCC:CME:FSP
//----------------------------------------------------------------------------
//
Expand Down Expand Up @@ -101,7 +101,6 @@
// Includes
// ----------------------------------------------------------------------
#include <p9_common_poweronoff.H>
#include <p9_common_poweronoff.C>
#include <p9_pm_pfet_control.H>

//------------------------------------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_control.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
PROCEDURE=p9_pm_pfet_control
FAPI2_PLAT_INCLUDE += $(ROOTPATH)/chips/p9/procedures/hwp/lib
$(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib/)
OBJS+=p9_common_poweronoff.o
OBJS+=p9_pm_pfet_control.o
lib$(PROCEDURE)_DEPLIBS += p9_common_poweronoff
$(call BUILD_PROCEDURE)

12 changes: 6 additions & 6 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_init.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
/// @file p9_pfet_init.C
/// @brief Initialization and reset the EC/EQ chiplet PFET controller
///
// *HWP HWP Owner: Amit Kumar <akumar3@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner: Sangeetha T S <sangeet2@in.ibm.com>
// *HWP Team: PM
// *HWP Level: 1
// *HWP Consumed by: FSP:HS
// *HWP Owner : Greg Still <stillgs@us.ibm.com>
// *HWP Backup Owner : David Du <daviddu@us.ibm.com>
// *HWP FW Owner : Prem S Jha <premjha2@in.ibm.com>
// *HWP Team : PM
// *HWP Consumed by : SBE:SGPE:CME
// *HWP Level : 3
///
/// High-level procedure flow:
/// \verbatim
Expand Down
14 changes: 7 additions & 7 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_pfet_init.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -25,12 +25,12 @@
/// @file p9_pm_pfet_init.H
/// @brief Initialization and reset the EC/EQ chiplet PFET controller

// *HWP HWP Owner : Amit Kumar <akumar3@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner : Sangeetha T S <sangeet2@in.ibm.com>
// *HWP Team : PM
// *HWP Level : 1
// *HWP Consumed by : HS
// *HWP Owner : Greg Still <stillgs@us.ibm.com>
// *HWP Backup Owner : David Du <daviddu@us.ibm.com>
// *HWP FW Owner : Prem S Jha <premjha2@in.ibm.com>
// *HWP Team : PM
// *HWP Consumed by : SBE:SGPE:CME
// *HWP Level : 3

#ifndef _P9_PFET_INIT_H_
#define _P9_PFET_INIT_H_
Expand Down
12 changes: 6 additions & 6 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_set_homer_bar.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
/// @file p9_pm_set_homer_bar.C
/// @brief Setup a PBABAR to locate the HOMER region for the OCC complex

// *HWP HWP Owner : Amit Kumar <akumar3@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner : Bilicon Patil <bilpatil@in.ibm.com>
// *HWP Team : PM
// *HWP Level : 2
// *HWP Consumed by : HS
// *HWP Owner : Greg Still <stillgs@us.ibm.com>
// *HWP Backup Owner : Prasad BGR <prasadbgr.in.ibm.com>
// *HWP FW Owner : Prem S Jha <premjha2@in.ibm.com>
// *HWP Team : PM
// *HWP Level : 3
// *HWP Consumed by : HS
///
///
/// High-level procedure flow:
Expand Down
16 changes: 8 additions & 8 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_set_homer_bar.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -26,13 +26,13 @@
/// @file p9_pm_set_homer_bar.H
/// @brief Set/reset the BLOCK_REG_WKUP_SOURCES bit in the PPM
/// associated with an EX chiplet
///
// *HWP HWP Owner: Amit Kumar <akumar3@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner: Bilicon Patil <bilpatil@in.ibm.com>
// *HWP Team: PM
// *HWP Level: 1
// *HWP Consumed by: FSP:HS

// *HWP Owner : Greg Still <stillgs@us.ibm.com>
// *HWP Backup Owner : Prasad BGR <prasadbgr.in.ibm.com>
// *HWP FW Owner : Prem S Jha <premjha2@in.ibm.com>
// *HWP Team : PM
// *HWP Level : 3
// *HWP Consumed by : HS
///
///-----------------------------------------------------------------------------

Expand Down
12 changes: 6 additions & 6 deletions src/import/chips/p9/procedures/hwp/pm/p9_query_stop_state.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
/// portions of the targets. FW/Platform is responsible for checking these
/// states before calling HWPs
///
// *HWP HWP Owner: Brian Vanderpool <vanderp@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner: Sangeetha T S <sangeet2@in.ibm.com>
// *HWP Team: PM
// *HWP Level: 2
// *HWP Consumed by: FSP:HS
// *HWP HWP Owner: Brian Vanderpool <vanderp@us.ibm.com>
// *HWP Backup Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner: Prem S Jha <premjha2@in.ibm.com>
// *HWP Team: PM
// *HWP Level: 3
// *HWP Consumed by: FSP:HS
///
///
///
Expand Down
2 changes: 1 addition & 1 deletion src/import/chips/p9/procedures/hwp/pm/p9_query_stop_state.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
///
// *HWP HWP Owner: Brian Vanderpool <vanderp@us.ibm.com>
// *HWP Backup HWP Owner: Greg Still <stillgs@us.ibm.com>
// *HWP FW Owner: Sangeetha T S <sangeet2@in.ibm.com>
// *HWP FW Owner: Prem S Jha <premjha2@in.ibm.com>
// *HWP Team: PM
// *HWP Level: 2
// *HWP Consumed by: FSP:HS
Expand Down
173 changes: 115 additions & 58 deletions src/import/chips/p9/procedures/xml/error_info/p9_common_poweronoff_errors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,24 @@
<!-- -->
<!-- IBM_PROLOG_END_TAG -->
<!-- Error definitions for p9_pfet_init and p9_pfet_lib procedures -->
<!--
*HWP HWP Owner : David Du <daviddu@us.ibm.com>
*HWP Backup HWP Owner : Greg Still <stillgs@us.ibm.com>
*HWP FW Owner : Prem S Jha <premjha2@in.ibm.com>
*HWP Team : PM
*HWP Consumed by : SBE:SGPE:CME
*HWP Level : 3
-->
<hwpErrors>
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_BAD_DOMAIN</rc>
<description>Invalid domain value passed to p9_pfet_control.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<rc>RC_PFET_FORCE_STATE_ERROR</rc>
<description>SCOM request failed.</description>
<ffdc>CHIPLET</ffdc>
<ffdc>PFCS_REG_ADDRESS</ffdc>
<ffdc>PFCS_REG_VALUE</ffdc>
<ffdc>OP_TYPE</ffdc>
<callout>
<procedure>CODE</procedure>
<priority>HIGH</priority>
Expand All @@ -39,101 +49,148 @@
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_BAD_SCOM</rc>
<description>SCOM request failed.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<rc>RC_VDD_CORE_PFET_TIMEOUT</rc>
<description>
PFET sequencer timed out in p9_pfet_control.
Bad Core Chiplet
</description>
<ffdc>ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_VALUE</ffdc>
<ffdc>PROC_CHIP</ffdc>
<ffdc>CORE_NUMBER_IN_ERROR</ffdc>
<callout>
<procedure>CODE</procedure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_CORE</childType>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
<priority>HIGH</priority>
</callout>
<deconfigure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_CORE</childType>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
</deconfigure>
<gard>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_CORE</childType>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
</gard>
</hwpError>

<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_BAD_OP</rc>
<description>Invalid operation value passed to p9_pfet_control.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<ffdc>OPERATION</ffdc>
<rc>RC_VDD_QUAD_PFET_TIMEOUT</rc>
<description>
PFET sequencer timed out in p9_pfet_control.
Bad EQ Chiplet
</description>
<ffdc>ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_VALUE</ffdc>
<ffdc>PROC_CHIP</ffdc>
<ffdc>EQ_NUMBER_IN_ERROR</ffdc>
<callout>
<procedure>CODE</procedure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
<priority>HIGH</priority>
</callout>
<deconfigure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
</deconfigure>
<gard>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
</gard>
</hwpError>

<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_RAIL_ON</rc>
<description>Error returned turning PFETs on in p9_pfet_control.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<ffdc>OPERATION</ffdc>
</hwpError>
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_RAIL_OFF</rc>
<description>Error returned turning PFETs off in p9_pfet_control.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<ffdc>OPERATION</ffdc>
</hwpError>
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFETLIB_TIMEOUT</rc>
<rc>RC_VCS_CORE_PFET_TIMEOUT</rc>
<description>
PFET sequencer timed out in p9_pfet_control.
Bad EX Chiplet
Bad Core Chiplet
</description>
<ffdc>ADDRESS</ffdc>
<ffdc>PFETCONTROLVALUE</ffdc>
<ffdc>DOMAIN</ffdc>
<ffdc>PPM_PFSNS_REG_ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_VALUE</ffdc>
<ffdc>PROC_CHIP</ffdc>
<ffdc>CORE_NUMBER_IN_ERROR</ffdc>
<callout>
<childTargets>
<parent>PROC_CHIP_IN_ERROR</parent>
<childType>TARGET_TYPE_EX_CHIPLET</childType>
<childNumber>EX_NUMBER_IN_ERROR</childNumber>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_CORE</childType>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
<priority>HIGH</priority>
</callout>
<deconfigure>
<childTargets>
<parent>PROC_CHIP_IN_ERROR</parent>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EX_CHIPLET</childType>
<childNumber>EX_NUMBER_IN_ERROR</childNumber>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
</deconfigure>
<gard>
<childTargets>
<parent>PROC_CHIP_IN_ERROR</parent>
<childType>TARGET_TYPE_EX_CHIPLET</childType>
<childNumber>EX_NUMBER_IN_ERROR</childNumber>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_CORE</childType>
<childNumber>CORE_NUMBER_IN_ERROR</childNumber>
</childTargets>
</gard>
</hwpError>
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFET_CODE_BAD_MODE</rc>
<description>Unknown mode passed to p9_pfet_init</description>
<ffdc>EX</ffdc>
<rc>RC_VCS_QUAD_PFET_TIMEOUT</rc>
<description>
PFET sequencer timed out in p9_pfet_control.
Bad EQ Chiplet
</description>
<ffdc>DOMAIN</ffdc>
<ffdc>PPM_PFSNS_REG_ADDRESS</ffdc>
<ffdc>PPM_PFSNS_REG_VALUE</ffdc>
<ffdc>PROC_CHIP</ffdc>
<ffdc>EQ_NUMBER_IN_ERROR</ffdc>
<callout>
<procedure>CODE</procedure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
<priority>HIGH</priority>
</callout>
</hwpError>
<!-- ********************************************************************* -->
<hwpError>
<sbeError/>
<rc>RC_PMPROC_PFET_GET_ATTR</rc>
<description>p9_pfet_init could not get an attribute.</description>
<ffdc>EX</ffdc>
<ffdc>DOMAIN</ffdc>
<ffdc>OPERATION</ffdc>
<deconfigure>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
</deconfigure>
<gard>
<childTargets>
<parent>PROC_CHIP</parent>
<childType>TARGET_TYPE_EQ</childType>
<childNumber>EQ_NUMBER_IN_ERROR</childNumber>
</childTargets>
</gard>
</hwpError>
<!-- ********************************************************************* -->
</hwpErrors>

0 comments on commit 22edf15

Please sign in to comment.