diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-11-06 11:17:13 -0600 |
|---|---|---|
| committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-11-07 23:34:48 -0600 |
| commit | c3689a69137b76f117ac9524a8f7ec189e133b04 (patch) | |
| tree | 630b37a42d7041f5c27d9ae17556654c8c779f57 /src/usr/fapiwrap | |
| parent | c016e9860f3dcd56e1332ca455bad8471952c92b (diff) | |
| download | talos-hostboot-c3689a69137b76f117ac9524a8f7ec189e133b04.tar.gz talos-hostboot-c3689a69137b76f117ac9524a8f7ec189e133b04.zip | |
Fixes to PMIC presence detection
While performing presence detection on the PMIC targets we need
to first read the parent OCMB's SPD to see what device address
the PMIC is on. There was a bug where we were attempting to read
the parent OCMB's spd without first checking if the OCMB is
present itself. This commit adds a check to ensure we dont attempt
i2c reads on devices that are not present. Also this commit adds
a check to make sure we do not attempt presence detection on GEMINI
ocmbs
Change-Id: I999189b3b97210bb37b7ba1fdb2d86658d770e36
CQ: SW480414
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/86564
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fapiwrap')
| -rw-r--r-- | src/usr/fapiwrap/fapiWrap.C | 51 | ||||
| -rw-r--r-- | src/usr/fapiwrap/makefile | 2 |
2 files changed, 48 insertions, 5 deletions
diff --git a/src/usr/fapiwrap/fapiWrap.C b/src/usr/fapiwrap/fapiWrap.C index a65b7c233..8950e0a92 100644 --- a/src/usr/fapiwrap/fapiWrap.C +++ b/src/usr/fapiwrap/fapiWrap.C @@ -23,12 +23,18 @@ /* */ /* IBM_PROLOG_END_TAG */ -#include <fapiwrap/fapiWrapif.H> // interface definitions +// Platform includes +#include <fapiwrap/fapiWrapif.H> // interface definitions #include <fapi2/plat_hwp_invoker.H> // FAPI_INVOKE_HWP -#include <trace/interface.H> // tracing includes +#include <trace/interface.H> // tracing includes +#include <vpd/spdenums.H> // DDIMM_DDR4_SPD_SIZE +#include <devicefw/driverif.H> // deviceRead +// Imported Includes #include <exp_getidec.H> // exp_getidec #include <pmic_i2c_addr_get.H> // get_pmic_i2c_addr +#include <chipids.H> // for GEMINI ID + trace_desc_t* g_trac_fapiwrap; TRAC_INIT(&g_trac_fapiwrap, FAPIWRAP_COMP_NAME, 6*KILOBYTE, TRACE::BUFFER_SLOW); @@ -57,9 +63,44 @@ namespace FAPIWRAP return l_errl; } - uint8_t get_pmic_dev_addr( const char* i_spd, - const uint8_t i_pmic_id) + errlHndl_t get_pmic_dev_addr( TARGETING::Target * i_ocmbChip, + const uint8_t i_pmic_id, + uint8_t& o_pmic_devAddr) { - return get_pmic_i2c_addr(i_spd, i_pmic_id); + errlHndl_t l_errl = nullptr; + + do{ + + auto l_chipId = i_ocmbChip->getAttr< TARGETING::ATTR_CHIP_ID>(); + + if( l_chipId == POWER_CHIPID::GEMINI_16) + { + // If this is a Gemini OCMB then there are no PMIC targets + // so just set the out parm to NO_PMIC_DEV_ADDR and break + o_pmic_devAddr = NO_PMIC_DEV_ADDR; + break; + } + + uint8_t l_spdBlob[SPD::DDIMM_DDR4_SPD_SIZE]; + size_t l_spdSize = SPD::DDIMM_DDR4_SPD_SIZE; + + l_errl = deviceRead(i_ocmbChip, + l_spdBlob, + l_spdSize, + DEVICE_SPD_ADDRESS(SPD::ENTIRE_SPD_WITHOUT_EFD)); + + if(l_errl) + { + TRACFCOMP( g_trac_fapiwrap, ERR_MRK"get_pmic_dev_addr() " + "Error reading SPD associated with OCMB 0x%.08X", + TARGETING::get_huid(i_ocmbChip)); + break; + } + + o_pmic_devAddr = get_pmic_i2c_addr(reinterpret_cast<char *>(l_spdBlob), + i_pmic_id); + + }while(0); + return l_errl; } }
\ No newline at end of file diff --git a/src/usr/fapiwrap/makefile b/src/usr/fapiwrap/makefile index 96d96e48b..1916630db 100644 --- a/src/usr/fapiwrap/makefile +++ b/src/usr/fapiwrap/makefile @@ -35,6 +35,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/ # to get ffdc_includes.H EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/ +# to get chipids.H +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils # HWP include directories : EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/ |
