diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2016-03-21 16:47:47 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-07-26 13:10:36 -0400 |
| commit | 4414670dda8f3c4b99834a44d226ab439250f844 (patch) | |
| tree | 013e5855ba4f040048411136bb9f4f312f7cf95d /src/usr/errl/test | |
| parent | 851467dd485ccfa61c4039f347ebe490173f859c (diff) | |
| download | talos-hostboot-4414670dda8f3c4b99834a44d226ab439250f844.tar.gz talos-hostboot-4414670dda8f3c4b99834a44d226ab439250f844.zip | |
Reenable mvpd testcases after new mvpd available
Reenable mvpd testcases now that mvpd is available.
Change-Id: Ib725d6c5d7b6f5e8615b759edb1f81d4900a6487
RTC:131121
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22314
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/errl/test')
| -rw-r--r-- | src/usr/errl/test/errluserdetailtest.H | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H index 4fac07cf9..c6a404d3a 100644 --- a/src/usr/errl/test/errluserdetailtest.H +++ b/src/usr/errl/test/errluserdetailtest.H @@ -368,8 +368,7 @@ public: { ErrlUserDetailsLogRegister eudlr(c_target); eudlr.addData(DEVICE_SCOM_ADDRESS(0x000F000Full)); - // Turn on MVPD Testing @TODO RTC 131121, - // eudlr.addData(DEVICE_MVPD_ADDRESS(3,0)); + eudlr.addData(DEVICE_MVPD_ADDRESS(3,0)); // error: eudlr.addData(DEVICE_FSI_ADDRESS(0x01028)); //TODO RTC: 123019 I2CM changes for P9 @@ -399,21 +398,20 @@ public: } ErrlUserDetailsLogRegister(c_target, ®1_data, reg1_size, DEVICE_SCOM_ADDRESS(0x000F000Full)).addToLog(errl); -// Turn on MVPD Testing @TODO RTC 131121, -// uint64_t reg2_data = 0; -// size_t reg2_size = sizeof(reg2_data); -// errl_deviceRead = DeviceFW::deviceRead(c_target, -// ®2_data, reg2_size, -// DEVICE_MVPD_ADDRESS(3,0)); -// -// if (errl_deviceRead != NULL) -// { -// TS_TRACE( "testLogRegister deviceRead return errl; deleting;"); -// delete errl_deviceRead; -// reg2_size = 0; -// } -// ErrlUserDetailsLogRegister(c_target, ®2_data, reg2_size, -// DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl); + uint64_t reg2_data = 0; + size_t reg2_size = sizeof(reg2_data); + errl_deviceRead = DeviceFW::deviceRead(c_target, + ®2_data, reg2_size, + DEVICE_MVPD_ADDRESS(3,0)); + + if (errl_deviceRead != NULL) + { + TS_TRACE( "testLogRegister deviceRead return errl; deleting;"); + delete errl_deviceRead; + reg2_size = 0; + } + ErrlUserDetailsLogRegister(c_target, ®2_data, reg2_size, + DEVICE_MVPD_ADDRESS(3,0)).addToLog(errl); uint32_t reg3_data = 0; size_t reg3_size = sizeof(reg3_data); @@ -439,9 +437,8 @@ public: ErrlUserDetailsLogRegister eudlr(c_target); eudlr.addDataBuffer(®1_data, reg1_size, DEVICE_SCOM_ADDRESS(0x000F000Full)); - // Turn on MVPD Testing @TODO RTC 131121, - /* eudlr.addDataBuffer(®2_data, reg2_size, - DEVICE_MVPD_ADDRESS(3,0));*/ + eudlr.addDataBuffer(®2_data, reg2_size, + DEVICE_MVPD_ADDRESS(3,0)); eudlr.addDataBuffer(®3_data, reg3_size, DEVICE_FSI_ADDRESS(0x01028)); eudlr.addToLog(errl); |
