diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2012-11-01 08:29:37 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-11-01 14:56:56 -0500 |
| commit | b24958bff535189e39fc9d4db54e13ebb57acc2b (patch) | |
| tree | 2bf938613b2df500663437fcdfbbbad928cb23d7 /src/usr | |
| parent | d683d0d67ece738633833244446ce85bddeb94bb (diff) | |
| download | talos-hostboot-b24958bff535189e39fc9d4db54e13ebb57acc2b.tar.gz talos-hostboot-b24958bff535189e39fc9d4db54e13ebb57acc2b.zip | |
SW172921 - Bad PNOR chipid in Simics
For some reason the Simics model is returning a different chipid
for the PNOR chip now than it used to. Talking to Adam we
suspect that the last byte is junk data anyway so it is just old
memory. The fix is to ignore the last byte since it isn't really
part of the id anyway.
Change-Id: Ie097224c312e5597668b6201eff698f91bfaa950
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2189
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/pnor/pnordd.C | 3 | ||||
| -rw-r--r-- | src/usr/pnor/pnordd.H | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/pnor/pnordd.C b/src/usr/pnor/pnordd.C index ea36adf02..bca353e5b 100644 --- a/src/usr/pnor/pnordd.C +++ b/src/usr/pnor/pnordd.C @@ -701,6 +701,9 @@ errlHndl_t PnorDD::getNORChipId(uint32_t& o_chipId, break; } + // Only look at a portion of the data that is returned + o_chipId &= ID_MASK; + }while(0); return l_err; diff --git a/src/usr/pnor/pnordd.H b/src/usr/pnor/pnordd.H index 407315930..f82b991a4 100644 --- a/src/usr/pnor/pnordd.H +++ b/src/usr/pnor/pnordd.H @@ -132,7 +132,9 @@ class PnorDD enum NorChipIDs { SIMICS_NOR_ID = 0x20ba2000, /**< CHIP ID returned by Simics NOR chip */ - VPO_NOR_ID = 0x20201820, /**< CHIP ID returned by VPO NOR chip */ + VPO_NOR_ID = 0x20201800, /**< CHIP ID returned by VPO NOR chip */ + + ID_MASK = 0xFFFFFF00, /**< Only look at 3 bytes */ }; |
