diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2017-06-19 08:07:16 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-11 15:52:08 -0400 |
| commit | 61f38bd338cfc056cb9e6d4f407b9279c437c4ab (patch) | |
| tree | 103586a446f86f5ba2be04989404260d50d8f2c9 /src/usr/testcore | |
| parent | 06b6c5e9291f0f25979e9ee1dbda1c780c9a98f0 (diff) | |
| download | talos-hostboot-61f38bd338cfc056cb9e6d4f407b9279c437c4ab.tar.gz talos-hostboot-61f38bd338cfc056cb9e6d4f407b9279c437c4ab.zip | |
Enable HDAT HB reserved memory when supported by FSP
Change-Id: Id0b156282e0197c6a8ed32d2e60066cb5c149edd
RTC: 169478
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42077
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/testcore')
| -rw-r--r-- | src/usr/testcore/rtloader/loader.H | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/usr/testcore/rtloader/loader.H b/src/usr/testcore/rtloader/loader.H index 4613d1c66..11bbc6f3d 100644 --- a/src/usr/testcore/rtloader/loader.H +++ b/src/usr/testcore/rtloader/loader.H @@ -44,7 +44,7 @@ #include <ipmi/ipmiif.H> #include <targeting/common/attributeTank.H> #include <config.h> -#include <util/runtime/util_rt.H> +#include <util/utilrsvdmem.H> #include <sys/misc.h> @@ -405,12 +405,12 @@ class RuntimeLoaderTest : public CxxTest::TestSuite VMM_HB_DATA_TOC_START_OFFSET; TRACFCOMP(g_trac_hbrt, "rt_get_hb_data: " - "mapping physical address:0x%.1611X", l_physical_addr); + "mapping physical address:0x%.16llX", l_physical_addr); // Map to the virtual address to access data l_vAddr = reinterpret_cast<uint64_t>(mm_block_map( reinterpret_cast<void*>(l_physical_addr), - sizeof(hbrtTableOfContents_t))); + sizeof(Util::hbrtTableOfContents_t))); TRACFCOMP(g_trac_hbrt, "rt_get_hb_data: mapped " "physical address 0x%.16llX -> virtual address 0x%.16llX", @@ -420,8 +420,8 @@ class RuntimeLoaderTest : public CxxTest::TestSuite assert(l_vAddr != 0,"rt_get_hb_data. Could not map HB DATA memory"); // find the total size - hbrtTableOfContents_t * toc_ptr = - reinterpret_cast<hbrtTableOfContents_t *>(l_vAddr); + Util::hbrtTableOfContents_t * toc_ptr = + reinterpret_cast<Util::hbrtTableOfContents_t *>(l_vAddr); l_totalSize = toc_ptr->total_size; TRACFCOMP(g_trac_hbrt, "rt_get_hb_data: " "total_size for HB Data = %lld", l_totalSize); @@ -642,7 +642,8 @@ class RuntimeLoaderTest : public CxxTest::TestSuite assert (cv_comm_phys_addr != 0, "rt_get_comm: Top of memory was 0!"); - cv_comm_phys_addr -= (VMM_RT_VPD_OFFSET + 64*KILOBYTE); + // Just picking 64K inside VMM_ATTR_DATA as it is available for HDAT + cv_comm_phys_addr -= (VMM_ALL_HOMER_OCC_MEMORY_SIZE + 64*KILOBYTE); uint8_t *comm_ptr = reinterpret_cast<uint8_t *>(cv_comm_phys_addr); |
