summaryrefslogtreecommitdiffstats
path: root/src/usr/runtime/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/runtime/common')
-rwxr-xr-xsrc/usr/runtime/common/create_hsvc_data.pl350
-rw-r--r--src/usr/runtime/common/extra_runtime_attributes.xml55
-rw-r--r--src/usr/runtime/common/hsvc_exdata.C15
-rw-r--r--src/usr/runtime/common/hsvc_procdata.C173
-rw-r--r--src/usr/runtime/common/hsvc_sysdata.C29
5 files changed, 525 insertions, 97 deletions
diff --git a/src/usr/runtime/common/create_hsvc_data.pl b/src/usr/runtime/common/create_hsvc_data.pl
new file mode 100755
index 000000000..ce29a52f0
--- /dev/null
+++ b/src/usr/runtime/common/create_hsvc_data.pl
@@ -0,0 +1,350 @@
+#!/usr/bin/perl
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/runtime/common/create_hsvc_data.pl $
+#
+# IBM CONFIDENTIAL
+#
+# COPYRIGHT International Business Machines Corp. 2012
+#
+# p1
+#
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# Origin: 30
+#
+# IBM_PROLOG_END_TAG
+
+# This script will parse a set of attribute xml files and HWP
+# source files in order to discover the list of required
+# attributes to push up to the Host Services code from Hostboot.
+# The ouput is a set of 3 data files that are used by the code
+# that populates mainstore.
+#
+# Note that this implementation is currently incomplete, it will
+# be finished as part of RTC:50411
+
+use strict;
+
+my $debug = 0;
+my $warning = 0;
+my @input_files;
+
+for (my $i=0; $i < $#ARGV + 1; $i++)
+{
+ if ($ARGV[$i] =~ /-h/)
+ {
+ print_usage();
+ exit;
+ }
+ elsif ($ARGV[$i] =~ /-d/)
+ {
+ $debug = 1;
+ print "Debug Mode\n";
+ }
+ elsif ($ARGV[$i] =~ /-w/)
+ {
+ $warning = 1;
+ print "Warnings enabled\n";
+ }
+ else
+ {
+ # must be the input filename
+ push @input_files, $ARGV[$i];
+ }
+}
+
+my $date = chopit(`date`);
+my $user = chopit(`whoami`);
+
+## Open up all of the output files
+if( -e "hsvc_sysdata.C" ) {
+ die("hsvc_sysdata.C file already exists\n");
+}
+open SYS_FILE, ">hsvc_sysdata.C", or die("Could not create hsvc_sysdata.C\n");
+print SYS_FILE "// Generated on $date by $user from \n";
+
+if( -e "hsvc_procdata.C" ) {
+ die("hsvc_procdata.C file already exists\n");
+}
+open PROC_FILE, ">hsvc_procdata.C", or die("Could not create hsvc_procdata.C\n");
+print PROC_FILE "// Generated on $date by $user from \n";
+
+if( -e "hsvc_exdata.C" ) {
+ die("hsvc_exdata.C file already exists\n");
+}
+open EX_FILE, ">hsvc_exdata.C", or die("Could not create hsvc_exdata.C\n");
+print EX_FILE "// Generated on $date by $user from \n";
+
+# Keep a list for each type of attribute ever to find dupes
+my @sys_all;
+my @proc_all;;
+my @ex_all;
+
+## Loop through all of the XML input files
+foreach my $ifile (@input_files)
+{
+ # Skip any non-XML files in this loop
+ if( !($ifile =~ /xml/) )
+ {
+ next;
+ }
+
+ # Open the file
+ print "Processing: $ifile\n";
+ open IN_FILE, $ifile or die("Cannot open $ifile\n");
+
+ # Keep a list for each type of attribute in this file
+ my @sys;
+ my @proc;
+ my @ex;
+
+ # Loop through the files and print out each line based on timestamp
+ my $linenum = 0;
+ my $id = "";
+ my $target = "";
+ while(my $curline = <IN_FILE>)
+ {
+ $linenum++;
+ if( $curline =~ /<attribute>/ )
+ {
+
+ }
+ elsif( $curline =~ /<id>/ )
+ {
+ # <id>ATTR_PM_POWER_PROXY_TRACE_TIMER</id>
+ my @divide = split( /[<>]/, $curline );
+ #print "xx:$divide[0],$divide[1],$divide[2],$divide[3]:xx\n";
+ $id = $divide[2];
+ if($debug){print "id=$id.\n";}
+ }
+ elsif( $curline =~ /<targetType>/ )
+ {
+ # <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ my @divide = split( /[<>]/, $curline );
+ #print "xx:$divide[0],$divide[1],$divide[2],$divide[3]:xx\n";
+ $target = $divide[2];
+ if($debug){print "target=$target.\n";}
+ }
+ elsif( $curline =~ /<\/attribute>/ )
+ {
+ # MVPD attributes are read live by HostServices code
+ if( $id =~ /MVPD/ )
+ {
+ if($debug){print "Skipping MVPD: %id\n";}
+ }
+ elsif( $target =~ /TARGET_TYPE_PROC_CHIP/ )
+ {
+ if($debug){print "PROC_CHIP: $id.\n";}
+ if( check_for_dupe($id,\@proc_all) )
+ {
+ if( $warning ) {
+ print "Duplicate attribute found for PROC '$id' in $ifile\n";
+ }
+ }
+ else
+ {
+ push @proc, $id;
+ push @proc_all, $id;
+ }
+ }
+ elsif( $target =~ /TARGET_TYPE_SYSTEM/ )
+ {
+ if($debug){print "SYSTEM: $id.\n";}
+ push @sys, $id;
+ push @sys_all, $id;
+ }
+ elsif( $target =~ /TARGET_TYPE_EX_CHIPLET/ )
+ {
+ if($debug){print "EX_CHIPLET: $id.\n";}
+ push @ex, $id;
+ push @ex_all, $id;
+ }
+ else
+ {
+ die("UNKNOWN targetType : $target\n");
+ }
+ }
+
+ }
+
+ close IN_FILE;
+
+ # Now print out the 3 files
+
+ # sysdata
+ print SYS_FILE "// -- Input: $ifile --\n";
+ if( $#sys > 0 )
+ {
+ @sys = sort(@sys);
+ foreach my $attr (@sys)
+ {
+ # HSVC_LOAD_ATTR( ATTR_FREQ_PB );
+ print SYS_FILE "HSVC_LOAD_ATTR( $attr );\n";
+ }
+ }
+ else
+ {
+ print SYS_FILE "// No attributes found\n";
+ }
+
+ # procdata
+ print PROC_FILE "// -- Input: $ifile --\n";
+ if( $#proc > 0 )
+ {
+ @sys = sort(@proc);
+ foreach my $attr (@proc)
+ {
+ # HSVC_LOAD_ATTR( ATTR_FREQ_PB );
+ print PROC_FILE "HSVC_LOAD_ATTR( $attr );\n";
+ }
+ }
+ else
+ {
+ print PROC_FILE "// No attributes found\n";
+ }
+
+ # exdata
+ print EX_FILE "// -- Input: $ifile --\n";
+ if( $#ex > 0 )
+ {
+ @sys = sort(@ex);
+ foreach my $attr (@ex)
+ {
+ # HSVC_LOAD_ATTR( ATTR_FREQ_PB );
+ print EX_FILE "HSVC_LOAD_ATTR( $attr );\n";
+ }
+ }
+ else
+ {
+ print EX_FILE "// No attributes found\n";
+ }
+
+}
+
+
+## Loop through all of the HWP input files
+foreach my $ifile (@input_files)
+{
+ # Skip any XML files in this loop
+ if( $ifile =~ /xml/ )
+ {
+ next;
+ }
+
+ # Open the file
+ print "Processing: $ifile\n";
+ open IN_FILE, $ifile or die("Cannot open $ifile\n");
+
+ # Keep a list for each type of attribute in this file
+ my @missing;
+
+ # Loop through the files and print out each line based on timestamp
+ my $linenum = 0;
+ while(my $curline = <IN_FILE>)
+ {
+ $linenum++;
+
+ if( substr($curline,0,2) eq "//" )
+ {
+ next;
+ }
+ #@todo - Ignore calls inside block comments RTC:48350
+
+ my $startnum = index( $curline, "FAPI_ATTR_" );
+ if( $startnum == -1 )
+ {
+ next;
+ }
+
+ my $attrstart = index( $curline, "ATTR_", $startnum+10 );
+ if( $attrstart == -1 )
+ {
+ if($debug) {
+ print "Something is odd with the procedure call\n";
+ print " ".$linenum.":".$curline;
+ }
+ next;
+ }
+ my $attrstop = index( $curline, ",", $attrstart );
+ my $id = chopit( substr( $curline, $attrstart, $attrstop-$attrstart ) );
+ #print "id=$id.\n";
+
+ # MVPD attributes are read live by HostServices code
+ if( $id =~ /MVPD/ )
+ {
+ if($debug){print "Skipping MVPD: %id\n";}
+ }
+ else
+ {
+ if( check_for_dupe($id,\@proc_all)
+ || check_for_dupe($id,\@ex_all)
+ || check_for_dupe($id,\@sys_all) )
+ {
+ push @missing, $id;
+ }
+ else
+ {
+ if( !check_for_dupe($id,\@missing) )
+ {
+ print "Missing attribute: $id.\n";
+ }
+ if($debug){print " ".$linenum.":".$curline;}
+ }
+ }
+
+ }
+
+ close IN_FILE;
+}
+
+
+close SYS_FILE;
+close PROC_FILE;
+close EX_FILE;
+
+exit;
+
+##################################################
+
+# remove all leading and trailing whitespace
+sub chopit
+{
+ my $temp = shift(@_);
+ $temp =~ s/^\s+//;
+ $temp =~ s/\s+$//;
+ return $temp;
+}
+
+# look for duplicate attributes
+sub check_for_dupe
+{
+ my $attr = shift(@_);
+ my @list = @{shift(@_)};
+
+ foreach my $entry (@list)
+ {
+ if( $entry eq $attr )
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+# print usage help
+sub print_usage
+{
+ print "Generate the hscv_xxxdata.C files for Hostboot\n";
+ print "Usage: create_hsvc_data.pl [-d] [-w] [filename1] [filename2] ...\n";
+ print " -d : Enable debug tracing\n";
+ print " -w : Enable tracing of warning messages, e.g. duplicate attributes\n";
+ print " filenameX : 1 or more input attribute xml files\n";
+}
diff --git a/src/usr/runtime/common/extra_runtime_attributes.xml b/src/usr/runtime/common/extra_runtime_attributes.xml
new file mode 100644
index 000000000..0c3356302
--- /dev/null
+++ b/src/usr/runtime/common/extra_runtime_attributes.xml
@@ -0,0 +1,55 @@
+<!-- IBM_PROLOG_BEGIN_TAG -->
+<!-- This is an automatically generated prolog. -->
+<!-- -->
+<!-- $Source: src/usr/runtime/common/extra_runtime_attributes.xml $ -->
+<!-- -->
+<!-- IBM CONFIDENTIAL -->
+<!-- -->
+<!-- COPYRIGHT International Business Machines Corp. 2012 -->
+<!-- -->
+<!-- p1 -->
+<!-- -->
+<!-- Object Code Only (OCO) source materials -->
+<!-- Licensed Internal Code Source Materials -->
+<!-- IBM HostBoot Licensed Internal Code -->
+<!-- -->
+<!-- The source code for this program is not published or otherwise -->
+<!-- divested of its trade secrets, irrespective of what has been -->
+<!-- deposited with the U.S. Copyright Office. -->
+<!-- -->
+<!-- Origin: 30 -->
+<!-- -->
+<!-- IBM_PROLOG_END_TAG -->
+<!--
+Contains FAPI attributes that we want to send up to HostServices
+that may not be specifically defined in the various HWP attribute
+xml files and procedures
+
+Parser only requires attribute, id and targetType tags.
+-->
+
+<attribute>
+ <id>ATTR_CHIP_ID</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+</attribute>
+
+<attribute>
+ <id>ATTR_FUNCTIONAL</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+</attribute>
+
+<attribute>
+ <id>ATTR_CHIP_UNIT_POS</id>
+ <targetType>TARGET_TYPE_EX_CHIPLET</targetType>
+</attribute>
+
+<attribute>
+ <id>ATTR_FUNCTIONAL</id>
+ <targetType>TARGET_TYPE_EX_CHIPLET</targetType>
+</attribute>
+
+<attribute>
+ <id>ATTR_FREQ_PB</id>
+ <targetType>TARGET_TYPE_SYSTEM</targetType>
+</attribute>
+
diff --git a/src/usr/runtime/common/hsvc_exdata.C b/src/usr/runtime/common/hsvc_exdata.C
index ce9b042c1..f60531a75 100644
--- a/src/usr/runtime/common/hsvc_exdata.C
+++ b/src/usr/runtime/common/hsvc_exdata.C
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/runtime/hsvc_exdata.C $ */
+/* $Source: src/usr/runtime/common/hsvc_exdata.C $ */
/* */
/* IBM CONFIDENTIAL */
/* */
@@ -20,8 +20,13 @@
/* Origin: 30 */
/* */
/* IBM_PROLOG_END_TAG */
-//@todo - This file will be autogenerated by the HostServices build RTC:48350
-// This file was generated on MM/DD/YYYY by username from build xxxxx
-
-HSVC_LOAD_ATTR( ATTR_CHIP_UNIT_POS );
+// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from
+// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_CHIP_UNIT_POS );
HSVC_LOAD_ATTR( ATTR_FUNCTIONAL );
+// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_plat.xml --
+// No attributes found
+// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_hwp.xml --
+HSVC_LOAD_ATTR( ATTR_PM_SPWUP_FSP );
+HSVC_LOAD_ATTR( ATTR_PM_SPWUP_OCC );
+HSVC_LOAD_ATTR( ATTR_PM_SPWUP_PHYP );
diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C
index 21f24af68..a3547192e 100644
--- a/src/usr/runtime/common/hsvc_procdata.C
+++ b/src/usr/runtime/common/hsvc_procdata.C
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/runtime/hsvc_procdata.C $ */
+/* $Source: src/usr/runtime/common/hsvc_procdata.C $ */
/* */
/* IBM CONFIDENTIAL */
/* */
@@ -20,79 +20,102 @@
/* Origin: 30 */
/* */
/* IBM_PROLOG_END_TAG */
-//@todo - This file will be autogenerated by the HostServices build RTC:48350
-// This file was generated on MM/DD/YYYY by username from build xxxxx
-
-HSVC_LOAD_ATTR( ATTR_CHIP_ID );
-HSVC_LOAD_ATTR( ATTR_FUNCTIONAL );
-HSVC_LOAD_ATTR_P( ATTR_EC );
-HSVC_LOAD_ATTR( ATTR_PM_AISS_TIMEOUT );
-HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_RANGE );
-HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_IVRMS_ENABLED );
-HSVC_LOAD_ATTR( ATTR_PM_OCC_HEARTBEAT_TIME );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1 );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT );
-HSVC_LOAD_ATTR( ATTR_PM_PMC_HANGPULSE_DIVIDER );
+// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from
+// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
+HSVC_LOAD_ATTR( ATTR_CHIP_ID );
+HSVC_LOAD_ATTR( ATTR_FUNCTIONAL );
+// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_plat.xml --
+HSVC_LOAD_ATTR( ATTR_PROC_DCM_INSTALLED );
+HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPSIZE );
+HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY );
+HSVC_LOAD_ATTR( ATTR_PM_SAFE_VOLTAGE );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_SLEEP_ENTRY );
+HSVC_LOAD_ATTR( ATTR_PM_SLEEP_EXIT );
+HSVC_LOAD_ATTR( ATTR_PM_SLEEP_TYPE );
+HSVC_LOAD_ATTR( ATTR_PM_WINKLE_ENTRY );
+HSVC_LOAD_ATTR( ATTR_PM_WINKLE_EXIT );
+HSVC_LOAD_ATTR( ATTR_PM_WINKLE_TYPE );
+HSVC_LOAD_ATTR( ATTR_PM_SAFE_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_FULL_CLOCK_SECTOR_BUFFER_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_LOWER_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR );
+// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_hwp.xml --
HSVC_LOAD_ATTR( ATTR_PM_POWER_PROXY_TRACE_TIMER );
-HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_MATCH_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_MATCH_VALUE );
HSVC_LOAD_ATTR( ATTR_PM_PPT_TIMER_TICK );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_STEPSIZE );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM );
-HSVC_LOAD_ATTR( ATTR_PM_PVSAFE_PSTATE );
-HSVC_LOAD_ATTR( ATTR_PM_SAFE_PSTATE );
-HSVC_LOAD_ATTR( ATTR_PM_SLEEP_ENTRY );
-HSVC_LOAD_ATTR( ATTR_PM_SLEEP_EXIT );
-HSVC_LOAD_ATTR( ATTR_PM_SLEEP_TYPE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_DIVIDER );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_PHASE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_POLARITY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FRAME_SIZE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_COUNT );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_DELAY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY );
-//HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY_WRITE_SETTNG );
-//HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTERFRAME_DELAY_WRITE_STATUS_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_OUT_COUNT );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_DIVIDER );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_PHASE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_POLARITY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_CHECK_ENABLE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_GEN_ENABLE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FRAME_SIZE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME1 );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME2 );
-//HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_FRAME_DELAY );
-//HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_FRAME_DELAY_WRITE_STATUS );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY_VALUE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
-//"HSVC_LOAD_ATTR( ATTR_PM_WINKLE_ENTRY" );
-//"HSVC_LOAD_ATTR( ATTR_PM_WINKLE_EXIT" );
-HSVC_LOAD_ATTR( ATTR_PM_WINKLE_TYPE );
+HSVC_LOAD_ATTR( ATTR_PM_AISS_TIMEOUT );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE_STEPSIZE );
+HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_RANGE );
+HSVC_LOAD_ATTR( ATTR_PM_EXTERNAL_VRM_STEPDELAY_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PMC_HANGPULSE_DIVIDER );
+HSVC_LOAD_ATTR( ATTR_PM_PVSAFE_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FRAME_SIZE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME1 );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME2 );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_POLARITY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_PHASE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_DIVIDER );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTERFRAME_DELAY_WRITE_STATUS_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_GEN_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_CHECK_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAJORITY_VOTE_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES );
+HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES );
+HSVC_LOAD_ATTR( ATTR_PM_OCC_HEARTBEAT_TIME );
+HSVC_LOAD_ATTR( ATTR_PM_SLEEP_WINKLE_REQUEST_TIMEOUT );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY0_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_DELAY1_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_CORE_SEQUENCE_DELAY_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY0_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_DELAY1_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_CORE_SEQUENCE_DELAY_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY0_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_DELAY1_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERUP_ECO_SEQUENCE_DELAY_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1 );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY0_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_DELAY1_VALUE );
+HSVC_LOAD_ATTR( ATTR_PM_PFET_POWERDOWN_ECO_SEQUENCE_DELAY_SELECT );
+HSVC_LOAD_ATTR( ATTR_PM_PSTATE0_FREQUENCY );
+HSVC_LOAD_ATTR( ATTR_PM_IVRMS_ENABLED );
+HSVC_LOAD_ATTR( ATTR_PM_SAFE_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_FULL_CSB_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LFRLOW_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LFRUPPER_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRLOW_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HFRHIGH_PSTATE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FRAME_SIZE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_OUT_COUNT );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_DELAY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_IN_COUNT );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_POLARITY );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_PHASE );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_CLOCK_DIVIDER );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY_SETTING );
+HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_INTER_FRAME_DELAY );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_RCV_RESERV_TIMEOUT );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_COUNT_OVERCOMMIT_ENABLE );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RETRY_THRESHOLD );
+HSVC_LOAD_ATTR( ATTR_PM_PBAX_SND_RESERV_TIMEOUT );
diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C
index 590c5fb3c..ab9a341cf 100644
--- a/src/usr/runtime/common/hsvc_sysdata.C
+++ b/src/usr/runtime/common/hsvc_sysdata.C
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/runtime/hsvc_sysdata.C $ */
+/* $Source: src/usr/runtime/common/hsvc_sysdata.C $ */
/* */
/* IBM CONFIDENTIAL */
/* */
@@ -20,19 +20,14 @@
/* Origin: 30 */
/* */
/* IBM_PROLOG_END_TAG */
-//@todo - This file will be autogenerated by the HostServices build RTC:48350
-// This file was generated on MM/DD/YYYY by username from build xxxxx
-
-HSVC_LOAD_ATTR( ATTR_FREQ_PB );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_POLARITY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CLOCK_PHASE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
-//HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_FRAME_DELAY_WRITE_STATUS );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_INTER_RETRY_DELAY );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_GEN_ENABLE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_CHECK_ENABLE );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_MAX_RETRIES );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_CRC_POLYNOMIAL_ENABLES );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME1 );
-HSVC_LOAD_ATTR( ATTR_PM_SPIVID_IN_DELAY_FRAME2 );
+// Generated on Wed Oct 17 08:41:32 CDT 2012 by dcrowell from
+// -- Input: src/usr/runtime/common/extra_runtime_attributes.xml --
+// No attributes found
+// -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_attributes_all_plat.xml --
+HSVC_LOAD_ATTR( ATTR_FREQ_CORE_MAX );
+HSVC_LOAD_ATTR( ATTR_PROC_DPLL_DIVIDER );
+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_attributes_all_hwp.xml --
+// No attributes found
OpenPOWER on IntegriCloud