Skip to content

Commit

Permalink
Temporarily moving attribute to the system target
Browse files Browse the repository at this point in the history
There were dependency issues between the FSP and hostboot
changes. This commit is temporarily moving everything to the system
target, so that we can get our changes through CI. We'll go back
later and fix the target to the proc

Change-Id: Ic2d63d10afe50342290a814a94fd2d07d7102fdf
RTC:176434
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56814
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.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: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56827
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
  • Loading branch information
e-liner authored and wghoffa committed Apr 9, 2018
1 parent c5ca811 commit a027c49
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/import/chips/p9/procedures/hwp/perv/p9_setup_sbe_config.C
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ enum P9_SETUP_SBE_CONFIG_Private_Constants
ATTR_PROC_FABRIC_GROUP_ID_LENGTH = 3,
ATTR_PROC_FABRIC_CHIP_ID_STARTBIT = 29,
ATTR_PROC_FABRIC_CHIP_ID_LENGTH = 3,
ATTR_PROC_CHIP_MEM_TO_USE_STARTBIT = 1,
ATTR_PROC_CHIP_MEM_TO_USE_LENGTH = 6,
ATTR_PROC_MEM_TO_USE_STARTBIT = 1,
ATTR_PROC_MEM_TO_USE_LENGTH = 6,
};


Expand Down Expand Up @@ -591,13 +591,13 @@ fapi2::ReturnCode p9_setup_sbe_config(const
l_read_scratch_reg.insertFromRight< ATTR_PROC_EFF_FABRIC_CHIP_ID_STARTBIT, ATTR_PROC_EFF_FABRIC_CHIP_ID_LENGTH >
(l_read_2);

FAPI_DBG("Reading ATTR_PROC_CHIP_MEM_TO_USE");
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_CHIP_MEM_TO_USE, i_target_chip, l_proc_chip_mem_to_use));
FAPI_DBG("Reading ATTR_PROC_MEM_TO_USE");
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_MEM_TO_USE, i_target_chip, l_proc_chip_mem_to_use));

l_read_scratch_reg.setBit<0>();
// set which proc memory to use
l_read_scratch_reg.insertFromRight<ATTR_PROC_CHIP_MEM_TO_USE_STARTBIT,
ATTR_PROC_CHIP_MEM_TO_USE_LENGTH>(l_proc_chip_mem_to_use);
l_read_scratch_reg.insertFromRight<ATTR_PROC_MEM_TO_USE_STARTBIT,
ATTR_PROC_MEM_TO_USE_LENGTH>(l_proc_chip_mem_to_use);

FAPI_DBG("Setting up value of Scratch_reg6");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,18 @@

<attribute>
<id>ATTR_PROC_CHIP_MEM_TO_USE</id>
<targetType>TARGET_TYPE_SYSTEM</targetType>
<description>This attribute denotes where our master proc's memory is
located. In the case that the master-proc does not have usable memory,
we are going to use another proc's memory to boot. The attribute will be
set to the chip and group ID of which proc we want to use.</description>
<valueType>uint8</valueType>
<persistRuntime/>
<platInit/>
</attribute>

<attribute>
<id>ATTR_PROC_MEM_TO_USE</id>
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
<description>This attribute denotes where our master proc's memory is
located. In the case that the master-proc does not have usable memory,
Expand Down

0 comments on commit a027c49

Please sign in to comment.