diff options
| author | Thi Tran <thi@us.ibm.com> | 2011-07-25 12:30:51 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2011-07-27 10:24:22 -0500 |
| commit | 4991a039cc2fc8a5ea6c28c21d7c7b07ffeaa36b (patch) | |
| tree | 4c9ae06951994545856269fa7f849afefcca254f /src/usr | |
| parent | 8c76c89044276c76479e732bc988f1ece7670a0a (diff) | |
| download | talos-hostboot-4991a039cc2fc8a5ea6c28c21d7c7b07ffeaa36b.tar.gz talos-hostboot-4991a039cc2fc8a5ea6c28c21d7c7b07ffeaa36b.zip | |
Fix VBU XSCOM & HWPF test case failure due to VBU unsupported address 0x130F0012
Change-Id: Ib44c3fa32220a4052682a4466a69e6459896a1f6
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/215
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/hwpf/hwp/fapiTestHwp.C | 2 | ||||
| -rw-r--r-- | src/usr/xscom/test/xscomtest.H | 3 | ||||
| -rw-r--r-- | src/usr/xscom/xscom.C | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/usr/hwpf/hwp/fapiTestHwp.C b/src/usr/hwpf/hwp/fapiTestHwp.C index b37bdd49a..9190f9c07 100644 --- a/src/usr/hwpf/hwp/fapiTestHwp.C +++ b/src/usr/hwpf/hwp/fapiTestHwp.C @@ -83,7 +83,7 @@ fapi::ReturnCode hwpInitialTest(const fapi::Target & i_chip) // Figure out the scom address and create a 64 bit data buffer ecmdDataBufferBase l_data(64); - const uint64_t l_addr = 0x0201240B; + const uint64_t l_addr = 0x13010002; // Perform a GetScom operation on the chip l_rc = GetScom(i_chip, l_addr, l_data); diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H index b2934bf4b..71f346070 100644 --- a/src/usr/xscom/test/xscomtest.H +++ b/src/usr/xscom/test/xscomtest.H @@ -30,8 +30,7 @@ const testXscomAddrData g_xscomAddrTable[] = { // Write data to be ORed with read value {0x13030007, 0x0000040000000000}, - {0x130F0012, 0x00000C0000000000}, - + {0x13010002, 0x00000C0000000000}, }; const uint32_t g_xscomAddrTableSz = sizeof(g_xscomAddrTable)/sizeof(testXscomAddrData); diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index 215d0e11b..d151a9bf8 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -267,6 +267,7 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, // Done, un-pin task_affinity_unpin(); + TRACFCOMP(g_trac_xscom, "xscomPerformOp: OpType %llx, Address 0%llx, MMIO Address %llx", static_cast<uint64_t>(i_opType), l_addr, @@ -288,6 +289,9 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, // Handle error if (l_hmer.mXSComStatus != HMER::XSCOM_GOOD) { + uint64_t l_hmerVal = l_hmer; + TRACFCOMP(g_trac_xscom, ERR_MRK "XSCOM status error HMER: %llx, XSComStatus %llx", + l_hmerVal, l_hmer.mXSComStatus); /*@ * @errortype * @moduleid XSCOM_PERFORM_OP |
