From 7b302d426af431f7a3775b5b9003b79bb7db337c Mon Sep 17 00:00:00 2001
From: spashabk-in <shakeebbk@in.ibm.com>
Date: Fri, 20 Apr 2018 00:17:38 -0500
Subject: 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>
---
 src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C         | 10 ++++------
 .../chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C      |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/import/chips/p9/procedures/hwp/nest')

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,
-- 
cgit v1.2.1