Skip to content

Commit

Permalink
Updates to initcompiler to support DD2 and cumulus
Browse files Browse the repository at this point in the history 
    -Branch based on scom address changes
    -Update error cases for missing/unsupported spys

RTC:163767
Change-Id: Ifc2b5b05a4cd3397125962959c7113da965e988b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35507
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@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: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35511
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@rjknight @dcrowell77
rjknight authored and dcrowell77 committed Feb 28, 2017
1 parent 8a6f2a3 commit e72a22b
Show file tree
Hide file tree
Showing 20 changed files with 82 additions and 40 deletions.
1 change: 1 addition & 0 deletions src/import/chips/p9/initfiles/p9.mca.scom.initfile
View file
Expand Up @@ -73,6 +73,7 @@ target_type 0 TARGET_TYPE_MCA;
target_type 1 TARGET_TYPE_MCBIST;
target_type 2 TARGET_TYPE_MCS;
target_type 3 TARGET_TYPE_SYSTEM;
target_type 4 TARGET_TYPE_PROC_CHIP;


define MCBIST = TGT1; # If referencing Attr from mcbist, add "MCBIST." in front
Expand Down
3 changes: 2 additions & 1 deletion src/import/chips/p9/initfiles/p9.mcs.scom.initfile
View file
Expand Up @@ -42,7 +42,7 @@
## Syntax Notes
# Compiler expects spys to be all caps


#--******************************************************************************
#-- Required keywords/variables
#--******************************************************************************
Expand All @@ -51,6 +51,7 @@ SyntaxVersion = 3

target_type 0 TARGET_TYPE_MCS;
target_type 1 TARGET_TYPE_SYSTEM;
target_type 2 TARGET_TYPE_PROC_CHIP;


#--******************************************************************************
Expand Down
6 changes: 5 additions & 1 deletion src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C
View file
Expand Up @@ -38,9 +38,13 @@ constexpr uint64_t literal_0b0010 = 0b0010;
constexpr uint64_t literal_0b0001 = 0b0001;

fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT2, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT2, l_chip_ec));
fapi2::ATTR_PROC_FABRIC_PUMP_MODE_Type l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_PUMP_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE));
fapi2::buffer<uint64_t> l_scom_buffer;
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -32,13 +32,13 @@


typedef fapi2::ReturnCode (*p9_cxa_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2);

}

Expand Down
9 changes: 7 additions & 2 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -46,9 +46,14 @@ constexpr uint64_t literal_0x4040 = 0x4040;
constexpr uint64_t literal_0xE058 = 0xE058;
constexpr uint64_t literal_0x0202 = 0x0202;

fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0)
fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT1, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
fapi2::buffer<uint64_t> l_scom_buffer;
{
FAPI_TRY(fapi2::getScom( TGT0, 0x800000030701103full, l_scom_buffer ));
Expand Down
8 changes: 5 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -31,12 +31,14 @@
#include <fapi2.H>


typedef fapi2::ReturnCode (*p9_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&);
typedef fapi2::ReturnCode (*p9_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0);
fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);

}

Expand Down
7 changes: 6 additions & 1 deletion src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.C
View file
Expand Up @@ -34,9 +34,14 @@ constexpr uint64_t literal_0x0000 = 0x0000;
constexpr uint64_t literal_0x0 = 0x0;
constexpr uint64_t literal_0b11 = 0b11;

fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0)
fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT1, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
fapi2::buffer<uint64_t> l_scom_buffer;
{
FAPI_TRY(fapi2::getScom( TGT0, 0x601180aull, l_scom_buffer ));
Expand Down
8 changes: 5 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_dl_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -31,12 +31,14 @@
#include <fapi2.H>


typedef fapi2::ReturnCode (*p9_fbc_ioe_dl_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&);
typedef fapi2::ReturnCode (*p9_fbc_ioe_dl_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0);
fapi2::ReturnCode p9_fbc_ioe_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);

}

Expand Down
6 changes: 5 additions & 1 deletion src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C
View file
Expand Up @@ -77,9 +77,13 @@ constexpr uint64_t literal_939 = 939;

fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3)
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT4, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT4, l_chip_ec));
fapi2::ATTR_PROC_EPS_READ_CYCLES_T0_Type l_TGT3_ATTR_PROC_EPS_READ_CYCLES_T0;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_EPS_READ_CYCLES_T0, TGT3, l_TGT3_ATTR_PROC_EPS_READ_CYCLES_T0));
uint64_t l_def_MC_EPSILON_CFG_T0 = ((l_TGT3_ATTR_PROC_EPS_READ_CYCLES_T0 + literal_6) / literal_4);
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -33,14 +33,14 @@

typedef fapi2::ReturnCode (*p9_mca_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&, const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4);

}

