Skip all HDAT stuff in AVP mode

Change-Id: Ic2940a7f70c8d6f4a6e4afd6ddfeb607a71fe749
RTC: 65948
CQ: SW191055
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3507
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 39 insertions, 8 deletions

diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index 205dc105a..89c42f811 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -133,6 +133,28 @@ void*    call_host_runtime_setup( void    *io_pArgs )
             }
         }
 
+        // Map the Host Data into the VMM if applicable
+        //   Note: call will set ATTR_PAYLOAD_KIND appropriately
+        l_err = RUNTIME::load_host_data();
+        if( l_err )
+        {
+            break;
+        }
+
+        // Skip the rest in AVP mode
+        TARGETING::Target * sys = NULL;
+        TARGETING::targetService().getTopLevelTarget( sys );
+        assert(sys != NULL);
+
+        TARGETING::ATTR_PAYLOAD_KIND_type payload_kind
+          = sys->getAttr<TARGETING::ATTR_PAYLOAD_KIND>();
+        if( TARGETING::PAYLOAD_KIND_AVP == payload_kind )
+        {
+            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                       "Skipping host_runtime_setup in AVP mode" );
+            break;
+        }
+
         // Write the HostServices attributes into mainstore
         l_err = RUNTIME::populate_attributes();
         if ( l_err )
diff --git a/src/usr/runtime/hdatservice.C b/src/usr/runtime/hdatservice.C
index 733063281..a6eceed51 100644
--- a/src/usr/runtime/hdatservice.C
+++ b/src/usr/runtime/hdatservice.C
@@ -318,7 +318,7 @@ errlHndl_t RUNTIME::load_host_data( void )
 
         // if any AVP flags are set, override the payload kind
         if( (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_AVP_ENABLE)
-            || (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_AVP_ENABLE) )
+            || (mnfg_flags & TARGETING::MNFG_FLAG_BIT_MNFG_HDAT_AVP_ENABLE) )
         {
             if( payload_kind != TARGETING::PAYLOAD_KIND_AVP )
             {
diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C
index 30514ca6b..650f0d927 100644
--- a/src/usr/runtime/populate_attributes.C
+++ b/src/usr/runtime/populate_attributes.C
@@ -520,13 +520,7 @@ errlHndl_t populate_attributes( void )
     do {
         TRACFCOMP( g_trac_runtime, "Running populate_attributes" );
 
-        // Map the Host Data into the VMM
-        errhdl = RUNTIME::load_host_data();
-        if( errhdl )
-        {
-            break;
-        }
-
+        // Write the System-level Attributes
         errhdl = populate_system_attributes();
         if( errhdl )
         {
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 0a11d5066..9dc1e6194 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2517,62 +2517,77 @@
         note that the MNFG_FLAG_BIT values are of type uint32_t
     </description>
     <enumerator>
+        <!-- Use default mfg error thresholds and reporting values -->
         <name>MNFG_THRESHOLDS</name>
         <value>0x00000001</value>
     </enumerator>
     <enumerator>
+        <!-- Enable AVP execution -->
         <name>MNFG_AVP_ENABLE</name>
         <value>0x00000002</value>
     </enumerator>
     <enumerator>
+        <!-- Enable HDAT AVPs** -->
         <name>MNFG_HDAT_AVP_ENABLE</name>
         <value>0x00000004</value>
     </enumerator>
     <enumerator>
+        <!-- All SRCs are terminating (CEC hardware/procedural) -->
         <name>MNFG_SRC_TERM</name>
         <value>0x00000008</value>
     </enumerator>
     <enumerator>
+        <!-- Enable IPL memory diagnostics to report memory CE -->
         <name>MNFG_IPL_MEMORY_CE_CHECKINGE</name>
         <value>0x00000010</value>
     </enumerator>
     <enumerator>
+        <!-- Enable Fast Background Scrub -->
         <name>MNFG_FAST_BACKGROUND_SCRUB</name>
         <value>0x00000020</value>
     </enumerator>
     <enumerator>
+        <!-- Test DRAM Repairs -->
         <name>MNFG_TEST_DRAM_REPAIRS</name>
         <value>0x00000040</value>
     </enumerator>
     <enumerator>
+        <!-- Disable Dram Repairs -->
         <name>MNFG_DISABLE_DRAM_REPAIRS</name>
         <value>0x00000080</value>
     </enumerator>
     <enumerator>
+        <!-- Enable exhaustive pattern test -->
         <name>MNFG_ENABLE_EXHAUSTIVE_PATTERN_TEST</name>
         <value>0x00000100</value>
     </enumerator>
     <enumerator>
+        <!-- Enable standard pattern test -->
         <name>MNFG_ENABLE_STANDARD_PATTERN_TEST</name>
         <value>0x00000200</value>
     </enumerator>
     <enumerator>
+        <!-- Enable minimum pattern test -->
         <name>MNFG_ENABLE_MINIMUM_PATTERN_TEST</name>
         <value>0x00000400</value>
     </enumerator>
     <enumerator>
+        <!-- Disable Fabric eRepair -->
         <name>MNFG_DISABLE_FABRIC_eREPAIR</name>
         <value>0x00000800</value>
     </enumerator>
     <enumerator>
+        <!-- Disable Memory eRepair -->
         <name>MNFG_DISABLE_MEMORY_eREPAIR</name>
         <value>0x00001000</value>
     </enumerator>
     <enumerator>
+        <!-- Fabric deploy lane spares -->
         <name>MNFG_FABRIC_DEPLOY_LANE_SPARES</name>
         <value>0x00002000</value>
     </enumerator>
     <enumerator>
+        <!-- DMI deploy lane spares -->
         <name>MNFG_DMI_DEPLOY_LANE_SPARES</name>
         <value>0x00004000</value>
     </enumerator>