diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2014-11-20 12:16:37 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-11-20 15:29:37 -0600 |
| commit | 0823ea543186a4e804959168c4b017d91e3091b7 (patch) | |
| tree | 9ec5afc8fcc4550bcc9a378d41d646d00f8176e4 /src | |
| parent | 3cd2ccfa60f133009f054affbfd639906a0a3d10 (diff) | |
| download | talos-hostboot-0823ea543186a4e804959168c4b017d91e3091b7.tar.gz talos-hostboot-0823ea543186a4e804959168c4b017d91e3091b7.zip | |
offset change in occ.C
Change-Id: I2363be62a862b391883dd1c6f25734ddce396c37
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14567
Tested-by: Jenkins Server
Reviewed-by: Christopher Cain <cjcain@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/hwpf/hwp/occ/occ.C | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C index 25d6e3656..0aea6a1aa 100644 --- a/src/usr/hwpf/hwp/occ/occ.C +++ b/src/usr/hwpf/hwp/occ/occ.C @@ -100,12 +100,13 @@ namespace HBOCC //Setup Addresses //============================== uint8_t tmpPos = i_target->getAttr<ATTR_POSITION>(); - uint64_t tmpOffset = (tmpPos * VMM_HOMER_INSTANCE_SIZE) + - HOMER_OFFSET_TO_OCC_IMG; + uint64_t tmpOffset = (tmpPos * VMM_HOMER_INSTANCE_SIZE); - uint64_t i_homerPhysAddr = i_homerPhysAddrBase + tmpOffset; + uint64_t i_homerPhysAddr = i_homerPhysAddrBase + tmpOffset + + HOMER_OFFSET_TO_OCC_IMG; uint64_t i_homerVirtAddr = reinterpret_cast<uint64_t> - (i_homerVirtAddrBase) + tmpOffset; + (i_homerVirtAddrBase) + tmpOffset + + HOMER_OFFSET_TO_OCC_IMG;; uint64_t i_commonPhysAddr = i_homerPhysAddrBase + VMM_HOMER_REGION_SIZE; @@ -126,7 +127,10 @@ namespace HBOCC //============================== //Setup host data area of HOMER; //============================== - void* occHostVirt = reinterpret_cast<void *>(i_homerVirtAddr); + uint64_t i_homerHostVirtAddr = reinterpret_cast<uint64_t> + (i_homerVirtAddrBase) + + tmpOffset + HOMER_OFFSET_TO_OCC_HOST_DATA; + void* occHostVirt = reinterpret_cast<void*>(i_homerHostVirtAddr); l_errl = HBOCC::loadHostDataToHomer(occHostVirt); if( l_errl != NULL ) { |
