Skip to content

Commit

Permalink
Leave scratch valid bits alone to allow HB to query
Browse files Browse the repository at this point in the history
Current behavior  of SBE is to set all the scratch 8
valid bits for all of the scratch registers, always.
This behavior makes it impossible for Hostboot to determine
if there was an actual override.   Since the SBE always ensures
valid settings in the scratch regs, leave the valid bits in
original state so Hostboot can make its own determination.

Change-Id: Iade385b289cb2300a4b7ed745981c4cac95a8b9c
CQ: SW451891
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68101
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: SRINIVAS V. POLISETTY <srinivan@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68107
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
  • Loading branch information
sannerd authored and sgupta2m committed Nov 29, 2018
1 parent 39be529 commit 4cedc39
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ fapi2::ReturnCode p9_sbe_attr_setup(const

FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_1_SCOM,
l_read_scratch_reg));
l_read_scratch8.setBit<0>();
}
}
//read_scratch2_reg
Expand Down Expand Up @@ -249,7 +248,6 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
//Setting SCRATCH_REGISTER_2 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_2_SCOM,
l_read_scratch_reg));
l_read_scratch8.setBit<1>();
}
}

Expand All @@ -268,8 +266,6 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
//Setting SCRATCH_REGISTER_3 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_3_SCOM,
l_read_scratch_reg));

l_read_scratch8.setBit<2>();
}
}

Expand Down Expand Up @@ -321,8 +317,6 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
//Setting SCRATCH_REGISTER_4 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_4_SCOM,
l_read_scratch_reg));

l_read_scratch8.setBit<3>();
}
}
//read_scratch5_reg
Expand Down Expand Up @@ -424,8 +418,6 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
//Setting SCRATCH_REGISTER_5 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_5_SCOM,
l_read_scratch_reg));

l_read_scratch8.setBit<4>();
}
}
//read_scratch6_reg
Expand Down Expand Up @@ -502,16 +494,13 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
//Setting SCRATCH_REGISTER_6 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_6_SCOM,
l_read_scratch_reg));

l_read_scratch8.setBit<5>();
}
}

FAPI_DBG("Setting Scratch8 for validity of Scratch register");
//Setting SCRATCH_REGISTER_8 register value
FAPI_TRY(fapi2::putScom(i_target_chip, PERV_SCRATCH_REGISTER_8_SCOM,
l_read_scratch8));

//To allow hostboot to know if there is an actual override, leave
//scratch 8 in the same state the SBE found it (prior to starting
//Hostboot all scratch regs have either been overriden or filled
//in by SBE... always)

FAPI_INF("p9_sbe_attr_setup: Exiting ...");

Expand Down

0 comments on commit 4cedc39

Please sign in to comment.