diff options
| author | Missy Connell <missyc@us.ibm.com> | 2012-02-23 11:09:50 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-03-30 15:55:17 -0500 |
| commit | 2c609c0829362e6f499464db39dd4dce6e592f30 (patch) | |
| tree | 82c9964691bc61c09c9d95c08a8a82a45650a9fd /src/usr/scom/scomtrans.H | |
| parent | a2cf819c913c65fb9a019b8e62c8e77b8964929a (diff) | |
| download | talos-hostboot-2c609c0829362e6f499464db39dd4dce6e592f30.tar.gz talos-hostboot-2c609c0829362e6f499464db39dd4dce6e592f30.zip | |
Full support for Scom Translate
Includes Xbus, Abus support and all indirect scom address ranges known to date.
Task 36903 - Scom Translate for A and X Bus
Task 37697 - Code updates for Scom Translate Abus/Xbus
Task 38765 - fix for Indirect Scom/Scom translate for MBA targets currently not yet supported
Added Murano XML targets for Xbus and Abus
Final Merge with Murano/Venice on 810 verified
Change-Id: I75d9e642efc4e020e39a2b87ab541cfa5ecd56ba
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/761
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/scom/scomtrans.H')
| -rw-r--r-- | src/usr/scom/scomtrans.H | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/usr/scom/scomtrans.H b/src/usr/scom/scomtrans.H index e65cc3511..d57e414dd 100644 --- a/src/usr/scom/scomtrans.H +++ b/src/usr/scom/scomtrans.H @@ -35,16 +35,29 @@ namespace SCOM enum ScomTransMask { - SCOM_TRANS_EX_MASK = 0x000000007F000000, - SCOM_TRANS_MCS_MASK = 0x000000007FFFFF80, - SCOM_TRANS_MBA_MASK = 0x000000007FFFF800, + SCOM_TRANS_EX_MASK = 0xFFFFFFFF7F000000, + SCOM_TRANS_MCS_MASK = 0xFFFFFFFF7FFFFF80, + SCOM_TRANS_MBA_MASK = 0xFFFFFFFF7FFFFC00, + SCOM_TRANS_XBUS_MASK = 0x00000000FFFFFC00, + SCOM_TRANS_IND_MCS_DMI_MASK = 0x80000060FFFFFFFF, + SCOM_TRANS_IND_MBA_MASK = 0x80000000FFFFFFFF, + SCOM_TRANS_ABUS_MASK = 0x000000FFFFFFFC00, + SCOM_TRANS_INDIRECT_MASK = 0x8000000000000000, }; enum ScomTransBaseAddr { - SCOM_TRANS_EX_BASEADDR = 0x0000000010000000, - SCOM_TRANS_MCS_BASEADDR = 0x0000000002011800, - SCOM_TRANS_MBA_BASEADDR = 0x0000000003010000, + SCOM_TRANS_EX_BASEADDR = 0x0000000010000000, + SCOM_TRANS_MCS_BASEADDR = 0x0000000002011800, + SCOM_TRANS_MCS_DMI_BASEADDR = 0x0000000002011A00, + SCOM_TRANS_IND_MCS_BASEADDR = 0x8000000002011A00, + SCOM_TRANS_MBA_BASEADDR = 0x0000000003010400, + // SCOM_TRANS_MBS_DPHY_BASEADDR = 0x0000000003011000, + SCOM_TRANS_XBUS_BASEADDR = 0x0000000004011000, + SCOM_TRANS_ABUS_BASEADDR = 0x0000000008010C00, + SCOM_TRANS_IND_MBA_BASEADDR = 0x800000000301143f, + SCOM_TRANS_IND_MCS_DMI_BASEADDR = 0x8000000002011A3F, + SCOM_TRANS_INDIRECT_ADDRESS = 0x8000000000000000, }; @@ -95,7 +108,7 @@ errlHndl_t scomPerformTranslate(TARGETING::EntityPath i_epath, TARGETING::TYPE i_ctype, TARGETING::TYPE i_ptype, int i_shift, - int i_mask, + uint64_t i_mask, TARGETING::Target * &o_target, uint64_t &i_addr ); |
