Remove i2cSupport

Change-Id: Ieb9de74df28ffb6aae25dabe007203446954e975
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81052
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>

4 files changed, 0 insertions, 1642 deletions

diff --git a/src/import/generic/memory/lib/utils/endian_utils.H b/src/import/generic/memory/lib/utils/endian_utils.H
deleted file mode 100644
index 00a3fe8e..00000000
--- a/src/import/generic/memory/lib/utils/endian_utils.H
+++ /dev/null
@@ -1,276 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/import/generic/memory/lib/utils/endian_utils.H $          */
-/*                                                                        */
-/* OpenPOWER sbe Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
-/* [+] 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                                                     */
-
-///
-/// @file endian_utils.H
-/// @brief Util functions to help with endianess
-///
-
-// *HWP HWP Owner: Ben Gass <bgass@us.ibm.com>
-// *HWP HWP Backup: Christian Geddes <crgeddes@us.ibm.com>
-// *HWP Team:
-// *HWP Level: 2
-// *HWP Consumed by: HB:FSP
-
-#ifndef _ENDIAN_UTILS_H_
-#define _ENDIAN_UTILS_H_
-
-#include <vector>
-
-#ifdef __PPE__
-    #include <mss_generic_consts.H>
-#else
-    #include <cstdint>
-    #include <generic/memory/lib/utils/shared/mss_generic_consts.H>
-#endif
-
-namespace mss
-{
-
-///
-/// @brief Forces native data into LE order
-/// @tparam T the data type to process
-/// @param[in] i_input inputted data to process
-/// @param[in,out] io_data vector to append data to
-///
-template < typename T >
-void forceLE(const T& i_input, std::vector<uint8_t>& io_data)
-{
-    // Temporary variable to process - we'll be doing bit shifts below
-    T l_temp = i_input;
-
-    for(size_t i = 0; i < sizeof(i_input); i++)
-    {
-        // Grab the lowest order byte and add it to the back of the vector
-        const uint8_t l_byte = l_temp & 0xFF;
-        io_data.push_back(l_byte);
-
-        // Shift higher byte value into lowest no matter existing endianness
-        l_temp >>= BITS_PER_BYTE;
-    }
-}
-
-#ifndef __PPE__
-///
-/// @brief Forces native data into LE order for an array
-/// @tparam T the data type to process
-/// @param[in] i_input inputted data to process
-/// @param[in] i_size size of the array
-/// @param[in,out] io_data vector to append data to
-///
-template < typename T >
-inline void forceLEArray(const T* i_input, const uint64_t i_size, std::vector<uint8_t>& io_data)
-{
-    for(size_t i = 0; i < i_size; i++)
-    {
-        forceLE(i_input[i], io_data);
-    }
-}
-#endif
-///
-/// @brief Forces native data into BE order
-/// @tparam T the data type to process
-/// @param[in] i_input inputted data to process
-/// @param[in,out] io_data vector to append data to
-///
-template < typename T >
-void forceBE(const T& i_input, std::vector<uint8_t>& io_data)
-{
-    // Temporary variable to process - we'll be doing bit shifts below
-    T l_temp = i_input;
-
-    std::vector<uint8_t> l_tempBuffer;
-
-    // This loop will put i_input into l_tempBuffer in BE order
-
-    for(size_t i = sizeof(i_input); i > 0; i--)
-    {
-        // Grab the lowest order byte and add it to the front of the vector
-        const uint8_t l_byte = l_temp & 0xFF;
-        l_tempBuffer.push_back(l_byte);
-
-        // Shift higher byte value into lowest no matter existing endianness
-        l_temp >>= BITS_PER_BYTE;
-    }
-
-    // Put the new BE formatted data at the end of the input buffer
-
-    std::vector<uint8_t>::iterator it = l_tempBuffer.end();
-    --it; //Move iterator to the last element.
-
-    for(uint8_t i = l_tempBuffer.size(); i > 0; --i)
-    {
-        io_data.push_back(*it);
-        --it;
-    }
-
-}
-
-#ifndef __PPE__
-///
-/// @brief Forces native data into BE order for an array
-/// @tparam T the data type to process
-/// @param[in] i_input inputted data to process
-/// @param[in] i_size size of the array
-/// @param[in,out] io_data vector to append data to
-///
-template < typename T >
-inline void forceBEArray(const T* i_input, const uint64_t i_size, std::vector<uint8_t>& io_data)
-{
-    for(size_t i = 0; i < i_size; i++)
-    {
-        forceBE(i_input[i], io_data);
-    }
-}
-#endif
-
-///
-/// @brief Converts LE data into native order
-/// @tparam T the data type to output to
-/// @param[in] i_input inputted data to process
-/// @param[in,out] io_idx current index
-/// @param[out] o_data data that has been converted into native endianness
-/// @return bool true if passing false if failing
-/// @note Real FFDC will be handled outside
-///
-template < typename T >
-bool readLE(const std::vector<uint8_t>& i_input, uint32_t& io_idx, T& o_data)
-{
-    const uint32_t l_sz = static_cast<uint32_t>(sizeof(o_data));
-    io_idx = l_sz + io_idx;
-
-    // Checks that our final index is within the data range
-    // Note: we decrement the index prior, so equal to is ok
-    if(io_idx > i_input.size())
-    {
-        return false;
-    }
-
-    uint64_t l_idx = io_idx;
-
-    o_data = 0;
-
-    for(uint64_t i = 0; i < l_sz; i++)
-    {
-        l_idx--;
-        uint8_t v = i_input[l_idx];
-        o_data <<= BITS_PER_BYTE;
-        o_data |= v;
-    }
-
-    return true;
-}
-
-#ifndef __PPE__
-///
-/// @brief Converts LE data into native order
-/// @tparam T the data type to output to
-/// @param[in] i_input inputted data to process
-/// @param[in] i_size size of the array
-/// @param[in,out] io_idx current index
-/// @param[out] o_data data that has been converted into native endianness
-/// @return bool true if passing false if failing
-/// @note Real FFDC will be handled outside
-///
-template < typename T >
-bool readLEArray(const std::vector<uint8_t>& i_input, const uint32_t i_size, uint32_t& io_idx, T* o_data)
-{
-    // Loop while the readLE is still passing and we haven't looped through the array's boundaries
-    bool l_passing = true;
-
-    for(uint32_t i = 0; i < i_size && l_passing; ++i)
-    {
-        l_passing = readLE(i_input, io_idx, o_data[i]);
-    }
-
-    return l_passing;
-}
-#endif
-
-///
-/// @brief Converts BE data into native order
-/// @tparam T the data type to output to
-/// @param[in] i_input inputted data to process
-/// @param[in,out] io_idx current index
-/// @param[out] o_data data that has been converted into native endianness
-/// @return bool true if passing false if failing
-/// @note Real FFDC will be handled outside
-///
-template < typename T >
-bool readBE(const std::vector<uint8_t>& i_input, uint32_t& io_idx, T& o_data)
-{
-    const uint32_t l_sz = static_cast<uint32_t>(sizeof(o_data));
-    uint64_t l_idx = io_idx;
-    io_idx = l_sz + io_idx;
-
-    // Checks that our final index is within the data range
-    // Note: we decrement the index prior, so equal to is ok
-    if(io_idx > i_input.size())
-    {
-        return false;
-    }
-
-    o_data = 0;
-
-    for(uint64_t i = 0; i < l_sz; i++)
-    {
-        uint8_t v = i_input[l_idx];
-        o_data <<= BITS_PER_BYTE;
-        o_data |= v;
-        l_idx++;
-    }
-
-    return true;
-}
-
-#ifndef __PPE__
-///
-/// @brief Converts BE data into native order
-/// @tparam T the data type to output to
-/// @param[in] i_input inputted data to process
-/// @param[in] i_size size of the array
-/// @param[in,out] io_idx current index
-/// @param[out] o_data data that has been converted into native endianness
-/// @return bool true if passing false if failing
-/// @note Real FFDC will be handled outside
-///
-template < typename T >
-bool readBEArray(const std::vector<uint8_t>& i_input, const uint32_t i_size, uint32_t& io_idx, T* o_data)
-{
-    // Loop while the readLE is still passing and we haven't looped through the array's boundaries
-    bool l_passing = true;
-
-    for(uint32_t i = 0; i < i_size && l_passing; ++i)
-    {
-        l_passing = readBE(i_input, io_idx, o_data[i]);
-    }
-
-    return l_passing;
-}
-#endif
-
-}
-
-#endif
diff --git a/src/import/generic/memory/lib/utils/mss_field.H b/src/import/generic/memory/lib/utils/mss_field.H
deleted file mode 100644
index 41e12cba..00000000
--- a/src/import/generic/memory/lib/utils/mss_field.H
+++ /dev/null
@@ -1,413 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/import/generic/memory/lib/utils/mss_field.H $             */
-/*                                                                        */
-/* OpenPOWER sbe Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
-/* [+] 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                                                     */
-
-///
-/// @file mss_field.H
-/// @brief API for data fields and operations
-///
-
-// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Louis Stermole <stermole@us.ibm.com>
-// *HWP Team: Memory
-// *HWP Level: 2
-// *HWP Consumed by: HB:FSP
-
-#ifndef _MSS_FIELD_H_
-#define _MSS_FIELD_H_
-
-#ifdef __PPE__
-    #include <mss_generic_check.H>
-#else
-    #include <generic/memory/lib/utils/shared/mss_generic_consts.H>
-    #include <generic/memory/lib/utils/mss_generic_check.H>
-#endif
-
-//Macro
-#ifdef __PPE__
-    #define TARGIDFORMAT "0x%08X"
-    #define TARGTID i_target.get()
-#else
-    #define TARGIDFORMAT "%s"
-    #define TARGTID spd::c_str(i_target)
-#endif
-
-namespace mss
-{
-
-///
-/// @brief endian fields for use as a template selecor
-///
-enum class endian
-{
-    BIG,
-    LITTLE,
-};
-
-///
-/// @class field_t
-/// @brief data structure for byte fields
-/// @tparam E endian type for this field
-/// @note holds byte index, start bit, and bit length of a decoded field
-///
-template< endian E >
-class field_t
-{
-    private:
-
-        const size_t iv_byte;
-        const size_t iv_start;
-        const size_t iv_length;
-
-    public:
-
-        // default ctor deleted
-        field_t() = delete;
-
-        ///
-        /// @brief ctor
-        /// @param[in] i_byte_index
-        /// @param[in] i_start_bit
-        /// @param[in] i_bit_length
-        ///
-        constexpr field_t(const size_t i_byte_index,
-                          const size_t i_start_bit,
-                          const size_t i_bit_length)
-            : iv_byte(i_byte_index),
-              iv_start(i_start_bit),
-              iv_length(i_bit_length)
-        {}
-
-        ///
-        /// @brief default dtor
-        ///
-        ~field_t() = default;
-
-        ///
-        /// @brief Byte index getter
-        /// @return the byte index for this field
-        ///
-        const size_t get_byte(const std::vector<uint8_t>& i_data) const;
-
-        ///
-        /// @brief Starting bit getter
-        /// @return the starting bit position for this field
-        ///
-        constexpr size_t get_start() const
-        {
-            return iv_start;
-        }
-
-        ///
-        /// @brief bit length getter
-        /// @return the bit length of this field
-        ///
-        constexpr size_t get_length() const
-        {
-            return iv_length;
-        }
-
-};// field_t
-
-///
-/// @brief Byte index getter - big endian specialization
-/// @return the byte index for this field
-///
-template<>
-inline const size_t field_t<mss::endian::BIG>::get_byte(const std::vector<uint8_t>& i_data) const
-{
-    return ( i_data.size() - 1 ) - iv_byte;
-}
-
-///
-/// @brief Byte index getter - big endian specialization
-/// @return the byte index for this field
-///
-template<>
-inline const size_t field_t<mss::endian::LITTLE>::get_byte(const std::vector<uint8_t>& i_data) const
-{
-    return iv_byte;
-}
-
-///
-/// @brief Checks input field against a custom conditional
-/// @tparam T field input type
-/// @tparam F Callable object type
-/// @param[in] i_field Extracted field
-/// @param[in] i_comparison_val value we are comparing against
-/// @param[in] i_op comparison operator function object
-/// @return boolean true or false
-///
-template < typename T, typename F >
-inline bool conditional(const T i_field,
-                        const size_t i_comparison_val,
-                        const F i_op)
-{
-    return i_op(i_field, i_comparison_val);
-}
-
-///
-/// @brief Helper function to extract byte information
-/// @tparam E endian type
-/// @tparam F the field to extract
-/// @tparam T the fapi2 target type
-/// @tparam IT data input type
-/// @tparam OT data output type
-/// @tparam FFDC ffdc code type
-/// @param[in] i_target the fapi2 target
-/// @param[in] i_data the data
-/// @param[in] i_ffdc_codes FFDC code
-/// @param[out] o_value raw value for this field
-/// @return FAPI2_RC_SUCCESS iff okay
-///
-template< mss::endian E,
-          const mss::field_t<E>& F,
-          fapi2::TargetType T,
-          typename IT,
-          typename OT,
-          typename FFDC >
-inline fapi2::ReturnCode get_field(const fapi2::Target<T>& i_target,
-                                   const std::vector<IT>& i_data,
-                                   const FFDC i_ffdc_codes,
-                                   OT& o_value)
-{
-    // Initializes the output value to 0, that way, we won't have any stale data in o_value
-    o_value = 0;
-
-    const size_t BYTE = F.get_byte(i_data);
-
-    FAPI_ASSERT( BYTE < i_data.size(),
-                 fapi2::MSS_OUT_OF_BOUNDS_INDEXING()
-                 .set_INDEX(BYTE)
-                 .set_LIST_SIZE(i_data.size())
-                 .set_FUNCTION(i_ffdc_codes)
-                 .set_TARGET(i_target),
-                 "Out of bounds indexing (with %d) on a list of size %d for " TARGIDFORMAT,
-                 BYTE,
-                 i_data.size(),
-                 TARGTID);
-
-    {
-        // Extracting desired bits
-        const fapi2::buffer<OT> l_buffer(i_data[BYTE]);
-        l_buffer.template extractToRight<F.get_start(), F.get_length()>(o_value);
-
-        FAPI_DBG(TARGIDFORMAT " data[%d] = 0x%02x. Field with start bit %d, bit len %d, has data 0x%02x.",
-                 TARGTID,
-                 BYTE,
-                 i_data[BYTE],
-                 F.get_start(),
-                 F.get_length(),
-                 o_value);
-    }
-
-    return fapi2::FAPI2_RC_SUCCESS;
-
-fapi_try_exit:
-    return fapi2::current_err;
-}
-#ifndef __PPE__
-
-///
-/// @brief Helper function to set byte field information
-/// @tparam E endian type
-/// @tparam F the field to extract
-/// @tparam T the fapi2 target type
-/// @tparam IT data input type
-/// @tparam OT data output type
-/// @tparam FFDC ffdc code type
-/// @param[in] i_target the fapi2 target
-/// @param[in] i_setting the setting to set
-/// @param[in] i_ffdc_codes FFDC code
-/// @param[in,out] io_data the data to modify
-/// @return FAPI2_RC_SUCCESS iff okay
-///
-template< mss::endian E,
-          const mss::field_t<E>& F,
-          fapi2::TargetType T,
-          typename IT,
-          typename OT,
-          typename FFDC >
-inline fapi2::ReturnCode set_field(const fapi2::Target<T>& i_target,
-                                   const IT i_setting,
-                                   const FFDC i_ffdc_codes,
-                                   std::vector<OT>& io_data)
-{
-    const size_t BYTE = F.get_byte(io_data);
-
-    FAPI_ASSERT( BYTE < io_data.size(),
-                 fapi2::MSS_OUT_OF_BOUNDS_INDEXING()
-                 .set_INDEX(BYTE)
-                 .set_LIST_SIZE(io_data.size())
-                 .set_FUNCTION(i_ffdc_codes)
-                 .set_TARGET(i_target),
-                 "Out of bounds indexing (with %d) on a list of size %d for %s",
-                 BYTE,
-                 io_data.size(),
-                 spd::c_str(i_target));
-
-    {
-        // Insert desired setting
-        fapi2::buffer<OT> l_buffer(io_data[BYTE]);
-        l_buffer.template insertFromRight<F.get_start(), F.get_length()>(i_setting);
-
-        io_data[BYTE] = static_cast<OT>(l_buffer);
-
-        FAPI_DBG("%s data[%d] = 0x%02x. Field with start bit %d, bit len %d, has data 0x%02x.",
-                 spd::c_str(i_target),
-                 BYTE,
-                 io_data[BYTE],
-                 F.get_start(),
-                 F.get_length(),
-                 i_setting);
-    }
-
-    return fapi2::FAPI2_RC_SUCCESS;
-
-fapi_try_exit:
-    return fapi2::current_err;
-}
-#endif
-
-///
-/// @brief byte field reader
-/// @tparam E endian type
-/// @tparam F the byte field to read
-/// @tparam TT traits associated with F - required
-/// @tparam T the fapi2 target type
-/// @tparam IT data input type
-/// @tparam OT data output type
-/// @param[in] i_target the dimm target
-/// @param[in] i_data the data
-/// @param[in] i_ffdc_codes FFDC code
-/// @param[out] o_value raw value for this field
-/// @return FAPI2_RC_SUCCESS iff okay
-///
-template< mss::endian E,
-          const mss::field_t<E>& F,
-          typename TT,
-          fapi2::TargetType T,
-          typename IT,
-          typename OT,
-          typename FFDC >
-inline fapi2::ReturnCode get_field( const fapi2::Target<T>& i_target,
-                                    const std::vector<IT>& i_data,
-                                    const FFDC i_ffdc_codes,
-                                    OT& o_value )
-{
-    IT l_temp = 0;
-    FAPI_TRY( (get_field<E, F>(i_target, i_data, i_ffdc_codes, l_temp)),
-              "Failed get_field() for " TARGIDFORMAT, TARGTID );
-
-    // Test if retrieved data seems valid
-    FAPI_TRY( check::invalid_value(i_target,
-                                   conditional( l_temp,
-                                           TT::COMPARISON_VAL,
-                                           typename TT::template COMPARISON_OP<IT>() ),
-                                   F.get_byte(i_data),
-                                   l_temp,
-                                   i_ffdc_codes,
-                                   TT::FIELD_STR),
-              "%s failed check::invalid_value() for %s",
-              TT::FIELD_STR, spd::c_str(i_target) );
-
-    // Output should only change if data check passes
-    o_value = static_cast<OT>(l_temp);
-    FAPI_ASSERT( o_value == l_temp,
-                 fapi2::MSS_CONVERSION_ERROR()
-                 .set_ORIGINAL_VAL(l_temp)
-                 .set_CONVERTED_VAL(o_value)
-                 .set_TARGET(i_target)
-                 .set_FUNCTION(i_ffdc_codes),
-                 "Conversion error between original %d to converted %d value for " TARGIDFORMAT,
-                 l_temp, o_value, TARGTID);
-
-    FAPI_DBG("%s: 0x%02x for %s",
-             TT::FIELD_STR,
-             o_value,
-             spd::c_str(i_target));
-
-
-fapi_try_exit:
-    return fapi2::current_err;
-}
-
-#ifndef __PPE__
-///
-/// @brief byte field writer
-/// @tparam E endian type
-/// @tparam F the byte field to read
-/// @tparam TT traits associated with writer
-/// @tparam T the fapi2 target type
-/// @tparam IT data input type
-/// @tparam OT data output type
-/// @tparam FFDC ffdc code type
-/// @param[in] i_target the dimm target
-/// @param[in] i_setting value to set for field
-/// @param[in] i_ffdc_codes FFDC code
-/// @param[in,out] io_data the data to modify
-/// @return FAPI2_RC_SUCCESS iff okay
-///
-template< mss::endian E,
-          const mss::field_t<E>& F,
-          typename TT,
-          fapi2::TargetType T,
-          typename IT,
-          typename OT,
-          typename FFDC >
-inline fapi2::ReturnCode set_field( const fapi2::Target<T>& i_target,
-                                    const IT i_setting,
-                                    const FFDC i_ffdc_codes,
-                                    std::vector<OT>& io_data )
-{
-    const size_t BYTE = F.get_byte(io_data);
-
-    // Test if the data we want to set is valid for this field
-    FAPI_TRY( check::invalid_value(i_target,
-                                   conditional( i_setting,
-                                           TT::COMPARISON_VAL,
-                                           typename TT::template COMPARISON_OP<IT>() ),
-                                   BYTE,
-                                   i_setting,
-                                   i_ffdc_codes),
-              "Failed fail_for_invalid_value() for %s", spd::c_str(i_target) );
-
-    FAPI_TRY( (set_field<E, F>(i_target, i_setting, i_ffdc_codes, io_data)),
-              "Failed set_field() for %s", spd::c_str(i_target) );
-
-    FAPI_DBG("%s: Set value of 0x%02x. Data for buffer at byte %d, is now 0x%02x for %s",
-             TT::FIELD_STR,
-             i_setting,
-             BYTE,
-             io_data[BYTE],
-             spd::c_str(i_target));
-
-fapi_try_exit:
-    return fapi2::current_err;
-}
-#endif
-
-}// mss
-
-#endif
diff --git a/src/import/generic/memory/lib/utils/mss_generic_check.H b/src/import/generic/memory/lib/utils/mss_generic_check.H
deleted file mode 100644
index 11a7bb6d..00000000
--- a/src/import/generic/memory/lib/utils/mss_generic_check.H
+++ /dev/null
@@ -1,238 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/import/generic/memory/lib/utils/mss_generic_check.H $     */
-/*                                                                        */
-/* OpenPOWER sbe Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
-/* [+] 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                                                     */
-
-///
-/// @file mss_generic_check.H
-/// @brief Checker functions for generic API
-///
-// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
-// *HWP Team: Memory
-// *HWP Level: 3
-// *HWP Consumed by: HB:FSP
-
-#ifndef _MSS_GENERIC_CHECK_H_
-#define _MSS_GENERIC_CHECK_H_
-
-#include <fapi2.H>
-
-#ifndef __PPE__
-    #include <generic/memory/lib/utils/shared/mss_generic_consts.H>
-    #include <generic/memory/lib/utils/scom.H>
-    #include <generic/memory/lib/utils/c_str.H>
-#endif
-
-namespace mss
-{
-namespace check
-{
-#ifndef __PPE__
-///
-/// @brief Checks whether any FIRs have lit up on a target
-/// @tparam MC MC type for which to check FIR's
-/// @tparam T the fapi2::TargetType which hold the FIR bits
-/// @param[in] i_target - the target on which to operate
-/// @param[in,out] io_rc - the return code for the function
-/// @param[out] o_fir_error - true iff a FIR was hit
-/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS iff ok
-///
-template< mss::mc_type MC, fapi2::TargetType T >
-fapi2::ReturnCode bad_fir_bits( const fapi2::Target<T>& i_target, fapi2::ReturnCode& io_rc, bool& o_fir_error );
-
-///
-/// @brief Checks whether the passed in FIRs have any un-masked errors set
-/// @tparam MC MC type for which to check FIR's
-/// @tparam T the fapi2::TargetType which hold the FIR bits
-/// @param[in] i_target - the target on which to operate
-/// @param[in] i_fir_regs - FIR register and mask register
-/// @param[out] o_fir_error - true iff a FIR was hit
-/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS iff ok
-///
-template< mss::mc_type MC, fapi2::TargetType T >
-inline fapi2::ReturnCode fir_with_mask( const fapi2::Target<T>& i_target,
-                                        const std::pair<uint64_t, uint64_t>& i_fir_regs,
-                                        bool& o_fir_error )
-{
-    // Temporary variables to make the code a bit more readable
-    const auto FIR_REG = i_fir_regs.first;
-    const auto FIR_MASK = i_fir_regs.second;
-
-    fapi2::buffer<uint64_t> l_fir;
-    fapi2::buffer<uint64_t> l_fir_mask;
-
-    // Read the registers
-    FAPI_TRY(mss::getScom(i_target, FIR_REG, l_fir));
-    FAPI_TRY(mss::getScom(i_target, FIR_MASK, l_fir_mask));
-
-
-    // The mask register will need to be inverted as a 0 in the mask register means the FIR is legit
-    // A bitwise and works the opposite way
-    l_fir_mask.invert();
-
-    // If we have any unmasked bit, set that we have a FIR error and exit out with success
-    // Note: we want to set success here as PRD will find the FIR as "new" and retrigger the procedure this way
-    o_fir_error = ((l_fir & l_fir_mask) != 0);
-
-    // And print the information for debuggability
-    FAPI_INF("%s %s on reg 0x%016lx value 0x%016lx and mask 0x%016lx value 0x%016lx", mss::c_str(i_target),
-             o_fir_error ? "has FIR's set" : "has no FIR's set", FIR_REG, l_fir, FIR_MASK, l_fir_mask.invert());
-
-fapi_try_exit:
-    return fapi2::current_err;
-}
-
-///
-/// @brief Checks whether a FIR or unlocked PLL could be the root cause of another failure
-/// @tparam MC MC type for which to check FIR's
-/// @tparam T the fapi2::TargetType which hold the FIR bits
-/// @param[in] i_target - the target on which to operate
-/// @param[in,out] io_rc - the return code for the function
-/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS iff ok
-/// @note This is a helper function to enable unit testing
-///
-template< mss::mc_type MC, fapi2::TargetType T >
-fapi2::ReturnCode hostboot_fir_or_pll_fail( const fapi2::Target<T>& i_target, fapi2::ReturnCode& io_rc)
-{
-    // We didn't have an error, so return success
-    if(io_rc == fapi2::FAPI2_RC_SUCCESS)
-    {
-        FAPI_INF("%s has a good return code, returning success", mss::c_str(i_target));
-        return fapi2::FAPI2_RC_SUCCESS;
-    }
-
-    fapi2::ReturnCode l_fircheck_scom_err(fapi2::FAPI2_RC_SUCCESS);
-    bool l_fir_error = false;
-
-    FAPI_ERR("%s has a bad return code, time to check some firs!", mss::c_str(i_target));
-
-    l_fircheck_scom_err = bad_fir_bits<MC>(i_target, io_rc, l_fir_error);
-
-    FAPI_ERR("%s took a fail. FIR was %s", mss::c_str(i_target),
-             l_fir_error ? "set - returning FIR RC" : "unset - returning inputted RC");
-
-    // If we had a FIR error, log the original error and return success
-    // PRD will handle the original error
-    if(l_fir_error)
-    {
-        fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;
-    }
-    else
-    {
-        fapi2::current_err = io_rc;
-    }
-
-    return fapi2::current_err;
-}
-
-///
-/// @brief Checks whether a FIR or unlocked PLL could be the root cause of another failure, if a check fir boolean is passed in
-/// @tparam MC MC type for which to check FIR's
-/// @tparam T the fapi2::TargetType which hold the FIR bits
-/// @param[in] i_target - the target on which to operate
-/// @param[in,out] io_rc - the return code for the function
-/// @param[in] i_check_fir - true IFF the FIR needs to be checked - defaults to true
-/// @return fapi2::ReturnCode FAPI2_RC_SUCCESS iff ok
-///
-template< mss::mc_type MC, fapi2::TargetType T >
-fapi2::ReturnCode fir_or_pll_fail( const fapi2::Target<T>& i_target,
-                                   fapi2::ReturnCode& io_rc,
-                                   const bool i_check_fir = true)
-{
-#ifdef __HOSTBOOT_MODULE
-
-    fapi2::ReturnCode l_rc(io_rc);
-
-    // If need be, check the FIR below
-    if(i_check_fir)
-    {
-        // Handle any issues according to PRD FIR scheme, as a FIR could have caused this issue
-        l_rc = hostboot_fir_or_pll_fail<MC>(i_target, l_rc);
-    }
-
-    return l_rc;
-
-#else
-    return io_rc;
-#endif
-}
-
-#endif
-///
-/// @brief Checks conditional passes and implements traces & exits if it fails
-/// @tparam T fapi2 target type
-/// @tparam IT input data type
-/// @tparam FFDC error callout code type
-/// @param[in] i_target fapi2 target
-/// @param[in] i_conditional conditional that we are testing against
-/// @param[in] i_byte_index byte index
-/// @param[in] i_data debug data
-/// @param[in] i_ffdc_codes FFDC code
-/// @param[in] i_err_str error string - defaulted to ""
-/// @return FAPI2_RC_SUCCESS iff okay
-///
-template< fapi2::TargetType T, typename IT , typename FFDC >
-inline fapi2::ReturnCode invalid_value(const fapi2::Target<T>& i_target,
-                                       const bool i_conditional,
-                                       const size_t i_byte_index,
-                                       const IT i_data,
-                                       const FFDC i_ffdc_codes,
-                                       const char* i_err_str = "")
-{
-#ifdef __PPE__
-    FAPI_ASSERT(i_conditional,
-                fapi2::MSS_FAILED_DATA_INTEGRITY_CHECK().
-                set_VALUE(i_data).
-                set_BYTE(i_byte_index).
-                set_TARGET(i_target).
-                set_FFDC_CODE(i_ffdc_codes),
-                "%s Byte %d, Data returned: %d.",
-                i_err_str,
-                i_byte_index,
-                i_data);
-#else
-    FAPI_ASSERT(i_conditional,
-                fapi2::MSS_FAILED_DATA_INTEGRITY_CHECK().
-                set_VALUE(i_data).
-                set_BYTE(i_byte_index).
-                set_TARGET(i_target).
-                set_FFDC_CODE(i_ffdc_codes),
-                "%s %s Byte %d, Data returned: %d.",
-                spd::c_str(i_target),
-                i_err_str,
-                i_byte_index,
-                i_data);
-
-#endif
-    return fapi2::FAPI2_RC_SUCCESS;
-
-fapi_try_exit:
-    return fapi2::current_err;
-
-} // fail_for_invalid_value
-
-} // check
-}// mss
-
-#endif
diff --git a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
deleted file mode 100644
index 138786af..00000000
--- a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
+++ /dev/null
@@ -1,715 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/import/generic/memory/lib/utils/shared/mss_generic_consts.H $ */
-/*                                                                        */
-/* OpenPOWER sbe Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
-/* [+] Evan Lojewski                                                      */
-/* [+] 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                                                     */
-
-///
-/// @file mss_generic_consts.H
-/// @brief Common constants to be shared
-///
-
-// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
-// *HWP HWP Backup: Louis Stermole <stermole@us.ibm.com>
-// *HWP Team: Memory
-// *HWP Level: 3
-// *HWP Consumed by: HB:FSP
-
-#ifndef _MSS_GENERIC_CONSTS_H_
-#define _MSS_GENERIC_CONSTS_H_
-
-#ifndef __PPE__
-    #include <cstdint>
-#endif
-
-namespace mss
-{
-
-///
-/// @brief Common constants
-///
-enum common_consts
-{
-    DEFAULT_POLL_LIMIT = 50,  ///< the number of poll attempts in the event we can't calculate another
-    MEMCMP_EQUAL = 0,         ///< Equal comparison value for memcmp
-    BAD_BITS_RANKS = 4,       ///< Bad bit attribute's number of ranks
-    BAD_DQ_BYTE_COUNT = 10,      ///< Bad bit attribute's number of byte
-    ATTR_RANK0 = 0, ///< Attribute index for rank0
-    ATTR_RANK1 = 1, ///< Attribute index for rank1
-    ATTR_RANK2 = 2, ///< Attribute index for rank2
-    ATTR_RANK3 = 3, ///< Attribute index for rank3
-};
-
-///
-/// @brief Common mcbist constants
-///
-enum mcbist_common_consts
-{
-    CYCLES_PER_CMD  = 4,      ///< Best case cycles per MCBIST command
-    MAX_RANK_PER_DIMM = 4,
-
-    BYTES_PER_GB = 1000000000,      ///< Multiplier to go from GB to B
-    T_PER_MT     = 1000000,         ///< Multiplier to go from MT/s to T/s
-
-    // Number of double words in...
-    NUM_DW_IN_128B = 16,
-    NUM_DW_IN_64B = 8,
-
-    BG_SCRUB_IN_HOURS       = 12,
-    CMD_TIMEBASE            = 8192,     ///< Represents the timebase multiplier for the MCBIST inter cmd gap
-    MAX_CMD_GAP             = 4095,     ///< Represents the maximum (non-multplied) time for MCBIST inter cmd gap
-
-
-    // MCBIST polling constant for actual HW
-    // The specific value here is not important, only that it is very large to avoid polling timeouts,
-    // but not to avoid any actual hardware timeouts
-    // Note: ~0 is not used as that would cause MCBIST to never timeout even if the hardware is in an infinite loop
-    // You can't get greater than ~0, so you'd never timeout
-    // TODO RTC:166340 - Clean up MCBIST polling
-    OVERLY_LARGE_NUMBER_OF_POLLS = 5000000000000,
-};
-
-///
-/// @brief Common timings
-///
-enum common_timings
-{
-    DELAY_1NS               = 1,
-    DELAY_10NS              = 10 ,      ///< general purpose 10  ns delay for HW mode
-    DELAY_100NS             = 100,      ///< general purpose 100 ns delay for HW mode
-    DELAY_1US               = 1000,     ///< general purpose 1 usec delay for HW mode
-    DELAY_10US              = 10000,    ///< general purpose 1 usec delay for HW mode
-    DELAY_100US             = 100000,   ///< general purpose 100 usec delay for HW mode
-    DELAY_1MS               = 1000000,  ///< general purpose 1 ms delay for HW mode
-};
-
-///
-/// @brief Common conversions
-///
-enum conversions
-{
-    CONVERT_PS_IN_A_NS      = 1000,     ///< 1000 pico in an nano
-    CONVERT_PS_IN_A_US      = 1000000,  ///< 1000000 picos in a micro
-    MHZ_TO_KHZ              = 1000,
-    SEC_IN_HOUR             = 60 * 60,  ///< seconds in an hour, used for scrub times
-    NIBBLES_PER_BYTE = 2,
-    BITS_PER_NIBBLE = 4,
-    BITS_PER_BYTE = 8,
-
-    // Used by exp_decoder.C for dA to cA
-    DECI_TO_CENTI = 10,
-};
-
-enum generic_sizes
-{
-    NUM_MAX_FREQS = 5,             ///< Used for ATTR_MAX_ALLOWED_DIMM_FREQ
-    MARK_STORE_COUNT = 8,          ///< Elements in a VPD mark/store array
-};
-
-///
-/// @brief FFDC generic codes
-///
-enum generic_ffdc_codes
-{
-    // Starting at 0x1%%% to avoid
-    // any collisions with values
-    // from controller specific ffdc codes
-    SET_ATTR_DIMM_TYPE = 0x1000,
-    SET_ATTR_DRAM_GEN = 0x1001,
-    SET_ATTR_HYBRID = 0x1002,
-    SET_ATTR_HYBRID_MEDIA = 0x1003,
-    SET_ATTR_MASTER_RANKS = 0x1004,
-    SET_ATTR_RANKS_CONFIGED  = 0x1005,
-    GET_FIELD = 0x1006,
-    READ_SPD_FIELD = 0x1007,
-    BASE_CFG_PARAM_SELECT = 0x1008,
-    DIMM_MODULE_PARAM_SELECT = 0x1009,
-    BASE_CFG_FACTORY = 0x100A,
-    DIMM_MODULE_FACTORY = 0x100B,
-    GET_TAAMIN = 0x100C,
-    GET_TCKMIN = 0x100D,
-    GET_TCKMAX = 0x100E,
-    GET_TIMEBASES_FTB = 0x100F,
-    GET_TIMEBASES_MTB = 0x1010,
-    GET_SUPPORTED_REV = 0x1011,
-    TRASMIN = 0x1012,
-    TRCMIN = 0x1013,
-    TRFC1MIN = 0x1014,
-    TRFC2MIN = 0x1015,
-    TRFC4MIN = 0x1016,
-    TFAWMIN = 0x1017,
-    TWTR_S_MIN = 0x1018,
-    TWRMIN = 0x1019,
-    TWTR_L_MIN = 0x101A,
-    DEVICE_TYPE = 0x101B,
-    BASE_MODULE_TYPE = 0x101C,
-    BAD_SPD_DATA = 0x101D,
-    SET_FIELD = 0x101E,
-    SELECT_SUPPORTED_FREQ = 0x101F,
-    FREQ_SCOREBOARD_REMOVE_FREQS_ABOVE_LIMIT = 0x1020,
-    FREQ_SCOREBOARD_REMOVE_FREQS_ABOVE_LIMIT_VECTOR = 0x1021,
-    FREQ_SCOREBOARD_REMOVE_FREQS_NOT_ON_LIST = 0x1022,
-    FREQ_SCOREBOARD_MAX_SUPPORTED_FREQ = 0x1023,
-    FREQ_SCOREBOARD_SUPPORTED_FREQS = 0x1024,
-    LIMIT_FREQ_BY_VPD = 0x1025,
-    SET_DIMM_TYPE = 0x1026,
-    SET_DRAM_GEN = 0x1027,
-    SET_HYBRID = 0x1028,
-    SET_HYBRID_MEDIA = 0x1029,
-    SET_MRANKS = 0x102A,
-    SET_HOST_TO_DDR_SPEED_RATIO = 0x102B,
-    SET_ATTR_HOST_TO_DDR_SPEED_RATIO = 0x102C,
-    CCS_INST_CONFIGURE_RANK = 0x102D,
-    SET_DIMM_RANKS_CNFG = 0x1039,
-    DDIMM_RAWCARD_DECODE = 0x103a,
-    INIT_RANK_INFO = 0x103B,
-    BIAS_PMIC_FROM_SPD = 0x103C,
-    SET_DRAM_WIDTH = 0x1040,
-
-    SET_SI_VREF_DRAM_WR = 0x1041,
-    SET_SI_MC_RCV_IMP_DQ_DQS = 0x1042,
-    SET_SI_MC_DRV_IMP_DQ_DQS_PULL_UP = 0x1043,
-    SET_SI_MC_DRV_IMP_DQ_DQS_PULL_DOWN = 0x1044,
-    SET_SI_MC_DRV_SLEW_RATE_DQ_DQS = 0x1045,
-    SET_SI_MC_DRV_IMP_CMD_ADDR = 0x10466,
-    SET_SI_MC_DRV_SLEW_RATE_CMD_ADDR = 0x1047,
-    SET_SI_MC_DRV_IMP_CLK = 0x1048,
-    SET_SI_MC_DRV_SLEW_RATE_CLK = 0x1049,
-    SET_SI_MC_RCV_IMP_ALERT_N = 0x1050,
-    SET_SI_DRAM_RTT_NOM = 0x1051,
-    SET_SI_DRAM_RTT_WR = 0x1052,
-    SET_SI_DRAM_RTT_PARK = 0x1053,
-    SET_SI_DRAM_PREAMBLE = 0x1054,
-    SET_SI_MC_DRV_EQ_DQ_DQS = 0x1055,
-    SET_SI_DRAM_DRV_IMP_DQ_DQS = 0x1056,
-    SET_SI_VREF_DQ_TRAIN_RANGE = 0x1057,
-    SET_SI_VREF_DQ_TRAIN_VALUE = 0x1058,
-    SET_SI_ODT_WR = 0x1059,
-    SET_SI_ODT_RD = 0x1060,
-    SET_SI_GEARDOWN_MODE = 0x1061,
-    PRE_DATA_ENGINE_CTOR = 0x1062,
-    SET_DRAM_GEN_METADATA = 0x1063,
-    SET_DIMM_TYPE_METADATA = 0x1064,
-    SET_DIMM_POS_METADATA = 0x1065,
-    SET_LOGICAL_RANKS = 0x1066,
-    SET_PRIM_STACK_TYPE = 0x1067,
-    SET_DIMM_SIZE = 0x1068,
-    SET_PRIM_BUS_WIDTH = 0x1069,
-    SET_PRIM_DIE_COUNT = 0x1070,
-    SET_DRAM_DENSITY = 0x1071,
-
-    // Power thermal functions
-    POWER_LIMIT = 0x1072,
-    SLOPE = 0x1073,
-    INTERCEPT = 0x1074,
-
-    SET_SI_RD_VREF_DQ = 0x1075,
-    SET_CAC_DELAY_A = 0x1076,
-    SET_CAC_DELAY_B = 0x1077,
-    EFD_CA_LATENCY_MODE = 0x1080,
-    EFD_CA_PL_MODE = 0x1081,
-    SET_COL_ADDR_BITS = 0x1082,
-    SET_ROW_ADDR_BITS = 0x1083,
-    SET_3DS_HEIGHT = 0x1084,
-    SET_DRAM_CWL = 0x1085,
-    SET_DRAM_TREFI = 0x1086,
-    SET_DRAM_TCCD_L = 0x1087,
-    SET_DRAM_TWTR_L = 0x1088,
-    SET_DRAM_TWTR_S = 0x1089,
-    SET_DRAM_TFAW = 0x108A,
-    SET_DRAM_TRCD = 0x108B,
-    SET_DRAM_TRP = 0x108C,
-    SET_DRAM_TRAS = 0x108D,
-    SET_DRAM_TWR = 0x108E,
-    SET_DRAM_TRTP = 0x108F,
-    SET_DRAM_TRRD_S = 0x1090,
-    SET_DRAM_TRRD_L = 0x1091,
-    SET_DRAM_TRFC = 0x1092,
-    SET_DRAM_TRFC_DLR = 0x1093,
-    SET_DRAM_MFG_ID = 0x1094,
-
-    // Used in fw_mark_store.H for MSS_INVALID_RANK_PASSED
-    FWMS_READ = 0x1095,
-    FWMS_WRITE = 0x1096,
-
-    // Used in hw_mark_store.H for MSS_INVALID_RANK_PASSED
-    HWMS_READ = 0x1097,
-    HWMS_WRITE = 0x1098,
-
-    // MSS_INVALID_INDEX_PASSED
-    SYMBOL_COUNT_READ = 0x1099,
-    SYMBOL_COUNT_WRITE = 0x109A,
-
-    SET_RCD_MFG_ID = 0x109B,
-    SET_DRAM_MODULE_HEIGHT = 0x109C,
-};
-
-///
-/// @brief Supported proc types
-/// @note Processor types by system generation and sub numbering
-///
-enum class proc_type
-{
-    NIMBUS  = 0x0900,
-    CUMULUS = 0x0901,
-    AXONE   = 0x0902,
-};
-
-///
-/// @brief Supported memory controller types
-///
-enum class mc_type
-{
-    NIMBUS   = 0,
-    CENTAUR  = 1,
-    EXPLORER = 2,
-};
-
-///
-/// @brief JEDEC supported DDR speeds
-/// @note Includes DDR4 and DDR5 only
-///
-enum ddr_dimm_speeds
-{
-    // Supported frequencies
-    DIMM_SPEED_1600 = 1600,
-    DIMM_SPEED_1866 = 1866,
-    DIMM_SPEED_2133 = 2133,
-    DIMM_SPEED_2400 = 2400,
-    DIMM_SPEED_2666 = 2666,
-    DIMM_SPEED_2933 = 2933,
-    DIMM_SPEED_3200 = 3200,
-    DIMM_SPEED_3600 = 3600,
-    DIMM_SPEED_4000 = 4000,
-    DIMM_SPEED_4400 = 4400,
-    DIMM_SPEED_4800 = 4800,
-
-    // Max/Mins for specific generations here
-    DDR4_MIN_SPEED = 1600,
-    DDR4_MAX_SPEED = 3200,
-    DDR5_MIN_SPEED = 3200,
-    DDR5_MAX_SPEED = 4800,
-};
-
-enum states
-{
-    LOW = 0,
-    HIGH = 1,
-    START = 1,
-    STOP = 0,
-    START_N = 0,
-    STOP_N = 1,
-    ON = 1,
-    OFF = 0,
-    ON_N = 0,
-    OFF_N = 1,
-    YES = 1,
-    NO = 0,
-    YES_N = 0,
-    NO_N = 1,
-    // Uses "_" in the name for INVALID as INVALID is defined as a macro in the
-    // FSP code. If we just use INVALID as an enum name, then the preprocessor
-    // compile phase changes it to be the macro.
-    _INVALID_ = 0xFF,
-    NO_CHIP_SELECT_ACTIVE = 0xFF,
-};
-
-
-enum port_select
-{
-    // Port selects for MCBIST and CCS
-    // Select for 1 port
-    PORT0            = 0b1000,
-    PORT1            = 0b0100,
-    PORT2            = 0b0010,
-    PORT3            = 0b0001,
-    // Selects for 2 port combinations
-    PORT01           = PORT0 | PORT1,
-    PORT02           = PORT0 | PORT2,
-    PORT03           = PORT0 | PORT3,
-    PORT12           = PORT1 | PORT2,
-    PORT13           = PORT1 | PORT3,
-    PORT23           = PORT2 | PORT3,
-    // Selects for 3 port combinations
-    PORT012          = PORT0 | PORT1 | PORT2,
-    PORT013          = PORT0 | PORT1 | PORT3,
-    PORT023          = PORT0 | PORT2 | PORT3,
-    PORT123          = PORT1 | PORT2 | PORT3,
-    // Select all
-    PORT0123         = PORT0 | PORT1 | PORT2 | PORT3,
-    // Maybe a better name for disabling all
-    PORT_NONE        = 0b0000,
-};
-
-enum dimm_select
-{
-    // Dimm selects for MCBIST and CCS
-    // Select for 1 dimm
-    DIMM0            = 0b10,
-    DIMM1            = 0b01,
-    // Selects for 2 dimm combinations
-    DIMM01           = DIMM0 | DIMM1,
-    // Maybe a better name for disabling all
-    DIMM_NONE        = 0b00,
-};
-
-namespace mcbist
-{
-
-enum broadcast_timebase
-{
-    // Number of 1024 2:1 cycle timebases to wait starting MCBIST
-    // for SRQs to get synced for broadcast mode
-    TB_COUNT_2     = 0b0000001,
-    TB_COUNT_4     = 0b0000011,
-    TB_COUNT_8     = 0b0000111,
-    TB_COUNT_16    = 0b0001111,
-    TB_COUNT_32    = 0b0011111,
-    TB_COUNT_64    = 0b0111111,
-    TB_COUNT_128   = 0b1111111,
-};
-
-enum rmw_address
-{
-    // 32B block addresses into the maint portion of the rmw buffer
-    DW0            = 0b111110000,
-    DW1            = 0b111110001,
-    DW2            = 0b111110010,
-    DW3            = 0b111110011,
-    DW4            = 0b111110100,
-    DW5            = 0b111110101,
-    DW6            = 0b111110110,
-    DW7            = 0b111110111,
-    DW8            = 0b111111000,
-    DW9            = 0b111111001,
-    DWA            = 0b111111010,
-    DWB            = 0b111111011,
-    DWC            = 0b111111100,
-    DWD            = 0b111111101,
-    DWE            = 0b111111110,
-    DWF            = 0b111111111,
-};
-
-enum data_rotate_mode
-{
-    // MCBIST data rotate modes refer to register MCBDRCR bits 0:3
-    ROTATE_0_BITS  = 0b0000,
-    ROTATE_1_BITS  = 0b0001,
-    ROTATE_2_BITS  = 0b0010,
-    ROTATE_3_BITS  = 0b0011,
-    ROTATE_4_BITS  = 0b0100,
-    ROTATE_5_BITS  = 0b0101,
-    ROTATE_6_BITS  = 0b0110,
-    ROTATE_7_BITS  = 0b0111,
-    ROTATE_8_BITS  = 0b1000,
-    ROTATE_9_BITS  = 0b1001,
-    ROTATE_10_BITS = 0b1010,
-    ROTATE_11_BITS = 0b1011,
-    ROTATE_12_BITS = 0b1100,
-    ROTATE_13_BITS = 0b1101,
-    ROTATE_14_BITS = 0b1110,
-    ROTATE_15_BITS = 0b1111,
-};
-
-enum data_seed_mode
-{
-    // MCBIST data seed modes refer to register MCBDRCR bits 21:22
-    ALL_UNIQUE        = 0b00,
-    REPEAT_SEED_0     = 0b01,
-    REPEAT_SEED_1     = 0b10,
-    REPEAT_SEED_2     = 0b11,
-};
-
-enum data_mode
-{
-    // MCBIST test data modes
-    FIXED_DATA_MODE   = 0b000,
-    RAND_FWD_MODE     = 0b001,
-    RAND_REV_MODE     = 0b010,
-    RAND_FWD_MAINT    = 0b011,
-    RAND_REV_MAINT    = 0b100,
-    DATA_EQ_ADDR      = 0b101,
-    ROTATE_LEFT_MODE  = 0b110,
-    ROTATE_RIGHT_MODE = 0b111,
-};
-
-// 0:3  Operation Type
-enum op_type
-{
-    WRITE            = 0b0000, // fast, with no concurrent traffic
-    READ             = 0b0001, // fast, with no concurrent traffic
-    READ_WRITE       = 0b0010,
-    WRITE_READ       = 0b0011,
-    READ_WRITE_READ  = 0b0100,
-    READ_WRITE_WRITE = 0b0101,
-    RAND_SEQ         = 0b0110,
-    READ_READ_WRITE  = 0b1000,
-    SCRUB_RRWR       = 0b1001,
-    STEER_RW         = 0b1010,
-    ALTER            = 0b1011, // (W)
-    DISPLAY          = 0b1100, // (R, slow)
-    CCS_EXECUTE      = 0b1111,
-
-    // if bits 9:11 (Data Mode bits)  = 000  (bits 4:8 used to specify which subtest to go to)
-    // Refresh only cmd if bits 9:11 (Data Mode bits) /= 000
-    GOTO_SUBTEST_N = 0b0111,
-};
-
-
-enum test_type
-{
-    USER_MODE = 0,
-    CENSHMOO = 1,
-    SUREFAIL = 2,
-    MEMWRITE = 3,
-    MEMREAD = 4,
-    CBR_REFRESH = 5,
-    MCBIST_SHORT = 6,
-    SHORT_SEQ = 7,
-    DELTA_I = 8,
-    DELTA_I_LOOP = 9,
-    SHORT_RAND = 10,
-    LONG1 = 11,
-    BUS_TAT = 12,
-    SIMPLE_FIX = 13,
-    SIMPLE_RAND = 14,
-    SIMPLE_RAND_2W = 15,
-    SIMPLE_RAND_FIXD = 16,
-    SIMPLE_RA_RD_WR = 17,
-    SIMPLE_RA_RD_R = 18,
-    SIMPLE_RA_FD_R = 19,
-    SIMPLE_RA_FD_R_INF = 20,
-    SIMPLE_SA_FD_R = 21,
-    SIMPLE_RA_FD_W = 22,
-    INFINITE = 23,
-    WR_ONLY = 24,
-    W_ONLY = 25,
-    R_ONLY = 26,
-    W_ONLY_RAND = 27,
-    R_ONLY_RAND = 28,
-    R_ONLY_MULTI = 29,
-    SHORT = 30,
-    SIMPLE_RAND_BARI = 31,
-    W_R_INFINITE = 32,
-    W_R_RAND_INFINITE = 33,
-    R_INFINITE1 = 34,
-    R_INFINITE_RF = 35,
-    MARCH = 36,
-    SIMPLE_FIX_RF = 37,
-    SHMOO_STRESS = 38,
-    SIMPLE_RAND_RA = 39,
-    SIMPLE_FIX_RA = 40,
-    SIMPLE_FIX_RF_RA = 41,
-    TEST_RR = 42,
-    TEST_RF = 43,
-    W_ONLY_INFINITE_RAND = 44,
-    MCB_2D_CUP_SEQ = 45,
-    MCB_2D_CUP_RAND = 46,
-    SHMOO_STRESS_INFINITE = 47,
-    HYNIX_1_COL = 48,
-    RMWFIX = 49,
-    RMWFIX_I = 50,
-    W_INFINITE = 51,
-    R_INFINITE = 52,
-};
-
-
-} // namespace mcbist
-
-///
-/// @brief Supported DIMM speed equality deliberations
-///
-enum class speed_equality : uint8_t
-{
-    NOT_EQUAL_DIMM_SPEEDS = 0, ///< denotes all DIMMs don't have the same speed
-    EQUAL_DIMM_SPEEDS = 1, ///< denotes all DIMMs have the same speed
-};
-
-namespace spd
-{
-
-///
-/// @brief SPD revisions - not tied any particular module
-///
-enum rev : uint8_t
-{
-    V0_0 = 0x00, ///< represents Rev 0.0
-    V1_0 = 0x10, ///< represents Rev 1.0
-    V1_1 = 0x11, ///< represents Rev 1.1
-    V1_2 = 0x12, ///< represents Rev 1.2
-
-    // These module revisions can vary independently
-    // so we track the largest decoded revision here.
-    GEN_SEC_MAX = V1_1,
-    RDIMM_MAX = V1_1,
-    LRDIMM_MAX = V1_2,
-    DDIMM_MAX = V0_0,
-};
-
-///
-/// @brief SPD module parameters
-/// @note helps distinguish SPD decoder sections
-///
-enum parameters
-{
-    UNINITIALIZED,
-    BASE_CNFG,
-    RDIMM_MODULE,
-    LRDIMM_MODULE,
-    NVDIMM_MODULE,
-    DDIMM_MODULE,
-};
-
-///
-/// @brief DRAM generation selector
-/// @note values set to SPD settings
-///
-enum device_type
-{
-    DDR4 = 0x0c,
-};
-
-///
-/// @brief DIMM type selector
-/// @note values set to SPD settings
-///
-enum dimm_type
-{
-    RDIMM = 0b0001,
-    LRDIMM = 0b0100,
-    DDIMM = 0b1010,
-    SORDIMM = 0b1000,
-    MINIRDIMM = 0b0101,
-};
-
-enum guard_band : uint16_t
-{
-    // Used for caclulating spd timing values - from JEDEC rounding algorithm
-    // Correction factor is 1% (for DDR3) or 2.5% (for DDR4)
-    // when doing integer math, we add-in the inverse correction factor
-    // Formula used for derivation:
-    // Guardband = 1000 * (1000* correction_factor) - 1
-    INVERSE_DDR4_CORRECTION_FACTOR = 974, ///< DDR4 correction factor
-};
-
-}// spd
-
-namespace efd
-{
-
-
-///
-/// @brief EFD Module identifier
-/// @note helps distinguish the EFD identifier
-///
-enum id
-{
-    DDR4_CUSTOM_MICROCHIP = 0x11,
-};
-
-}//efd
-
-///
-/// @brief DIMM nibble mask
-/// @note nibble0: 4 high bits, nibble1: 4 low bits
-///
-enum nibble_mask
-{
-    MASK_NIBBLE0 = 0xf0,
-    MASK_NIBBLE1 = 0x0f,
-};
-
-///
-/// @brief throttle_type used to set bulk_pwr_throttls to run POWER or THERMAL throttling
-/// @note OCC will be using the POWER option
-///
-enum class throttle_type
-{
-    POWER = 0,
-    THERMAL = 1,
-};
-
-
-
-///
-/// @brief Trait classes for proc_type - AXONE specialization
-///
-/// TODO: Need to add mc_type
-template< >
-struct procTraits<proc_type::AXONE>
-{
-    enum
-    {
-        EXP_PORTS_PER_OCMB = 1,
-        DIMMS_PER_PORT = 2,
-    };
-};
-
-///
-/// @brief Trait classes for mc_type
-/// @tparam MC the mc_type
-///
-template< mc_type MC >
-class mcTypeTraits;
-
-///
-/// @brief Trait classes for mc_type - NIMBUS specialization
-///
-template< >
-struct mcTypeTraits<mc_type::NIMBUS>
-{
-    enum
-    {
-        MC_PER_MODULE = 2,
-        MCS_PER_MC = 2,
-        MCS_PER_PROC = MC_PER_MODULE * MCS_PER_MC,
-        PORTS_PER_MCBIST = 4,
-        PORTS_PER_MCS = 2,
-        DIMMS_PER_PORT = 2,
-        DIMMS_PER_MCS = PORTS_PER_MCS * DIMMS_PER_PORT,
-        DIMMS_PER_MCBIST = PORTS_PER_MCBIST * DIMMS_PER_PORT,
-    };
-};
-
-///
-/// @brief Trait classes for mc_type - EXPLORER specialization
-///
-template< >
-struct mcTypeTraits<mc_type::EXPLORER>
-{
-    enum
-    {
-        MC_PER_PROC = 2,
-        MI_PER_MC = 2,
-        MCC_PER_MI = 2,
-        OMI_PER_MCC = 2,
-        OCMB_PER_OMI = 1,
-        PORTS_PER_OCMB = 1,
-        DIMMS_PER_PORT = 2,
-    };
-};
-
-
-}// mss
-
-#endif