diff options
| author | Missy Connell <missyc@us.ibm.com> | 2013-03-26 10:04:46 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-03-29 13:31:43 -0500 |
| commit | e19ac2a6405413a5ae2f8a84f8c9b545a9e4e075 (patch) | |
| tree | adc7bf1cc7ff97d32076fd06e312d73f15e0365a /src | |
| parent | 6e854b214f209e339309170c4bcb2e090bd57e89 (diff) | |
| download | talos-hostboot-e19ac2a6405413a5ae2f8a84f8c9b545a9e4e075.tar.gz talos-hostboot-e19ac2a6405413a5ae2f8a84f8c9b545a9e4e075.zip | |
Update ScomTrans with MCS/DMI changes
Change-Id: I56cf5aab1e47ed16919795da8b4606af74a86b04
RTC:67240
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3744
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/scom/scomtrans.C | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C index 4d83b598b..41354cede 100644 --- a/src/usr/scom/scomtrans.C +++ b/src/usr/scom/scomtrans.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -212,21 +212,24 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, // MCS Indirect mask = 0x80000060_FFFFFFFF // 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 + // 0x80000000_02011A3F MCS 2 # DMI3 Indirect SCOM RX0 + // 0x80000020_02011A3F MCS 3 # DMI2 Indirect SCOM RX1 + // // 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 - + // 0x80000000_02011E3F MCS 6 # DMI7 Indirect SCOM RX0 + // 0x80000020_02011E3F MCS 7 # DMI6 Indirect SCOM RX1 + // // 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 + // 0x80000400_02011A3F MCS 2 # DMI3 Indirect SCOM TX0 + // 0x80000420_02011A3F MCS 3 # DMI2 Indirect SCOM TX1 + // // 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 + // 0x80000400_02011E3F MCS 6 # DMI7 Indirect SCOM TX0 + // 0x80000420_02011E3F MCS 7 # DMI6 Indirect SCOM TX1 + // // SCOM_TRANS_IND_MCS_BASEADDR = 0x8000006002011A00, @@ -258,12 +261,12 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType, { i_addr |= 0x4000000000; } - // instance 2 or 6 - else if (l_instance % 4 == 2) + // instance 3 or 7 + else if (l_instance % 4 == 3) { i_addr |= 0x2000000000; } - // instance 3 or 7 is 0 so no bits to turn on. + // instance 2 or 6 is 0 so no bits to turn on. } } |
