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>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/include/usr/targeting/attrrp.H b/src/include/usr/targeting/attrrp.H
index 897e6dec4..cb7e9e35e 100644
--- a/src/include/usr/targeting/attrrp.H
+++ b/src/include/usr/targeting/attrrp.H
@@ -342,7 +342,7 @@ class AttrRP
               iv_isMpipl(false)
 #else
             : iv_isTempInstance(false), iv_instanceStatus(SINGLE_NODE),
-              iv_sections(NULL), iv_sectionCount(0), iv_isMpipl(false)
+              iv_isMpipl(false)
 #endif
         {
         };
@@ -546,6 +546,12 @@ class AttrRP
 
         // Message Queue for VMM requests
         msg_q_t iv_msgQ;
+
+        // Parsed structures of the attribute sections.
+        AttrRP_Section* iv_sections;
+
+        // Count of attribute sections.
+        size_t iv_sectionCount;
 #else
         // Indicator that AttrRP instance is a temporary one, not the singleton
         bool iv_isTempInstance;
@@ -556,11 +562,6 @@ class AttrRP
         // Node instance status
         NodeInstanceStatus iv_instanceStatus;
 #endif
-        // Parsed structures of the attribute sections.
-        AttrRP_Section* iv_sections; // @TODO RTC:186585 move to #ifndef clause
-
-        // Count of attribute sections.
-        size_t iv_sectionCount; // @TODO RTC:186585 move to #ifndef clause
 
         bool iv_isMpipl;
 };