summaryrefslogtreecommitdiffstats
path: root/src/include/usr/sbe
diff options
context:
space:
mode:
authorChristian Geddes <crgeddes@us.ibm.com>2019-01-23 14:43:37 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2019-02-16 09:10:13 -0600
commite6832f74ac222be90b6719a33613863698239ce4 (patch)
tree58f0f0010bd984b11c8ce200e3dabae2b0bbd91a /src/include/usr/sbe
parentbc80fc6b84359fa03c4212162e3e548dadcd8a9c (diff)
downloadblackbird-hostboot-e6832f74ac222be90b6719a33613863698239ce4.tar.gz
blackbird-hostboot-e6832f74ac222be90b6719a33613863698239ce4.zip
Add new path in EEPROM device op to allow reading from new EECACHE
Recently a new EECACHE section was introduced to Hostboot. This section gets populated with a copy of every PRIMARY_VPD eeprom (someday could contain other eeprom roles also) during host_discover_targets. This commit add support to allow users to select where they want to perform their EEPROM device operation. If they pass CACHE to the deviceOp macro then a read will come from the pnor cache, writes will write to pnor cache and then also write to the eeprom HW. If HARDWARE is passed in then reads and writes will be directly done on the eeprom hardware. If AUTOSELECT is passed the code will check our cache to see if we have a copy of the eeprom in question, if we have a copy we will go the CACHE path, if no copy exists we will go the HARDWARE path. Along with this change some reorganization was done w/ the eeprom related files. RTC: 196805 Change-Id: If2c4e5d3e338a1a10780740c1a019eb4af003b73 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70822 Reviewed-by: Matt Derksen <mderkse1@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: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Roland Veloz <rveloz@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/usr/sbe')
-rw-r--r--src/include/usr/sbe/sbe_update.H8
-rw-r--r--src/include/usr/sbe/sbeif.H4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/include/usr/sbe/sbe_update.H b/src/include/usr/sbe/sbe_update.H
index f4dc648b7..b388c4cae 100644
--- a/src/include/usr/sbe/sbe_update.H
+++ b/src/include/usr/sbe/sbe_update.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2018 */
+/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -31,7 +31,7 @@
#include <errl/errlentry.H> // errlHndl_t
#include <errl/hberrltypes.H> // ERRORLOG::errlSeverity_t
#include <targeting/common/target.H> // Target
-#include <i2c/eepromif.H> // eeprom_chip_types_t
+#include <i2c/eepromif.H> // EEPROM_ROLE
#include <pnor/ecc.H> // PNOR::ECC::eccStatus
#include <util/utilxipimage.H> // Util::imageBuild_t
#include <p9_infrastruct_help.H> // MAX_RING_BUF_SIZE, etc
@@ -175,7 +175,7 @@ namespace SBE
// Update Fields and New Fields to be Written to the Target
sbeUpdateActions_t update_actions;
- EEPROM::eeprom_chip_types_t seeprom_side_to_update;
+ EEPROM::EEPROM_ROLE seeprom_side_to_update;
sbeSeepromVersionInfo_t new_seeprom_ver;
bool new_readBack_check;
@@ -342,7 +342,7 @@ namespace SBE
* @return errlHndl_t Error log handle on failure.
*/
errlHndl_t getSeepromSideVersionViaI2c(TARGETING::Target* i_target,
- EEPROM::eeprom_chip_types_t i_seepromSide,
+ EEPROM::EEPROM_ROLE i_seepromSide,
sbeSeepromVersionInfo_t& o_info,
bool& o_seeprom_ver_ECC_fail);
/**
diff --git a/src/include/usr/sbe/sbeif.H b/src/include/usr/sbe/sbeif.H
index 022be1d72..0fa909f4a 100644
--- a/src/include/usr/sbe/sbeif.H
+++ b/src/include/usr/sbe/sbeif.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2018 */
+/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -146,7 +146,7 @@ namespace SBE
* @return errlHndl_t Error log handle on failure; otherwise nullptr
*/
errlHndl_t getHwKeyHashFromSbeImage(TARGETING::Target* i_target,
- EEPROM::eeprom_chip_types_t i_seeprom,
+ EEPROM::EEPROM_ROLE i_seeprom,
sbeSeepromSide_t i_bootSide,
SHA512_t o_hash,
const void * i_image_ptr = nullptr);
OpenPOWER on IntegriCloud