diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-04-07 15:03:53 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-04-08 16:55:01 -0500 |
| commit | ed6d7133031da2790f31826f9a5ff99da3a8c963 (patch) | |
| tree | 8b12e5d437a10a2ea5c56f7e6c8a52eb0eeaef52 /src/usr/fsi | |
| parent | 3f7400b8fe83ae55f87f9a630e9d75428ca94f36 (diff) | |
| download | talos-hostboot-ed6d7133031da2790f31826f9a5ff99da3a8c963.tar.gz talos-hostboot-ed6d7133031da2790f31826f9a5ff99da3a8c963.zip | |
Fix bad FSI port usage
The change to support the alt FSI paths introduced a case where
we had a chip with a MFSI master but no port. I changed the code
to force this into a 'no master' setting.
Change-Id: I2f301615f375285ecf28091aea90668f6dc382f1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10240
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/fsi')
| -rw-r--r-- | src/usr/fsi/fsidd.C | 6 | ||||
| -rw-r--r-- | src/usr/fsi/fsidd.H | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C index 6b25bf6dd..571daf448 100644 --- a/src/usr/fsi/fsidd.C +++ b/src/usr/fsi/fsidd.C @@ -2305,11 +2305,13 @@ FsiDD::FsiChipInfo_t FsiDD::getFsiInfo( TARGETING::Target* i_target ) } - if( (info.master == NULL) || (info.type == FSI_MASTER_TYPE_NO_MASTER) ) + if( (info.master == NULL) + || (info.type == FSI_MASTER_TYPE_NO_MASTER) + || (info.port == UINT8_MAX) ) { info.master = NULL; info.type = FSI_MASTER_TYPE_NO_MASTER; - info.port = 0; + info.port = UINT8_MAX; info.cascade = 0; info.flags = 0; info.linkid.id = 0; diff --git a/src/usr/fsi/fsidd.H b/src/usr/fsi/fsidd.H index b29ff9f9a..7f796d225 100644 --- a/src/usr/fsi/fsidd.H +++ b/src/usr/fsi/fsidd.H @@ -202,7 +202,7 @@ class FsiDD FsiChipInfo_t() : slave(NULL), master(NULL), type(TARGETING::FSI_MASTER_TYPE_NO_MASTER), - port(0xFF), cascade(0), flags(0) + port(UINT8_MAX), cascade(0), flags(0) {}; }; @@ -221,14 +221,14 @@ class FsiDD FsiAddrInfo_t( TARGETING::Target* i_target, uint64_t i_address ) : fsiTarg(i_target), opbTarg(NULL), - relAddr(i_address), absAddr(0xFFFFFFFF) + relAddr(i_address), absAddr(UINT32_MAX) {}; private: /** Default Constructor is not allowed */ FsiAddrInfo_t() : fsiTarg(NULL), opbTarg(NULL), - relAddr(0xFFFFFFFF),absAddr(0xFFFFFFFF) + relAddr(UINT32_MAX),absAddr(UINT32_MAX) {}; }; |
