diff options
| author | Missy Connell <missyc@us.ibm.com> | 2012-12-11 12:31:20 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-12-13 14:17:19 -0600 |
| commit | 219b91a0ae64a987471cfe07e669bb55d70cf594 (patch) | |
| tree | 0f18452c1e3bed261f74ac891f4d1070ce47def2 | |
| parent | aee31b7876297202881b1a17355d3ef1cea34b3d (diff) | |
| download | blackbird-hostboot-219b91a0ae64a987471cfe07e669bb55d70cf594.tar.gz blackbird-hostboot-219b91a0ae64a987471cfe07e669bb55d70cf594.zip | |
Scom Translate scominfo File version update
Change-Id: Iff2063d8e7d881e2e98cdb2881bdae96cc1cfcf2
RTC: 59593
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2643
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/usr/scom/scomtrans.C | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C index 4bbfa5d69..4d83b598b 100644 --- a/src/usr/scom/scomtrans.C +++ b/src/usr/scom/scomtrans.C @@ -26,6 +26,9 @@ * @brief Implementation of SCOM operations */ + +// Code up to date for version: p8 1.9/s1 1.3 of p8.chipunit.scominfo + /*****************************************************************************/ // I n c l u d e s /*****************************************************************************/ @@ -76,7 +79,6 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, scomTranslate); - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, @@ -208,16 +210,26 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, // correct address range. // MCS Indirect mask = 0x80000060_FFFFFFFF - // 0x80000060_02011A3F MCS 0 # DMI0 Indirect SCOM - // 0x80000040_02011A3F MCS 1 # DMI1 Indirect SCOM - // 0x80000020_02011A3F MCS 2 # DMI2 Indirect SCOM - // 0x80000000_02011A3F MCS 3 # DMI3 Indirect SCOM - // 0x80000060_02011E3F MCS 4 # DMI4 Indirect SCOM - // 0x80000040_02011E3F MCS 5 # DMI5 Indirect SCOM - // 0x80000020_02011E3F MCS 6 # DMI6 Indirect SCOM - // 0x80000000_02011E3F MCS 7 # DMI7 Indirect SCOM + // 0x80000060_02011A3F MCS 0 # DMI0 Indirect SCOM RX3 + // 0x80000040_02011A3F MCS 1 # DMI1 Indirect SCOM RX2 + // 0x80000020_02011A3F MCS 2 # DMI2 Indirect SCOM RX1 + // 0x80000000_02011A3F MCS 3 # DMI3 Indirect SCOM RX0 + // 0x80000060_02011E3F MCS 4 # DMI4 Indirect SCOM RX3 + // 0x80000040_02011E3F MCS 5 # DMI5 Indirect SCOM RX2 + // 0x80000020_02011E3F MCS 6 # DMI6 Indirect SCOM RX1 + // 0x80000000_02011E3F MCS 7 # DMI7 Indirect SCOM RX0 + + // 0x80000460_02011A3F MCS 0 # DMI0 Indirect SCOM TX3 + // 0x80000440_02011A3F MCS 1 # DMI1 Indirect SCOM TX2 + // 0x80000420_02011A3F MCS 2 # DMI2 Indirect SCOM TX1 + // 0x80000400_02011A3F MCS 3 # DMI3 Indirect SCOM TX0 + // 0x80000460_02011E3F MCS 4 # DMI4 Indirect SCOM TX3 + // 0x80000440_02011E3F MCS 5 # DMI5 Indirect SCOM TX2 + // 0x80000420_02011E3F MCS 6 # DMI6 Indirect SCOM TX1 + // 0x80000400_02011E3F MCS 7 # DMI7 Indirect SCOM TX0 // SCOM_TRANS_IND_MCS_BASEADDR = 0x8000006002011A00, + // check that we are working with a MCS/DMI address range.. // can be indirect or direct. else if (((i_addr & SCOM_TRANS_MCS_MASK) == @@ -287,11 +299,16 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, // 0x04011800 XBUS 3 # XBUS3 Direct SCOM // // XBUS Indirect Address info - // mask = 0x80000000_FFFFFFFF - // 0x800000000401103F XBUS 0 # XBUS0 Indirect SCOM - // 0x800000000401143F XBUS 1 # XBUS1 Indirect SCOM - // 0x8000000004011C3F XBUS 2 # XBUS2 Indirect SCOM - // 0x800000000401183F XBUS 3 # XBUS3 Indirect SCOM + // mask = 0x80000000_FFFFFFC0 + // 0x800000000401103F XBUS 0 # XBUS0 RX0 Indirect SCOM + // 0x800000000401143F XBUS 1 # XBUS1 RX1 Indirect SCOM + // 0x8000000004011C3F XBUS 2 # XBUS2 RX2 Indirect SCOM + // 0x800000000401183F XBUS 3 # XBUS3 RX3 Indirect SCOM + // + // 0x800004000401103F XBUS 0 # XBUS0 TX0 Indirect SCOM + // 0x800004000401143F XBUS 1 # XBUS1 TX1 Indirect SCOM + // 0x8000040004011C3F XBUS 2 # XBUS2 TX2 Indirect SCOM + // 0x800004000401183F XBUS 3 # XBUS3 TX3 Indirect SCOM // no differentiation between direct and indirect.. translate the same way @@ -351,9 +368,14 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, // // Abus Indirect Addresses // Abus Indirect MASK = 0x80000060FFFFFFFF - // 0x80000000_08010C3F ABUS 0 # ABUS0 Indirect SCOM - // 0x80000020_08010C3F ABUS 1 # ABUS1 Indirect SCOM - // 0x80000040_08010C3F ABUS 2 # ABUS2 Indirect SCOM + // 0x80000000_08010C3F ABUS 0 # ABUS0 RX0 Indirect SCOM + // 0x80000020_08010C3F ABUS 1 # ABUS1 RX1 Indirect SCOM + // 0x80000040_08010C3F ABUS 2 # ABUS2 RX2 Indirect SCOM + // + // 0x80000400_08010C3F ABUS 0 # ABUS0 TX0 Indirect SCOM + // 0x80000420_08010C3F ABUS 1 # ABUS1 TX1 Indirect SCOM + // 0x80000440_08010C3F ABUS 2 # ABUS2 TX2 Indirect SCOM + // Check that we are working with the correct address range |
