From 4cedc39a1cbee94ec87b4c5e5821c5854bca589a Mon Sep 17 00:00:00 2001 From: Dean Sanner Date: Mon, 29 Oct 2018 09:07:33 -0500 Subject: Leave scratch valid bits alone to allow HB to query 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 Tested-by: PPE CI Reviewed-by: Sachin Gupta Reviewed-by: SRINIVAS V. POLISETTY Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68107 Tested-by: FSP CI Jenkins --- .../chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/import') diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C index ae215e27..802eff20 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C +++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C @@ -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 @@ -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>(); } } @@ -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>(); } } @@ -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 @@ -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 @@ -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 ..."); -- cgit v1.2.1