diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2013-06-24 13:27:11 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-06-28 15:21:57 -0500 |
| commit | 50c029f1ac96bc844550000cb5ee4e9fac4ad462 (patch) | |
| tree | 93e0e3eb8dca3e262005161847f5acd1af1d3f5c /src/usr/scom | |
| parent | 1c2d9ba0fb63a8e955087f7ae0e2a7cc19d7d72d (diff) | |
| download | blackbird-hostboot-50c029f1ac96bc844550000cb5ee4e9fac4ad462.tar.gz blackbird-hostboot-50c029f1ac96bc844550000cb5ee4e9fac4ad462.zip | |
MBA unit still has MBS as parent but MBS does not exist anymore
Change-Id: Ia65919670b1863cabd6b9e0defbeea8d81d95a3c
RTC:73745
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5172
Tested-by: Jenkins Server
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/scom')
| -rw-r--r-- | src/usr/scom/scomtrans.C | 19 | ||||
| -rw-r--r-- | src/usr/scom/test/scomtest.H | 11 |
2 files changed, 3 insertions, 27 deletions
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C index 41354cede..694d1fafe 100644 --- a/src/usr/scom/scomtrans.C +++ b/src/usr/scom/scomtrans.C @@ -55,11 +55,6 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, DeviceFW::SCOM, - TARGETING::TYPE_MBS, - scomTranslate); - -DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, - DeviceFW::SCOM, TARGETING::TYPE_MBA, scomTranslate); @@ -413,20 +408,6 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, } - else if (l_type == TARGETING::TYPE_MBS) - { - // MBS - // Mask : NA - // Range 1 : 0x02010000 - 0x0201FFFF - // default>physical:sys-0/node-0/membuf-10/mbs-0</default> - - // NO address shifting required.. no mask.. - // just get parent. - l_err = scomfindParentTarget(epath, - TARGETING::TYPE_MEMBUF, - i_target); - - } else if (l_type == TARGETING::TYPE_MBA) { // MBA diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H index 4f31dd346..8e183a748 100644 --- a/src/usr/scom/test/scomtest.H +++ b/src/usr/scom/test/scomtest.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -1089,7 +1089,6 @@ public: // Setup some targets to use enum { myMembuf0, - myMBS, myMBA0, myMBA1, NUM_TARGETS @@ -1121,15 +1120,12 @@ public: if(scom_targets[myMembuf0] != NULL) { - // add MBS target. - epath.addLast(TARGETING::TYPE_MBS,0); - scom_targets[myMBS] = TARGETING::targetService().toTarget(epath); // add MBA0 target. epath.addLast(TARGETING::TYPE_MBA,0); scom_targets[myMBA0] = TARGETING::targetService().toTarget(epath); - // remote MBA0 target (off of sys-0/node-0/membuf-0/MBS-0/MBA0) + // remote MBA0 target (off of sys-0/node-0/membuf-0/MBA0) epath.removeLast(); // Add MBA1 to the path and create new target @@ -1148,9 +1144,8 @@ public: { scom_targets[myMBA1], 0x03010655, 0x333333334444EEEE}, { scom_targets[myMBA0], 0x8000C0140301143F,0x1111111111111212}, { scom_targets[myMBA1], 0x8000C0140301143F, 0x333333334444abcd}, - { scom_targets[myMBS], 0x02011417, 0x123123123123FFFF}, { scom_targets[myMBA0], 0x8000C0140301183F,0x111111111111ccee}, // invalid non zero indirect address - { scom_targets[myMBA0], 0x03010E55, 0x010101010101CCCC}, // invalid passing in a non-0 unit address + { scom_targets[myMBA0], 0x03010E55, 0x010101010101CCCC}, // invalid passing in a non-0 unit address }; const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]); |
