Removing a few more attributes from the Serverwiz2 export list

Mostly fixing up a bunch of attributes that are marked as both non-volatile and writeable. That tends to be a sign of a mistake somewhere. Change-Id: Icbe092479e10990f79aeb2a8a9917a21d90ac760 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66826 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
open-power · Oct 26, 2018 · 2cf2696 · 2cf2696
1 parent d45d4fa
commit 2cf2696
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -171,6 +171,7 @@
       </uint8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -842,6 +843,7 @@
     </simpleType>
     <writeable/>
     <ignoreEkb/>
+    <no_export/>
     <hwpfToHbAttrMap>
       <id>ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8</id>
       <macro>DIRECT</macro>
@@ -858,6 +860,7 @@
       </uint8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -1378,10 +1381,11 @@
     <readable/>
     <simpleType>
       <uint8_t>
-        <default>0x10</default>
+        <default>0xFF</default>
       </uint8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -1596,6 +1600,7 @@
       </uint32_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -1703,6 +1708,7 @@
     <persistency>non-volatile</persistency>
     <readable/>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <!-- Required by FSP -->
@@ -1894,6 +1900,7 @@
     <persistency>non-volatile</persistency>
     <readable/>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -1953,6 +1960,7 @@
         <default>256</default>
       </uint32_t>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -2259,6 +2267,7 @@
       </uint32_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -2435,6 +2444,7 @@
       </uint64_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -2684,6 +2694,7 @@
     <readable/>
     <writeable/>
     <ignoreEkb/>
+    <no_export/>
     <hwpfToHbAttrMap>
       <id>ATTR_ISTEP_MODE</id>
       <macro>DIRECT</macro>
@@ -6435,6 +6446,7 @@
       </uint8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <enumerationType>
@@ -6588,6 +6600,7 @@
       </uint8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7177,6 +7190,7 @@
       </int8_t>
     </simpleType>
     <writeable/>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7216,6 +7230,7 @@
         <default>0x4</default>
       </uint32_t>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7228,6 +7243,7 @@
         <default>0x800000</default>
       </uint32_t>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7238,6 +7254,7 @@
     <simpleType>
       <uint32_t/>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7248,6 +7265,7 @@
     <simpleType>
       <uint32_t/>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7258,6 +7276,7 @@
     <simpleType>
       <uint32_t/>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7268,6 +7287,7 @@
     <simpleType>
       <uint32_t/>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -7278,6 +7298,7 @@
     <simpleType>
       <uint32_t/>
     </simpleType>
+    <no_export/>
   </attribute>
 
   <attribute>
@@ -8010,23 +8031,6 @@
     </simpleType>
   </attribute>
 
-  <attribute>
-    <description>
-      Used to tell INTRP code whether to use the XIVE HW Reset
-      or a software based reset.
-      0 = Software based reset
-      1 = XIVE HW reset
-    </description>
-    <id>XIVE_HW_RESET</id>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <simpleType>
-      <uint8_t>
-        <default>0</default>
-      </uint8_t>
-    </simpleType>
-  </attribute>
-
   <attribute>
     <description>XIVE - Thread Management Bar address register 1
          MMIO consumed by HB/PHYP

diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -533,9 +533,6 @@
     <attribute>
       <id>VPD_REC_NUM</id>
     </attribute>
-    <attribute>
-      <id>XIVE_HW_RESET</id>
-    </attribute>
   </targetType>
 
   <targetType>
@@ -713,6 +710,10 @@
     <attribute>
       <id>SECUREBOOT_PROTECT_DECONFIGURED_TPM</id>
     </attribute>
+    <attribute>
+      <id>TIME_BASE</id>
+      <default>0x800000</default>
+    </attribute>
     <attribute>
       <default>4</default>
       <id>TLB_DATA_ASSOC_SETS</id>