diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2015-02-20 13:26:37 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-21 15:47:15 -0600 |
| commit | 3b0689c1999f62b7288ddf62cf21b08ab1595304 (patch) | |
| tree | 2962a55ced17f4949dc9bcc5e924ceb4116dd10e /src/usr | |
| parent | 30a6542e4e00f777c3f57834bcd24483208ac552 (diff) | |
| download | blackbird-hostboot-3b0689c1999f62b7288ddf62cf21b08ab1595304.tar.gz blackbird-hostboot-3b0689c1999f62b7288ddf62cf21b08ab1595304.zip | |
Fix up virtual address of HOMER image in HBRT
Change-Id: Id7a1732b1afd4a0e930ca6377af0382bc9cd7158
RTC: 124391
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15871
Tested-by: Jenkins Server
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/hwpf/hwp/occ/runtime/rt_occ.C | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C index 87d30b71b..1bc02a83f 100644 --- a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C +++ b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C @@ -431,14 +431,22 @@ namespace RT_OCC // If we already loaded OCC during the IPL we need to fix up // the virtual address because we're now not using virtual // memory + // Note: We called our memory "ibm,slw-occ-image" but OPAL + // created their own range that subsumed ours + //@todo-RTC:124392-solve this naming issue... + uint64_t l_base_homer = + g_hostInterfaces->get_reserved_mem("ibm,homer-image"); + TargetHandleList procChips; getAllChips(procChips, TYPE_PROC, true); for (TargetHandleList::iterator itr = procChips.begin(); itr != procChips.end(); ++itr) { - uint64_t addr = (*itr)->getAttr<ATTR_HOMER_PHYS_ADDR>(); - (*itr)->setAttr<ATTR_HOMER_VIRT_ADDR>(addr); + uint64_t l_offset = (*itr)->getAttr<ATTR_POSITION>() + * VMM_HOMER_INSTANCE_SIZE; + (*itr)->setAttr<ATTR_HOMER_VIRT_ADDR> + (l_base_homer+l_offset); } } }; |
