Update configs and files for some external tests

Signed-off-by: Nathaniel Mitchell <nathaniel.p.mitchell@intel.com>

Author: npmitche

chipsec/cfg/8086/HOSTCTL/hostctl11gen.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 
-  <mmio>
-    <bar name="PXPEPBAR" register="PXPEPBAR" base_field="PXPEPBAR" size="0x1000" enable_bit="0" desc="PCI Express Egress Port Register Range"/>
-    <bar name="MCHBAR"   register="MCHBAR" base_field="MCHBAR" size="0x8000" enable_bit="0" desc="Host Memory Mapped Register Range"/>
-    <bar name="MMCFG"    register="PCIEXBAR" base_field="PXPEPBAR" size="0x1000" enable_bit="0" desc="PCI Express Register Range"/>
-    <bar name="DMIBAR"   register="DMIBAR" base_field="DMIBAR" size="0x1000" enable_bit="0" desc="Root Complex Register Range"/>
-    <!-- VT-d BARs -->
-    <bar name="VTBAR"    register="VTBAR"    base_field="Base" size="0x1000" enable_field="Enable" desc="Intel VT-d Register Register Range"/>
-    <bar name="GFXVTBAR" register="GFXVTBAR" base_field="Base" size="0x1000" enable_field="Enable" desc="Intel Processor Graphics VT-d Register Range"/>
-  </mmio>
-
   <!-- #################################### -->
   <!--                                      -->
   <!-- Configuration registers              -->

chipsec/cfg/8086/MMIO/pwrm0.xml

@@ -11,6 +11,10 @@
             <field name="SCIS"    bit="0" size="3" desc="SCI IRQ Select"/>
         </register>
         <register name="PM_CFG" type="mmio" bar="PWRMBASE" offset="0x1818" size="4" desc="Power Management Configuration Reg 1"/>
+        <register name="ETR3" type="mmio" bar="PWRMBASE" offset="0x1048" size="4" desc="Extended Test Mode Register 3">
+            <field name="CF9GR" bit="20" size="1" desc="CF9h Global Reset"/>
+            <field name="CF9LOCK" bit="31" size="1" desc="CF9h Lock"/>
+        </register>
     </registers>
 
     <controls>

chipsec/cfg/8086/tglu.xml

@@ -49,7 +49,9 @@ http://www.intel.com/content/www/us/en/processors/core/core-technical-resources.
   <!--                                      -->
   <!-- #################################### -->
   <pci>
-    <device name="HOSTCTL" bus="0x0" dev="0x00" fun="0" did="0x9A14" config="HOSTCTL.hostctl11gen.xml"/>
+    <device name="HOSTCTL" bus="0x0" dev="0x00" fun="0" did="0x9A14" config="HOSTCTL.hostctl11gen.xml">
+      <subcomponent type="mmiobar" name="MCHBAR" register="MCHBAR" base_field="MCHBAR" size="0x8000" enable_bit="0" config="MMIO.mmio0.xml" />
+    </device>
     <!-- <device name="HOSTCTL" bus="0x0" dev="0x00" fun="0" config="IOMMU.iommu.xml"/> -->
     <device name="IGD"     bus="0x0" dev="0x02" fun="0" config="IGD.igd0.xml"/>
     <device name="MEI1"    bus="0x0" dev="0x16" fun="0" config="ME.mei0.xml" />

chipsec/library/register.py

@@ -337,12 +337,10 @@ def has_field(self, reg_name: str, field_name: str) -> bool:
             reg_defs = self.cs.Cfg.get_reglist(reg_name)
         except RegisterNotFoundError:
             return False
-        for reg_def in reg_defs:
-            try:
-                return field_name in reg_def.fields
-            except KeyError:
-                return False
-        return False
+        try:
+            return bool(reg_defs) and all([field_name in reg_def.fields for reg_def in reg_defs])
+        except KeyError:
+            return False
 
     def get_match(self, name: str) -> List[str]:
         """

tests/modules/tgl/common-remap_test.json

@@ -31,6 +31,12 @@
     ],
     "(4275851416,8)": [
       "0"
+    ],
+    "(4275886224,8)": [
+      "549754765312"
+    ],
+    "(4275886232,8)": [
+      "0"
     ]
   },
   "read_msr": {

tests/modules/tgl/enumeration.json

@@ -132,7 +132,7 @@
   },
   "read_pci_reg": {
     "(0,0,0,0,4)": [
-      "1493467270"
+      "2585034886"
     ],
     "(0,0,0,8,1)": [
       "1"