diff options
| author | spashabk-in <shakeebbk@in.ibm.com> | 2018-04-20 00:17:38 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-04-20 13:28:52 -0400 |
| commit | 7b302d426af431f7a3775b5b9003b79bb7db337c (patch) | |
| tree | 15ec20d0f9c9f78bd31b6379f44aa2800dee7f5d | |
| parent | 4b5d5ef5275223d39ec0952be83483d95b3c3396 (diff) | |
| download | talos-sbe-7b302d426af431f7a3775b5b9003b79bb7db337c.tar.gz talos-sbe-7b302d426af431f7a3775b5b9003b79bb7db337c.zip | |
Revert changes to EFF_FBC_GRP_CHIP_IDS mode
Change-Id: I4907eea62c2fa85bdf9ed193d1820fba84afc82f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57530
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+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: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57534
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Tested-by: Sachin Gupta <sgupta2m@in.ibm.com>
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C | 10 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C index ee602beb..fb0dbdbb 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C @@ -182,12 +182,10 @@ fapi2::ReturnCode p9_fbc_utils_get_chip_base_address_no_aliases( l_proc_chip_mem_to_use), "Error from FAPI_ATTR_GET (ATTR_FABRIC_GROUP_ID)"); - l_proc_chip_mem_to_use.extract<FABRIC_ADDR_MEMORY_GROUP_ID_START_BIT, - FABRIC_ADDR_MEMORY_GROUP_ID_LEN, - 0>(l_fabric_group_id); - l_proc_chip_mem_to_use.extract<FABRIC_ADDR_MEMORY_CHIP_ID_START_BIT, - FABRIC_ADDR_MEMORY_CHIP_ID_LEN, - 0>(l_fabric_chip_id); + l_proc_chip_mem_to_use.extractToRight<FABRIC_ADDR_MEMORY_GROUP_ID_START_BIT, + FABRIC_ADDR_MEMORY_GROUP_ID_LEN>(l_fabric_group_id); + l_proc_chip_mem_to_use.extractToRight<FABRIC_ADDR_MEMORY_CHIP_ID_START_BIT, + FABRIC_ADDR_MEMORY_CHIP_ID_LEN>(l_fabric_chip_id); } else if (i_addr_mode == EFF_FBC_GRP_CHIP_IDS) { diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C index 365a9393..18ce7098 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C @@ -406,7 +406,7 @@ get_bootloader_config_data( // read platform initialized attributes to determine struct content FAPI_TRY(p9_fbc_utils_get_chip_base_address_no_aliases(i_master_chip_target, - HB_GRP_CHIP_IDS, + EFF_FBC_GRP_CHIP_IDS, l_chip_base_address_nm0, l_chip_base_address_nm1, l_chip_base_address_m, |
