From 512f92467c65876005f92ebe1d3f2abe078db265 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Thu, 16 Jan 2020 12:55:30 -0600 Subject: Adjust idec algorithm for Explorer B.0 format The update to B.0 doesn't allow for a change to the register that previously contained the MAJOR_REVISION value. Because of that we are revising the logic that determines the EC level to be a lookup based on a single number instead. Ignore the MAJOR_RELEASE field from CHIP_INFO entirely, it will always =1. Instead we will rely only on the EFUSE bits currently designated for MINOR_RELEASE. Since we lost the ability to have a common M.m we will just use a single incrementing value to represent the ordinal revision number, regardless of major/minor, i.e. the 1st revision is 0, the 2nd is 1, the 10th is 9, etc. So that gives us these values for EFUSE_IMAGE_OUT_3[13:10] A.0 = 0 = 0x10 in Host Firmware A.1 = 1 = 0x11 in Host Firmware B.0 = 2 = 0x20 in Host Firmware B.1 = 3 = 0x21 in Host Firmware (if it were to happen) Change-Id: I878491e8e004c231ce4dcd7abe887a947c7f3dc3 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89764 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Louis Stermole Tested-by: Hostboot CI Reviewed-by: Christian R Geddes Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/89793 Reviewed-by: RAJA DAS --- .../ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H index cf381398..434242eb 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018,2019 */ +/* Contributors Listed Below - COPYRIGHT 2018,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -177,12 +177,13 @@ enum ecid_consts enum idec_consts { EXPLR_CHIP_INFO_REG = 0x2134, - MAJOR_EC_BIT_START = 32, - MAJOR_EC_BIT_LENGTH = 4, LOCATION_BIT_START = 44, LOCATION_BIT_LENGTH = 4, CHIPID_BIT_START = 56, CHIPID_BIT_LENGTH = 8, + + REVISION_BIT_START = 50, + REVISION_BIT_LENGTH = 4, }; -- cgit v1.2.1