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/fsi | |
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/fsi')
-rw-r--r-- | src/usr/fsi/fsidd.C | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C index e870411c5..1c6a8094d 100644 --- a/src/usr/fsi/fsidd.C +++ b/src/usr/fsi/fsidd.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/fsi/fsidd.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/fsi/fsidd.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 fsidd.C * @@ -693,8 +694,8 @@ errlHndl_t FsiDD::read(const FsiAddrInfo_t& i_addrInfo, l_mutex = (i_addrInfo.opbTarg)->getHbMutexAttr<TARGETING::ATTR_FSI_MASTER_MUTEX>(); - if( (iv_ffdcTask != 0) // performance hack for typical case - && (iv_ffdcTask != task_gettid()) ) + if( (iv_ffdcTask == 0) // performance hack for typical case + || (iv_ffdcTask != task_gettid()) ) { mutex_lock(l_mutex); need_unlock = true; @@ -771,8 +772,8 @@ errlHndl_t FsiDD::write(const FsiAddrInfo_t& i_addrInfo, l_mutex = (i_addrInfo.opbTarg)->getHbMutexAttr<TARGETING::ATTR_FSI_MASTER_MUTEX>(); - if( (iv_ffdcTask != 0) // performance hack for typical case - && (iv_ffdcTask != task_gettid()) ) + if( (iv_ffdcTask == 0) // performance hack for typical case + || (iv_ffdcTask != task_gettid()) ) { mutex_lock(l_mutex); need_unlock = true; |