diff options
| author | Thi Tran <thi@us.ibm.com> | 2011-07-14 13:49:28 -0500 |
|---|---|---|
| committer | Thi N. Tran <thi@us.ibm.com> | 2011-07-21 09:44:19 -0500 |
| commit | f8db3532fc97a0f97d89ee97e85be4d9c81a1c54 (patch) | |
| tree | 1fdb4bba6868e3fa7971abd54ae2288c0afeed8c /src/usr/xscom/xscom.C | |
| parent | 471f09f1a9bcc46fc385fa8aca776cb682075c0b (diff) | |
| download | talos-hostboot-f8db3532fc97a0f97d89ee97e85be4d9c81a1c54.tar.gz talos-hostboot-f8db3532fc97a0f97d89ee97e85be4d9c81a1c54.zip | |
Update addresses used in XSCOM/HWPF test cases to work in VBU
Disable XSCOM and HWPF test cases so automated test doesn't fail
Added XSCOM address in trace
Re-enable XSCOM and HWPF test cases to be used with new fips build
Change to backing build b0720a_1132.750 & fix test cases failure
Change-Id: Iac54bdcde54d2d8168455e1f51f6ff309f14918f
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/200
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/xscom/xscom.C')
| -rw-r--r-- | src/usr/xscom/xscom.C | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index 969b81db0..215d0e11b 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -181,6 +181,7 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, errlHndl_t l_err = NULL; HMER l_hmer; mutex_t* l_XSComMutex; + uint64_t l_addr = va_arg(i_args,uint64_t); // Retry loop bool l_retry = false; @@ -213,7 +214,7 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, } // Build the XSCom address - XSComP8Address l_mmioAddr(va_arg(i_args,uint64_t), l_xscomChipInfo.nodeId, + XSComP8Address l_mmioAddr(l_addr, l_xscomChipInfo.nodeId, l_xscomChipInfo.chipId, l_XSComBaseAddr); // Re-init l_retry for loop @@ -266,10 +267,15 @@ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, // Done, un-pin task_affinity_unpin(); - - TRACFCOMP(g_trac_xscom, "xscomPerformOp: OpType 0x%.8X, Address %llx, Page %llx; Offset %llx; VirtAddr %llx; l_virtAddr+l_offset %llx", - i_opType, static_cast<uint64_t>(l_mmioAddr), l_page, - l_offset_64, l_virtAddr, l_virtAddr + l_offset_64); + TRACFCOMP(g_trac_xscom, "xscomPerformOp: OpType %llx, Address 0%llx, MMIO Address %llx", + static_cast<uint64_t>(i_opType), + l_addr, + static_cast<uint64_t>(l_mmioAddr)); + TRACFCOMP(g_trac_xscom, "xscomPerformOp: Page %llx; Offset %llx; VirtAddr %llx; l_virtAddr+l_offset %llx", + l_page, + l_offset_64, + l_virtAddr, + l_virtAddr + l_offset_64); if (i_opType == DeviceFW::READ) { |
