diff options
| author | Joe McGill <jmcgill@us.ibm.com> | 2016-10-12 21:56:10 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-10-13 14:32:58 -0400 |
| commit | 4cd9bcda23b013e31c30976c1625e14492ec5a74 (patch) | |
| tree | 4af1b226e97fd9ab1dfff0926b40f0d69e41a26e /src/import | |
| parent | abe596145276ef0c0bd6496df3c787e76a12515a (diff) | |
| download | talos-hostboot-4cd9bcda23b013e31c30976c1625e14492ec5a74.tar.gz talos-hostboot-4cd9bcda23b013e31c30976c1625e14492ec5a74.zip | |
p9_fbc_eff_config_aggregate -- fix aggregate config typo, account for pump mode
Change-Id: I122895d8a636c63c7a76db90c8efec9ba5dc07f1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31119
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31120
Reviewed-by: Hostboot Team <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>
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config_aggregate.C | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config_aggregate.C b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config_aggregate.C index bfe822cde..24f1d2853 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config_aggregate.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_eff_config_aggregate.C @@ -78,7 +78,7 @@ fapi2::ReturnCode p9_fbc_eff_config_aggregate_link_setup( // if link is valid, bump fabric ID usage count if (i_en[l_loc_link_id]) { - l_fbc_id_active_count[i_rem_link_id[l_loc_link_id]]++; + l_fbc_id_active_count[i_rem_fbc_id[l_loc_link_id]]++; } o_addr_dis[l_loc_link_id] = 0; @@ -212,6 +212,10 @@ p9_fbc_eff_config_aggregate(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i uint8_t l_a_addr_dis[P9_FBC_UTILS_MAX_A_LINKS]; uint8_t l_a_aggregate; + // pump mode + fapi2::ATTR_PROC_FABRIC_PUMP_MODE_Type l_pump_mode; + fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> FAPI_SYSTEM; + // read attributes for this chip FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG, i_target, l_x_en), "Error from FAPI_ATTR_GET (ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG)"); @@ -253,16 +257,19 @@ p9_fbc_eff_config_aggregate(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i "Error from p9_fbc_utils_get_chip_id_attr"); FAPI_TRY(p9_fbc_utils_get_group_id_attr(i_target, l_loc_fbc_group_id), "Error from p9_fbc_utils_get_group_id_attr"); + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_PUMP_MODE, FAPI_SYSTEM, l_pump_mode), + "Error from FAPI_ATTR_GET (ATTR_PROC_FABRIC_PUMP_MODE"); // calculate aggregate configuration - FAPI_TRY(p9_fbc_eff_config_aggregate_link_setup(P9_FBC_UTILS_MAX_X_LINKS, - l_x_en, - l_loc_fbc_chip_id, - l_x_rem_link_id, - l_x_rem_fbc_chip_id, - l_x_agg_link_delay, - l_x_aggregate, - l_x_addr_dis), + FAPI_TRY(p9_fbc_eff_config_aggregate_link_setup( + P9_FBC_UTILS_MAX_X_LINKS, + l_x_en, + (l_pump_mode == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_NODE) ? (l_loc_fbc_chip_id) : (l_loc_fbc_group_id), + l_x_rem_link_id, + l_x_rem_fbc_chip_id, + l_x_agg_link_delay, + l_x_aggregate, + l_x_addr_dis), "Error from p9_fbc_eff_config_aggregate_link_setup (X)"); FAPI_TRY(p9_fbc_eff_config_aggregate_link_setup(P9_FBC_UTILS_MAX_A_LINKS, |
