summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types.xml26
-rw-r--r--src/usr/targeting/common/xmltohb/simics_MURANO.system.xml6
-rw-r--r--src/usr/targeting/common/xmltohb/simics_VENICE.system.xml6
-rw-r--r--src/usr/targeting/common/xmltohb/target_types.xml1
-rw-r--r--src/usr/targeting/common/xmltohb/vbu.system.xml6
-rw-r--r--src/usr/targeting/xmltohb/TULETA.mrw.xml8
-rwxr-xr-xsrc/usr/targeting/xmltohb/genHwsvMrwXml.pl14
-rw-r--r--src/usr/trace/daemon/daemon.C4
8 files changed, 64 insertions, 7 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 666bb0d83..ca33a1d8e 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -1630,6 +1630,28 @@
<default>1</default>
</field>
<field>
+ <name>reserved</name>
+ <description>Reserved for future use</description>
+ <type>uint8_t</type>
+ <bits>5</bits>
+ <default>0</default>
+ </field>
+ </complexType>
+ <persistency>non-volatile</persistency>
+ <readable/>
+</attribute>
+
+<attribute>
+ <id>HB_SETTINGS</id>
+ <description>
+ Attribute which describes how the SP has configured features in
+ Hostboot.
+ </description>
+ <complexType>
+ <description>Structure which defines a system's HB settings.
+ Applicable for System target only.
+ </description>
+ <field>
<name>traceContinuous</name>
<description>
Enable / Disable continuous trace.
@@ -1644,14 +1666,16 @@
<name>reserved</name>
<description>Reserved for future use</description>
<type>uint8_t</type>
- <bits>4</bits>
+ <bits>7</bits>
<default>0</default>
</field>
</complexType>
<persistency>non-volatile</persistency>
<readable/>
+ <writeable/>
</attribute>
+
<!-- Begin attributes (4) to test string support -->
<attribute>
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 59276d94d..c006aebc8 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -119,6 +119,12 @@
<field><id>fsiSlaveInit</id><value>0</value></field>
<field><id>mailboxEnabled</id><value>0</value></field>
<field><id>fsiMasterInit</id><value>0</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>HB_SETTINGS</id>
+ <default>
<field><id>traceContinuous</id><value>1</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index d0ea7bed4..4edf160a0 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -95,6 +95,12 @@
<field><id>fsiSlaveInit</id><value>0</value></field>
<field><id>mailboxEnabled</id><value>0</value></field>
<field><id>fsiMasterInit</id><value>0</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>HB_SETTINGS</id>
+ <default>
<field><id>traceContinuous</id><value>1</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index fe7f3a78d..59bbe49ff 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -98,6 +98,7 @@
<attribute><id>FREQ_A</id></attribute>
<attribute><id>FREQ_X</id></attribute>
<attribute><id>SP_FUNCTIONS</id></attribute>
+ <attribute><id>HB_SETTINGS</id></attribute>
<attribute><id>PAYLOAD_KIND</id></attribute>
<attribute><id>PAYLOAD_BASE</id></attribute>
<attribute><id>PAYLOAD_ENTRY</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu.system.xml b/src/usr/targeting/common/xmltohb/vbu.system.xml
index 58ba6c15c..05e2c83ac 100644
--- a/src/usr/targeting/common/xmltohb/vbu.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu.system.xml
@@ -112,6 +112,12 @@
<field><id>fsiSlaveInit</id><value>1</value></field>
<field><id>mailboxEnabled</id><value>0</value></field>
<field><id>fsiMasterInit</id><value>0</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>HB_SETTINGS</id>
+ <default>
<field><id>traceContinuous</id><value>1</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
diff --git a/src/usr/targeting/xmltohb/TULETA.mrw.xml b/src/usr/targeting/xmltohb/TULETA.mrw.xml
index 199888096..98da3540b 100644
--- a/src/usr/targeting/xmltohb/TULETA.mrw.xml
+++ b/src/usr/targeting/xmltohb/TULETA.mrw.xml
@@ -161,7 +161,13 @@
<field><id>fsiSlaveInit</id><value>1</value></field>
<field><id>mailboxEnabled</id><value>1</value></field>
<field><id>fsiMasterInit</id><value>1</value></field>
- <field><id>traceContinuous</id><value>0</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>HB_SETTINGS</id>
+ <default>
+ <field><id>traceContinuous</id><value>0</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
</attribute>
diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
index 1d489d33b..4c92b7437 100755
--- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
+++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
@@ -362,17 +362,17 @@ foreach my $i2c_device (@{$i2c_devices->{'i2c-device'}})
if( (exists($i2c_device->{'content-type'}))
&& ($i2c_device->{'content-type'} eq 'SBE_VPD'))
{
- my $dev_path =
+ my $dev_path =
$i2c_device->{'system-paths'}->{'system-path'}->{'fsp-device-path'};
my $ipath = $i2c_device->{'i2c-master'}{'instance-path'};
# @TODO via RTC: 60269
- # Uncomment the line below and remove the next when once correct size
+ # Uncomment the line below and remove the next when once correct size
# is available in MRW
#my $size = $i2c_device->{'size'};
my $size = "2c0512";
my $addr = $i2c_device->{'address'};
-
+
# @TODO via RTC: 60436
# Read primary device directly from MRW
if($addr eq 'AE')
@@ -381,7 +381,7 @@ foreach my $i2c_device (@{$i2c_devices->{'i2c-device'}})
= 'L,'.$dev_path.','.$size.','.$addr;
}
else
- {
+ {
$sbe_i2c_paths{$ipath}->{'primary-path'}
= 'L,'.$dev_path.','.$size.','.$addr;
}
@@ -1311,6 +1311,12 @@ sub generate_sys
<field><id>fsiSlaveInit</id><value>1</value></field>
<field><id>mailboxEnabled</id><value>1</value></field>
<field><id>fsiMasterInit</id><value>1</value></field>
+ <field><id>reserved</id><value>0</value></field>
+ </default>
+ </attribute>
+ <attribute>
+ <id>HB_SETTINGS</id>
+ <default>
<field><id>traceContinuous</id><value>0</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
diff --git a/src/usr/trace/daemon/daemon.C b/src/usr/trace/daemon/daemon.C
index fd426933a..9f5a856fb 100644
--- a/src/usr/trace/daemon/daemon.C
+++ b/src/usr/trace/daemon/daemon.C
@@ -325,9 +325,11 @@ namespace TRACEDAEMON
TARGETING::SpFunctions spFunctions =
sys->getAttr<TARGETING::ATTR_SP_FUNCTIONS>();
+ TARGETING::HbSettings hbSettings =
+ sys->getAttr<TARGETING::ATTR_HB_SETTINGS>();
// Determine if continuous trace is currently enabled.
- bool contEnabled = spFunctions.traceContinuous;
+ bool contEnabled = hbSettings.traceContinuous;
if (g_debugSettings.contTraceOverride != 0)
{
contEnabled = (g_debugSettings.contTraceOverride == 2);
OpenPOWER on IntegriCloud