Attribute updates for HostServices

Change-Id: Ia8640d52bf822ed0696776d1aad0fc728433cd8c
RTC: 50411
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5466
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 215 insertions, 51 deletions

diff --git a/src/usr/runtime/common/hsvc_exdata.C b/src/usr/runtime/common/hsvc_exdata.C
index 9b79941cf..447f6246b 100644
--- a/src/usr/runtime/common/hsvc_exdata.C
+++ b/src/usr/runtime/common/hsvc_exdata.C
@@ -20,16 +20,37 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// Generated on Wed Feb 20 15:44:15 CST 2013 by dcrowell from 
-//  src/usr/runtime/common/create_hsvc_data.pl src/usr/runtime/common/extra_runtime_attributes.xml src/usr/hwpf/hwp/chip_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml -w -d
-// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
-HSVC_LOAD_ATTR( ATTR_CHIP_UNIT_POS );
+// Generated on Wed Jul 17 21:21:59 CDT 2013 by cswenson from
+//  ./create_hsvc_data.pl -w ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/unit_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml
+// -- Input: ../../xml/attribute_info/common_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_FUNCTIONAL );
-// -- Input: src/usr/hwpf/hwp/chip_attributes.xml --
+// -- Input: ../../xml/attribute_info/chip_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/p8_xip_customize_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_L3_ENABLE );
+// -- Input: ../../xml/attribute_info/proc_pll_ring_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/L2_L3_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml --
 // No attributes found
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml --
+// -- Input: ../../xml/attribute_info/freq_attributes.xml --
 // No attributes found
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml --
+// -- Input: ../../xml/attribute_info/unit_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_CHIP_UNIT_POS );
+// -- Input: ../../xml/attribute_info/pm_hwp_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_PM_SPWUP_FSP );
 HSVC_LOAD_ATTR( ATTR_PM_SPWUP_OCC );
 HSVC_LOAD_ATTR( ATTR_PM_SPWUP_PHYP );
+// -- Input: ../../xml/attribute_info/scratch_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/pm_plat_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/system_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml --
+// No attributes found
diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C
index df0f4a90e..73cd6755b 100644
--- a/src/usr/runtime/common/hsvc_procdata.C
+++ b/src/usr/runtime/common/hsvc_procdata.C
@@ -20,29 +20,77 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// Generated on Wed Feb 20 15:44:15 CST 2013 by dcrowell from 
-//  src/usr/runtime/common/create_hsvc_data.pl src/usr/runtime/common/extra_runtime_attributes.xml src/usr/hwpf/hwp/chip_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml -w -d
-// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
+// Generated on Wed Jul 17 21:21:59 CDT 2013 by cswenson from
+//  ./create_hsvc_data.pl -w ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/unit_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml
+// -- Input: ../../xml/attribute_info/common_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_FUNCTIONAL );
-// -- Input: src/usr/hwpf/hwp/chip_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_POS );
+// -- Input: ../../xml/attribute_info/chip_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_CHIP_HAS_SBE );
 HSVC_LOAD_ATTR( ATTR_CHIP_ID );
 HSVC_LOAD_ATTR( ATTR_CHIP_REGIONS_TO_ENABLE );
 HSVC_LOAD_ATTR_P( ATTR_EC );
