diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2012-02-07 16:20:54 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-02-09 15:38:45 -0600 |
| commit | c60a3bc6149ff5e363f19d5a54a83796eb643ddb (patch) | |
| tree | 17682d662352b3b7509c24e0fc2a8382e46b2966 /src/usr/hwpf | |
| parent | 8802f986037017ba5a2e3efa2cb7c054b8bcea7a (diff) | |
| download | talos-hostboot-c60a3bc6149ff5e363f19d5a54a83796eb643ddb.tar.gz talos-hostboot-c60a3bc6149ff5e363f19d5a54a83796eb643ddb.zip | |
HWPF: Add support for X and A Bus Endpoint FAPI Targets
Change-Id: I2b1cb92df44d1bc50bc3e3dc108cedd621c35424
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/648
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: CAMVAN T. NGUYEN <ctnguyen@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/fapi/fapiTarget.C | 14 | ||||
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatSystemConfig.C | 12 |
2 files changed, 16 insertions, 10 deletions
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", |