Expand Down
6 changes: 5 additions & 1 deletion src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C
View file
Expand Up @@ -34,9 +34,13 @@ constexpr uint64_t literal_0 = 0;
constexpr uint64_t literal_0b0001100000000 = 0b0001100000000;

fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT2, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT2, l_chip_ec));
fapi2::ATTR_RISK_LEVEL_Type l_TGT1_ATTR_RISK_LEVEL;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_RISK_LEVEL, TGT1, l_TGT1_ATTR_RISK_LEVEL));
fapi2::buffer<uint64_t> l_scom_buffer;
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.H
View file
Expand Up @@ -32,13 +32,13 @@


typedef fapi2::ReturnCode (*p9_mcs_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2);

}

Expand Down
8 changes: 6 additions & 2 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -50,9 +50,13 @@ constexpr uint64_t literal_0b0010110 = 0b0010110;
constexpr uint64_t literal_0b1000110 = 0b1000110;

fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT2, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT2, l_chip_ec));
fapi2::ATTR_IS_SIMULATION_Type l_TGT1_ATTR_IS_SIMULATION;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_IS_SIMULATION, TGT1, l_TGT1_ATTR_IS_SIMULATION));
uint64_t l_def_IS_HW = (l_TGT1_ATTR_IS_SIMULATION == literal_0);
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -32,13 +32,13 @@


typedef fapi2::ReturnCode (*p9_obus_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2);

}

Expand Down
6 changes: 5 additions & 1 deletion src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C
View file
Expand Up @@ -58,9 +58,13 @@ constexpr uint64_t literal_0b1100 = 0b1100;
constexpr uint64_t literal_0b00 = 0b00;

fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1)
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2)
{
{
fapi2::ATTR_EC_Type l_chip_ec;
fapi2::ATTR_NAME_Type l_chip_id;
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT2, l_chip_id));
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT2, l_chip_ec));
fapi2::ATTR_IS_SIMULATION_Type l_TGT1_ATTR_IS_SIMULATION;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_IS_SIMULATION, TGT1, l_TGT1_ATTR_IS_SIMULATION));
uint64_t l_def_IS_HW = (l_TGT1_ATTR_IS_SIMULATION == literal_0);
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -32,13 +32,13 @@


typedef fapi2::ReturnCode (*p9_xbus_g1_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>&,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);

extern "C"
{

fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1);
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2);

}

Expand Down
5 changes: 4 additions & 1 deletion src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C
View file
Expand Up @@ -78,6 +78,9 @@ fapi2::ReturnCode p9_io_obus_scominit( const fapi2::Target<fapi2::TARGET_TYPE_OB
// get system target
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> l_system_target;

// get a proc target
fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_proc_target = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>();

// assert IO reset to power-up bus endpoint logic
FAPI_TRY( io::rmw( OPT_IORESET_HARD_BUS0, i_target, GROUP_00, LANE_00, SET_RESET ) );

Expand All @@ -87,7 +90,7 @@ fapi2::ReturnCode p9_io_obus_scominit( const fapi2::Target<fapi2::TARGET_TYPE_OB
FAPI_TRY( io::rmw( OPT_IORESET_HARD_BUS0, i_target, GROUP_00, LANE_00, CLEAR_RESET ) );

FAPI_INF("Invoke FAPI procedure core: input_target");
FAPI_EXEC_HWP(rc, p9_obus_scom, i_target, l_system_target);
FAPI_EXEC_HWP(rc, p9_obus_scom, i_target, l_system_target, l_proc_target);

// mark HWP exit
FAPI_INF("p9_io_obus_scominit: ...Exiting");
Expand Down
9 changes: 6 additions & 3 deletions src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C
View file
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 Down Expand Up @@ -130,6 +130,9 @@ fapi2::ReturnCode p9_io_xbus_scominit(
// get system target
const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> l_system_target;

// get proc chip to pass for EC level checks in procedure
fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_proc =
i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>();

// assert IO reset to power-up bus endpoint logic
// read-modify-write, set single reset bit (HW auto-clears)
Expand Down Expand Up @@ -194,7 +197,7 @@ fapi2::ReturnCode p9_io_xbus_scominit(

case ENUM_ATTR_XBUS_GROUP_1:
FAPI_INF("Group 1:Invoke FAPI procedure core: input_target");
FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_target, l_system_target);
FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_target, l_system_target, l_proc);

if( rc )
{
Expand All @@ -204,7 +207,7 @@ fapi2::ReturnCode p9_io_xbus_scominit(
}

FAPI_INF("Group 1:Invoke FAPI procedure core: connected_target");
FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_connected_target, l_system_target);
FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_connected_target, l_system_target, l_proc);

if( rc )
{
Expand Down

0 comments on commit e72a22b

Please sign in to comment.