diff options
| -rw-r--r-- | src/include/usr/hwpf/fapi/fapiTarget.H | 25 | ||||
| -rw-r--r-- | src/usr/hwpf/fapi/fapiTarget.C | 14 | ||||
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatSystemConfig.C | 12 |
3 files changed, 31 insertions, 20 deletions
diff --git a/src/include/usr/hwpf/fapi/fapiTarget.H b/src/include/usr/hwpf/fapi/fapiTarget.H index 7b87ffc16..9a09c7644 100644 --- a/src/include/usr/hwpf/fapi/fapiTarget.H +++ b/src/include/usr/hwpf/fapi/fapiTarget.H @@ -36,6 +36,8 @@ * mjjones 07/05/2011 Removed const from handle * mjjones 08/29/2011 Updated toString function * mjjones 09/12/2011 Added isChip and isChiplet + * mjjones 02/07/2012 Remove MBS_CHIPLET + * Add XBUS_ENDPOINT ABUS_ENDPOINT */ #ifndef FAPITARGET_H_ @@ -52,15 +54,16 @@ namespace fapi */ enum TargetType { - TARGET_TYPE_NONE = 0x00000000, - TARGET_TYPE_SYSTEM = 0x00000001, - TARGET_TYPE_DIMM = 0x00000002, - TARGET_TYPE_PROC_CHIP = 0x00000004, - TARGET_TYPE_MEMBUF_CHIP = 0x00000008, - TARGET_TYPE_EX_CHIPLET = 0x00000010, - TARGET_TYPE_MBA_CHIPLET = 0x00000020, - TARGET_TYPE_MBS_CHIPLET = 0x00000040, - TARGET_TYPE_MCS_CHIPLET = 0x00000080, + TARGET_TYPE_NONE = 0x00000000, + TARGET_TYPE_SYSTEM = 0x00000001, + TARGET_TYPE_DIMM = 0x00000002, + TARGET_TYPE_PROC_CHIP = 0x00000004, + TARGET_TYPE_MEMBUF_CHIP = 0x00000008, + TARGET_TYPE_EX_CHIPLET = 0x00000010, + TARGET_TYPE_MBA_CHIPLET = 0x00000020, + TARGET_TYPE_MCS_CHIPLET = 0x00000040, + TARGET_TYPE_XBUS_ENDPOINT = 0x00000080, + TARGET_TYPE_ABUS_ENDPOINT = 0x00000100, }; /** @@ -200,7 +203,9 @@ public: /** * @brief Returns if the target is a chiplet * - * @return boolean. true if chiplet else fase + * This includes all chip units (e.g. XBUS, ABUS) + * + * @return boolean. true if chiplet else false */ bool isChiplet() const; diff --git a/src/usr/hwpf/fapi/fapiTarget.C b/src/usr/hwpf/fapi/fapiTarget.C index 899cc4503..5689b756f 100644 --- a/src/usr/hwpf/fapi/fapiTarget.C +++ b/src/usr/hwpf/fapi/fapiTarget.C @@ -33,6 +33,8 @@ * mjjones 04/13/2011 Created. Based on Hlava prototype * mjjones 07/05/2011 Removed const from handle * mjjones 09/12/2011 Added isChip and isChiplet + * mjjones 02/07/2012 Remove MBS_CHIPLET + * Add XBUS_ENDPOINT ABUS_ENDPOINT */ #include <fapiTarget.H> @@ -151,8 +153,7 @@ void Target::setType(const TargetType i_type) //****************************************************************************** bool Target::isChip() const { - return ((iv_type == TARGET_TYPE_PROC_CHIP) || - (iv_type == TARGET_TYPE_MEMBUF_CHIP)); + return ((iv_type & (TARGET_TYPE_PROC_CHIP | TARGET_TYPE_MEMBUF_CHIP)) != 0); } //****************************************************************************** @@ -160,10 +161,11 @@ bool Target::isChip() const //****************************************************************************** bool Target::isChiplet() const { - return ((iv_type == TARGET_TYPE_EX_CHIPLET) || - (iv_type == TARGET_TYPE_MBA_CHIPLET) || - (iv_type == TARGET_TYPE_MBS_CHIPLET) || - (iv_type == TARGET_TYPE_MCS_CHIPLET)); + return ((iv_type & (TARGET_TYPE_EX_CHIPLET | + TARGET_TYPE_MBA_CHIPLET | + TARGET_TYPE_MCS_CHIPLET | + TARGET_TYPE_XBUS_ENDPOINT | + TARGET_TYPE_ABUS_ENDPOINT)) != 0); } } diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C index 5aadd4b11..9bd778b57 100644 --- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C +++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C @@ -91,14 +91,18 @@ fapi::ReturnCode fapiGetChildChiplets( { l_predicate.setType(TARGETING::TYPE_MBA); } - else if (i_chipletType == fapi::TARGET_TYPE_MBS_CHIPLET) - { - l_predicate.setType(TARGETING::TYPE_MBS); - } else if (i_chipletType == fapi::TARGET_TYPE_MCS_CHIPLET) { l_predicate.setType(TARGETING::TYPE_MCS); } + else if (i_chipletType == fapi::TARGET_TYPE_XBUS_ENDPOINT) + { + l_predicate.setType(TARGETING::TYPE_XBUS); + } + else if (i_chipletType == fapi::TARGET_TYPE_ABUS_ENDPOINT) + { + l_predicate.setType(TARGETING::TYPE_ABUS); + } else { FAPI_ERR("fapiGetChildChiplets. Chiplet type 0x%x not supported", |
