Add in calls to p9_get_sbe_msg_register and handler functions (4/4)

This commit adds in an additional hwp needed for the SBE conditions
handling, p9_get_sbe_msg_register.  This HWP pulls out the SBE
register and determines if it got to runtime or not.  From there
there are handler functions that decide what to do next.

Change-Id: I0e17b345bb983ed6373ec36ea2a6eb9b5e1bf3f1
RTC:173809
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41503
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: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 2 insertions, 710 deletions

diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index cb343f680..5c4068631 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -52,7 +52,7 @@
 #include <sbe/sbeif.H>
 #include <sbeio/sbeioif.H>
 #include <sbe/sbereasoncodes.H>
-#include "sbe_update.H"
+#include <sbe/sbe_update.H>
 #ifdef CONFIG_BMC_IPMI
 #include <ipmi/ipmisensor.H>
 #endif
diff --git a/src/usr/sbe/sbe_update.H b/src/usr/sbe/sbe_update.H
deleted file mode 100644
index 20a028c29..000000000
--- a/src/usr/sbe/sbe_update.H
+++ /dev/null
@@ -1,708 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/sbe/sbe_update.H $                                    */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2017                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-#ifndef __SBE_SBE_UPDATE_H
-#define __SBE_SBE_UPDATE_H
-
-
-#include <stdint.h>
-#include <builtins.h>
-#include <errl/errlentry.H>
-#include <pnor/pnorif.H>
-#include <pnor/ecc.H>
-#include <vmmconst.h>
-#include <targeting/common/targetservice.H>
-#include <i2c/eepromif.H>
-#include <p9_infrastruct_help.H>
-
-namespace SBE
-{
-    /******************************************/
-    /*  Constants                             */
-    /******************************************/
-
-    // Using only first 20 bytes of 64-byte sbe_image_version
-    const size_t   SBE_MVPD_SHORT_IMAGE_VERSION_SIZE = 20;
-
-    // Number of versions supported
-    const uint8_t SBE_SEEPROM_STRUCT_MAX_VERSIONS    = 0x02;
-
-    // Size of supported versions - must be 8-byte aligned
-    const size_t  SBE_SEEPROM_STRUCT_SIZES[SBE_SEEPROM_STRUCT_MAX_VERSIONS] =
-                      {
-                         0,   // ver0: uninitialized - no size
-                         80,  // ver1: size of struct is 80 bytes
-                      };
-
-    // This enum provides the struct versions for sbeSeepromVersionInfo_t
-    // Each numeric version is named after the key feature it introduces.
-    enum sbeSeepromStructVersionInfo_t {
-        STRUCT_VERSION_FIRST  = 0x1,
-        STRUCT_VERSION_LATEST = 0x1,
-        STRUCT_VERSION_SIMICS = 0x5A5A5A5A,
-    };
-
-    #define STRUCT_VERSION_CHECK(version) (((version) >= STRUCT_VERSION_FIRST) \
-                                        && ((version) <= STRUCT_VERSION_LATEST))
-
-    // Constant written to SBE SEEPROM version struct to invalidate the
-    // struct and the image - 'INVALID\0'
-    const uint64_t SBE_SEEPROM_STRUCT_INVALID = 0x494E56414C494400;
-
-    // Used for locations of SBE_Version and SBE Image on a SEEPROM
-    const uint64_t SBE_IMAGE_SEEPROM_ADDRESS    = 0x00;          // 0
-    const uint64_t SBE_VERSION_SPACE_WITH_ECC   = (256 * 9) / 8; // 256B + ECC
-    const uint64_t SBE_SEEPROM_SIZE             = 64*KILOBYTE;   // 64KB
-    const uint64_t SBE_SEEPROM_ECC_PAD          = SBE_SEEPROM_SIZE % 9;
-    // SBE Version (with ECC) kept at end of fourth 64KB memory
-    // Adjust end of usable memory with ECC to be a multiple of 9 bytes
-    const uint64_t SBE_VERSION_SEEPROM_ADDRESS  = 4*SBE_SEEPROM_SIZE
-                                                - SBE_SEEPROM_ECC_PAD
-                                                - SBE_VERSION_SPACE_WITH_ECC;
-
-    // Used to read SBE Boot Side from processor
-    // (PERV_SB_CS_SCOM 0x00050008 or PERV_SB_CS_FSI 0x2808)
-    const uint64_t SBE_BOOT_SELECT_MASK = 0x0000400000000000;
-
-    // Hard coded value, pass in 2KB max
-    const uint32_t RING_OVD_SIZE = 0x800;
-
-
-    // PNOR SBE and SBEC Partition constants
-    const uint32_t MAX_SBE_ENTRIES = 9;
-    const uint32_t SBETOC_EYECATCH = 0x53424500;  //'SBE\0'
-    const uint64_t NONSECURE_VER_EYECATCH = 0x56455253494F4E00; //'VERSION\0'
-    const uint32_t SUPPORTED_TOC_VER = 0x00000001;
-
-    // Cacheline Size
-    const uint64_t CACHELINE_SIZE = 128;
-
-    // MVPD SB Keyword contants
-    const size_t  MVPD_SB_RECORD_SIZE = 129;
-
-    // PERMANENT FLAG - bit 0: 0x0 -> indicates 0 is permanent.
-    const uint8_t PERMANENT_FLAG_MASK             = 0x80;
-    const uint8_t SEEPROM_0_PERMANENT_VALUE       = 0x00;
-    const uint8_t SEEPROM_1_PERMANENT_VALUE       = 0x80;
-
-    // RE-IPL SEEPROM DESIGNATION - bit 1: 0x0 -> indicates boot from SEEPROM 0
-    // NOTE: Used *ONLY* for re-IPL Requests
-    const uint8_t REIPL_SEEPROM_MASK              = 0x40;
-    const uint8_t REIPL_SEEPROM_0_VALUE           = 0x00;
-    const uint8_t REIPL_SEEPROM_1_VALUE           = 0x40;
-
-    // Situation constants -- bits numbered from left to right
-    const uint8_t SITUATION_ALL_BITS_MASK = 0xE0;
-    // Bit 0: current side is permanent (=0) or temp (=1)
-    const uint8_t SITUATION_CUR_IS_PERM   = 0x00;
-    const uint8_t SITUATION_CUR_IS_TEMP   = 0x80;
-
-    // Bit 1:  current_side clean (=0) or dirty (=1)
-    const uint8_t SITUATION_CUR_IS_CLEAN  = 0x00;
-    const uint8_t SITUATION_CUR_IS_DIRTY  = 0x40;
-
-    // Bit 2:  alt side clean (=0) or dirty (=1)
-    const uint8_t SITUATION_ALT_IS_CLEAN  = 0x00;
-    const uint8_t SITUATION_ALT_IS_DIRTY  = 0x20;
-
-    // For mbox messages to FSP
-    const uint32_t MSG_IPL_DUE_TO_SBE_UPDATE = 0x40000012;
-    const uint32_t MSG_IPL_MASTER_CORE       = 0x40000005;
-
-    /******************************************/
-    /*  Enums                                 */
-    /******************************************/
-    // SBE VADDR Layout
-    // 000K - 256K  = Dest for Customized SBE image
-    //
-    // 256K - 316K  = Ring buf1
-    // 316K - 376K  = Ring buf2
-    // 376K - 632K  = Ring Section buf
-    // ---- ALT use 256K-632K for SBE ECC image
-    // 632K - 888K  = SBE + HBBL image
-    enum {
-        FIXED_SEEPROM_WORK_SPACE = 256 * 1024,
-        SBE_IMG_VADDR = VMM_VADDR_SBE_UPDATE,
-        RING_BUF1_VADDR = FIXED_SEEPROM_WORK_SPACE + SBE_IMG_VADDR,
-        RING_BUF2_VADDR = RING_BUF1_VADDR + MAX_RING_BUF_SIZE,
-        RING_SEC_VADDR  = RING_BUF2_VADDR + MAX_RING_BUF_SIZE,
-        //NOTE: recycling the same memory space for different
-        //steps in the process.
-        SBE_ECC_IMG_VADDR = RING_BUF1_VADDR,
-        SBE_ECC_IMG_MAX_SIZE = (MAX_SEEPROM_IMAGE_SIZE * 9 / 8) +
-                               (3 * SBE_SEEPROM_ECC_PAD),
-        SBE_HBBL_IMG_VADDR = RING_SEC_VADDR + FIXED_SEEPROM_WORK_SPACE,
-    };
-
-    // Used for MVPD function
-    enum opType_t
-    {
-        MVPDOP_UNKNOWN,   // Invalid
-        MVPDOP_READ,      // Read version data from MVPD
-        MVPDOP_WRITE,     // Write version data to MVPD
-    };
-
-    // Used to keep track of perm/temp, and cur/alt
-    enum sbeSeepromSide_t
-    {
-        SBE_SEEPROM0         = 0x00,   // corresponds to EEPROM::SBE_PRIMARY
-        SBE_SEEPROM1         = 0x01,   // corresponds to EEPROM::SBE_BACKUP
-        SBE_SEEPROM_INVALID  = 0xFF,
-    };
-
-    // Actions can be combined
-    enum sbeUpdateActions_t
-    {
-        CLEAR_ACTIONS          = 0x00000000,
-        DO_UPDATE              = 0x00000001,
-        IPL_RESTART            = 0x00000002,
-        UPDATE_MVPD            = 0x00000004,
-        MVPD_UPDATE_COMPLETE   = 0x00000008,
-        UPDATE_SBE             = 0x00000010,
-        SBE_UPDATE_COMPLETE    = 0x00000020,
-        UPDATE_NEST_FREQ       = 0x00000100,
-        UNSUPPORTED_SITUATION  = 0x80000000,
-    };
-
-    // Values used to indicate whether an SBE Seeprom image originates from the
-    // golden side SBE Seeprom or not
-    enum sbeOrigin_t
-    {
-        WORKING_SIDE = 0,
-        GOLDEN_SIDE = 1,
-    };
-
-    /******************************************/
-    /*  Structs                               */
-    /******************************************/
-
-    /**
-     * @brief Struct containing version information stored on SBE SEEPROMs
-     *
-     * NOTE: For ECC purposes, this must be 8-byte aligned,
-     *       so pad data if necessary
-     *       struct_version 1: size = 4+4+64+4+1+3 = 80 (aligned)
-     */
-    struct sbeSeepromVersionInfo_t
-    {
-        // The first 64-bits will be read out to check for struct_version
-        uint32_t  struct_version;
-        uint32_t  data_crc;
-        uint8_t   image_version[SBE_IMAGE_VERSION_SIZE];
-        uint32_t  nest_freq_mhz;
-        uint8_t   origin;        // set if SBE came from golden side
-        uint8_t   unused[3];     // unused space; added for alignment
-    } PACKED;
-
-    // This line forces a compile fail if struct is NOT 8-byte-aligned
-    static_assert(0 == (sizeof(sbeSeepromVersionInfo_t) % 8),
-                  "sbeSeepromVersionInfo_t is not 8-byte-aligned");
-
-
-    /**
-     * @brief Struct of individual SBE entry in SBE and SBEC
-     *        Table of Contents in PNOR partitions
-     */
-    struct sbeTocEntry_t
-    {
-        uint32_t ec;          // Chip EC, right aligned
-        uint32_t offset;      // Offset within partition, in bytes
-        uint32_t size;        // Size of image, in bytes
-    } PACKED;
-
-    /**
-     * @brief Layout of Table of Contents at beginning of SBE and
-     *        SBEC Partitions in PNOR
-     */
-    struct sbeToc_t
-    {
-        uint32_t eyeCatch;                      // Expected to contain 'SBE\0'
-        uint32_t tocVersion;                    // Version of SBE TOC
-        sbeTocEntry_t entries[MAX_SBE_ENTRIES]; // Image entries
-    } PACKED;
-
-    /**
-     * @brief Layout of Hostboot Bootloader (HBBL) end of load data
-     */
-    struct hbblEndData_t
-    {
-        uint64_t eyecatcher;                 // Expected to contain 'HBBLend\0'
-        uint64_t address;                    // bootloader.ld end_load_address
-    } PACKED;
-
-    /**
-     * @brief Layout of SB keyword in MVPD
-     */
-    struct mvpdSbKeyword_t
-    {
-        uint8_t flags;                 // 1 byte for various flags
-
-        uint32_t seeprom_0_data_crc;
-        uint8_t seeprom_0_short_version[SBE_MVPD_SHORT_IMAGE_VERSION_SIZE];
-
-        uint32_t seeprom_1_data_crc;
-        uint8_t seeprom_1_short_version[SBE_MVPD_SHORT_IMAGE_VERSION_SIZE];
-        uint8_t mvpdSbPad[MVPD_SB_RECORD_SIZE - sizeof(flags)
-                          - sizeof(seeprom_0_data_crc)
-                          - sizeof(seeprom_1_data_crc)
-                          - (SBE_MVPD_SHORT_IMAGE_VERSION_SIZE * 2)];
-    } PACKED;
-
-
-    /**
-     * @brief Contains the SBE state for a given target
-     */
-    struct sbeTargetState_t
-    {
-
-        // Target Information
-        TARGETING::Target*       target;
-        bool                     target_is_master;
-        uint8_t                  ec;
-
-        // Current Target SBE State Information
-        sbe_image_version_t      pnorVersion;
-        mvpdSbKeyword_t          mvpdSbKeyword;
-
-        sbeSeepromVersionInfo_t  seeprom_0_ver;
-        sbeSeepromVersionInfo_t  seeprom_1_ver;
-
-        bool                     seeprom_0_ver_ECC_fail;
-        bool                     seeprom_1_ver_ECC_fail;
-
-        sbeSeepromSide_t         cur_seeprom_side; // aka 'booted' side
-        sbeSeepromSide_t         alt_seeprom_side;
-        sbeSeepromSide_t         permanent_seeprom_side;
-
-        // Customized Image Information for this Target
-        size_t                   customizedImage_size;
-        uint32_t                 customizedImage_crc;
-
-        // Update Fields and New Fields to be Written to the Target
-        sbeUpdateActions_t            update_actions;
-        EEPROM::eeprom_chip_types_t   seeprom_side_to_update;
-
-        sbeSeepromVersionInfo_t       new_seeprom_ver;
-        bool                          new_readBack_check;
-
-        uint32_t                      err_plid;
-        uint32_t                      err_eid;
-        uint16_t                      err_rc;
-        ERRORLOG::errlSeverity_t      err_sev;
-
-        // Constructor to default certain values
-        sbeTargetState_t() :
-          target(NULL), target_is_master(false), ec(0x0),
-          seeprom_0_ver_ECC_fail(false), seeprom_1_ver_ECC_fail(false),
-          customizedImage_size(0x0), customizedImage_crc(0x0),
-          new_readBack_check(false),
-          err_plid(0x0), err_eid(0x0), err_rc(0x0),
-          err_sev(ERRORLOG::ERRL_SEV_UNKNOWN)
-        {};
-    };
-
-
-
-    /******************************************/
-    /*  Functions -- High Level Functions     */
-    /******************************************/
-
-    /**
-     * @brief Collects SBE Information for a specifc target
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t getSbeInfoState(sbeTargetState_t& io_sbeState);
-
-    /**
-     * @brief Analyze and Determine Update Actions for a specific target
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t getTargetUpdateActions(sbeTargetState_t& io_sbeState);
-
-    /**
-     * @brief Performs the Update Actions for a specific target
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t performUpdateActions(sbeTargetState_t& io_sbeState);
-
-
-    /******************************************/
-    /*  Functions -- System Access            */
-    /******************************************/
-
-    /**
-     * @brief Read or Write SB Keyword in MVPD
-     *
-     * @param[in] i_target   Target processor
-     *
-     * @param[in] i_op      Indicates read or write
-     *
-     * @param[io/out] io_sb_keyword  Pointer to MVPD SBE Keyword struct
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t getSetMVPDVersion(TARGETING::Target* i_target,
-                                 opType_t i_op,
-                                 mvpdSbKeyword_t& io_sb_keyword);
-
-
-    /**
-     * @brief Read SBE Version from PNOR
-     *
-     * @param[in] i_pnorImgHdrPtr Pointer to Image Header in PNOR
-     *
-     * @param[out] o_version      Pointer to SBE Version struct
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t readPNORVersion(void*& i_pnorImgHdrPtr,
-                               sbe_image_version_t& o_version);
-
-
-    /**
-     * @brief Append HBBL Immage to SBE Image
-     *
-     * @param[in] i_section          Pointer to HBBL Image to append
-     *
-     * @param[in] i_section_size     Cacheline size of HBBL Image
-     *
-     * @param[in] i_image            Pointer to SBE image in memory (non-ecc)
-     *
-     * @param[in/out] io_image_size  in: space available for enlarged XIP image
-     *                               out: size of enlarged XIP image
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t appendHbblToSbe(void*     i_section,
-                               uint32_t  i_section_size,
-                               void*     i_image,
-                               uint32_t& io_image_size);
-
-
-    /**
-     * @brief Customize SBE Image for current Processor
-     *
-     * @param[in] i_target      Target processor to customize
-     *
-     * @param[in] i_sbeImgPtr   Pointer to SBE Image with HBBL appended
-     *                          Expected that this pointer points to memory
-     *                          where the SBE Image in PNOR was copied and
-     *                          the HBBL Image in PNOR was appended
-     *
-     * @param[in] i_maxImgSize  Maximum size of customized image
-     *
-     * @param[out] io_imgPtr    Pointer to SBE image in memory
-     *                          Memory from this pointer through
-     *                          i_maxImgSize is expected to be pre-allocated
-     *
-     * @param[out] o_actImgSize  Actual size of the customized image
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t procCustomizeSbeImg(TARGETING::Target* i_target,
-                                   void* i_sbeImgPtr,
-                                   size_t i_maxImgSize,
-                                   void* io_imgPtr,
-                                   size_t& o_actImgSize);
-
-    /**
-     * @brief Determines which Seeprom was used to boot the SBE
-     *
-     * @param[in] i_target      Target processor to customize
-     *
-     * @param[out] o_bootSide   The Seeprom the SBE booted from
-     *
-     * @return errlHndl_t       Error log handle on failure.
-     */
-    errlHndl_t getSbeBootSeeprom(TARGETING::Target* i_target,
-                                 sbeSeepromSide_t& o_bootSide);
-
-    /**
-     * @brief Collects Version information from a specific SEEPROM
-     *
-     * @param[in] i_target      Target processor to customize
-     *
-     * @param[in] i_seepromSide The SEEPROM on the target that to collect
-     *                          the information from
-     *
-     * @param[out] o_info       Struct containing the SBE Version Information
-     *
-     * @param[out] o_seeprom_ver_ECC_fail Reports if there was an ECC erorr on
-     *                                    the collected information
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t getSeepromSideVersion(TARGETING::Target* i_target,
-                                     EEPROM::eeprom_chip_types_t i_seepromSide,
-                                     sbeSeepromVersionInfo_t& o_info,
-                                     bool& o_seeprom_ver_ECC_fail);
-
-    /**
-     * @brief Updates a specific SEEPROM
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *                              and the information to be used for updating
-     *                              the SBE State of the target
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t updateSeepromSide(sbeTargetState_t& io_sbeState);
-
-    /**
-     * @brief Check and Update all targets before Re-IPL Request
-     *
-     * @param[io/out] io_sbeStates_v   Vector of SBE State structs
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t preReIplCheck(std::vector<sbeTargetState_t>& io_sbeStates_v);
-
-
-    /******************************************/
-    /*  Functions -- Helper Functions         */
-    /******************************************/
-
-    /**
-     * @brief Send Mailbox msg to FSP to query if this IPL came from
-     *        SBE Update Re-Ipl Request
-     *
-     * @return  bool    If true, this IPL was from a Hostboot re-IPL request
-     */
-    bool isIplFromReIplRequest(void);
-
-    /**
-     * @brief Determines the Update Actions for a specific target situation
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *                              and is updated based on the situation
-     *
-     * @param[in] i_system_situation SBE Situation of the target that requires
-     *                               analysis to determine Update Actions
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t decisionTreeForUpdates(sbeTargetState_t& io_sbeState,
-                                      uint8_t i_system_situation);
-
-
-
-    /**
-     * @brief Provides the decisionTreeForUpdates() functionality in the
-     *        case that both sides of the SBE should be updated
-     *        simultaneously.
-     *
-     * @param[io/out] io_actions   SBE Update actions required for the target
-     *
-     * @param[io/out] io_sbeState   Struct containing SBE State of the target
-     *                              and is updated based on the situation
-     *
-     * @param[in] i_system_situation SBE Situation of the target that requires
-     *                               analysis to determine Update Actions
-     *
-     */
-    void decisionTreeForUpdatesSimultaneous(uint32_t& io_actions,
-                                            sbeTargetState_t& io_sbeState,
-                                            uint8_t& i_system_situation );
-
-    /**
-     * @brief Deconfigures any Targets whose version does not match the
-     *        Master Target's Version
-     *
-     * @pre   All planned updates must have been completed
-     *
-     * @param[io/out] io_sbeStates_v   Vector of SBE State structs
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t masterVersionCompare(
-                     std::vector<sbeTargetState_t>& io_sbeStates_v);
-
-    /**
-     * @brief Creates the memory space needed for SBE Image Customization
-     *        by allocating and setting permissions on VMM_VADDR_SBE_UPDATE
-     *        area defined in vmmconst.H
-     *
-     * @param[in]   void
-     *
-     * @return      void
-     */
-    errlHndl_t createSbeImageVmmSpace(void);
-
-    /**
-     * @brief Cleans up memory space needed for SBE Image Customization
-     *
-     * @param[in]   void
-     *
-     * @return      void
-     */
-    errlHndl_t cleanupSbeImageVmmSpace(void);
-
-
-    /**
-     * @brief Select best cores to include in SBE Image.
-     *        The output is used to indicate to p8_xip_customize which cores
-     *        should be included in the SBE image.
-     *
-     * @param[in] i_target   Target processor to use for core selection
-     *
-     * @param[in] i_maxCores  Maximum number of cores to select for inclusion
-     *                        in the SBE Image
-     *
-     * @param[out] o_coreMask  Core Mask for the target that does not exceed
-     *                         the maximum number of cores
-     *                         NOTE: bits 8:31 = EC00:EC23
-     *                         This value is used as input into
-     *                         p9_xip_customize.C
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t selectBestCores(TARGETING::Target* i_target,
-                               size_t i_maxCores,
-                               uint32_t& o_coreMask);
-
-
-    /**
-     * @brief Reduces bits set in a bit mask until there is a
-     *        a maximum number of bits set.
-     *        NOTE: bits removed left-to-right
-     *
-     * @param[in] i_mask      Starting mask to be reduced
-     *
-     * @param[in] i_maxBits   Maximum number of bits that the
-     *                        returned Bit Mask can contain
-     *
-     * @return uint32_t       Bit Mask
-     */
-    uint32_t trimBitMask(uint32_t i_mask,
-                         size_t i_maxBits);
-
-
-    /**
-     * @brief Calculates ECC size for a block of code or data allowing for
-     *        padding at chip boundaries so 9-byte segment (8 bytes of code
-     *        or data and 1 byte of ECC) does not straddle the boundary.
-     *
-     * @param[in]  i_srcSz    Size of source (code or data)
-     *
-     * @param[in]  i_offset   Offset into device for storing destination
-     *
-     * @param[in]  i_boundary Chip boundary
-     *
-     * @return Size of source (code or data) with ECC and padding
-     */
-    size_t setECCSize(size_t i_srcSz,
-                      const uint64_t i_offset = SBE_IMAGE_SEEPROM_ADDRESS,
-                      const uint64_t i_boundary = SBE_SEEPROM_SIZE);
-
-
-    /**
-     * @brief Injects ECC into a block of code or data.  Pads output at chip
-     *        boundaries so 9-byte segment (8 bytes of code or data and 1 byte
-     *        of ECC) does not straddle the boundary.
-     *
-     * @param[in]  i_src      Location of source (code or data) without ECC
-     *
-     * @param[in]  i_srcSz    Size of source (code or data)
-     *
-     * @param[in]  i_offset   Offset into device for storing destination
-     *
-     * @param[in]  i_boundary Chip boundary within the device
-     *
-     * @param[out] o_dst      Location of destination (code or data) with ECC
-     *
-     * @return void
-     */
-    void injectECC(const uint8_t* i_src,
-                   size_t i_srcSz,
-                   const uint64_t i_offset,
-                   const uint64_t i_boundary,
-                   uint8_t* o_dst);
-
-
-    /**
-     * @brief Removes ECC from a block of code or data.  Removes padding at
-     *        chip boundaries where 9-byte segment (8 bytes of code or data
-     *        and 1 byte of ECC) was moved to next chip so as to not straddle
-     *        the boundary.
-     *
-     * @param[in/out] io_src  Location of source (code or data) with ECC
-     *
-     * @param[out] o_dst      Location of destination (code or data) without ECC
-     *
-     * @param[in]  i_dstSz    Size of destination (code or data)
-     *
-     * @param[in]  i_offset   Offset into device where source was stored
-     *
-     * @param[in]  i_boundary Chip boundary
-     *
-     * @return     eccStatus  ECC status from removing ECC.
-     */
-    PNOR::ECC::eccStatus removeECC(uint8_t* io_src,
-                                   uint8_t* o_dst,
-                                   size_t i_dstSz,
-                                   const uint64_t i_offset,
-                                   const uint64_t i_boundary);
-
-    /**
-     * @brief Add ring overrides to SBE image if present in PNOR partition
-     *
-     * @param[out] io_imgPtr      Pointer to current SBE image in memory
-     *                            Memory from this pointer through io_actImgSize
-     *                            is expected to be pre-allocated
-     *
-     * @param[out] io_actImgSize   Max size as input, actual size of the
-     *                            customized image as output
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t ringOvd(void *io_imgPtr,
-                       uint32_t & io_ovdImgSize);
-
-    /**
-     * @brief Performs any necessary actions and then reboot the system
-     *
-     * @return errlHndl_t    Error log handle on failure.
-     */
-    errlHndl_t sbeDoReboot( void );
-
-    /**
-     * @brief Checks if a secure key transition is needed and if so verifies
-     *        the key transition container is valid. Then gets the new hw keys'
-     *        hash and sets the global hash transition data variables.
-     *
-     * @return errlHndl_t    Error log handle on failure. NULL on success
-     */
-    errlHndl_t secureKeyTransition();
-
-} //end namespace SBE
-#endif
diff --git a/src/usr/sbe/test/sbeupdatetest.H b/src/usr/sbe/test/sbeupdatetest.H
index bb0e8d6f3..48d64921a 100644
--- a/src/usr/sbe/test/sbeupdatetest.H
+++ b/src/usr/sbe/test/sbeupdatetest.H
@@ -40,7 +40,7 @@
 #include <targeting/common/utilFilter.H>
 #include <config.h>
 #include <sbe/sbeif.H>
-#include "../sbe_update.H"
+#include <sbe/sbe_update.H>
 #include <secureboot/service.H>