diff options
author | Adam Muhle <armuhle@us.ibm.com> | 2012-06-06 08:48:08 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-06-07 12:25:40 -0500 |
commit | 39ce3d8ecf06c4c04d245a6107daa73611767c5f (patch) | |
tree | 1709552e18f20a5c4c51393856720edb2d1d14d5 /src/usr/scom | |
parent | 774b4b489dd962ea9a90d89d200cd938855049af (diff) | |
download | talos-hostboot-39ce3d8ecf06c4c04d245a6107daa73611767c5f.tar.gz talos-hostboot-39ce3d8ecf06c4c04d245a6107daa73611767c5f.zip |
Fix FSIDD mutex issue, misc memory tweaks
-Fixed Mutex issue in FSIDD
-Remove FSIDD workaround for a perceived simcis bug which we now think was just the mutex issue.
-Cleaned up some traces in scom.C
-Temporarily disabled testCastOutPages() to avoid memory issues
-Tweaked periodics in cpumgr.H
Change-Id: Ic34193cc2f81a40530214cd3338dfb405d1e8198
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1171
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/scom')
-rw-r--r-- | src/usr/scom/scom.C | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index d4cabd173..798b3f18a 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/scom/scom.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/scom/scom.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2011-2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ /** * @file scom.C * @@ -227,7 +228,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, // got an indirect read error // the data buffer is in tempIoData TRACFCOMP(g_trac_scom, - "INDIRECT SCOM READ= ERROR valid bits are not on.. scomreg=0x%X", + "INDIRECT SCOM READ= ERROR valid bits are not on.. scomreg=0x%.16X", *((uint64_t *)io_buffer)); /*@ @@ -254,7 +255,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, { // got an indirect read timeout TRACFCOMP(g_trac_scom, - "INDIRECT SCOM READ=indirect read timout .. scomreg=0x%X", + "INDIRECT SCOM READ=indirect read timout .. scomreg=0x%.16X", *((uint64_t *)io_buffer)); @@ -346,7 +347,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, if (l_indScomError == true) { // got an indirect write error - TRACFCOMP(g_trac_scom, "INDIRECT SCOM WRITE= ERROR valid bits are not on.. scomreg=0x%X", temp_io_buffer); + TRACFCOMP(g_trac_scom, "INDIRECT SCOM WRITE= ERROR valid bits are not on.. scomreg=0x%.16X", temp_io_buffer); /*@ * @errortype @@ -372,7 +373,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType, { // got an indirect write timeout TRACFCOMP(g_trac_scom, - "INDIRECT SCOM READ=indirect write timout .. scomreg=0x%X", + "INDIRECT SCOM WRITE=indirect write timeout .. scomreg=0x%.16X", temp_io_buffer); |