diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2014-04-17 17:28:31 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-05-21 17:33:37 -0500 |
| commit | 3faeb6dd6cbc8929ac94d92525d1d4f5dcfe9156 (patch) | |
| tree | e85f34a6f2ff5457a366a80936d4cf1d54f80eb0 /src/usr/devtree | |
| parent | 42e2de679d889a35d67ff0be4f5433ef3b495ff7 (diff) | |
| download | talos-hostboot-3faeb6dd6cbc8929ac94d92525d1d4f5dcfe9156.tar.gz talos-hostboot-3faeb6dd6cbc8929ac94d92525d1d4f5dcfe9156.zip | |
Set CMFSI fields correctly in the devtree for altmaster
Change-Id: I4a36c70d36ec0603d053d5198a2aa78c07c63334
RTC: 35041
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10626
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/devtree')
| -rw-r--r-- | src/usr/devtree/bld_devtree.C | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C index d0d73e07d..ff1fa59c2 100644 --- a/src/usr/devtree/bld_devtree.C +++ b/src/usr/devtree/bld_devtree.C @@ -52,6 +52,7 @@ $ */ #include <util/align.H> #include <vector> #include <vfs/vfs.H> +#include <fsi/fsiif.H> trace_desc_t *g_trac_devtree = NULL; TRAC_INIT(&g_trac_devtree, "DEVTREE", 4096); @@ -844,7 +845,7 @@ errlHndl_t bld_fdt_mem(devTree * i_dt, bool i_smallTree) for ( size_t memb = 0; (!errhdl) && (memb < l_memBufList.size()); memb++ ) { - const TARGETING::Target * l_pMemB = l_memBufList[memb]; + TARGETING::Target * l_pMemB = l_memBufList[memb]; //Get MMIO Offset from parent MCS attribute. PredicateCTM l_mcs(CLASS_UNIT,TYPE_MCS, MODEL_NA); @@ -898,9 +899,10 @@ errlHndl_t bld_fdt_mem(devTree * i_dt, bool i_smallTree) i_dt->addPropertyCell32(membNode, "ibm,chip-id",l_cenId); //Add the CMFSI (which CMFSI 0 or 1) and port - //TODO RTC93298 make which CMFSI correct + FSI::FsiLinkInfo_t linkinfo; + FSI::getFsiLinkInfo( l_pMemB, linkinfo ); uint32_t cmfsiCells[2] = - {0,l_pMemB->getAttr<ATTR_FSI_MASTER_PORT>()}; + {linkinfo.mPort,linkinfo.link}; i_dt->addPropertyCells32(membNode, "ibm,fsi-master-port", cmfsiCells, 2); } |
