summaryrefslogtreecommitdiffstats
path: root/src/hwpf
diff options
context:
space:
mode:
authorSantosh Puranik <santosh.puranik@in.ibm.com>2016-09-13 11:31:46 -0500
committerSantosh S. Puranik <santosh.puranik@in.ibm.com>2016-09-19 01:45:34 -0400
commitd6dcd0125e002508ea665a5b71eb2019a0274c91 (patch)
tree15911e4b3f1722d5bec3083f8030288046329d4d /src/hwpf
parent84f49a31edbf1f4dbdca4397194a498c97d4244c (diff)
downloadtalos-sbe-d6dcd0125e002508ea665a5b71eb2019a0274c91.tar.gz
talos-sbe-d6dcd0125e002508ea665a5b71eb2019a0274c91.zip
FAPI Plat Cleanup - III
-- Move completely to using FAPI from src/import Change-Id: Ifd27a900fea45ef0e7d6bd4a62192e50812b99ac Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29581 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com> Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Diffstat (limited to 'src/hwpf')
-rw-r--r--src/hwpf/include/buffer_traits.H242
-rw-r--r--src/hwpf/include/error_info.H686
-rw-r--r--src/hwpf/include/error_info_defs.H332
-rw-r--r--src/hwpf/include/fapi2.H78
-rw-r--r--src/hwpf/include/fapi2Structs.H133
-rw-r--r--src/hwpf/include/fapi2_attribute_service.H148
-rw-r--r--src/hwpf/include/fapi2_hw_access.H465
-rw-r--r--src/hwpf/include/fapi2_target.H589
-rw-r--r--src/hwpf/include/ffdc.H36
-rw-r--r--src/hwpf/include/plat/plat_target.H60
-rw-r--r--src/hwpf/include/plat/plat_target_utils.H2
-rw-r--r--src/hwpf/include/plat/plat_utils.H (renamed from src/hwpf/include/set_sbe_error.H)45
-rw-r--r--src/hwpf/include/plat/target.H41
-rw-r--r--src/hwpf/include/return_code.H108
-rw-r--r--src/hwpf/include/utils.H123
-rw-r--r--src/hwpf/include/vector.H851
-rw-r--r--src/hwpf/src/plat/plat_attribute_service.H9
-rw-r--r--src/hwpf/src/plat/target.C23
18 files changed, 138 insertions, 3833 deletions
diff --git a/src/hwpf/include/buffer_traits.H b/src/hwpf/include/buffer_traits.H
deleted file mode 100644
index a698ed1c..00000000
--- a/src/hwpf/include/buffer_traits.H
+++ /dev/null
@@ -1,242 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/buffer_traits.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
-/* [+] 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 buffer_traits.H
- * @brief trait definitions for fapi2 buffer base class
- */
-
-#ifndef __FAPI2_BUFFER_TRAITS__
-#define __FAPI2_BUFFER_TRAITS__
-
-#include <stdint.h>
-#include <vector>
-#include <algorithm>
-#include <buffer_parameters.H>
-
-#ifdef FAPI2_DEBUG
-#include <iostream>
-#endif
-
-#if !defined(DOXYGEN) && defined(FAPI2_DEBUG)
-#include <iterator>
-#endif
-
-namespace fapi2
-{
- /// @cond
- /// Types representing a container of bits. Used to create
- /// variable_buffer. container_unit must remain 32-bits
- /// for now - there will be a lot of code to change if it
- /// changes. There are assertions helping to enforce this
- /// in places in the code.
- typedef uint32_t container_unit;
- typedef std::vector<container_unit> bits_container;
-
- /// @brief Traits of buffers
- // In general, we try to give buffers traits reflecting integral types. If
- // this fails, the compiler will let someone know.
- ///
- /// @tparam T is the type of iv_data (std::vector, etc)
- /// @tparam B is the type of the bit-specifier, typically uint32_t
- template<typename T, typename B = uint32_t>
- class bufferTraits
- {
- public:
-
-#if !defined(DOXYGEN) && defined(FAPI2_DEBUG)
- ///
- /// @brief Print a container of bits
- /// @param[in] i_data the container of bits
- ///
- static inline void print(const T& i_data)
- {
- // convert to uint64_t to prevent uint8_t from being
- // printed as a char.
- std::cout << "\tdata is "
- << std::hex
- << static_cast<uint64_t>(i_data)
- << std::dec << std::endl;
- }
-#endif
-
- ///
- /// @brief Return the size of the buffer in E units
- /// @tparam E, the element size.
- /// @param[in] io_buffer the buffer which to size
- /// @return The size of the buffer in E's rounded up
- ///
- template<typename E>
- constexpr static B size(const T& i_buffer)
- {
- return (bit_length(i_buffer) +
- (parameterTraits<E>::bit_length() - 1)) /
- parameterTraits<E>::bit_length();
- }
-
- ///
- /// @brief Return the size of the buffer itself
- /// @param[in] io_buffer the buffer which to size
- /// @return The size of the buffer in bits (not units)
- ///
- constexpr static B bit_length(const T&)
- { return sizeof(T) * 8; }
-
- ///
- /// @brief Clear the buffer
- /// @param[in,out] io_buffer the buffer which to clear
- ///
- static inline void clear(T& io_buffer)
- { io_buffer = static_cast<T>(0); }
-
- ///
- /// @brief Set the buffer
- /// @param[in,out] io_buffer the buffer which to set
- ///
- static inline void set(T& io_buffer)
- { io_buffer = static_cast<T>(~0); }
-
- ///
- /// @brief Invert the buffer
- /// @param[in,out] io_buffer the buffer which to invert
- ///
- static inline void invert(T& io_buffer)
- { io_buffer = ~io_buffer; }
-
- ///
- /// @brief Reverse the buffer
- /// @param[in,out] io_buffer the buffer which to reverse
- ///
- static inline void reverse(T& io_buffer)
- {
- io_buffer =
- ((io_buffer & 0xAAAAAAAAAAAAAAAA) >> 1) |
- ((io_buffer & 0x5555555555555555) << 1);
- }
-
- ///
- /// @brief Get the address of the buffer as an array
- /// @param[in] i_buffer the buffer which to invert
- /// @return The address of the first element of the buffer
- ///
- static inline void* get_address(T& i_buffer)
- { return (void*)&i_buffer; }
-
- typedef B bits_type;
- typedef T unit_type;
- constexpr static uint32_t bits_per_unit(void)
- { return sizeof(unit_type) * 8; }
- };
-
- //
- //
- /// @brief Traits for buffers which are a container of bits
- //
- //
- template<>
- class bufferTraits<bits_container, uint32_t>
- {
- public:
-#if !defined(DOXYGEN) && defined(FAPI2_DEBUG)
- ///
- /// @brief Print a container of bits
- /// @param[in] i_data the container of bits
- ///
- static inline void print(const bits_container& i_data)
- {
- std::cout << "\tdata is " << std::hex;
- std::copy(i_data.begin(), i_data.end(),
- std::ostream_iterator<container_unit>(std::cout, " "));
- std::cout << std::dec << std::endl;
- }
-#endif
-
- ///
- /// @brief Return the size of the buffer in E units
- /// @tparam E, the element size.
- /// @param[in] io_buffer the buffer which to size
- /// @return The size of the buffer in E's rounded up
- ///
- template<typename E>
- constexpr static uint32_t size(const bits_container& i_buffer)
- {
- return (bit_length(i_buffer) +
- (parameterTraits<E>::bit_length() - 1)) /
- parameterTraits<E>::bit_length();
- }
-
- ///
- /// @brief Return the size of the buffer itself
- /// @param[in,out] io_buffer the buffer which to size
- /// @return The size of the buffer in bits (not units)
- ///
- static inline uint32_t bit_length(const bits_container& i_buffer)
- { return i_buffer.size() * sizeof(container_unit) * 8; }
-
- ///
- /// @brief Clear the buffer
- /// @param[in,out] io_buffer the buffer which to clear
- ///
- static inline void clear(bits_container& io_buffer)
- { io_buffer.assign(io_buffer.size(), 0); }
-
- ///
- /// @brief Set the buffer
- /// @param[in,out] io_buffer the buffer which to set
- ///
- static inline void set(bits_container& io_buffer)
- { io_buffer.assign(io_buffer.size(), ~0); }
-
- ///
- /// @brief Invert the buffer
- /// @param[in,out] io_buffer the buffer which to invert
- ///
- static inline void invert(bits_container& io_buffer)
- {
- std::transform(io_buffer.begin(), io_buffer.end(),
- io_buffer.begin(),
- [](container_unit u) { return ~u; });
- }
-
- ///
- /// @brief Get the address of the buffer as an array
- /// @param[in] i_buffer the buffer which to invert
- /// @return The address of the first element of the buffer
- ///
- static inline void* get_address(bits_container& i_buffer)
- {
- return (void*)&(i_buffer[0]);
- }
-
- typedef uint32_t bits_type;
- typedef container_unit unit_type;
- constexpr static uint32_t bits_per_unit(void)
- { return sizeof(unit_type) * 8; }
- };
- /// @endcond
-}
-
-
-
-#endif
diff --git a/src/hwpf/include/error_info.H b/src/hwpf/include/error_info.H
deleted file mode 100644
index 9085a4df..00000000
--- a/src/hwpf/include/error_info.H
+++ /dev/null
@@ -1,686 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/error_info.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2016 */
-/* [+] 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 error_info.H
-/// @brief Defines the Error Information structures and classes
-///
-
-#ifndef FAPI2_ERRORINFO_H_
-#define FAPI2_ERRORINFO_H_
-
-#include <stdint.h>
-#ifndef __PPE__
-#include <memory>
-#endif
-#include <vector>
-#include <target.H>
-#include <error_info_defs.H>
-
-namespace fapi2
-{
-#if defined(MINIMUM_FFDC)
-
-// convert generic type to uint64_t
-template<typename T>
-inline uint64_t convertType( T& i_value )
-{
- // for simplicity sake, all FFDC chunks from the SBE
- // are going to be sent as a uint64_t
- return static_cast<uint64_t>(i_value);
-};
-
-// convert platform target handle to a uint64_t
-template<fapi2::TargetType T, typename V>
-inline uint64_t convertType( const fapi2::Target<T, V>& i_value)
-{
- // TODO: via RTC 158868 : Update this for multicast targets
- // get the SBE platform target handle
- return static_cast<uint64_t>((static_cast<uint64_t>((static_cast<plat_target_handle_t>(i_value.get()).getFapiTargetType())) << 32) | static_cast<plat_target_handle_t>(i_value.get()).getTargetInstance());
-};
-#endif
-
-#if !defined(FAPI2_NO_FFDC) && !defined(MINIMUM_FFDC)
-// forward fapi2::Assert()
-extern void Assert(bool);
-
-///
-/// @class ErrorInfoFfdc
-///
-/// This class contains a copy of some FFDC data
-///
-class ErrorInfoFfdc
-{
- public:
- ///
- /// @brief Constructor
- ///
- /// @param[in] i_ffdcId FFDC Identifier (used to decode FFDC)
- /// @param[in] i_pFfdc Pointer to the FFDC to copy
- /// @param[in] i_size Size of the FFDC to copy
- ///
- ErrorInfoFfdc(const uint32_t i_ffdcId,
- const void* i_pFfdc,
- const uint32_t i_size);
-
- ///
- /// @brief Get a pointer to the FfdcData
- ///
- /// @param[out] o_size Reference to uint32_t that is filled in with
- /// the FFDC size
- ///
- /// @return void *. Pointer to the FFDC
- ///
- inline const void* getData(uint32_t& o_size) const
- {
- o_size = iv_size;
- return iv_pFfdc.get();
- }
-
- ///
- /// @brief Get a pointer to the FfdcData
- /// @return void *. Pointer to the FFDC
- ///
- inline void* getData(void) const
- {
- return iv_pFfdc.get();
- }
-
- ///
- /// @brief Get the FFDC Identifier
- ///
- /// @return uint32_t The FFDC Identifier
- ///
- inline uint32_t getFfdcId(void)
- {
- return iv_ffdcId;
- }
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- private:
-
- // FFDC Identifier
- uint32_t iv_ffdcId;
-
- // Pointer to the FFDC
- std::shared_ptr<uint8_t> iv_pFfdc;
-
- // Size of the FFDC
- uint32_t iv_size;
-
- // Disabled
- ErrorInfoFfdc(const ErrorInfoFfdc&) = delete;
- ErrorInfoFfdc& operator=(const ErrorInfoFfdc&) = delete;
-};
-
-///
-/// @struct ErrorInfoHwCallout
-///
-/// This struct contains hardware to callout
-///
-struct ErrorInfoHwCallout
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_hw Hardware to callout
- /// @param[in] i_calloutPriority Priority of callout
- /// @param[in] i_refTarget Reference to reference target
- ///
- ErrorInfoHwCallout(
- const HwCallouts::HwCallout i_hw,
- const CalloutPriorities::CalloutPriority i_calloutPriority,
- const Target<TARGET_TYPE_ALL>& i_refTarget);
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // The hw to callout
- HwCallouts::HwCallout iv_hw;
-
- // The callout priority
- CalloutPriorities::CalloutPriority iv_calloutPriority;
-
- // The reference target (needed for some HW callouts to identify what to
- // callout). The target handle is NULL if there is no reference target.
- Target<TARGET_TYPE_ALL> iv_refTarget;
-};
-
-///
-/// @struct ErrorInfoProcedureCallout
-///
-/// This struct contains a procedure to callout
-///
-struct ErrorInfoProcedureCallout
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_procedure Procedure to callout
- /// @param[in] i_calloutPriority Priority of callout
- ///
- ErrorInfoProcedureCallout(
- const ProcedureCallouts::ProcedureCallout i_procedure,
- const CalloutPriorities::CalloutPriority i_calloutPriority);
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // The procedure to callout
- ProcedureCallouts::ProcedureCallout iv_procedure;
-
- // The callout priority
- CalloutPriorities::CalloutPriority iv_calloutPriority;
-};
-
-///
-/// @struct ErrorInfoBusCallout
-///
-/// This struct contains a bus to callout
-///
-struct ErrorInfoBusCallout
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_target1 Reference to target on one end of the bus
- /// @param[in] i_target2 Reference to target on other end of the bus
- /// @param[in] i_calloutPriority Priority of callout
- ///
- ErrorInfoBusCallout(
- const Target<TARGET_TYPE_ALL>& i_target1,
- const Target<TARGET_TYPE_ALL>& i_target2,
- const CalloutPriorities::CalloutPriority i_calloutPriority);
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // The targets on each end of the bus to callout
- Target<TARGET_TYPE_ALL> iv_target1;
- Target<TARGET_TYPE_ALL> iv_target2;
-
- // The callout priority
- CalloutPriorities::CalloutPriority iv_calloutPriority;
-};
-
-///
-/// @struct ErrorInfoCDG
-///
-/// This struct contains a target to callout/deconfigure/GARD
-///
-struct ErrorInfoCDG
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_target Reference to the target to c/d/g
- /// @param[in] i_callout True if Target should be called out
- /// @param[in] i_deconfigure True if Target should be deconfigured
- /// @param[in] i_gard True if Target should be GARDed
- /// @param[in] i_priority The priority of any callout
- ///
- ErrorInfoCDG(const Target<TARGET_TYPE_ALL>& i_target,
- const bool i_callout,
- const bool i_deconfigure,
- const bool i_gard,
- const CalloutPriorities::CalloutPriority i_priority);
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // The target to callout/deconfigure/GARD
- Target<TARGET_TYPE_ALL> iv_target;
-
- // Callout Information
- bool iv_callout;
- CalloutPriorities::CalloutPriority iv_calloutPriority;
-
- // Deconfigure Information
- bool iv_deconfigure;
-
- // GARD Information
- bool iv_gard;
-};
-
-///
-/// @struct ErrorInfoChildrenCDG
-///
-/// This struct contains children targets to callout/deconfigure/GARD
-///
-/// Children by containment can be CDG (chiplets belonging to a parent chip)
-/// e.g.
-/// - PROC_CHIP -> EX_CHIPLET
-/// - MEMBUF_CHIP -> MBA_CHIPLET
-/// Children by affinity can be CDG.
-/// Any from PROC_CHIP->MCS_CHIPLET->MEMBUF_CHIP->MBA_CHIPLET->DIMM e.g.
-/// - PROC_CHIP->MEMBUF_CHIP
-/// - MEMBUF_CHIP->DIMM
-/// - MBA_CHIPLET->DIMM
-/// Port and Number criteria can be applied to the child target as
-/// detailed in the constructor
-///
-struct ErrorInfoChildrenCDG
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_parentChip Reference to the parent target
- /// @param[in] i_childType Child target type to c/d/g
- /// @param[in] i_callout True if Target should be called out
- /// @param[in] i_deconfigure True if Target should be deconfigured
- /// @param[in] i_gard True if Target should be GARDed
- /// @param[in] i_priority The priority of any callout
- /// @param[in] i_childPort Child Port
- /// For DIMM children, the MBA port number
- /// @param[in] i_childNum Child Number
- /// For DIMM children, the dimm socket number
- /// For Chip children, the chip position
- /// For Chiplet children, the chiplet unit pos
- ///
- ErrorInfoChildrenCDG(const Target<TARGET_TYPE_ALL>& i_parentChip,
- const TargetType i_childType,
- const bool i_callout,
- const bool i_deconfigure,
- const bool i_gard,
- const CalloutPriorities::CalloutPriority i_priority,
- const uint8_t i_childPort, const uint8_t i_childNum);
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // The parent chip
- Target<TARGET_TYPE_ALL> iv_parent;
-
- // The child target types to c/d/g
- TargetType iv_childType;
-
- // Callout Information
- bool iv_callout;
- CalloutPriorities::CalloutPriority iv_calloutPriority;
-
- // Deconfigure Information
- bool iv_deconfigure;
-
- // GARD Information
- bool iv_gard;
-
- // Child Port
- static const uint8_t ALL_CHILD_PORTS = 0xff;
- uint8_t iv_childPort;
-
- // Child Number
- static const uint8_t ALL_CHILD_NUMBERS = 0xff;
- uint8_t iv_childNumber;
-};
-
-///
-/// @struct ErrorInfoCollectTrace
-///
-/// This struct contains trace ID to add to the error log
-///
-struct ErrorInfoCollectTrace
-{
- ///
- /// @brief Constructor.
- ///
- /// @param[in] i_traceId
- ///
- ErrorInfoCollectTrace(CollectTraces::CollectTrace i_traceId);
-
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // trace
- CollectTraces::CollectTrace iv_eiTraceId;
-};
-
-///
-/// @struct ErrorInfo
-///
-/// This struct defines the error information associated with a fapi2::ffdc
-/// Users are allowed to access the data directly
-///
-struct ErrorInfo
-{
-
-#ifdef FAPI_CUSTOM_MALLOC
- ///
- /// @brief Overload new operator to use platform-specific allocator
- ///
- /// @param[in] i_sz Size of memory to allocate in bytes
- ///
- /// @return Pointer to allocated memory
- ///
- static void* operator new(size_t i_sz);
-
- ///
- /// @brief Overload delete operator to use platform-specific deallocator
- ///
- /// @param[in] i_ptr Pointer to memory previously allocated with new
- ///
- static void operator delete(void* i_ptr);
-#endif
-
- // Vector of FFDC Data
- std::vector<std::shared_ptr<ErrorInfoFfdc> > iv_ffdcs;
-
- // Vector of Hardware to callout
- std::vector<std::shared_ptr<ErrorInfoHwCallout> > iv_hwCallouts;
-
- // Vector of procedures to callout
- std::vector<std::shared_ptr<ErrorInfoProcedureCallout> >
- iv_procedureCallouts;
-
- // Vector of buses to callout
- std::vector<std::shared_ptr<ErrorInfoBusCallout> > iv_busCallouts;
-
- // Vector of targets to callout/deconfigure/GARD
- std::vector<std::shared_ptr<ErrorInfoCDG> > iv_CDGs;
-
- // Vector of children targets to callout/deconfigure/GARD
- std::vector<std::shared_ptr<ErrorInfoChildrenCDG> > iv_childrenCDGs;
-
- // Vector of traces to collect
- std::vector<std::shared_ptr<ErrorInfoCollectTrace> > iv_traces;
-};
-///
-/// @brief Structure representing a single ErrorInfo entry.
-///
-/// An array of these is passed to the addErrorInfo function when a HWP
-/// generates an error by calling the FAPI_SET_HWP_ERROR macro
-// Why aren't these inherited classes? Saves on allocation overhead.
-// We create an array of ErrorInfoEntries as automatics when we start
-// FFDC collection. If we did this as inherited classes it would either
-// be allocating and deallocating or we'd need to allocate an array of
-// the largest and map each struct in to it. That's messy to do without
-// unions (that's what they're for) so we do it like this. The inherited
-// model would result in a jump table anyway, so we're basically doing
-// all of that by hand to avoid the mess.
-//
-struct ErrorInfoEntryFfdc
-{
- uint8_t iv_ffdcObjIndex;
- uint16_t iv_ffdcSize;
- uint32_t iv_ffdcId;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Structure representing a hardware callout
-///
-struct ErrorInfoEntryHwCallout
-{
- uint8_t iv_hw;
- uint8_t iv_calloutPriority;
- uint8_t iv_refObjIndex;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Structure representing a procedure callout
-///
-struct ErrorInfoEntryProcCallout
-{
- uint8_t iv_procedure;
- uint8_t iv_calloutPriority;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-
- ErrorInfoEntryProcCallout(uint8_t i_procedure, uint8_t i_calloutPriority):
- iv_procedure(i_procedure),
- iv_calloutPriority(i_calloutPriority)
- {}
-
- ErrorInfoEntryProcCallout(void) = default;
-};
-
-///
-/// @brief Structure representing a bus callout
-///
-struct ErrorInfoEntryBusCallout
-{
- uint8_t iv_endpoint1ObjIndex;
- uint8_t iv_endpoint2ObjIndex;
- uint8_t iv_calloutPriority;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Structure representing a target callout
-///
-struct ErrorInfoEntryTargetCDG
-{
- uint8_t iv_targetObjIndex;
- uint8_t iv_callout;
- uint8_t iv_deconfigure;
- uint8_t iv_gard;
- uint8_t iv_calloutPriority;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Structure representing a child callout
-///
-struct ErrorInfoEntryChildrenCDG
-{
- uint8_t iv_parentObjIndex;
- uint8_t iv_callout;
- uint8_t iv_deconfigure;
- uint32_t iv_childType;
- uint8_t iv_childPort;
- uint8_t iv_childNumber;
- uint8_t iv_gard;
- uint8_t iv_calloutPriority;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Structure representing collected trace information
-///
-struct ErrorInfoEntryCollectTrace
-{
- uint32_t iv_eieTraceId;
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const;
-};
-
-///
-/// @brief Union of all the error info types
-///
-struct ErrorInfoEntry
-{
- uint8_t iv_type; // Value from ErrorInfoType
- union
- {
- ErrorInfoEntryFfdc ffdc;
- ErrorInfoEntryHwCallout hw_callout;
- ErrorInfoEntryProcCallout proc_callout;
- ErrorInfoEntryBusCallout bus_callout;
- ErrorInfoEntryTargetCDG target_cdg;
- ErrorInfoEntryChildrenCDG children_cdg;
- ErrorInfoEntryCollectTrace collect_trace;
- };
-
- ///
- /// @brief Add error information to the FFDC object
- /// @param[in] i_info a shared pointer to the error info
- /// @param[in] i_object the list of ffdc objects being collected
- ///
- void addErrorInfo(std::shared_ptr<ErrorInfo> i_info,
- const void* const* i_object) const
- {
- // "unhandled error info type");
- fapi2::Assert(iv_type < EI_LAST_TYPE);
-
- switch(iv_type)
- {
- case EI_TYPE_FFDC:
- ffdc.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_HW_CALLOUT:
- hw_callout.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_PROCEDURE_CALLOUT:
- proc_callout.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_BUS_CALLOUT:
- bus_callout.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_CDG:
- target_cdg.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_CHILDREN_CDG:
- children_cdg.addErrorInfo(i_info, i_object);
- break;
-
- case EI_TYPE_COLLECT_TRACE:
- collect_trace.addErrorInfo(i_info, i_object);
- break;
- };
-
- return;
- }
-};
-#endif
-}
-#endif // FAPI2_ERRORINFO_H_
diff --git a/src/hwpf/include/error_info_defs.H b/src/hwpf/include/error_info_defs.H
deleted file mode 100644
index 02d4ee34..00000000
--- a/src/hwpf/include/error_info_defs.H
+++ /dev/null
@@ -1,332 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/error_info_defs.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2016 */
-/* [+] 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 error_info_defs.H
-/// @brief Defines to support the Error Information class
-///
-
-#ifndef FAPI2_ERRORINFO_DEFS_H_
-#define FAPI2_ERRORINFO_DEFS_H_
-
-#include <stdint.h>
-#include <target.H>
-#if !defined(MINIMUM_FFDC) && !defined(FAPI2_NO_FFDC)
-#include <variable_buffer.H>
-#include <utility>
-#endif
-namespace fapi2
-{
-
-///
-/// @brief Type to hold the ffdc data to be returned to caller
-/// when error occurs in sbe environment.
-///
-/// Note: Typical data sent seems to be register/addresss info
-/// rather than use extra space converting stuff just
-/// send a uint64 always
-///
-struct sbeFfdc_t
-{
- uint32_t size;
- uint64_t data;
-};
-
-// Data type for SBE ffdc buffer sent through fifo
-typedef struct
-{
- uint32_t fapiRc; // Return code from failure
- uint32_t ffdcLength; // length of Fapi FFDC data (in bytes)
- struct sbeFfdc_t ffdcData[10]; // fapi FFDC data
-} SbeFfdcData_t; // 128 bytes
-
-///
-/// @brief Type to hold the ffdc element in the ffdc class
-/// Needed so that the size can be squirled away before the
-/// macro is called.
-///
-struct ffdc_struct
-{
- const void* ptr;
- int16_t size;
-};
-
-
-class ffdc_t
-{
- public:
- ffdc_t(void)
- {}
-
- void operator=(const ffdc_t& i )
- {
- iv_value.ptr = i.ptr();
- iv_value.size = i.size();
- }
-
- operator const void* () const
- {
- return iv_value.ptr;
- }
- operator uint8_t() const
- {
- return *(reinterpret_cast<const uint8_t*>(iv_value.ptr));
- }
-
- int16_t size(void) const
- {
- return iv_value.size;
- }
- int16_t& size(void)
- {
- return iv_value.size;
- }
-
- const void* ptr(void) const
- {
- return iv_value.ptr;
- }
- const void*& ptr(void)
- {
- return iv_value.ptr;
- }
-
- private:
- struct ffdc_struct iv_value;
-};
-
-///
-/// @brief Enumeration of ErrorInfo FFDC sizes that are used to indicate a
-/// special type that cannot simply be memcopied
-enum ErrorInfoFfdcSize
-{
- EI_FFDC_SIZE_BUF = 0xffff, // fapi2::buffer<T>
- EI_FFDC_SIZE_TARGET = 0xfffe, // fapi2::Target
- EI_FFDC_SIZE_VBUF = 0xfffd, // fapi2::variable_buffer
- EI_FFDC_MAX_SIZE = 0x1000, // Limit regular FFDC capture to 4kb
-};
-
-///
-/// @brief Enumeration of error log severity.
-///
-enum errlSeverity_t
-{
- FAPI2_ERRL_SEV_UNDEFINED = 0x00, /// Used internally by ffdc mechanism
- FAPI2_ERRL_SEV_RECOVERED = 0x10, /// Not seen by customer
- FAPI2_ERRL_SEV_PREDICTIVE = 0x20, /// Error recovered but customer will see
- FAPI2_ERRL_SEV_UNRECOVERABLE = 0x40 /// Unrecoverable, general
-};
-
-///
-/// @brief Enumeration of ErrorInfo types
-///
-enum ErrorInfoType
-{
- EI_TYPE_FFDC = 0,
- EI_TYPE_HW_CALLOUT = 1,
- EI_TYPE_PROCEDURE_CALLOUT = 2,
- EI_TYPE_BUS_CALLOUT = 3,
- EI_TYPE_CDG = 4, // Target Callout/Deconfig/GARD
- EI_TYPE_CHILDREN_CDG = 5, // Children Callout/Deconfig/GARD
- EI_TYPE_COLLECT_TRACE = 6,
- EI_LAST_TYPE = EI_TYPE_COLLECT_TRACE + 1,
-};
-
-#if !defined(MINIMUM_FFDC) && !defined(FAPI2_NO_FFDC)
-///
-/// @enum HwCallout
-///
-/// This enumeration defines the possible Hardware Callouts that are not
-/// represented by fapi2::Targets
-///
-/// Note that platform code may depend on the enum values starting at 0 and
-/// incrementing in order to efficiently convert to a platform callout value
-/// so do not reorder without consulting all platforms
-///
-namespace HwCallouts
-{
-enum HwCallout
-{
- // Where indicated, a HW Callout in FAPI Error XML must include a
- // reference target that is used to identify the HW. e.g. for
- // TOD_CLOCK, the proc chip that the clock is attached to must be
- // specified
- TOD_CLOCK = 0, // Include proc-chip ref (or child chiplet)
- MEM_REF_CLOCK = 1, // Include membuf-chip ref (or child chiplet)
- PROC_REF_CLOCK = 2, // Include proc-chip ref (or child chiplet)
- PCI_REF_CLOCK = 3, // Include proc-chip ref (or child chiplet)
- FLASH_CONTROLLER_PART = 4,
- PNOR_PART = 5,
- SBE_SEEPROM_PART = 6,
- VPD_PART = 7,
- LPC_SLAVE_PART = 8,
- GPIO_EXPANDER_PART = 9,
- SPIVID_SLAVE_PART = 10,
-};
-}
-
-///
-/// @enum ProcedureCallout
-///
-/// This enumeration defines the possible Procedure Callouts
-/// These instruct the customer/customer-engineer what to do
-///
-/// Note that platform code may depend on the enum values starting at 0 and
-/// incrementing in order to efficiently convert to a platform callout value
-/// so do not reorder without consulting all platforms
-///
-namespace ProcedureCallouts
-{
-enum ProcedureCallout
-{
- CODE = 0, // Code problem
- LVL_SUPPORT = 1, // Call next level of support
- MEMORY_PLUGGING_ERROR = 2, // DIMM Plugging error
- BUS_CALLOUT = 3, // Bus Called Out
-};
-}
-
-///
-/// @enum CalloutPriority
-///
-/// This enumeration defines the possible Procedure and Target callout priorities
-///
-/// Note that platform code may depend on the enum values starting at 0 and
-/// incrementing in order to efficiently convert to a platform priority value
-/// so do not reorder without consulting all platforms
-///
-namespace CalloutPriorities
-{
-enum CalloutPriority
-{
- LOW = 0,
- MEDIUM = 1,
- HIGH = 2,
-};
-}
-
-///
-/// @enum CollectTrace
-///
-/// This enumeration defines the possible firmware traces to collect
-///
-namespace CollectTraces
-{
-const uint32_t TRACE_SIZE = 256; // limit collected trace size
-enum CollectTrace
-{
- FSI = 1,
- SCOM = 2,
- SCAN = 3,
- MBOX = 4,
-};
-}
-
-///
-/// @brief Get FFDC Data from FIFO buffer
-///
-/// This is called by hwsv/hb ffdc code when an error is returned in the
-/// sbe fifo area. It will translate the data based on type and convert
-/// the local data size to the correct length based on the known data size.
-///
-/// NOTE - this assumes no buffers are passed - mistake? maybe
-inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc )
-{
- fapi2::ffdc_t temp;
-
- // passed in size is a uint32_t but, needs to be uint16_t
- temp.size() = static_cast<uint16_t>(i_sbeFfdc.size);
-
- if(i_sbeFfdc.size == EI_FFDC_SIZE_TARGET )
- {
- fapi2::TargetType type = TARGET_TYPE_EX;
- uint64_t targetData = i_sbeFfdc.data;
- // call hostboot to get the fapi2 target
- temp.ptr() = static_cast<void*>(getTarget((targetData >> 32), static_cast<uint8_t>(targetData & 0xFFFFFFFF)));
- }
- else
- {
- // adjust the pointer based on the data size.
- temp.ptr() = reinterpret_cast<uint8_t*>(&i_sbeFfdc.data) + (sizeof(uint64_t) - i_sbeFfdc.size);
- }
-
- return temp;
-}
-#endif
-///
-/// @brief Get FFDC Size
-///
-/// This is called by the FAPI_SET_HWP_ERROR macro to find out the size of
-/// FFDC data. If the data is of a special type that is handled differently
-/// than types that are simply memcopied then it is handled by a template
-/// specialization.
-/// If this function template is instantiated with a pointer, the compile
-/// will fail.
-///
-/// @return uint16_t. Size of the FFDC data
-///
-template<typename T>
-inline uint16_t getErrorInfoFfdcSize(const T&)
-{
- static_assert(sizeof(T) <= EI_FFDC_MAX_SIZE,
- "FFDC too large to capture");
- return sizeof(T);
-}
-#if !defined(MINIMUM_FFDC) && !defined(FAPI2_NO_FFDC)
-///
-/// @brief Compile error if caller tries to get the FFDC size of a pointer
-///
-template<typename T>
-inline uint16_t getErrorInfoFfdcSize(const T*)
-{
- static_assert(std::is_pointer<T>::value,
- "pointer passed to getErrorInfoFfdcSize");
- return 0;
-}
-#endif
-///
-/// @brief Get FFDC Size specialization for fapi2::Target
-///
-template<fapi2::TargetType T>
-inline uint16_t getErrorInfoFfdcSize(const fapi2::Target<T>&)
-{
- return EI_FFDC_SIZE_TARGET;
-}
-
-#if !defined(MINIMUM_FFDC) && !defined(FAPI2_NO_FFDC)
-///
-/// @brief Get FFDC Size specialization for variable buffers
-///
-template<>
-inline uint16_t getErrorInfoFfdcSize(const fapi2::variable_buffer& i_thing)
-{
- // Limit a variable buffer to 4kb bytes, and we can memcpy the storage.
- return std::min(static_cast<uint32_t>(EI_FFDC_MAX_SIZE),
- i_thing.getLength<uint8_t>());
-}
-#endif
-};
-
-#endif // FAPI2_ERRORINFO_DEFS_H_
diff --git a/src/hwpf/include/fapi2.H b/src/hwpf/include/fapi2.H
deleted file mode 100644
index ea79cb6f..00000000
--- a/src/hwpf/include/fapi2.H
+++ /dev/null
@@ -1,78 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/fapi2.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2016 */
-/* [+] 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 fapi2.H
-/// @brief top level header for fapi2
-///
-
-#ifndef __FAPI2_TOP_LEVEL__
-#define __FAPI2_TOP_LEVEL__
-
-// Define which platforms will not have FAPI Return Codes
-#undef __noRC__
-#if defined (__CME__) || defined (__SGPE__) || defined (__PGPE__)
-#define __noRC__
-#endif
-
-// Determine if running on a PPE platform
-#ifndef __PPE__
-#if defined (__SBE__) || defined (__CME__) || defined (__SGPE__) || defined (__PGPE__)
-#define __PPE__
-#endif
-#endif
-
-#include <plat_trace.H>
-#include <target.H>
-#include <return_code.H>
-#include <buffer.H>
-#include <hw_access.H>
-#include <utils.H>
-
-// In turn includes the needed generated headers (hwp_ffd_classes, etc.)
-#include <error_scope.H>
-#include <set_sbe_error.H> // Generated file
-#include <plat_attributes.H>
-#include <plat_target_utils.H>
-
-// Not supported by PPE
-#ifndef __PPE__
-#include <mvpdAccess.H>
-#endif
-
-#include <fapi2_hwp_executor.H>
-
-// Block of headers not currently in fapi2
-#ifdef FAPI2_MISSING_HEADERS
- #include <mbvpdAccess.H>
-#endif
-
-
-#endif // __FAPI2_TOP_LEVEL__
-
-
-
-
-
-
diff --git a/src/hwpf/include/fapi2Structs.H b/src/hwpf/include/fapi2Structs.H
deleted file mode 100644
index 15120ab0..00000000
--- a/src/hwpf/include/fapi2Structs.H
+++ /dev/null
@@ -1,133 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/fapi2Structs.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2016 */
-/* [+] 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 fapiStructs_h
-#define fapiStructs_h
-// Copyright **********************************************************
-//
-// File fapiStructs.H
-//
-// IBM Confidential
-// OCO Source Materials
-// 9400 Licensed Internal Code
-// (C) COPYRIGHT IBM CORP. 1996
-//
-// The source code for this program is not published or otherwise
-// divested of its trade secrets, irrespective of what has been
-// deposited with the U.S. Copyright Office.
-//
-// End Copyright ******************************************************
-
-/**
- * @file fapiStructs.H
- * @brief fapi eCMD Extension Structures
-
- * Extension Owner : John Farrugia
-*/
-
-//--------------------------------------------------------------------
-// Includes
-//--------------------------------------------------------------------
-#include <string>
-
-
-//--------------------------------------------------------------------
-// Forward References
-//--------------------------------------------------------------------
-
-#define ECMD_FAPI_CAPI_VERSION "1.0" ///< eCMD FAPI Extension version
-
-
-
-#ifndef ECMD_PERLAPI
-
-namespace fapi
-{
-
-/**
- * @brief Enumeration of fapi file types
- */
-typedef enum {
- FAPI_FILE_UNKNOWN, ///< Default for not initialized
- FAPI_FILE_HWP
-} FileType_t;
-
-
-enum AttributeSource
-{
- FAPI_ATTRIBUTE_SOURCE_UNKNOWN = 0x00000000,
- FAPI_ATTRIBUTE_SOURCE_PLAT = 0x00000001,
- FAPI_ATTRIBUTE_SOURCE_HWP = 0x00000002,
-};
-
-
-#define FAPI_ATTRIBUTE_TYPE_STRING 0x80000000
-#define FAPI_ATTRIBUTE_TYPE_UINT8 0x40000000
-#define FAPI_ATTRIBUTE_TYPE_UINT32 0x20000000
-#define FAPI_ATTRIBUTE_TYPE_UINT64 0x10000000
-#define FAPI_ATTRIBUTE_TYPE_UINT8ARY 0x04000000
-#define FAPI_ATTRIBUTE_TYPE_UINT32ARY 0x02000000
-#define FAPI_ATTRIBUTE_TYPE_UINT64ARY 0x01000000
-
-#define FAPI_ATTRIBUTE_MODE_CONST 0x80000000
-/**
- @brief Used by the get/set configuration functions to return the data
-*/
-template<typename T>
-class Attribute
-{
-public:
- // Constructor
- Attribute();
-
- // Destructor
- ~Attribute();
-
- //
- /// @brief Assignment Operator.
- /// @param[in] i_right Reference to Value to assign from.
- /// @return Reference to 'this' Target
- ///
- Attribute<T>& operator=(const T& i_right)
- {
- this->value = i_right->value;
- }
-
-private:
- T value;
-
-};
-
-inline AttributeData::AttributeData() {}
-
-inline AttributeData::~AttributeData() {}
-
-} //namespace
-#endif // #ifndef ECMD_PERLAPI
-#endif
-
-
-
-
-
diff --git a/src/hwpf/include/fapi2_attribute_service.H b/src/hwpf/include/fapi2_attribute_service.H
deleted file mode 100644
index b1c7a668..00000000
--- a/src/hwpf/include/fapi2_attribute_service.H
+++ /dev/null
@@ -1,148 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/fapi2_attribute_service.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2016 */
-/* */
-/* */
-/* 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 fapi2AttributeService.H
-///
-/// @brief Defines the FAPI_ATTR_GET and FAPI_ATTR_SET macros that a user
-/// calls to get/set attributes and a check function that the macros use to
-/// verify correct usage
-///
-
-#ifndef FAPI2ATTRIBUTESERVICE_H_
-#define FAPI2ATTRIBUTESERVICE_H_
-#include <stdint.h>
-#include <attribute_ids.H>
-#include <target.H>
-#include <target_types.H>
-#include <plat_attribute_service.H>
-
-/// @brief Macros called by user to get/set attributes for FAPI2 targets
-///
-/// Code must have a reference to a FAPI2 Target and an attribute ID (from
-/// XML file):
-/// fapi2::ReturnCode l_rc;
-/// fapi2::Target<target type>& l_target = ????;
-/// Ex: Target<TARGET_TYPE_PROC_CHIP>& l_target = ????;
-///
-/// To get a copy of an integer attribute and set the attribute
-/// uint64_t l_val = 0;
-/// l_rc = FAPI_ATTR_GET(<ID>, l_target, l_val);
-/// l_rc = FAPI_ATTR_SET(<ID>, l_target, l_val);
-///
-/// To get a copy of an integer array attribute and set the attribute
-/// uint32_t l_pVal[4] = {0};
-/// l_rc = FAPI_ATTR_GET(<ID>, l_target, l_pVal);
-/// l_rc = FAPI_ATTR_SET(<ID>, l_target, l_pVal);
-///
-/// A priveleged attribute is one that a HWP should not generally access,
-/// examples include ATTR_NAME and ATTR_EC, where usage can lead to a non
-/// data-driven design. A privileged attribute can be accessed with
-/// FAPI_ATTR_GET_PRIVILEGED and FAPI_ATTR_SET_PRIVILEGED
-///
-/// The non-PRIVILEGED macros first call a template function (compiler will
-/// optimize out) that will cause a compile failure if the attribute is
-/// privileged, they then call a PRIVILEGED macro to get/set the attribute
-///
-/// The PRIVILEGED macros call a template function (compiler will optimize out)
-/// that will cause a compile failure if the ID is not valid or VAL is not the
-/// correct type.
-//
-
-#define FAPI_ATTR_GET(ID, TARGET, VAL) \
- (fapi2::failIfPrivileged<ID##_Privileged>(), \
- fapi2::checkIdType<ID##_Type>(ID, VAL), \
- ID##_GETMACRO(ID, TARGET, VAL))
-
-#define FAPI_ATTR_SET(ID, TARGET, VAL) \
- (fapi2::failIfPrivileged<ID##_Privileged>(), \
- fapi2::checkIdType<ID##_Type>(ID, VAL), \
- ID##_SETMACRO(ID, TARGET, VAL))
-
-#define FAPI_ATTR_GET_PRIVILEGED(ID, TARGET, VAL) \
- (fapi2::checkIdType<ID##_Type>(ID, VAL), \
- ID##_GETMACRO(ID, TARGET, VAL))
-
-#define FAPI_ATTR_SET_PRIVILEGED(ID, TARGET, VAL) \
- (fapi2::checkIdType<ID##_Type>(ID, VAL), \
- ID##_SETMACRO(ID, TARGET, VAL))
-
-namespace fapi2
-{
-
-///
-/// @brief Get an InitFile attribute for FAPI2
-///
-/// This function gets a copy of an attribute. In the case of an array attribute,
-/// The value in the specified index is retrieved. This should be used by the
-/// InitFile HWP only, that HWP processes a binary InitFile and therefore needs
-/// to read a variable ID of a variable data type. Standard HWPs should use the
-/// FAPI2_ATTR_GET macro which automatically checks the type for correct usage.
-///
-/// If there are ever attributes with more than 4 dimensions then this function
-/// will need to be updated.
-///
-/// @Tparam K template parameter, passed in target.
-/// @param[in] i_id AttributeID
-/// @param[in] i_target Reference to fapi2::Target (can be NULL for system)
-/// @param[out] o_val Reference to uint64_t where attribute value is set
-/// @param[in] i_arrayIndex1 If array attribute then index1
-/// @param[in] i_arrayIndex2 If at least 2D array attribute then index2
-/// @param[in] i_arrayIndex3 If at least 3D array attribute then index3
-/// @param[in] i_arrayIndex4 If at least 4D array attribute then index4
-///
-/// @return ReturnCode. Zero if success
-///
-template< TargetType K >
-ReturnCode getInitFileAttr(const AttributeId i_id,
- const Target<K>& i_target,
- uint64_t & o_val,
- const uint32_t i_arrayIndex1 = 0,
- const uint32_t i_arrayIndex2 = 0,
- const uint32_t i_arrayIndex3 = 0,
- const uint32_t i_arrayIndex4 = 0);
-
-/**
- * @brief Check the ID and TYPE
- *
- * This is called by FAPI code to check at compile time that a FAPI attribute
- * access is using the correct data type and a valid AttributeId
- */
-template<typename T> inline void checkIdType(AttributeId, T &) {}
-
-/**
- * @brief Fail if attribute privileged
- *
- * This is called by FAPI code to check at compile time that a standard FAPI
- * attribute access (FAPI_ATTR_GET) is not accessing a privileged attribute
- */
-class ErrorAccessingPrivilegedAttribute;
-template<const bool PRIVILEGED> void failIfPrivileged()
-{
- ErrorAccessingPrivilegedAttribute();
-}
-template <> inline void failIfPrivileged<false>() {}
-
-}
-
-#endif // FAPI2ATTRIBUTESERVICE_H_
diff --git a/src/hwpf/include/fapi2_hw_access.H b/src/hwpf/include/fapi2_hw_access.H
deleted file mode 100644
index ba7d3a62..00000000
--- a/src/hwpf/include/fapi2_hw_access.H
+++ /dev/null
@@ -1,465 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/fapi2_hw_access.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
-/* [+] 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 fapi2_hw_access.H
-/// @brief Common file that defines the hardware access functions that
-/// platform code must implement.
-///
-
-#ifndef _FAPI2_COMMON_HWACCESS_H_
-#define _FAPI2_COMMON_HWACCESS_H_
-
-#ifdef FAPI_SUPPORT_SPY_AS_ENUM
-#include <spy_ids.H>
-typedef uint64_t spyId_t;
-#endif
-
-#include <stdint.h>
-#include <buffer.H>
-
-// thread/variable_buffer isn't supported on PPE
-#ifndef __PPE__
-#include <thread>
-#include <variable_buffer.H>
-#endif
-
-#include <return_code.H>
-#include <target.H>
-#include <hw_access_def.H>
-#include <plat_hw_access.H>
-#include "imageProcs/p9_ringId.H"
-
-#ifdef FAPI_SUPPORT_MULTI_SCOM
-#include <multi_scom.H>
-#endif
-
-namespace fapi2
-{
- //--------------------------------------------------------------------------
- // PIB Error Functions
- //--------------------------------------------------------------------------
-
- /// @brief Sets the PIB error mask - platform dependant
- /// @param[in] i_mask The new error mask
- inline void setPIBErrorMask(uint8_t i_mask);
-
- /// @brief Gets the PIB error mask - platform dependant
- /// @return uint8_t The current PIB error mask
- inline uint8_t getPIBErrorMask(void);
-
- //--------------------------------------------------------------------------
- // Operational Mode Error Functions
- //--------------------------------------------------------------------------
-
- /// @brief Sets the operational mode
- /// @param[in] i_mode The new mode
- inline void setOpMode(const OpModes i_mode);
-
- /// @brief Gets the operational mode
- /// @return the operational mode
- inline OpModes getOpMode(void);
-
- //--------------------------------------------------------------------------
- // HW Communication Functions
- //--------------------------------------------------------------------------
-
- /// @brief Reads a SCOM register from a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address SCOM register address to read from.
- /// @param[out] o_data Buffer that holds data read from HW target.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- __attribute__((always_inline))
- inline ReturnCode getScom(const Target<K, V>& i_target, const uint64_t i_address,
- buffer<uint64_t>& o_data);
-
- /// @brief Writes a SCOM register on a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address SCOM register address to write to.
- /// @param[in] i_data Buffer that holds data to write into address.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- __attribute__((always_inline))
- inline ReturnCode putScom(const Target<K, V>& i_target, const uint64_t i_address,
- const buffer<uint64_t> i_data);
-
- /// @brief Writes a SCOM register under mask on a chip
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address SCOM register address to write to.
- /// @param[in] i_data Buffer that holds data to write into address.
- /// @param[in] i_mask Buffer that holds the mask value.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode putScomUnderMask(const Target<K, V>& i_target,
- const uint64_t i_address,
- const buffer<uint64_t> i_data,
- const buffer<uint64_t> i_mask);
-
- /// @brief Reads a CFAM register from a chip.
- /// CFAM register is 32-bit wide.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address CFAM register address to read from.
- /// @param[out] o_data Buffer that holds data read from HW target.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode getCfamRegister(const Target<K, V>& i_target,
- const uint32_t i_address,
- buffer<uint32_t>& o_data);
-
- /// @brief Writes a CFAM register on a chip.
- /// CFAM register is 32-bit wide.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address CFAM register address to write to.
- /// @param[in] i_data Buffer that holds data to write into address.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode putCfamRegister(const Target<K, V>& i_target,
- const uint32_t i_address,
- const buffer<uint32_t> i_data);
-
- /// @brief Read-modify-write a CFAM register on a chip.
- /// CFAM register is 32-bit wide.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target HW target to operate on.
- /// @param[in] i_address CFAM register address to modify.
- /// @param[in] i_data Buffer that holds data to be modified.
- /// @param[in] i_modifyMode The modify mode (or/and/xor).
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode modifyCfamRegister(const Target<K, V>& i_target,
- const uint32_t i_address,
- const buffer<uint32_t> i_data,
- const ChipOpModifyMode i_modifyMode);
-
-/// @brief Writes a ring to a chip.
-/// @tparam K template parameter, passed in target.
-/// @param[in] i_target Target to operate on.
-/// @param[in] i_RingID Ring ID to write to.
-/// @param[in] i_ringMode Ring operation mode.
-/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
-template< TargetType K, typename V >
-inline ReturnCode putRing(const Target<K, V>& i_target,
- const RingID i_ringID,
- const RingMode i_ringMode = RING_MODE_HEADER_CHECK);
-
- // variable_buffer isn't supported on PPE
-#ifndef __PPE__
- /// @brief Reads a ring from a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in] i_address Ring address to read from.
- /// @param[out] o_data Buffer that holds data read from HW target.
- /// @param[in] i_ringMode Ring operation mode.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode getRing(const Target<K, V>& i_target,
- const scanRingId_t i_address,
- variable_buffer& o_data,
- const RingMode i_ringMode = 0);
-
-
-
- /// @brief Read-modify-write a ring on a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in] i_address Ring address to modify.
- /// @param[in] i_data Buffer that contains RS4 compressed ring data
- /// to be modified.
- /// @param[in] i_modifyMode The modify mode (or/and/xor)
- /// @param[in] i_ringMode Ring operation mode.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- template< TargetType K, typename V >
- inline ReturnCode modifyRing(const Target<K, V>& i_target,
- const scanRingId_t i_address,
- const variable_buffer& i_data,
- const ChipOpModifyMode i_modifyMode,
- const RingMode i_ringMode = 0);
-#endif
-
-#ifdef FAPI_SUPPORT_MULTI_SCOM
- /// @brief Performs a multiple SCOM operation
- /// This interface performs multiple SCOM operations on a chip in the
- /// order specified by the input MultiScom object.
- /// See fapiMultiScom.H for details of how to populate the MultiScom
- /// object with SCOM operations.
- ///
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in,out] io_multiScomObj Reference to a MultiScom object,
- /// pre-populated with SingleScomInfo entries
- /// to perform multiple SCOMs on input target
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- ///
- /// @note This is a synchronous interface and would return after all the
- /// SCOM operations are completed or on the first failed operation
- ///
- /// @note SCOMs will be performed in the order they were added to the
- /// input MultiScom object
- ///
- /// @note In case of errors, the platform code is responsible to collect
- /// and add all the required error info and FFDC into the error data
- /// for debugging
- ///
- /// @note If the SCOM operations added are specific to a processor chip,
- /// then the FSI Shift Engine configured in scatter-gather DMA mode
- /// extension would be used to execute the SCOM operations in a
- /// performance optimize mode. In this mode, the special
- /// SCOM_BULK_READ_MODE and SCOM_BULK_WRITE_MODE operations are
- /// supported that allow a large bulk of SCOM access (in multiple of
- /// 64 bits) for targets that support auto-increment. The
- /// SCOM_WRITE_UNDER_MASK operation is not supported in this mode
- ///
- /// @note If the SCOM operations added are specific to a memory buffer
- /// chip, then the regular SCOM engine is used to execute the SCOM
- /// operations. SCOM_WRITE_UNDER_MASK operation is supported in
- /// this mode, but the special SCOM_BULK_READ_MODE and
- /// SCOM_BULK_WRITE_MODE operations are not supported due to
- /// hardware limitations.
- ///
- template< TargetType K, typename V >
- fapi2::ReturnCode multiScom (const Target<K, V>& i_target,
- MultiScom& io_multiScomObj);
-#endif
-
- // --------------------------------------------------------------------------
- // NOTE:
- // Implement platform Spy access functions if platform supports them.
- // --------------------------------------------------------------------------
-
- // variable_buffer isn't supported on PPE
-#ifndef __PPE__
- /// @brief Reads a spy from a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in] i_spyId Id of the spy whose data to be read.
- /// @param[out] o_data Buffer that holds data read from HW target.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- ///
- /// @note: The string version is only supported for cronus.
- ///
- /// The fapi design to support both FSP and cronus use of get and
- /// put spy functions is dependant on the SPY names being expanded
- /// to resemble a valid C identifier. This design places some
- /// restrictions on the SPY names which can be used.
- ///
- /// 1. if the spy name contains a # procedure writers should replace
- /// it with an __P__ for example -
- ///
- /// ABUS.RX0.RXPACKS#0.RXPACK.RD.LC.LC.ACT_DIS
- /// becomes
- /// ABUS.RX0.RXPACKS__P__0.RXPACK.RD.LC.LC.ACT_DIS
- ///
- /// 2. if the spy name has a number following a "." it must have an
- /// underscore prepended to the number.
- ///
- /// EH.TPCHIP.2KX100_ARY_CLK_EDGES_DLY
- /// becomes
- /// EH.TPCHIP._2KX100_ARY_CLK_EDGES_DLY
- ///
- /// Example SPY name:
- /// The hardware procedure should call the function like:
- ///
- /// ABUS.RX0.RXPACKS#0.RXPACK.RD.LC.LC.ACT_DIS
- ///
- /// fapi2::ReturnCode rc = fapiGetSpy( targ,
- /// ABUS.RX0.RXPACKS__P__0.RXPACK.RD.LC.LC.ACT_DIS, data );
- ///
- /// @note The ID is not in quotes the fapi code will handle adding
- /// the quotes for the cronus environment
-#if defined(FAPI_SUPPORT_SPY_AS_ENUM) || defined(DOXYGEN)
-
-#define FAPI_GET_SPY(TARGET, ID, DATA) fapi2::getSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA)
-
- template< TargetType K, typename V >
- inline ReturnCode getSpy(const Target<K, V>& i_target,
- const spyId_t i_spyId,
- variable_buffer& o_data);
-#endif
-
-#if defined(FAPI_SUPPORT_SPY_AS_STRING) || defined(DOXYGEN)
-
-#define FAPI_GET_SPY(TARGET, ID, DATA) fapi2::getSpy(TARGET, #ID, DATA)
-
- template< TargetType K, typename V >
- inline ReturnCode getSpy(const Target<K, V>& i_target,
- const char * const i_spyId,
- variable_buffer& o_data);
-#endif
-
- /// @brief Writes a spy on a chip.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in] i_spyId Id of the spy to write data to.
- /// @param[out] i_data Buffer that holds data to write into spy.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- ///
- /// @note: The string version is only supported for cronus.
- ///
- /// The fapi design to support both FSP and cronus use of get and
- /// put spy functions is dependent on the SPY names being expanded
- /// to resemble a valid C identifier. This design places some
- /// restrictions on the SPY names which can be used.
- ///
- /// 1. if the spy name contains a # procedure writers should replace
- /// is with an __P__ for example -
- ///
- /// ABUS.RX0.RXPACKS#0.RXPACK.RD.LC.LC.ACT_DIS
- /// becomes
- /// ABUS.RX0.RXPACKS__P__0.RXPACK.RD.LC.LC.ACT_DIS
- ///
- /// 2. if the spy name has a number following a "." it must have an
- /// underscore prepended to the number.
- ///
- /// EH.TPCHIP.2KX100_ARY_CLK_EDGES_DLY
- /// becomes
- /// EH.TPCHIP._2KX100_ARY_CLK_EDGES_DLY
- ///
- /// Example SPY name:
- /// The hardware procedure should call the function like:
- ///
- /// ABUS.RX0.RXPACKS#0.RXPACK.RD.LC.LC.ACT_DIS
- ///
- /// fapi2::ReturnCode rc = fapiPutSpy( targ,
- /// ABUS.RX0.RXPACKS__P__0.RXPACK.RD.LC.LC.ACT_DIS, data );
- ///
- /// @note The ID is not in quotes the fapi code will handle adding
- /// the quotes for the cronus environment
- ///
-#if defined(FAPI_SUPPORT_SPY_AS_ENUM) || defined(DOXYGEN)
-
-#define FAPI_PUT_SPY(TARGET, ID, DATA) fapi2::putSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA)
-
- template< TargetType K, typename V >
- inline ReturnCode putSpy(const Target<K, V>& i_target,
- const spyId_t i_spyId,
- variable_buffer& i_data);
-#endif
-
-#if defined(FAPI_SUPPORT_SPY_AS_STRING) || defined(DOXYGEN)
-
-#define FAPI_PUT_SPY(TARGET, ID, DATA) fapi2::putSpy(TARGET, #ID, DATA)
-
- template< TargetType K, typename V >
- inline ReturnCode putSpy(const Target<K, V>& i_target,
- const char* const i_spyId,
- variable_buffer& i_data);
-#endif
-
- /// @brief Writes spy data into a buffer holding ring data image
- /// This API is used by L2/L3 repair to put column repair data
- /// into a ring buffer image.
- /// @tparam K template parameter, passed in target.
- /// @param[in] i_target Target to operate on.
- /// @param[in] i_spyId Id of the spy.
- /// @param[in] i_data Buffer that holds spy data to write into ring
- /// image.
- /// @param[out] o_data Buffer that holds updated ring image.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- ///
- /// @note: The string version is only supported for cronus.
- ///
- /// The fapi design to support both FSP and cronus use of get and
- /// put spy functions is dependent on the SPY names being expanded
- /// to resemble a valid C identifier. This design places some
- /// restrictions on the SPY names which can be used.
- ///
- /// See fapiPutSpy for details on spy id specifics.
- ///
-#if defined(FAPI_SUPPORT_SPY_AS_ENUM) || defined(DOXYGEN)
-
-#define FAPI_PUT_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \
- fapi2::putSpyImage(TARGET, FAPI_SPY_NAMES::ID.value, \
- DATA1, DATA2)
-
- template< TargetType K, typename V >
- inline ReturnCode putSpyImage(const Target<K, V>& i_target,
- const spyId_t i_spyId,
- const variable_buffer& i_data,
- variable_buffer& o_imageData);
-#endif
-
-#if defined(FAPI_SUPPORT_SPY_AS_STRING) || defined(DOXYGEN)
-
-#define FAPI_PUT_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \
- fapi2::putSpyImage(TARGET, #ID, DATA1,DATA2)
-
- template< TargetType K, typename V >
- inline ReturnCode putSpyImage(const Target<K, V>& i_target,
- const char* const i_spyId,
- const variable_buffer& i_data,
- variable_buffer& o_imageData);
-#endif
-
- /// @brief Reads spy data from a ring image buffer
- /// @param[in] i_target Target to operate on
- /// @param[in] i_spyId The spy's id
- /// @param[out] o_data Buffer that holds data read from ring image.
- /// @param[in] i_imageData Buffer that holds ring image to read data
- /// from.
- /// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
- ///
- /// @note: The string version is only supported for cronus.
- ///
- /// The fapi design to support both FSP and cronus use of get and
- /// put spy functions is dependent on the SPY names being expanded
- /// to resemble a valid C identifier. This design places some
- /// restrictions on the SPY names which can be used.
- ///
- /// See fapiPutSpy for details on spy id specifics.
- ///
-#if defined(FAPI_SUPPORT_SPY_AS_ENUM) || defined(DOXYGEN)
-
-#define FAPI_GET_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \
- fapi2:getSpyImage(TARGET, FAPI_SPY_NAMES::ID.value, \
- DATA1, DATA2)
-
- template< TargetType K, typename V >
- inline ReturnCode getSpyImage(const Target<K, V>& i_target,
- const spyId_t i_spyId,
- variable_buffer& o_data,
- const variable_buffer& i_imageData);
-#endif
-
-#if defined(FAPI_SUPPORT_SPY_AS_STRING) || defined(DOXYGEN)
-
-#define FAPI_GET_SPY_IMAGE(TARGET, ID, DATA1, DATA2) \
- fapi2::getSpyImage(TARGET, #ID, DATA1,DATA2)
-
- template< TargetType K, typename V >
- inline ReturnCode getSpyImage(const Target<K, V>& i_target,
- const char * const i_spyId,
- variable_buffer& o_data,
- const variable_buffer& i_imageData);
-#endif
-
-#endif // PPE
-};
-
-#endif // _FAPI2_HWACCESS_H_
diff --git a/src/hwpf/include/fapi2_target.H b/src/hwpf/include/fapi2_target.H
deleted file mode 100644
index ce856e8c..00000000
--- a/src/hwpf/include/fapi2_target.H
+++ /dev/null
@@ -1,589 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/fapi2_target.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2016 */
-/* [+] 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 fapi2_target.H
-/// @brief Common definitions for fapi2 targets
-///
-
-#ifndef __FAPI2_COMMON_TARGET__
-#define __FAPI2_COMMON_TARGET__
-
-#include <stdint.h>
-#include <vector>
-#include <target_types.H>
-#include <target_states.H>
-#include <plat_target.H>
-
-namespace fapi2
-{
-
-
- ///
- /// @brief Typedef for chiplet number values
- ///
- typedef uint8_t ChipletNumber_t;
-
- ///
- /// @brief Class representing a FAPI2 Target
- /// @tparam K the type (Kind) of target
- /// @tparam V the type of the target's Value
- /// @remark TargetLite targets are uint64_t, Targets
- /// are uintptr_t (void*).
- ///
- /// Assuming there are representations of a processor,
- /// a membuf and a system here are some examples:
- /// @code
- /// #define PROCESSOR_CHIP_A 0xFFFF0000
- /// #define MEMBUF_CHIP_B 0x0000FFFF
- /// #define SYSTEM_C 0x0000AAAA
- /// @endcode
- ///
- /// * To define a target:
- /// @code
- /// fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> A(PROCESSOR_CHIP_A);
- /// fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> C(SYSTEM_C);
- /// fapi2::Target<fapi2::TARGET_TYPE_MEMBUF_CHIP> B(MEMBUF_CHIP_B);
- /// @endcode
- ///
- /// * Functions which take composite target types
- /// @code
- /// void takesProcOrMembuf(
- /// const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP |
- /// fapi2::TARGET_TYPE_MEMBUF_CHIP>& V );
- ///
- /// void takesAny(const fapi2::Target<fapi2::TARGET_TYPE_ALL>& V );
- ///
- /// @endcode
- ///
- /// * Traversing the target "tree"
- /// @code
- /// fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> A(PROCESSOR_CHIP_A);
- ///
- /// // Get A's parent
- /// A.getParent<fapi2::TARGET_TYPE_SYSTEM>();
- ///
- /// // Get the 0x53'd core
- /// fapi2::getTarget<fapi2::TARGET_TYPE_CORE>(0x53);
- ///
- /// // Get all *my* present/functional children which are cores
- /// A.getChildren<fapi2::TARGET_TYPE_CORE>();
- ///
- /// // Get all of the the cores relative to my base target
- /// fapi2::getChildren<fapi2::TARGET_TYPE_CORE>();
- /// @endcode
- ///
- /// * Invalid casts
- /// @code
- /// // Can't cast to a specialized target
- /// fapi2::Target<fapi2::TARGET_TYPE_NONE> D(MEMBUF_CHIP_B);
- /// takesProcOrMembuf( D );
- ///
- /// // Not one of the shared types
- /// fapi2::Target<fapi2::TARGET_TYPE_ABUS_ENDPOINT> E;
- /// takesProcOrMembuf( E );
- /// @endcode
- template<TargetType K, typename V = plat_target_handle_t>
- class Target
- {
- public:
-
- ///
- /// @brief Delagate default constructor to constructor
- /// that takes in a value as a param
- ///
- Target(): Target(V())
- {};
-
- ///
- /// @brief Create a Target, with a value
- /// @param[in] Value the value (i.e., specific element this
- /// target represents, or pointer)
- /// @note Platforms can mangle the value and K to get a
- /// single uint64_t in value which represents all the information
- /// they might need. value( K | V ), for example
- ///
- Target(const V& Value):
- iv_handle(Value)
- {};
-
- ///
- /// @brief Assignment Operator.
- /// @param[in] i_right Reference to Target to assign from.
- /// @return Reference to 'this' Target
- ///
- Target& operator=(const Target& i_right);
-
- ///
- /// @brief Equality Comparison Operator
- /// @param[in] i_right Reference to Target to compare.
- /// @return bool. True if equal.
- /// @note Platforms need to define this so that the physical
- /// targets are determined to be equivilent rather than just the handles
- ///
- bool operator==(const Target& i_right) const;
-
- ///
- /// @brief Inquality Comparison Operator
- /// @param[in] i_right Reference to Target to compare.
- /// @return bool. True if not equal.
- /// @note Platforms need to define this so that the physical
- /// targets are determined to be equivilent rather than just the handles
- ///
- bool operator!=(const Target& i_right) const;
-
- ///
- /// @brief Get the handle.
- /// @return V The target's handle, or value
- ///
- V get(void) const
- {
- return iv_handle;
- }
-
- ///
- /// @brief Get the handle as a V
- /// @return V The target's handle, or value
- ///
- inline operator V() const
- {
- return iv_handle;
- }
-
- ///
- /// @brief Get a target's value
- /// @return V The target's handle, or value
- ///
- inline V& operator()(void)
- {
- return iv_handle;
- }
-
- ///
- /// @brief Get the target type
- /// @return The type of target represented by this target
- ///
- inline TargetType getType(void) const
- {
- return iv_type;
- }
-
- ///
- /// @brief Get this target's immediate parent
- /// @tparam T The type of the parent
- /// @return Target<T, V> a target representing the parent
- ///
- template< TargetType T>
- inline Target<T, V> getParent(void) const;
-
- ///
- /// @brief Is this target a chip?
- /// @return Return true if this target is a chip, false otherwise
- ///
- inline constexpr bool isChip(void) const
- {
-// return ( (K == TARGET_TYPE_PROC_CHIP) ||
-// (K == TARGET_TYPE_MEMBUF_CHIP) );
-
- return ( (K == TARGET_TYPE_PROC_CHIP) );
- }
-
- ///
- /// @brief Is this target a chiplet?
- /// @return Return true if this target is a chiplet, false otherwise
- ///
- inline constexpr bool isChiplet(void) const
- {
- return ( (K == TARGET_TYPE_EX) ||
-// (K == TARGET_TYPE_MBA) ||
- (K == TARGET_TYPE_MCS) ||
-// (K == TARGET_TYPE_XBUS) ||
-// (K == TARGET_TYPE_ABUS) ||
-// (K == TARGET_TYPE_L4) ||
- (K == TARGET_TYPE_CORE) ||
- (K == TARGET_TYPE_EQ) ||
-// (K == TARGET_TYPE_MCA) ||
-// (K == TARGET_TYPE_MCBIST) ||
-// (K == TARGET_TYPE_MI) ||
-// (K == TARGET_TYPE_DMI) ||
-// (K == TARGET_TYPE_OBUS) ||
-// (K == TARGET_TYPE_NV) ||
-// (K == TARGET_TYPE_SBE) ||
-// (K == TARGET_TYPE_PPE) ||
-// (K == TARGET_TYPE_PERV) ||
- (K == TARGET_TYPE_PERV) );
-// (K == TARGET_TYPE_PEC) ||
-// (K == TARGET_TYPE_PHB) );
- }
-
- ///
- /// @brief Get this target's children
- /// @tparam T The type of the parent
- /// @param[in] i_state The desired TargetState of the children
- /// @return std::vector<Target<T, V> > a vector of present/functional
- /// children
- /// @warning The children of EX's (cores) are expected to be returned
- /// in order. That is, core 0 is std::vector[0].
- ///
- template< TargetType T>
- std::vector<Target<T, V> >
- getChildren(const TargetState i_state = TARGET_STATE_FUNCTIONAL) const;
-
- ///
- /// @brief Get this target's children, filtered
- /// @tparam T The type of the parent
- /// @param[in], i_filter The desired chiplet filter
- /// @param[in] i_state The desired TargetState of the children
- /// @return std::vector<Target<T, V> > a vector of present/functional
- /// children
- ///
- template< TargetType T>
- std::vector<Target<T, V>>
- getChildren(const TargetFilter i_filter,
- const TargetState i_state = TARGET_STATE_FUNCTIONAL) const;
-
- ///
- /// @brief Get the target at the other end of a bus - dimm included
- /// @tparam T The type of the parent
- /// @param[in] i_state The desired TargetState of the children
- /// @return Target<T, V> a target representing the thing on the other end
- /// @note Can be easily changed to a vector if needed
- ///
- template<TargetType T>
- inline Target<T, V>
- getOtherEnd(const TargetState i_state = TARGET_STATE_FUNCTIONAL) const;
-
- ///
- /// @brief Is the target functional?
- /// @return true if target is functional, false if non-functional
- ///
-
- inline bool
- isFunctional(void) const;
-
- ///
- /// @brief Copy from a Target<O, VO> to a Target<K, V>
- /// @tparam O the target type of the other
- ///
- template<TargetType O, typename VO>
- inline Target( const Target<O, VO>& Other ):
- Target<K, V>(Other.get())
- {
- // In case of recursion depth failure, use -ftemplate-depth=
- static_assert( (K & O) != 0,
- "unable to cast Target, no shared types");
-
- static_assert( bitCount<K>::count >= bitCount<O>::count,
- "unable to cast to specialized Target");
- }
-
-#ifdef __PPE__
-
- ///
- /// @brief Get the target present setting
- /// @return Bool whether present
- ///
- inline bool getPresent(void) const
- {
- return (static_cast<plat_target_handle_t>(this->iv_handle).fields.present ? true : false);
- }
-
- ///
- /// @brief Get the target functional setting
- /// @return Bool whether functional
- ///
- inline bool getFunctional(void) const
- {
- return (static_cast<plat_target_handle_t>(this->iv_handle).fields.functional ? true : false);
- }
-
- ///
- /// @brief Set the target present setting
- /// @return Bool whether present
- ///
- inline void setPresent(void)
- {
- (static_cast<plat_target_handle_t&>(this->iv_handle)).fields.present = 1;
- return;
- }
-
- ///
- /// @brief Set the target functional setting
- /// @return Bool whether functional
- ///
- inline void setFunctional(const bool &i_state)
- {
- (static_cast<plat_target_handle_t&>(this->iv_handle)).fields.functional = (i_state) ? 1 : 0;
- return;
- }
-
-
- /// Need to optimize PPE Target resoulution in a cheap manner
- /// Brian: not sure if the this is the place for this as
- /// this is plaform specific.
-
- ///
- /// @brief Get address overlay to reduce runtime processing
- /// @return Overlay as a type uint32_t
- ///
- inline uint32_t getAddressOverlay(void) const
- {
- return (static_cast<plat_target_handle_t>(iv_handle).value & 0xFF000000);
- }
-
- ///
- /// @brief Get target number
- /// @return Overlay as a type V
- ///
- inline uint32_t getTargetNumber(void) const
- {
- return static_cast<uint32_t>(static_cast<plat_target_handle_t>(iv_handle).fields.type_target_num);
- }
-
- ///
- /// @brief Get target type directly from the handle
- /// @return Overlay as a type V
- ///
- inline TargetType getTargetType(void) const
- {
- return static_cast<TargetType>(static_cast<plat_target_handle_t>(iv_handle).fields.type);
- }
-
- ///
- /// @brief Get chiplet number from the handle
- /// @return ChipletNumber_t Chiplet Number
- ///
- inline ChipletNumber_t getChipletNumber(void) const
- {
- return static_cast<ChipletNumber_t>(static_cast<plat_target_handle_t>(iv_handle).fields.chiplet_num);
- }
-
-#endif
-
-
- private:
- // Don't use enums here as it makes it hard to assign
- // in the platform target cast constructor.
- static const TargetType iv_type = K;
-
- V iv_handle;
- };
-
- // EX threads map to CORE threads:
- // t0 / t2 / t4 / t6 fused = t0 / t1 / t2 / t3 normal (c0)
- // t1 / t3 / t5 / t7 fused = t0 / t1 / t2 / t3 normal (c1)
- // So when splitting the EX, we need to map from EX threads
- // to CORE threads.
-
- ///
- /// @brief Given a normal core thread id, translate this to
- /// a fused core thread id. (normal to fused)
- /// @param[in] the ordinal number of the normal core this thread belongs to
- /// @param[in] a normal core thread id - 0, ..., 3
- /// @return the fused core thread id
- ///
- inline uint8_t thread_id_n2f(const uint8_t i_ordinal, const uint8_t i_thread_id)
- {
- return (i_thread_id << 1) | i_ordinal;
- }
-
- ///
- /// @brief Given a fused core thread id, translate this to
- /// a normal core thread id. (fused to normal)
- /// @param[in] a fused core thread id - 0, ..., 7
- /// @return the normal core thread id
- ///
- inline uint8_t thread_id_f2n(const uint8_t i_thread_id)
- {
- return i_thread_id >> 1;
- }
-
- ///
- /// @brief Given a normal core thread id, translate this to a
- /// normal core bitset.
- /// @param[in] a normal core thread id - 0, ..., 3
- /// @return the normal core bitset
- /// @note to got from a fused core id to a normal core bitset,
- /// translate from a fused core thread id first.
- ///
- inline uint8_t thread_id2bitset(const uint8_t i_thread_id)
- {
- // 0xff means "set all bits"
- static const uint8_t all_threads = 0xff;
- static const uint8_t all_normal_threads_bitset = 0x0f;
-
- if (i_thread_id == all_threads)
- {
- return all_normal_threads_bitset;
- }
-
- // A thread_id is really just bit index.
- return (1 << (4 - i_thread_id - 1));
- }
-
- ///
- /// @brief Given a bitset of normal core thread ids, translate this to
- /// a bit mask of fused core thread id. (normal to fused)
- /// @param[in] the ordinal number of the normal core this thread belongs to
- /// @param[in] a normal core thread bitset - b0000, ..., b1111
- /// @return the corresponding fused core bitset
- ///
- inline uint8_t thread_bitset_n2f(const uint8_t i_ordinal, const uint8_t i_threads)
- {
- // Since we only have 4 bits I think this is better than a shift-type solution
- // for interleaving bits
- static uint8_t core_map[] = {
- 0b00000000, // b0000
- 0b00000010, // b0001
- 0b00001000, // b0010
- 0b00001010, // b0011
- 0b00100000, // b0100
- 0b00100010, // b0101
- 0b00101000, // b0110
- 0b00101010, // b0111
- 0b10000000, // b1000
- 0b10000010, // b1001
- 0b10001000, // b1010
- 0b10001010, // b1011
- 0b10100000, // b1100
- 0b10100010, // b1101
- 0b10101000, // b1110
- 0b10101010, // b1111
- };
-
- return core_map[i_threads] >> i_ordinal;
- }
-
- ///
- /// @brief Given a fused core thread bitset, translate this to
- /// a normal core thread bitset. (fused to normal)
- /// @param[in] the ordinal number of the normal core this thread belongs to
- /// @param[in] a fused core thread bitset - b00000000, ..., b11111111
- /// @return the corresponding normal core bitset
- ///
- inline uint8_t thread_bitset_f2n(const uint8_t i_ordinal, const uint8_t i_threads)
- {
- uint8_t normal_set = 0;
-
- // core 0 is the left-most bit in the pair
- uint8_t pair_mask = (i_ordinal == 0) ? 0x2 : 0x1;
-
- // For each bit which can be set in the normal core bit_set ...
- for( auto i = 0; i <= 3; ++i )
- {
- // ... grab the two fused bits which represent it ...
- // ... and mask off the bit in the pair which represents this normal core ...
- // (the << 1 shifts the masks over as we walk the pairs of bits)
- uint8_t bits = (((3 << (i << 1)) & i_threads) & (pair_mask << (i << 1)));
-
- // ... if either bit is set, set the corresponding bit in
- // the normal core bitset.
- normal_set |= (bits != 0) << i;
- }
- return normal_set;
- }
-
- ///
- /// @brief Return the string interpretation of this target
- /// @tparam T The type of the target
- /// @param[in] i_target Target<T, V>
- /// @param[in] i_buffer buffer to write in to
- /// @param[in] i_bsize size of the buffer
- /// @return void
- /// @post The contents of the buffer is replaced with the string
- /// representation of the target
- ///
- template< TargetType T, typename V >
- inline void toString(const Target<T, V>& i_target, char* i_buffer, size_t i_bsize);
-
- ///
- /// @brief Return the string interpretation of this target
- /// @tparam T The type of the target
- /// @tparam B The type of the buffer
- /// @param[in] A pointer to the Target<T, V>
- /// @param[in] i_buffer buffer to write in to
- /// @param[in] i_bsize size of the buffer
- /// @return void
- /// @post The contents of the buffer is replaced with the string
- /// representation of the target
- ///
- template< TargetType T, typename V >
- inline void toString(const Target<T, V>* i_target, char* i_buffer, size_t i_bsize);
-
- ///
- /// @brief Get an enumerated target of a specific type
- /// @tparam T The type of the target
- /// @param[in] Ordinal representing the ordinal number of
- /// the desired target
- /// @return Target<T, V> the target requested
- ///
- template<TargetType T, typename V>
- inline Target<T, V> getTarget(uint64_t Ordinal);
-
- // Why has the been removed? For starters, the API name
- // is probably wrong as it's already been confused with
- // Target::getChildren(). And if I'm going to change it
- // I really want to see if we need it. I'm still not
- // clear on whether we're alloing this traversal or not.
-#if 0
- ///
- /// @brief Get the base target's children
- /// @tparam T The type of the target
- /// @return std::vector<Target<T> > a vector of present/functional
- /// children
- ///
- template<TargetType T>
- inline std::vector<Target<T> > getChildren()
- {
- // For testing
- return {Target<T>(), Target<T>()};
- }
-#endif
-
- ///
- /// @brief Return the string interpretation of this target
- /// @tparam T The type of the target
- /// @tparam B The type of the buffer
- /// @param[in] i_target Target<T>
- /// @param[in] i_buffer buffer
- /// @return void
- /// @post The contents of the buffer is replaced with the string
- /// representation of the target
- ///
- template<TargetType T, typename V, typename B>
- inline void toString(const Target<T, V>& i_target, B& i_buffer);
-
- ///
- /// @brief Check if the target is of a type, or in a type subset.
- /// @tparam K the TargetType to check
- /// @tparam T TargetType or TargetType composite to check against
- /// @return True, iff K is a proper T
- ///
- template< TargetType K, TargetType T >
- inline constexpr bool is_same(void)
- { return (K & T) != 0; }
-
-
-}
-#endif
diff --git a/src/hwpf/include/ffdc.H b/src/hwpf/include/ffdc.H
deleted file mode 100644
index dc68f7a2..00000000
--- a/src/hwpf/include/ffdc.H
+++ /dev/null
@@ -1,36 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/ffdc.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2015,2016 */
-/* [+] 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 ffdc.H
- * @brief Defines the FirstFailureData class
- */
-
-#ifndef FAPI2_FFDC_H_
-#define FAPI2_FFDC_H_
-
-namespace fapi2
-{
-}
-#endif // FAPI2_FFDC_H_
diff --git a/src/hwpf/include/plat/plat_target.H b/src/hwpf/include/plat/plat_target.H
index 7f7ac99f..bf7bcad3 100644
--- a/src/hwpf/include/plat/plat_target.H
+++ b/src/hwpf/include/plat/plat_target.H
@@ -102,16 +102,74 @@ namespace fapi2
TargetType getFapiTargetType() const;
///
+ /// @brief Get the scom address overlay for this target
+ ///
+ /// @return Address overlay
+ ///
+ uint32_t getAddressOverlay() const
+ {
+ return (value & 0xFF000000);
+ }
+
+ ///
+ /// @brief Get the plat target type
+ ///
+ /// @return The plat target type as a fapi2::TargetType
+ ///
+ TargetType getTargetType() const
+ {
+ return static_cast<TargetType>(fields.type);
+ }
+
+ ///
/// @brief Get the instance number for this target
///
/// @return The instance number for this target
///
- inline uint32_t getTargetInstance() const
+ uint32_t getTargetInstance() const
{
return fields.type_target_num;
}
///
+ /// @brief Returns whether this target is functional
+ ///
+ /// @return true if Target is functional
+ ///
+ bool getFunctional() const
+ {
+ return fields.functional;
+ }
+
+ ///
+ /// @brief Set functional state of the Target
+ ///
+ /// @param [in] i_state Functional state to set
+ ///
+ void setFunctional(const bool &i_state)
+ {
+ fields.functional = i_state;
+ }
+
+ ///
+ /// @brief Returns whether this target is present
+ ///
+ /// @return true if Target is present
+ ///
+ bool getPresent() const
+ {
+ return fields.present;
+ }
+
+ ///
+ /// @brief Set Target as present
+ ///
+ void setPresent()
+ {
+ fields.present = true;
+ }
+
+ ///
/// @brief Get this target's children
///
/// @param [in] i_parentType fapi2 type of the parent
diff --git a/src/hwpf/include/plat/plat_target_utils.H b/src/hwpf/include/plat/plat_target_utils.H
index b97da650..523dfca4 100644
--- a/src/hwpf/include/plat/plat_target_utils.H
+++ b/src/hwpf/include/plat/plat_target_utils.H
@@ -30,6 +30,8 @@
#ifndef __FAPI2_PLAT_TARGET_UTIL__
#define __FAPI2_PLAT_TARGET_UTIL__
+#include <proc_sbe_fixed.H>
+
#pragma pack(8) //Start of packing to 8byte boundary
typedef struct {
fapi2attr::SystemAttributes_t G_system_attrs;
diff --git a/src/hwpf/include/set_sbe_error.H b/src/hwpf/include/plat/plat_utils.H
index 6231fad9..eadee6aa 100644
--- a/src/hwpf/include/set_sbe_error.H
+++ b/src/hwpf/include/plat/plat_utils.H
@@ -1,12 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/hwpf/include/set_sbe_error.H $ */
+/* $Source: src/hwpf/include/plat/plat_utils.H $ */
/* */
/* OpenPOWER sbe Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
-/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
@@ -22,3 +21,45 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
+#ifndef _PLAT_UTILS_H_
+#define _PLAT_UTILS_H_
+
+#ifdef __ASSEMBLER__
+
+#ifndef ULL
+#define ULL(x) x
+#endif
+
+#else
+
+#ifndef ULL
+#define ULL(x) x##ull
+
+#endif
+
+#endif // __ASSEMBLER
+
+/// Create a multi-bit mask of \a n bits starting at bit \a b
+#ifndef BITS
+ #define BITS(b, n) ((ULL(0xffffffffffffffff) << (64 - (n))) >> (b))
+#endif
+
+/// Create a single bit mask at bit \a b
+#ifndef BIT
+ #define BIT(b) BITS((b), 1)
+#endif
+
+#ifdef _BIG_ENDIAN
+
+#define revle16(x) x
+#define revle32(x) x
+#define revle64(x) x
+
+#else
+
+uint16_t revle16(uint16_t i_x);
+uint32_t revle32(uint32_t i_x);
+uint64_t revle64(uint64_t i_x);
+
+#endif
+#endif //_PLAT_UTILS_H_
diff --git a/src/hwpf/include/plat/target.H b/src/hwpf/include/plat/target.H
index bfcfe185..09c27d0b 100644
--- a/src/hwpf/include/plat/target.H
+++ b/src/hwpf/include/plat/target.H
@@ -38,6 +38,7 @@
#include <utils.H>
#include <stdint.h>
#include <vector>
+#include <plat_target_utils.H>
extern "C"
{
@@ -233,15 +234,15 @@ namespace fapi2
}
if((TARGET_TYPE_EQ == T) && (TARGET_TYPE_CORE == K)) // EC ===> EQ
{
- return static_cast<V>(G_vec_targets[(getTargetNumber() / CORES_PER_QUAD) + EQ_TARGET_OFFSET]);
+ return static_cast<V>(G_vec_targets[(static_cast<plat_target_handle_t>(get()).getTargetInstance() / CORES_PER_QUAD) + EQ_TARGET_OFFSET]);
}
if((TARGET_TYPE_EQ == T) && (TARGET_TYPE_EX == K)) // EX ===> EQ
{
- return static_cast<V>(G_vec_targets[(getTargetNumber() / EX_PER_QUAD) + EQ_TARGET_OFFSET]);
+ return static_cast<V>(G_vec_targets[(static_cast<plat_target_handle_t>(get()).getTargetInstance() / EX_PER_QUAD) + EQ_TARGET_OFFSET]);
}
if(TARGET_TYPE_EX == T) // EC ===> EX
{
- return static_cast<V>(G_vec_targets[(getTargetNumber() / CORES_PER_EX) + EX_TARGET_OFFSET]);
+ return static_cast<V>(G_vec_targets[(static_cast<plat_target_handle_t>(get()).getTargetInstance() / CORES_PER_EX) + EX_TARGET_OFFSET]);
}
}
@@ -310,33 +311,27 @@ namespace fapi2
}
///
- /// @brief Get the target at the other end of a bus - dimm included
- /// @tparam T The type of the parent
- /// @param[in] i_state The desired TargetState of the children
- /// @return Target<T, V> a target representing the thing on the other end
- /// @note Can be easily changed to a vector if needed
+ /// @brief Is the target functional?
+ /// @return true if target is functional, false if non-functional
///
template<TargetType K, typename V>
- template<TargetType T>
- inline Target<T, V>
- Target<K, V>::getOtherEnd(const TargetState i_state) const
+ inline bool
+ Target<K, V>::isFunctional(void) const
{
-// static_assert( false, "getOtherEnd() is not supported on PPE platforms");
+ return static_cast<plat_target_handle_t>(get()).getFunctional();
}
///
- /// @brief Is the target functional?
- /// @return true if target is functional, false if non-functional
+ /// @brief Returns the chiplet number for this Target
+ /// @return The chiplet number
///
-
template<TargetType K, typename V>
- inline bool
- Target<K, V>::isFunctional(void) const
+ inline uint8_t
+ Target<K, V>::getChipletNumber(void) const
{
- return getFunctional();
+ return static_cast<plat_target_handle_t>(iv_handle).fields.chiplet_num;
}
-
///
/// @brief Return the string interpretation of this target
/// @tparam T The type of the target
@@ -359,7 +354,7 @@ namespace fapi2
const uint32_t i_addr)
{
ScomAddr l_addr = i_addr;
- if(0 != i_target.getAddressOverlay())
+ if(0 != static_cast<plat_target_handle_t>(i_target.get()).getAddressOverlay())
{
l_addr.iv_chiplet = i_target.getChipletNumber();
}
@@ -376,13 +371,13 @@ namespace fapi2
{
l_addr.iv_chiplet = i_target.getChipletNumber();
l_addr.iv_ring = (l_addr.iv_ring - (l_addr.iv_ring % 2)) +
- (i_target.getTargetNumber() % 2);
+ (static_cast<plat_target_handle_t>(i_target.get()).getTargetInstance() % 2);
}
else if ((CORE_CHIPLET_OFFSET <= l_addr.iv_chiplet) &&
((CORE_CHIPLET_OFFSET + CORE_TARGET_COUNT) > l_addr.iv_chiplet))
{
l_addr.iv_chiplet = CORE_CHIPLET_OFFSET + (l_addr.iv_chiplet % 2) +
- (i_target.getTargetNumber() * 2);
+ (static_cast<plat_target_handle_t>(i_target.get()).getTargetInstance() * 2);
}
else
{
@@ -396,7 +391,7 @@ namespace fapi2
{
ScomAddr l_addr = i_addr;
l_addr.iv_chiplet = i_target.getChipletNumber();
- l_addr.iv_satId = (2 * (i_target.getTargetNumber() % 2));
+ l_addr.iv_satId = (2 * (static_cast<plat_target_handle_t>(i_target.get()).getTargetInstance() % 2));
return l_addr;
}
diff --git a/src/hwpf/include/return_code.H b/src/hwpf/include/return_code.H
deleted file mode 100644
index 3672f097..00000000
--- a/src/hwpf/include/return_code.H
+++ /dev/null
@@ -1,108 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/return_code.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
-/* [+] 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 return_code.H
- * @brief definitions for fapi2 return codes
- */
-
-#ifndef __FAPI2_RETURN_CODE__
-#define __FAPI2_RETURN_CODE__
-
-#include <stdint.h>
-#include <return_code_defs.H>
-
-#ifndef FAPI2_NO_FFDC
-#include <ffdc.H>
-#endif
-
-namespace fapi2
-{
- ///
- /// @brief Class representing a FAPI2 ReturnCode
- ///
- // Remove the inheritance relationship with FirstFailureData if
- // the platform doesn't support FFDC.
-#if defined(FAPI2_NO_FFDC) || defined (MINIMUM_FFDC)
- class ReturnCode
-#else
- class ReturnCode : public FirstFailureData<ReturnCode>
-#endif
- {
- public:
-
- ///
- /// @brief Constructor.
- /// @param[in] i_rc the rc to set
- ///
- ReturnCode(const uint32_t i_rc = FAPI2_RC_SUCCESS):
- iv_rc(i_rc)
- {};
-
- ///
- /// @brief integral type conversion function. Returns the error code
- /// @return The error code
- ///
- inline operator uint32_t() const { return iv_rc; }
-
- ///
- /// @brief Returns true if iv_rc != SUCCESS
- /// @return true or false
- ///
- inline operator bool() const { return iv_rc != FAPI2_RC_SUCCESS; }
-
- ///
- /// @brief Assignement operator
- ///
-#ifdef DOXYGEN
- inline ReturnCode& operator=(const uint32_t& rhs)
- inline ReturnCode& operator=(const ReturnCodes& rhs)
-#endif
-
- inline bool operator==(const uint32_t& rhs) const
- { return rhs == iv_rc; }
-
- inline bool operator==(const ReturnCodes& rhs) const
- { return rhs == iv_rc; }
-
- inline bool operator!=(const uint32_t& rhs) const
- { return rhs != iv_rc; }
-
- inline bool operator!=(const ReturnCodes& rhs) const
- { return rhs != iv_rc; }
-
- private:
- uint32_t iv_rc;
- };
-
- /// This implementation assumes no exception handling and leverages thread-local
- /// storage. For platforms without thread support, a global variable will
- /// suffice for the error state.
-// extern thread_local ReturnCode current_err; /// the current error state
- extern ReturnCode current_err; /// the current error state
- extern thread_local uint64_t pib_error_mask; /// the pib mask
- extern thread_local uint64_t operational_state; /// the operational mode
-}
-#endif
-
diff --git a/src/hwpf/include/utils.H b/src/hwpf/include/utils.H
deleted file mode 100644
index 940e78dc..00000000
--- a/src/hwpf/include/utils.H
+++ /dev/null
@@ -1,123 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/utils.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
-/* [+] 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 utils.H
- *
- * @brief Defines common utility elements for FAPI2 use.
- */
-
-#ifndef FAPI2_UTILS_H_
-#define FAPI2_UTILS_H_
-
-#include <return_code.H>
-
-#ifdef __ASSEMBLER__
-
-#ifndef ULL
-#define ULL(x) x
-#endif
-
-#else
-
-#ifndef ULL
-#define ULL(x) x##ull
-
-#endif
-
-#endif // __ASSEMBLER
-
-/// Create a multi-bit mask of \a n bits starting at bit \a b
-#ifndef BITS
- #define BITS(b, n) ((ULL(0xffffffffffffffff) << (64 - (n))) >> (b))
-#endif
-
-/// Create a single bit mask at bit \a b
-#ifndef BIT
- #define BIT(b) BITS((b), 1)
-#endif
-
-#ifdef _BIG_ENDIAN
-
-#define revle16(x) x
-#define revle32(x) x
-#define revle64(x) x
-
-#else
-
-uint16_t revle16(uint16_t i_x);
-uint32_t revle32(uint32_t i_x);
-uint64_t revle64(uint64_t i_x);
-
-#endif
-
-namespace fapi2
-{
-///
-/// @brief Delay this thread. Hostboot will use the nanoseconds parameter
-/// and make a syscall to nanosleep. While in the syscall, the hostboot
-/// kernel will continue to consume CPU cycles as it looks for a runnable
-/// task. When the delay time expires, the task becomes runnable and will soon
-/// return from the syscall. Callers of delay() in the hostboot environment
-/// will likely have to know the mHz clock speed they are running on and
-/// compute a non-zero value for i_nanoSeconds.
-///
-/// On the FSP, it was sometimes acceptable to just provide zero for the
-/// sleep delay time, causing the task to yield its time slice. By the
-/// time the calling task could run again, it was pretty certain enough
-/// host cycles had past. This is probably not acceptable in
-/// the hostboot environment. Callers should calculate and provide a
-/// sleep value in nanoseconds relative to host clock speed.
-///
-/// On FSP when VBU is the target, then the i_simCycles parameter will be
-/// used instead. The FSP needs to use the simdispatcher client/server
-/// API and issue a command to the awan to advance the simulation the
-/// specified number of cycles.
-///
-/// On SBE when __FAPI_DELAY_SIM__ is defined, then the i_simCycles parameter
-/// will be used instead and will use the number passed. The build parameter
-/// __FAPI_DELAY_SIM_CYCLES__ allows the delay to adjust for the number of
-/// simulation cycles that the PPE engine is running at. The delay algorithm
-/// takes the i_simCycles parameter, subtracts the loop overhead instructions
-/// times __FAPI_DELAY_SIM_CYCLES__ and then divides the remainder by the
-/// number of loop instructions times __FAPI_DELAY_SIM_CYCLES__.
-///
-/// On SBE when __FAPI_DELAY_SIM__ is NOT defined, the nanoseconds parameter
-/// will bus used to loop on the a call to pk_timebase32_get() function to
-/// determine the elapsed time. pk_sleep() is NOT used as there are not
-/// other threads to dispatch.
-///
-/// @param[in] i_nanoSeconds nanoseconds to sleep
-/// @param[in] i_simCycles count of Awan cycles to advance
-/// @param[in] i_fixed Determination, for DFT, if this time is
-/// fixed or not. Defaults to non-fixed
-///
-/// @return ReturnCode. Zero on success, else platform specified error.
-///
-ReturnCode delay(uint64_t i_nanoSeconds,
- uint64_t i_simCycles,
- bool i_fixed = false);
-}
-
-#endif // FAPI2_UTILS_H_
diff --git a/src/hwpf/include/vector.H b/src/hwpf/include/vector.H
deleted file mode 100644
index 1117017e..00000000
--- a/src/hwpf/include/vector.H
+++ /dev/null
@@ -1,851 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/hwpf/include/vector.H $ */
-/* */
-/* OpenPOWER sbe Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2016 */
-/* [+] 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 stl_vector
-#define stl_vector
-
-/**
- * @file vector
- * @brief simple stl vector template class declaration.
- */
-
-#include <stddef.h>
-
-#if !defined( __STDC_LIMIT_MACROS)
-#define __STDC_LIMIT_MACROS
-#endif
-#include <stdint.h>
-//#include <new>
-#include <algorithm>
-#include <assert.h>
-
-namespace std
-{
-
- /**
- * @class vector
- * subset of stl vector
- * @note Does not support allocators, reverse iterators.
- */
- template <class T>
- class vector
- {
- public:
-
- typedef T * iterator;
- typedef const T * const_iterator;
- typedef T & reference;
- typedef const T & const_reference;
- typedef size_t size_type;
- typedef size_t difference_type;
- // typedef ptrdiff_t difference_type;
- typedef T value_type;
- typedef T * pointer;
- typedef const T * const_pointer;
-
-
- protected:
-
- pointer iv_start;
- pointer iv_finish;
- pointer iv_end_of_storage;
-
- public:
-
- /**
- * Constructor default
- * @post The vector is created with no elements. size() == 0, capacity() == 0
- */
- __attribute__ ((always_inline))
- explicit vector(void)
- :
- iv_start(NULL),
- iv_finish(NULL),
- iv_end_of_storage(NULL)
- {}
-
-
- /**
- * Constructor to create a vector of size n elements of value.
- * @param[in] n number of elements to create
- * @param[in] value used to create the n elements
- * @post The vector is created with n elements of value.
- * Storage allocated. size() == n, capacity() == n
- */
- explicit vector(size_type n, const T& value = T())
- :
- iv_start(NULL),
- iv_finish(NULL),
- iv_end_of_storage(NULL)
- {
- reserve(n);
- iv_finish = iv_start+n;
- ctor_fill(iv_start,iv_finish,value);
- }
-
-
- /**
- * COPY CTOR create a vector from another vector
- * @param[in] x source vector
- * @post vector of x.size() is created from x with same # nodes
- * size() == capacity() == x.size()
- */
- vector(const vector<T>& x)
- :
- iv_start(NULL),
- iv_finish(NULL),
- iv_end_of_storage(NULL)
- {
- reserve(x.size());
- iv_finish = ctor_copy(x.iv_start, x.iv_finish, iv_start);
- }
-
- /**
- * CTOR create a vector from a container slice
- * @param[in] first iterator first in source sequence
- * @param[in] last iterator one past end of source sequence
- * @returns None.
- * @pre last > first; first,last contained within source vector
- * @post vector is created from slice given
- */
- template<typename InputIterator>
- vector(InputIterator first, InputIterator last)
- :
- iv_start(NULL),
- iv_finish(NULL),
- iv_end_of_storage(NULL)
- {
- // assert(last >= first);
- // input iterators only support operator ( ++i, i++,==,!=,*,->,=)
- size_type n = 0;
- for(InputIterator i = first; i != last; ++i) ++n;
- reserve(n);
- iv_finish = ctor_copy(first,last,iv_start);
- }
-
- /**
- * DTOR
- * @post Storage released
- */
- __attribute__ ((always_inline))
- ~vector()
- {
- clear(); // call dtors
- free_storage(iv_start);
- }
-
- /**
- * Assignment operator.
- * @param[in] x A vector.
- * @return A vector (for the purpose of multiple assigns).
- * @pre None.
- * @post *this == x, this->capacity() == x.size().
- * All previously obtained iterators are invalid.
- */
- vector<T>& operator=(const vector<T>& x)
- {
- clear();
- reserve(x.size());
- iv_finish = ctor_copy(x.iv_start, x.iv_finish, iv_start);
- return(*this);
- }
-
- // Iterators --------------------
-
- /**
- * Get iterator to the first vector element
- * @return iterator of rist vector element
- * @pre None.
- * @post None.
- */
- __attribute__ ((always_inline))
- iterator begin()
- {
- return (iv_start);
- }
-
- /**
- * Get const_iterator to the first vector element
- * @return const_iterator of rist vector element
- * @pre None.
- * @post None.
- */
- __attribute__ ((always_inline))
- const_iterator begin() const
- {
- return (iv_start);
- }
-
- /**
- * Get iterator to the last vector element + 1
- * @return iterator
- * @pre None.
- * @post None.
- */
- __attribute__ ((always_inline))
- iterator end()
- {
- return (iv_finish);
- }
-
- /**
- * Get const_iterator to the last vector element + 1
- * @return const_iterator
- * @pre None.
- * @post None.
- */
- __attribute__ ((always_inline))
- const_iterator end() const
- {
- return (iv_finish);
- }
-
- /* TODO - Implement only if needed
- reverse_iterator rbegin()
- {
- return(iv_finish -1);
- }
-
- const_reverse_iterator rend()
- {
- return (iv_start - 1);
- }
- */
-
- // Capacity -----------------------------------------------
-
- /**
- * Get the number of elements in the container
- * @return number of elements in the container
- */
- __attribute__ ((always_inline))
- size_type size() const
- {
- return(iv_finish - iv_start);
- }
-
- /**
- * Return the maximum potential size the container could reach.
- * @return number of the maximum element count this container could reach
- */
- __attribute__ ((always_inline))
- size_type max_size() const
- {
- return UINT64_MAX/sizeof(T);
- }
-
- /**
- * Resize the vector to contain n elements
- * @param[in] n new size
- * @param[in] x object used to copy to any added elements if size() is increased
- * @post All previously obtained iterators are invalid.
- * @node if n < size(), vector is truncated.
- * if n > size(), vector is padded with copies of x
- */
- void resize( size_type n, T x = T());
-
- /**
- * Get the number of elements the vector can hold before needing to reallocate storage.
- * @return element capacity of the vector
- * @pre None.
- * @post None.
- */
- __attribute__ ((always_inline))
- size_type capacity() const
- {
- return(iv_end_of_storage - iv_start);
- }
-
- /**
- * Query for empty container
- * @return bool, true if size()==0 else false.
- * @pre none
- * @post none
- */
- __attribute__ ((always_inline))
- bool empty() const
- {
- return(size() == 0);
- }
-
- /**
- * Reserve storage for a given number of elements
- * @param[in] n The requested capacity of the vector
- * @pre None
- * @post If current cpacity() < n then new capcity == n; else no change.
- * All previously obtained iterators are invalid
- */
- void reserve(size_type n);
-
- // - Element Access -----------------------------------
-
- /**
- * Access a mutable reference to an element in the container
- * @param An index into the vector
- * @return A reference to an element
- * @pre 0 <= n < size()
- * @post None.
- */
- __attribute__ ((always_inline))
- reference operator[](size_type n)
- {
- return(*(iv_start + n));
- }
-
- /**
- * Access a mutable reference to an element in the container
- * @param[in] index An index into the vector
- * @return A reference to an element
- * @pre 0 <= n < size()
- * @post None.
- * @note no exception handling
- */
- __attribute__ ((always_inline))
- reference at(size_type index)
- {
- assert(index < size());
- return(*(iv_start + index));
- }
-
- /**
- * Get an immutable reference to an element in the container
- * @param[in] index An index into the vector
- * @return A const_reference to an object or type T
- * @pre 0 <= n < size()
- * @post None.
- */
- __attribute__ ((always_inline))
- const_reference operator[](size_type index) const
- {
- assert(index < size());
- return(*(iv_start + index));
- }
-
- /**
- * Get an immutable reference to an element in the container
- * @param[in] index An index into the vector
- * @return A const_reference to an object or type T
- * @pre 0 <= n < size()
- * @post None.
- * @note no exception handling
- */
- __attribute__ ((always_inline))
- const_reference at(size_type index) const
- {
- assert(index < size());
- return(*(iv_start + index));
- }
-
- /**
- * Get a mutable reference to the first element in the container
- * @return reference to first element
- * @pre none
- * @post None
- */
- __attribute__ ((always_inline))
- reference front()
- {
- return *iv_start;
- }
-
- /**
- * Get an Immutable reference to the first element in the container
- * @return const_reference to first element
- * @pre none
- * @post None
- */
- __attribute__ ((always_inline))
- const_reference front() const
- {
- return *iv_start;
- }
-
- /**
- * Get a mutable reference to the last element in the container
- * @return reference to last element
- * @pre none
- * @post None
- */
- __attribute__ ((always_inline))
- reference back()
- {
- return *(iv_finish-1);
- }
-
- /**
- * Get an Immutable reference to the last element in the container
- * @return reference to last element
- * @pre none
- * @post None
- */
- __attribute__ ((always_inline))
- const_reference back() const
- {
- return *(iv_finish-1);
- }
-
- // -- Modifiers -----------------------------
-
- /*
- * Assign new content to the vector object
- * @param[n] first iterator to first element to copy in
- * @param[n] last iterator to last element + 1 to copy in
- */
- template <class InputIterator>
- void assign (InputIterator first, InputIterator last)
- {
- clear();
- size_type n = 0;
- for(InputIterator i = first; i != last; ++i) ++n;
- reserve(n);
- iv_finish = ctor_copy(first,last,iv_start);
- }
-
-
- /*
- * Assign new content to the vector object
- * @param[in] n number of elements to assign
- * @param[in] x reference to element to copy in
- */
- void assign ( size_type n, const T& x)
- {
- clear();
- reserve(n);
- ctor_fill_n(iv_start,n,x);
- iv_finish = iv_start + n;
- }
-
-
- /**
- * Add element to the back of the container
- * @param[in] x reference to object used to create new element
- * @pre none
- * @post All previously obtained iterators are invalid.
- */
- __attribute__ ((always_inline))
- void push_back(const T& x)
- {
- reserve(size() + 1);
- new (iv_finish++) T(x);
- }
-
- /**
- * Remove the last element in the container
- * @return nothing
- * @pre size() > 0
- * @post size() decreased by one
- */
- __attribute__ ((always_inline))
- void pop_back()
- {
- erase(iv_finish-1,iv_finish);
- }
-
- /**
- * Insert an element into the container at a given position
- * @param[in] position iterator to position to insert
- * @param[in] x reference of element to insert
- * @pre begin() <= position < end()
- * @post Element inserted at position, storage adjusted as needed.
- * All previously obtained iterators are invalid.
- */
- iterator insert(iterator position, const T& x)
- {
- // iv_start will change if the vector gets resized - so save the offset for
- // return.
- difference_type offset = position - iv_start;
- insert(position, 1, x);
- return (iv_start + offset);
- }
-
- /**
- * Insert a number of copies of a given elements at a given position
- * @param[in] postion iterator, postion to insert elements
- * @param[in] n number of elements to insert
- * @param[in] x A reference to the object to uses to create the new elements
- * @pre begin() <= postion < end()
- * @post All previously obtained iterators are invalid.
- */
- void insert (iterator position, size_type n, const T& x);
-
- /**
- * Insert a slice into the current container at a given position
- * @param[in] position iterator, position to insert slice
- * @param[in] first iterator to first element of slice insert
- * @param[in] last iterator to last element + 1 of slice to insert
- * @pre begin() <= postion <= end(), first < last.
- * @post Elements inserted at postition. Storage adjusted as needed.
- * All previously obtained iterators are invalid.
- * @note element pointed to by last is not inserted.
- */
- template <class InputIterator>
- void insert (iterator position, InputIterator first,
- InputIterator last);
-
-
- /**
- * Remove an element from the container
- * @param[in] position iterator, position of element to remove
- * @return new location of the element that followed the last
- * element erased, or end() if the operation erased
- * the last element in the sequence.
- * @pre begin() <= position < end()
- * @post All previously obtained iterators are invalid.
- */
- __attribute__ ((always_inline))
- iterator erase(iterator position)
- {
- return erase(position,position+1);
- }
-
- /**
- * Remove a slice of elements from the container
- * @param[in] first iterator, postion of the first element to remove
- * @param[in] last iterator, postion of the last element + 1 to remove
- * @return new location of the element that followed the last
- * element erased, or end() if the operation erased
- * the last element in the sequence.
- * @pre begin() <= first,last <= end(), first <= last.
- * @post All previously obtained iterators are invalid.
- * @note The element pointed to be last is not deleted.
- */
- iterator erase(iterator first, iterator last)
- {
- assert(last >= first);
- assert(first >= iv_start);
- assert(first <= iv_finish);
- assert(last >= iv_start);
- assert(last <= iv_finish);
-
- last = copy(last,iv_finish,first);
- while(last != iv_finish)
- {
- --iv_finish;
- iv_finish->~T();
- }
- return first;
- }
-
-
- /**
- * Swap this vector with another
- * @param reference to another vector of this type
- */
- void swap(vector<T>& x)
- {
- std::swap(iv_start,x.iv_start);
- std::swap(iv_finish,x.iv_finish);
- std::swap(iv_end_of_storage,x.iv_end_of_storage);
- }
-
- /**
- * Clear the vector
- * @pre none.
- * @post size() = 0, All previously obtained iterators are invalid
- * @note capacity unchanged
- */
- void clear ()
- {
- while(iv_finish != iv_start)
- {
- --iv_finish;
- (iv_finish)->~T();
- }
- }
-
- private:
-
- /**
- * Copy constructs elements into raw storage
- * @param[in] first iterator of first element to copy
- * @pararm[in] last iterator of last element + 1 to copy
- * @param[in] destination iterator of destination
- * @post elements moved
- */
- template <class InputIterator, class OutputIterator>
- OutputIterator
- ctor_copy(InputIterator first,
- InputIterator last,
- OutputIterator destination)
- {
- while(first != last)
- {
- new (destination) T(*first);
- ++destination;
- ++first;
- }
- return(destination);
- }
-
- /**
- * Copy constructs elements into raw storage
- * @param[in] first iterator of first element to copy
- * @param[in] last iterator of last element + 1 to copy
- * @param[in] destination iterator to end of destination + 1
- * @post elements moved
- */
- template <class BidirectionalIterator1, class BidirectionalIterator2>
- BidirectionalIterator2
- ctor_copy_backward ( BidirectionalIterator1 first,
- BidirectionalIterator1 last,
- BidirectionalIterator2 destination)
- {
- while(last != first)
- {
- --destination;
- --last;
- new(destination) T(*last);
- }
- return destination;
- }
-
- /**
- * fill by copy construct ino raw storage
- * @param[in] first itertor fo first element
- * @param[in] last iterator to last element + 1
- * @param[in] value to use to fill
- */
- template < class ForwardIterator, class Tp >
- void
- ctor_fill (ForwardIterator first, ForwardIterator last, const Tp& value )
- {
- while (first != last)
- {
- new (first) T(value);
- ++first;
- }
- }
-
- /**
- * fill by copy construct into raw storage
- * @param[in] first iterator first location to fill
- * @param[in] n number of elements to fill
- * @param[in] value to use to fill
- */
- template < class OutputIterator, class Size, class Tp >
- void
- ctor_fill_n( OutputIterator first, Size n, const Tp& value )
- {
- for(; n>0; --n)
- {
- new (first) T(value);
- ++first;
- }
- }
-
-
- /**
- * Free all the storage allocated to this vector
- * @param[in] i_start iterator to start of storage block
- */
- __attribute__ ((always_inline))
- void free_storage(iterator i_start)
- {
- delete [] (uint8_t *)i_start;
- }
-
- /**
- * Allocate storage for this vector
- * @param[in] n, number of elements required
- */
- __attribute__ ((always_inline))
- iterator allocate_storage(size_type n)
- {
- return (iterator) new uint8_t[n * sizeof(T)];
- }
-
- /**
- * debug dump
- */
- //void dump(const char * msg = "")
- //{
- // puts(msg);
- // printf("vector_dump::start 0x%016lx finish 0x%016lx eos 0x%016lx\n",
- // (uint64_t)iv_start, (uint64_t)iv_finish, (uint64_t)iv_end_of_storage);
- //}
- };
-
-}; // end namespace std
-
-// ------------------------------------------------------------------------------------------------
-
-template <class T>
-void std::vector<T>::reserve(size_type n)
-{
- size_type c = capacity();
- if(n > c)
- {
- // if requested new capacity < 10% of current capacity then increase by 10%
- size_type dif = n - c;
- size_type inc = 1 + (c/size_type(10));
- if(dif < inc)
- {
- n += inc;
- }
-
- iterator newStart = allocate_storage(n);
- if(NULL == iv_start)
- {
- iv_finish = newStart;
- }
- else
- {
- iterator newFinish = ctor_copy(iv_start, iv_finish, newStart);
- clear();
- iv_finish = newFinish;
- free_storage(iv_start);
- }
- iv_end_of_storage = newStart + n;
- iv_start = newStart;
- }
-}
-
-
-// ------------------------------------------------------------------------------------------------
-
-template <class T>
-void std::vector<T>::insert (iterator position, size_type n, const T& x)
-{
- //assert (position >= iv_start);
- //assert (position <= iv_finish);
- size_type new_size = size() + n;
- if(position == end())
- {
- reserve(new_size);
- while(n--) new (iv_finish++) T(x);
- }
- else if(new_size > capacity())
- {
- vector<T> new_vec;
- new_vec.reserve(new_size);
- for(const_iterator i = begin(); i != end(); ++i)
- {
- if(i == position)
- {
- while(n--) new_vec.push_back(x);
- }
- new_vec.push_back(*i);
- }
- swap(new_vec); // swap this with new_vec
- }
- else // already have enough space
- {
- size_type m = iv_finish - position; // # of existing elements to move
- pointer new_finish = iv_finish + n;
- if(m < n)
- {
- ctor_copy_backward(position,iv_finish,new_finish);
- while(n--)
- {
- if(position < iv_finish) *position = x;
- else new (position) T(x);
- ++position;
- }
- }
- else // n <= m
- {
- ctor_copy_backward(iv_finish-n,iv_finish,new_finish); // raw storage copy
- copy_backward(position, iv_finish-n, iv_finish); // operator= copy
- fill_n(position,n,x);
- }
- iv_finish = new_finish;
- }
-}
-
-// ------------------------------------------------------------------------------------------------
-
-template <class T>
-template <class InputIterator>
-void std::vector<T>::insert (iterator position,
- InputIterator first,
- InputIterator last)
-// Should only move storage if there is not room
-// InputIterators are not random access (eg. can't do diff = last - first)
-{
- size_type n = 0;
- for(InputIterator i = first; i != last; ++i) ++n;
- size_type new_size = size() + n;
-
- if(position == end())
- {
- reserve(new_size);
- iv_finish = ctor_copy(first,last,iv_finish);
- }
- else if(new_size > capacity()) // make a new vector
- {
- vector<T> new_vec;
- new_vec.reserve(new_size);
- for(const_iterator i = begin(); i != end(); ++i)
- {
- if(i == position)
- {
- while(n--) new_vec.push_back(*first++);
- }
- new_vec.push_back(*i);
- }
- swap(new_vec);
- }
- else // already have enough space
- {
- size_type m = iv_finish - position; // # of exising elements to adjust
- if(m < n)
- {
- ctor_copy_backward(position,iv_finish,iv_finish+n); // cp all existing elements to raw storage
- while(first != last)
- {
- if(position < iv_finish) *position = *first; // cp new elements to existing element locations
- else new (position) T(*first); // cp remaining new elements to raw storage
- ++position;
- ++first;
- }
- }
- else // n <= m
- {
- ctor_copy_backward(iv_finish-n, iv_finish, iv_finish+n); // cp existing elements to raw storage
- copy_backward(position, iv_finish-n, iv_finish); // cp rest of existing elements to existing locations
- copy(first,last,position); // cp in new elements to existing locations
- }
- iv_finish += n;
- }
-}
-
-// ------------------------------------------------------------------------------------------------
-
-template <class T>
-void std::vector<T>::resize(size_type n, T x)
-{
- size_type sz = size();
- if(n < sz)
- {
- erase(iv_start + n,iv_finish);
- }
- else if(n > sz)
- {
- insert(iv_finish,n-sz,x);
- }
- // else n == size() do nothing
-}
-
-#endif
-/* vim: set filetype=cpp : */
diff --git a/src/hwpf/src/plat/plat_attribute_service.H b/src/hwpf/src/plat/plat_attribute_service.H
index 9e2a26a2..2decbed4 100644
--- a/src/hwpf/src/plat/plat_attribute_service.H
+++ b/src/hwpf/src/plat/plat_attribute_service.H
@@ -6,6 +6,7 @@
/* OpenPOWER sbe Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
+/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
@@ -56,12 +57,12 @@
/* global get uint8_t 1D array macro */
#define PLAT_ATTR_GET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \
- _getAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
+ _getAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##TargetType), ID> \
(ID, PTARGET, VAL)
/* global set uint8_t 1D array macro */
#define PLAT_ATTR_SET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \
- _setAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
+ _setAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##TargetType), ID> \
(ID, PTARGET, VAL)
/* global get uint8_t 2D array macro */
@@ -144,12 +145,12 @@
/* global get int macro (uint8_t, 16, 32 and 64) */
#define PLAT_ATTR_GET_GLOBAL_INT(ID, PTARGET, VAL) \
- _get<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
+ _get<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetType), ID> \
(ID, PTARGET, VAL)
/* global set int macro (uint8_t, 16, 32 and 64) */
#define PLAT_ATTR_SET_GLOBAL_INT(ID, PTARGET, VAL) \
- _set<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \
+ _set<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetType), ID> \
(ID, PTARGET, VAL)
diff --git a/src/hwpf/src/plat/target.C b/src/hwpf/src/plat/target.C
index 9600140a..4249c6ec 100644
--- a/src/hwpf/src/plat/target.C
+++ b/src/hwpf/src/plat/target.C
@@ -318,18 +318,17 @@ namespace fapi2
if (b_present)
{
- i_chiplet_target.setPresent();
- i_chiplet_target.setFunctional(true);
+ static_cast<plat_target_handle_t&>((i_chiplet_target.operator()())).setPresent();
+ static_cast<plat_target_handle_t&>((i_chiplet_target.operator()())).setFunctional(true);
}
else
{
- FAPI_DBG("Perv target NOT present (nor functional): chiplet_number = %d",
- i_chiplet_target.getChipletNumber());
+ FAPI_DBG("Perv target NOT present (nor functional): chiplet_number = %d", i_chiplet_target.getChipletNumber());
}
FAPI_DBG("Target present = %u, Target functional = %u",
- i_chiplet_target.getPresent(),
- i_chiplet_target.getFunctional());
+ static_cast<plat_target_handle_t>(i_chiplet_target.get()).getPresent(),
+ static_cast<plat_target_handle_t>(i_chiplet_target.get()).getFunctional());
fapi_try_exit:
return fapi2::current_err;
@@ -490,8 +489,8 @@ fapi_try_exit:
if(0 == l_eqAttrPg)
{
- target_name.setPresent();
- target_name.setFunctional(true);
+ static_cast<plat_target_handle_t&>(target_name.operator ()()).setPresent();
+ static_cast<plat_target_handle_t&>(target_name.operator ()()).setFunctional(true);
}
G_vec_targets.at(l_beginning_offset+i) = revle32((fapi2::plat_target_handle_t)(target_name.get()));
}
@@ -525,8 +524,8 @@ fapi_try_exit:
if(0 == l_attrPg)
{
- target_name.setPresent();
- target_name.setFunctional(true);
+ static_cast<plat_target_handle_t&>(target_name.operator ()()).setPresent();
+ static_cast<plat_target_handle_t&>(target_name.operator ()()).setFunctional(true);
}
G_vec_targets.at(l_beginning_offset+i) = revle32((fapi2::plat_target_handle_t)(target_name.get()));
@@ -572,7 +571,7 @@ fapi_try_exit:
FAPI_DBG("Making %d'th EQ non-functional", l_idx);
// EQ chiplet l_idx is to be marked non-functional
fapi2::Target<fapi2::TARGET_TYPE_EQ> l_target = G_vec_targets.at(l_idx + EQ_TARGET_OFFSET);
- l_target.setFunctional(false);
+ static_cast<plat_target_handle_t&>(l_target.operator ()()).setFunctional(false);
G_vec_targets.at(l_idx + EQ_TARGET_OFFSET) = l_target.get();
}
}
@@ -584,7 +583,7 @@ fapi_try_exit:
FAPI_DBG("Making %d'th EC non-functional", l_idx);
// EC chiplet l_idx is to be marked non-functional
fapi2::Target<fapi2::TARGET_TYPE_CORE> l_target = G_vec_targets.at(l_idx + CORE_TARGET_OFFSET);
- l_target.setFunctional(false);
+ static_cast<plat_target_handle_t&>(l_target.operator ()()).setFunctional(false);
G_vec_targets.at(l_idx + CORE_TARGET_OFFSET) = l_target.get();
}
else
OpenPOWER on IntegriCloud