diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2019-06-13 14:31:24 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-06-20 09:12:54 -0500 |
commit | f815ee6a9c029f7f8c91c53b38da2be4430892f6 (patch) | |
tree | 97e6ed5dbc59ca94954645efc218339ed064ffe3 /src/include | |
parent | 47b32b1aaaf211c8409f4091c36ae1335595fa1f (diff) | |
download | talos-hostboot-f815ee6a9c029f7f8c91c53b38da2be4430892f6.tar.gz talos-hostboot-f815ee6a9c029f7f8c91c53b38da2be4430892f6.zip |
Add Axone target types to errl/hwas functions
Filled in a couple spots where we needed to support the new
Axone targets types: OCMB, PMIC.
Cleaned up the way we handle adding PN/SN/ECID to our logs
to make them more generic to handle new types in the future
automatically.
Change-Id: I12173f762f92923347f7215c4e590436fcfb9ed7
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79061
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/usr/errl/errlentry.H | 10 | ||||
-rw-r--r-- | src/include/usr/hwas/common/hwasCallout.H | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H index a41cb7bcf..fea1a76ef 100644 --- a/src/include/usr/errl/errlentry.H +++ b/src/include/usr/errl/errlentry.H @@ -860,17 +860,15 @@ private: */ void addVersionInfo(void); -#ifdef CONFIG_BMC_IPMI /** - * @brief called by addHwCallout to retrieve the serial and part number - * from the current target. If the current target does not contain - * ATTR_PART_NUMBER or ATTR_SERIAL_NUMBER, find the first parent that does - * and adds the attribute to the error log. + * @brief called by addHwCallout to retrieve various pieces of card + * and/or chip data, e.g. part number, serial number, ecid. * * @param[in] i_target The target to get the numbers for */ - void addPartAndSerialNumbersToErrLog(const TARGETING::Target * i_target); + void addPartIdInfoToErrLog(const TARGETING::Target * i_target); +#ifdef CONFIG_BMC_IPMI /** * @brief called by addHwCallout to retrieve the FRU ID and sensor ID * from the current target. If the current target does not contain diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H index a39e4a229..9c11236df 100644 --- a/src/include/usr/hwas/common/hwasCallout.H +++ b/src/include/usr/hwas/common/hwasCallout.H @@ -186,7 +186,8 @@ enum busTypeEnum X_BUS_TYPE = 4, I2C_BUS_TYPE = 5, PSI_BUS_TYPE = 6, - O_BUS_TYPE = 7 + O_BUS_TYPE = 7, + OMI_BUS_TYPE = 8, }; // Used by Hostboot code where real clock targets do not exist |