+HSVC_LOAD_ATTR( ATTR_EX_L2_SINGLE_MEMBER_ENABLE );
 HSVC_LOAD_ATTR( ATTR_FABRIC_CHIP_ID );
 HSVC_LOAD_ATTR( ATTR_FABRIC_NODE_ID );
 HSVC_LOAD_ATTR( ATTR_FSI_GP_REG_SCOM_ACCESS );
 HSVC_LOAD_ATTR_P( ATTR_NAME );
 HSVC_LOAD_ATTR( ATTR_PROC_DCM_INSTALLED );
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml --
-HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR );
-HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID );
-HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml --
+// -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PNOR_I2C_ADDRESS_BYTES );
+HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_ADDRESS_BYTES );
+HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_DEVICE_ADDRESS );
+HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_PORT );
+// -- Input: ../../xml/attribute_info/p8_xip_customize_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_ADU_UNTRUSTED_BAR_BASE_ADDR );
+HSVC_LOAD_ATTR( ATTR_PROC_ADU_UNTRUSTED_BAR_SIZE );
+HSVC_LOAD_ATTR( ATTR_PROC_A_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PROC_NX_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PROC_PCIE_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PROC_PSI_UNTRUSTED_BAR0_BASE_ADDR );
+HSVC_LOAD_ATTR( ATTR_PROC_PSI_UNTRUSTED_BAR0_SIZE );
+HSVC_LOAD_ATTR( ATTR_PROC_PSI_UNTRUSTED_BAR1_BASE_ADDR );
+HSVC_LOAD_ATTR( ATTR_PROC_PSI_UNTRUSTED_BAR1_SIZE );
+HSVC_LOAD_ATTR( ATTR_PROC_SECURITY_SETUP_VECTOR );
+HSVC_LOAD_ATTR( ATTR_PROC_X_ENABLE );
+// -- Input: ../../xml/attribute_info/proc_pll_ring_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_CHIPLET_ID );
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_DATA );
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_FLUSH );
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_FOR_DCCAL_DATA );
+//HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_FOR_DCCAL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_AB_BNDY_PLL_SCAN_SELECT );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_CHIPLET_ID );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_DATA );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_FLUSH );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_FOR_DCCAL_DATA );
+//HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_FOR_DCCAL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_PB_BNDY_DMIPLL_SCAN_SELECT );
+HSVC_LOAD_ATTR( ATTR_PROC_PCI_BNDY_PLL_CHIPLET_ID );
+HSVC_LOAD_ATTR( ATTR_PROC_PCI_BNDY_PLL_DATA );
+HSVC_LOAD_ATTR( ATTR_PROC_PCI_BNDY_PLL_FLUSH );
+HSVC_LOAD_ATTR( ATTR_PROC_PCI_BNDY_PLL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_PCI_BNDY_PLL_SCAN_SELECT );
+HSVC_LOAD_ATTR( ATTR_PROC_PERV_BNDY_PLL_CHIPLET_ID );
+HSVC_LOAD_ATTR( ATTR_PROC_PERV_BNDY_PLL_DATA );
+HSVC_LOAD_ATTR( ATTR_PROC_PERV_BNDY_PLL_FLUSH );
+HSVC_LOAD_ATTR( ATTR_PROC_PERV_BNDY_PLL_LENGTH );
+HSVC_LOAD_ATTR( ATTR_PROC_PERV_BNDY_PLL_SCAN_SELECT );
+// -- Input: ../../xml/attribute_info/L2_L3_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_PCIE_NOT_F_LINK );
+// -- Input: ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_L3_BAR1_REG );
+HSVC_LOAD_ATTR( ATTR_PROC_L3_BAR2_REG );
+HSVC_LOAD_ATTR( ATTR_PROC_L3_BAR_GROUP_MASK_REG );
+// -- Input: ../../xml/attribute_info/freq_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/unit_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/pm_hwp_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_PM_AISS_TIMEOUT );
 HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_RANGE );
 HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_VALUE );
@@ -116,3 +164,18 @@ HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE );
 HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES );
 HSVC_LOAD_ATTR( ATTR_PM_WINKLE_TYPE );
 HSVC_LOAD_ATTR( ATTR_PROC_DPLL_DIVIDER );
+// -- Input: ../../xml/attribute_info/scratch_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/pm_plat_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
+// -- Input: ../../xml/attribute_info/system_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_EX_FUNC_L3_DELTA_DATA );
+HSVC_LOAD_ATTR( ATTR_PROC_EX_FUNC_L3_LENGTH );
diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C
index e0bb0a553..8cd62ff8a 100644
--- a/src/usr/runtime/common/hsvc_sysdata.C
+++ b/src/usr/runtime/common/hsvc_sysdata.C
@@ -20,18 +20,64 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// Generated on Wed Feb 20 15:44:15 CST 2013 by dcrowell from 
-//  src/usr/runtime/common/create_hsvc_data.pl src/usr/runtime/common/extra_runtime_attributes.xml src/usr/hwpf/hwp/chip_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml -w -d
+// Generated on Wed Jul 17 21:21:59 CDT 2013 by cswenson from
+//  ./create_hsvc_data.pl -w ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/unit_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml
 
-// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
-HSVC_LOAD_ATTR( ATTR_EXECUTION_PLATFORM );
+// -- Input: ../../xml/attribute_info/common_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/chip_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/p8_xip_customize_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/proc_pll_ring_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/L2_L3_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_L2_FORCE_R_T2_EPS );
+HSVC_LOAD_ATTR( ATTR_L2_R_T0_EPS );
+HSVC_LOAD_ATTR( ATTR_L2_R_T1_EPS );
+HSVC_LOAD_ATTR( ATTR_L2_R_T2_EPS );
+HSVC_LOAD_ATTR( ATTR_L2_W_EPS );
+HSVC_LOAD_ATTR( ATTR_L3_FORCE_R_T2_EPS );
+HSVC_LOAD_ATTR( ATTR_L3_R_T0_EPS );
+HSVC_LOAD_ATTR( ATTR_L3_R_T1_EPS );
+HSVC_LOAD_ATTR( ATTR_L3_R_T2_EPS );
+HSVC_LOAD_ATTR( ATTR_L3_W_EPS );
+// -- Input: ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_FREQ_CORE );
+HSVC_LOAD_ATTR( ATTR_PROC_EPS_GB_DIRECTION );
+HSVC_LOAD_ATTR( ATTR_PROC_EPS_GB_PERCENTAGE );
+HSVC_LOAD_ATTR( ATTR_PROC_FABRIC_ASYNC_SAFE_MODE );
+// -- Input: ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/freq_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_FREQ_A );
+HSVC_LOAD_ATTR( ATTR_FREQ_CORE_FLOOR );
+HSVC_LOAD_ATTR( ATTR_FREQ_MEM_REFCLOCK );
 HSVC_LOAD_ATTR( ATTR_FREQ_PB );
+HSVC_LOAD_ATTR( ATTR_FREQ_PCIE );
 HSVC_LOAD_ATTR( ATTR_FREQ_PROC_REFCLOCK );
-HSVC_LOAD_ATTR( ATTR_IS_SIMULATION );
-HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_1 );
-// -- Input: src/usr/hwpf/hwp/chip_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_FREQ_X );
+// -- Input: ../../xml/attribute_info/unit_attributes.xml --
 // No attributes found
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_plat_attributes.xml --
+// -- Input: ../../xml/attribute_info/pm_hwp_attributes.xml --
+// No attributes found
+// -- Input: ../../xml/attribute_info/scratch_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_2 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_ARRAY_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT32_ARRAY_2 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT64_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT64_2 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT64_ARRAY_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT64_ARRAY_2 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT8_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT8_2 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT8_ARRAY_1 );
+HSVC_LOAD_ATTR( ATTR_SCRATCH_UINT8_ARRAY_2 );
+// -- Input: ../../xml/attribute_info/pm_plat_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_FREQ_CORE_MAX );
 HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY );
 HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPSIZE );
@@ -46,5 +92,23 @@ HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY );
 HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS );
 HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE );
 HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET );
-// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml --
-// No attributes found
+// -- Input: ../../xml/attribute_info/system_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_ALL_MCS_IN_INTERLEAVING_GROUP );
+HSVC_LOAD_ATTR( ATTR_BOOT_FREQ_MHZ );
+HSVC_LOAD_ATTR( ATTR_BOOT_VOLTAGE );
+HSVC_LOAD_ATTR( ATTR_DUMMY_PERSISTENCY );
+HSVC_LOAD_ATTR( ATTR_EXECUTION_PLATFORM );
+HSVC_LOAD_ATTR( ATTR_EX_GARD_BITS );
+HSVC_LOAD_ATTR( ATTR_IS_MPIPL_HB );
+HSVC_LOAD_ATTR( ATTR_IS_SIMULATION );
+HSVC_LOAD_ATTR( ATTR_MNFG_FLAGS );
+HSVC_LOAD_ATTR( ATTR_NEST_FREQ_MHZ );
+HSVC_LOAD_ATTR( ATTR_PIB_I2C_NEST_PLL );
+HSVC_LOAD_ATTR( ATTR_PIB_I2C_REFCLOCK );
+HSVC_LOAD_ATTR( ATTR_PROC_EPS_TABLE_TYPE );
+HSVC_LOAD_ATTR( ATTR_PROC_FABRIC_PUMP_MODE );
+HSVC_LOAD_ATTR( ATTR_PROC_X_BUS_WIDTH );
+HSVC_LOAD_ATTR( ATTR_RISK_LEVEL );
+HSVC_LOAD_ATTR( ATTR_SBE_IMAGE_OFFSET );
+// -- Input: ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_PBIEX_ASYNC_SEL );
diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C
index 21053101e..0af17b6d3 100644
--- a/src/usr/runtime/populate_attributes.C
+++ b/src/usr/runtime/populate_attributes.C
@@ -161,7 +161,7 @@ namespace RUNTIME
 struct system_data_t
 {
     enum {
-        MAX_ATTRIBUTES = 25
+        MAX_ATTRIBUTES = 100
     };
 
     // header data that HostServices uses
@@ -180,7 +180,7 @@ struct node_data_t
     enum {
         MAX_PROCS_RSV = P8_MAX_PROCS*2, //leave space for double
         MAX_EX_RSV = MAX_PROCS_RSV*P8_MAX_EX_PER_PROC,
-        NUM_PROC_ATTRIBUTES = 125,
+        NUM_PROC_ATTRIBUTES = 150,
         NUM_EX_ATTRIBUTES = 10,
         MAX_ATTRIBUTES = MAX_PROCS_RSV*NUM_PROC_ATTRIBUTES +
                          MAX_EX_RSV*NUM_EX_ATTRIBUTES
@@ -388,25 +388,39 @@ errlHndl_t populate_node_attributes( uint64_t i_nodeNum )
           reinterpret_cast<uint64_t>(node_data->procs)
           - reinterpret_cast<uint64_t>(node_data);
 
-        // Get the list of processors
-        TARGETING::TargetHandleList all_procs;
-        TARGETING::getAllChips( all_procs, TARGETING::TYPE_PROC, false );
-
-        // Loop around all of the proc chips
-        for( size_t p = 0; p < all_procs.size(); p++ )
+        // Get all proc targets
+        //  use PredicateHwas to filter only present procs
+        TARGETING::PredicateHwas isPresent;
+        isPresent.reset().poweredOn(true).present(true);
+        //  filter for Chips/Chiplets
+        TARGETING::PredicateCTM isChipProc(TARGETING::CLASS_CHIP,
+                                           TARGETING::TYPE_PROC);
+        //  declare a postfix expression widget
+        TARGETING::PredicatePostfixExpr goodFilter;
+        //  is-a-chip  is-present   AND
+        goodFilter.push(&isChipProc).push(&isPresent).And();
+        //  apply the filter through all targets.
+        TARGETING::TargetRangeFilter procIter(
+                        TARGETING::targetService().begin(),
+                        TARGETING::targetService().end(),
+                        &goodFilter );
+
+        // Iterate through the present proc list
+        // p is the index of the current procIter
+        for ( size_t p = 0; procIter; ++procIter,p++ )
         {
             // Cast to a FAPI type of target.
             fapi::Target fapi_proc( fapi::TARGET_TYPE_PROC_CHIP,
                          reinterpret_cast<void *>
-                         (const_cast<TARGETING::Target*>(all_procs[p])) );
+                         (const_cast<TARGETING::Target*>(*procIter)) );
 
             // Compute the processor id to match what HDAT uses
             uint64_t node_id =
-              all_procs[p]->getAttr<TARGETING::ATTR_FABRIC_NODE_ID>();
+              (*procIter)->getAttr<TARGETING::ATTR_FABRIC_NODE_ID>();
             uint64_t chip_id =
-              all_procs[p]->getAttr<TARGETING::ATTR_FABRIC_CHIP_ID>();
+              (*procIter)->getAttr<TARGETING::ATTR_FABRIC_CHIP_ID>();
             uint32_t procid = (node_id << 3) | (chip_id); //NNNCCC
-            TRACDCOMP( g_trac_runtime, "PROC:%d (%.8X)", procid, TARGETING::get_huid(all_procs[p]) );
+            TRACDCOMP( g_trac_runtime, "PROC:%d (%.8X)", procid, TARGETING::get_huid(*procIter) );
 
             // Fill in the metadata
             node_data->procs[p].procid = procid;
@@ -422,10 +436,10 @@ errlHndl_t populate_node_attributes( uint64_t i_nodeNum )
             _target = &fapi_proc;
 
             // Fill up the attributes
-            ADD_HUID( (all_procs[p]) ); // for debug
-            ADD_PHYS_PATH( (all_procs[p]) );
+            ADD_HUID( (*procIter) ); // for debug
+            ADD_PHYS_PATH( (*procIter) );
             ADD_ECMD_STRING();
-            ADD_IBSCOM_BASE( (all_procs[p]) );
+            ADD_IBSCOM_BASE( (*procIter) );
 
             // Use a generated file for the list of attributes to load
             #include "common/hsvc_procdata.C"
@@ -433,14 +447,14 @@ errlHndl_t populate_node_attributes( uint64_t i_nodeNum )
             // Add an empty attribute header to signal the end
             EMPTY_ATTRIBUTE;
 
-            TRACFCOMP( g_trac_runtime, "populate_node_attributes> PROC:%d (%.8X) : numAttr=%d", procid, TARGETING::get_huid(all_procs[p]), node_data->procs[p].numAttr );
+            TRACFCOMP( g_trac_runtime, "populate_node_attributes> PROC:%d (%.8X) : numAttr=%d", procid, TARGETING::get_huid(*procIter), node_data->procs[p].numAttr );
 
             // Make sure we don't overrun our space
             assert( *_num_attr < node_data_t::NUM_PROC_ATTRIBUTES );
 
             // Loop around all of the EX chiplets for this proc
             TARGETING::TargetHandleList all_ex;
-            TARGETING::getChildChiplets( all_ex, all_procs[p],
+            TARGETING::getChildChiplets( all_ex, (*procIter),
                                          TARGETING::TYPE_EX, false );
             for( size_t e = 0; e < all_ex.size(); e++ )
             {
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 4e1619d34..51dc75e09 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -104,9 +104,6 @@
     <attribute><id>MSS_PREFETCH_ENABLE</id></attribute>
     <attribute><id>MSS_CLEANER_ENABLE</id></attribute>
     <attribute><id>MIRROR_BASE_ADDRESS</id></attribute>
-    <attribute><id>PROC_EPS_GB_PERCENTAGE</id></attribute>
-    <attribute><id>PROC_EPS_GB_DIRECTION</id></attribute>
-    <attribute><id>PROC_FABRIC_ASYNC_SAFE_MODE</id></attribute>
     <attribute><id>FREQ_PCIE</id></attribute>
     <attribute><id>L2_R_T0_EPS</id></attribute>
     <attribute><id>L2_R_T1_EPS</id></attribute>
@@ -159,6 +156,12 @@
     <attribute><id>A_EREPAIR_THRESHOLD_MNFG</id></attribute>
     <attribute><id>DMI_EREPAIR_THRESHOLD_MNFG</id></attribute>
     <!-- End erepair_thresholds.xml -->
+    <!-- proc_fab_smp_fabric_attributes.xml -->
+    <attribute><id>FREQ_CORE</id></attribute>
+    <attribute><id>PROC_EPS_GB_PERCENTAGE</id></attribute>
+    <attribute><id>PROC_EPS_GB_DIRECTION</id></attribute>
+    <attribute><id>PROC_FABRIC_ASYNC_SAFE_MODE</id></attribute>
+    <!-- End proc_fab_smp_fabric_attributes.xml -->
 
     <attribute><id>ENABLED_THREADS</id></attribute>
     <attribute><id>MSS_ZSERIES</id></attribute>
@@ -274,7 +277,6 @@
     <attribute><id>PROC_L3_BAR2_REG</id></attribute>
     <attribute><id>PROC_L3_BAR_GROUP_MASK_REG</id></attribute>
      <!--   proc_fab_smp_fabric_attributes.xml  -->
-     <attribute><id>FREQ_CORE</id></attribute>
      <attribute><id>PROC_PCIE_NOT_F_LINK</id></attribute>
      <attribute><id>MSS_INTERLEAVE_ENABLE</id></attribute>
      <attribute><id>MSS_MCS_GROUP_32</id></attribute>