diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2018-03-15 08:52:50 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-04-10 16:14:46 -0400 |
| commit | 67de094e51e209b16622bee4788a97dd28b538c6 (patch) | |
| tree | a785b4673e61a8e85032f2eb86979f5917a76ca3 /src/usr/targeting | |
| parent | 7a4cb95b51a4090a1a4c3506bf206915bb73de21 (diff) | |
| download | talos-hostboot-67de094e51e209b16622bee4788a97dd28b538c6.tar.gz talos-hostboot-67de094e51e209b16622bee4788a97dd28b538c6.zip | |
Support multiple nodes in HBRT - Remove Single Node Items
There are some items that applied to a single node implementation that can
be removed after all dependencies on them have been removed by other tasks.
This single node support is being moved/removed. Also a check is being
added to the VPD support so the node value does not index beyond the end
of the array of reserved memory addresses.
Change-Id: I7fea5ac9cdfa9f37caa57905d320633a8039e79d
RTC: 186585
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55917
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rwxr-xr-x | src/usr/targeting/attrrp_common.C | 11 | ||||
| -rw-r--r-- | src/usr/targeting/runtime/attrrp_rt.C | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/usr/targeting/attrrp_common.C b/src/usr/targeting/attrrp_common.C index 173c249ec..a78017e29 100755 --- a/src/usr/targeting/attrrp_common.C +++ b/src/usr/targeting/attrrp_common.C @@ -58,13 +58,13 @@ namespace TARGETING AttrRP::~AttrRP() { - if (iv_sections) // @TODO RTC:186585 move if... to #ifndef clause +#ifndef __HOSTBOOT_RUNTIME + if (iv_sections) { delete[] iv_sections; iv_sections = nullptr; - } // @TODO RTC:186585 move if... to #ifndef clause + } -#ifndef __HOSTBOOT_RUNTIME msg_q_destroy(iv_msgQ); TARG_ASSERT(false, "Assert to exit ~AttrRP"); #else @@ -72,11 +72,6 @@ namespace TARGETING { if (iv_nodeContainer[i].pSections) { - if((i == NODE0) && (iv_sections == nullptr)) - { - iv_nodeContainer[i].pSections = nullptr; - continue; - } // @TODO RTC:186585 move if... delete[] iv_nodeContainer[i].pSections; iv_nodeContainer[i].pSections = nullptr; } diff --git a/src/usr/targeting/runtime/attrrp_rt.C b/src/usr/targeting/runtime/attrrp_rt.C index 8d260cf75..9f8cce8a6 100644 --- a/src/usr/targeting/runtime/attrrp_rt.C +++ b/src/usr/targeting/runtime/attrrp_rt.C @@ -277,11 +277,6 @@ namespace TARGETING io_nodeCont.sectionCount = i_header->numSections; io_nodeCont.pSections = new AttrRP_Section[io_nodeCont.sectionCount](); - if (i_nodeId == NODE0) // @TODO RTC:186585 remove - { // @TODO RTC:186585 remove - iv_sectionCount = io_nodeCont.sectionCount; // @TODO RTC:186585 - iv_sections = io_nodeCont.pSections; // @TODO RTC:186585 remove - } // @TODO RTC:186585 remove // Find start to the first section: // (header address + size of header + offset in header) |
