diff --git a/xml/.gitignore b/xml/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/xml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/xml/chip_data_xml.md b/xml/chip_data_xml.md
deleted file mode 100644
index a82043d..0000000
--- a/xml/chip_data_xml.md
+++ /dev/null
@@ -1,440 +0,0 @@
-# Chip Data XML
-
-The machine readable Chip Data XML files are used to generate the Chip Data
-Binary files that are consumed directly by the Hardware Error Isolator (simply
-referred to as 'the isolator'). Details of the isolator and the [Chip Data
-Binary][] format and requirements can be found in the
-[openbmc/openpower-libhei][] project.
-
-[chip data binary]:
-  https://github.com/openbmc/openpower-libhei/blob/master/src/chip_data/CHIP_DATA.md
-[openbmc/openpower-libhei]: https://github.com/openbmc/openpower-libhei
-
-## 1) Chip Files - Root Element: `<chip>`
-
-Each chip represented by the XML must have a separate file. These files describe
-the supported model/EC levels and where to start isolation for each attention
-type supported by the chip.
-
-The filename must start with the prefix `chip_` and have the `.xml` extension.
-
-### 1.1) Attribute `name` (required)
-
-The name of the chip. Must be alphanumeric or underscores, no spaces or other
-symbols allowed.
-
-### 1.2) Attribute `model_ec` (required)
-
-See the notice in the appendix regarding the `model_ec` attributes.
-
-### 1.3) Element `<attn_tree>` (required 1 or more)
-
-These indicate where to start isolation for a specific attention type.
-
-#### 1.3.1) Attribute `attn_type` (required)
-
-The attention type for this tree. See appendix for supported values.
-
-#### 1.3.2) Attribute `root_node` (required)
-
-The name of the node that will be the root of this isolation tree. This value
-can be found in the `name` attribute of the `<attn_node>` root element.
-
-#### 1.3.3) Attribute `node_inst` (required)
-
-The logical instance of the root node. See the various `node_inst`
-sub-attributes of the `<attn_node>` root element.
-
-## 2) Isolation Node Files - Root Element: `<attn_node>`
-
-The data described by the XML in these files represents attention isolation
-trees. Each tree node will contain:
-
-- A list of registers related to this node (FIRs, masks, config regs, etc.).
-
-- A list of registers to store in logs for additional debug, if necessary.
-
-- A set of rules describing registers and bit operations required to determine
-  if there are active attentions for supported attention types.
-
-- A bit definition indicating if an active attention has been found or if it
-  originated from another node.
-
-**Important Note:** A node typically represents a Fault Isolation Register
-(FIR). However, other hardware registers, like `c_err_rpt` registers, or a
-combination of registers could be used as well.
-
-For readability and maintainability, the data for each node will be stored in
-separate XML files.
-
-The filename must start with the prefix `node_` and have the `.xml` extension.
-
-### 2.1) Attribute `name` (required)
-
-The name of the node. Must be alphanumeric or underscores, no spaces or other
-symbols allowed. This name will be displayed in log files.
-
-Note that this typically matches the name of the register(s) targeted for
-isolation, but it is not required.
-
-### 2.2) Attribute `model_ec` (required)
-
-See the notice in the appendix regarding the `model_ec` attributes.
-
-### 2.3) Attribute `reg_type` (required)
-
-All registers used by this node must be of the same type. This dispels any
-ambiguity that may occur with the bitwise operations defined by the `<rule>`
-elements. It also defines the maximum number of `<bit>` elements that can be
-defined for this node and the order of the bit `pos` attribute (left to right
-vs. right to left). Supported types:
-
-- POWER Systems SCOM register
-
-  - Attribute value: SCOM
-  - Address length: 4 bytes
-  - Register length: 8 bytes
-  - Bit order: ascending (0-63, left to right)
-
-- POWER Systems Indirect SCOM register
-  - Attribute value: IDSCOM
-  - Address length: 8 bytes
-  - Register length: 8 bytes
-  - Bit order: ascending (0-63, left to right)
-
-### 2.4) Element `<register>` (conditionally optional)
-
-These provide a list of all registers required for isolation of this node.
-
-At a minimum, a `<register>` element must exist for each register referenced by
-the `<capture_group>` or `<rule>` elements. Also, see the `<local_fir>` element
-for a possible shorthand definition.
-
-#### 2.4.1) Attribute `name` (required)
-
-The name of the register. Must be alphanumeric or underscores, no spaces or
-other symbols allowed.
-
-#### 2.4.2) Attribute `access` (optional)
-
-The hardware operation accessibility. Supported values:
-
-| Value | Description                                                    |
-| ----- | -------------------------------------------------------------- |
-| RO    | read-only access                                               |
-| WO    | write-only access                                              |
-| RW    | read and write access (default when 'access' is not specified) |
-
-#### 2.4.3) Element `<instance>` (required)
-
-It is possible that a register could have multiple instances within a chip. For
-example, the same register could exist for each core on a processor chip.
-Generally, the isolation rules and bit definition for registers like these are
-the same for each instance. The only difference would be the register addresses
-associated with each instance. So, instead of repeating the same information in
-multiple files, there will be an `<instance>` element for each unique instance
-of the register.
-
-##### 2.4.3.1) Attribute `reg_inst` (required)
-
-A unique integer value for the logical instance of this register. Note that the
-default value of 0 should be used for any single instance registers.
-
-##### 2.4.3.2) Attribute `addr` (required)
-
-The register address for this instance. The length of this hexadecimal integer
-is dependent on the `reg_type` attribute defined in the root `<attn_node>`
-element.
-
-### 2.5) Element `<capture_group>` (optional)
-
-These provide a list of all registers that should be captured and stored in log
-files for additional debug, if necessary.
-
-This may seem redundant because in most cases the `<register>` elements will
-align exactly with this list. However, consider a special case:
-
-- There is a set of FIR bits that represent a unit within a chip.
-- That same set exists for each instance of that chip unit.
-- To save space in the hardware, a particular FIR may contain a set for more
-  than one chip unit.
-- For example, sixteen bits per set and four sets per FIR could represent eight
-  units in just two FIRs).
-
-Therefore, if we set up the bit definition and rules for a node to represent the
-hardware units instead of the FIRs, the register instances will not match the
-node instances.
-
-#### 2.5.1) Attribute `node_inst` (required)
-
-The logical instance of the node targeted by this capture group. A list and/or
-range value (see appendix) may be used to indicate this capture group applies to
-more than one node.
-
-#### 2.5.2) Element `<capture_register>` (required 1 or more)
-
-A reference to a register that should be captured.
-
-##### 2.5.2.1) Attribute `reg_name` (required)
-
-See the `name` attribute of `<register>`.
-
-##### 2.5.2.2) Attribute `reg_inst` (required)
-
-See the `reg_inst` attribute for each `<instance>` of `<register>`.
-
-**Important Note:** This value is interpreted as an array, where the index is
-the instance value of the `node_inst` attribute of the `<capture_group>`
-element. Therefore, this requires the number of instances represented by this
-attribute to equal the number of instances represented by the the `node_inst`
-attribute of the `<capture_group>` element.
-
-### 2.6) Element `<rule>` (conditionally optional)
-
-A rule helps specify if an attention is being raised from a register and what
-type of attention is being raised. A rule is constructed by a series of
-expressions (see `<expr>` below). The result of the expressions will indicate
-all active attentions for a rule.
-
-At least one `<rule>` must exist if any `<bit>` elements are defined. The
-`<rule>` elements are optional for nodes that are intended to only capture FFDC
-for a bit defined in the parent node. Also, see the `<local_fir>` element for a
-possible shorthand definition.
-
-#### 2.6.1) Attribute `attn_type` (required)
-
-The attention type for this rule. See appendix for supported values.
-
-#### 2.6.2) Attribute `node_inst` (required)
-
-The logical instance of the node targeted by this rule. A list and/or range
-value (see appendix) may be used to indicate this rule applies to more than one
-node.
-
-#### 2.6.3) Element `<expr>` (required 1 or more)
-
-Expressions are used to characterize bitwise operations carried out against
-registers and/or integer constants. For example, `~some_register & 0xffff` will
-take the contents of `some_register` apply a bitwise NOT operation and then AND
-that value with the integer `0xffff`. This example will generate XML as follows:
-
-    <expr type="and">
-        <expr type="not">
-            <expr type="register" value="some_register" />
-        </expr>
-        <expr type="integer" value="0xffff" />
-    </expr>
-
-For simplicity, the register and integer sizes will be defined by the `reg_type`
-attribute of the root `<attn_node>` element. This ensures all values are the
-same, eliminating the ambiguity caused by variable register/integer sizes.
-
-It is also important to note that any values shifted beyond the defined register
-length will be lost. For example, given the register length of 2 bytes, the
-expression `(0xffff << 8) >> 8` will resolve to `0x00ff`.
-
-##### 2.6.3.1) Attributes `type` (required) and `value1`/`value2` (conditional)
-
-Each `<expr>` will have an expression type. Supported types are:
-
-| `type` | Description        | Sub-elements | `value1`      | `value2`     |
-| ------ | ------------------ | :----------: | ------------- | ------------ |
-| reg    | register reference |              | reg name      | reg instance |
-| int    | integer constant   |              | integer value |              |
-| and    | bitwise AND        |  2 or more   |               |              |
-| or     | bitwise OR         |  2 or more   |               |              |
-| not    | bitwise NOT        |      1       |               |              |
-| lshift | left shift         |      1       | shift value   |              |
-| rshift | right shift        |      1       | shift value   |              |
-
-Table notes:
-
-- Some types require the sub-elements or `value1`/`value2` attributes, but they
-  are only required if explicitly stated in the table above.
-- Sub-elements are expressions and will be resolved before handling the
-  containing expression.
-
-Expression type notes:
-
-- A register reference is a special expression that indicates the contents of
-  the target register should be used for this expression. Generally, this means
-  reading the register value from hardware. The `value1` attribute is required
-  for this expression type and will indicate the name of the target register.
-  The `value2` attribute is optional and indicates the target register instance.
-  If omitted, the register instance will match the node instance(s) represented
-  by this rule.
-- An integer constant is simply a right-justified, unsigned integer. The
-  `value1` attribute for this expression type will contain the integer value.
-  The length of the number is defined by the `reg_type` attribute of the root
-  `<attn_node>` element.
-
-### 2.7) Element `<bit>` (conditionally optional)
-
-These provide metadata for each bit in this node.
-
-The `<bit>` elements should only be defined if there are `<rule>` elements
-defined and there should be a `<bit>` element for each bit in the rules that
-could generate an attention.
-
-#### 2.7.1) Attribute `pos` (required)
-
-A numeric value representing the bit position within the node. The value cannot
-exceed the bit length defined by the `reg_type` attribute of the root
-`<attn_node>` element. A list and/or range value (see appendix) may be used to
-indicate this bit definition applies to more than one bit.
-
-#### 2.7.2) Attribute `child_node` (optional)
-
-If this attribute exists, it means the event that raised the attention in this
-bit originated from another node. The value of this attribute is the name of the
-child node, which can be found in the `name` attribute of the `<attn_node>` root
-element.
-
-#### 2.7.3) Attribute `node_inst` (optional)
-
-The target instance of the child node. This attribute should only exist when
-`child_node` is specified. Also, if `child_node` is specified and this attribute
-is omitted, the default value of 0 is used.
-
-**Important Note:** This value is actually interpreted as an array where the
-index is the instance value of the current node. Therefore, this requires the
-number of instances represented by this attribute to equal the number of
-instances represented by the current node.
-
-A list and/or range value (see appendix) may be used to represent the attribute
-value. For example, say we have a node with four possible instances and a bit
-defined as either of the following:
-
-    <bit pos="0" child_node="SOME_FIR" node_inst="4,5,6,7" ...
-    <bit pos="0" child_node="SOME_FIR" node_inst="4:7" ...
-    <bit pos="0" child_node="SOME_FIR" node_inst="4:5,6:7" ...
-
-All of which are equivalent once the lists/ranges are expanded. Then, if the
-input instance during isolation of this node is 1, the instance used for
-`SOME_FIR` will be 5.
-
-#### 2.7.4) Data for `<bit>` (required)
-
-A human readable description of this bit. This description will be printed out
-in logs for human consumption. It is highly recommended to keep this description
-short and concise (~50 characters) because longer descriptions will likely be
-truncated depending on the application.
-
-### 2.8) Special Element `<local_fir>` (optional)
-
-Some chips have a lot of local FIR registers, especially POWER processor chips,
-and nearly all of these FIRs follow the same pattern where:
-
-- The MASK, ACTION, WOF, etc. register are on the same address offset from the
-  FIR address.
-- Attention rules are defined by the associated MASK and ACTION registers.
-
-Therefore, this special `<local_fir>` element is simply provided as shorthand
-for these common patterns. Under the covers it will generate the required
-`<register>`, `<capture_group>`, and `<rule>` elements for the FIR.
-
-#### 2.8.1) Attribute `name` (required)
-
-The FIR name. Defined exactly as the `name` attribute of `<register>`.
-
-#### 2.8.2) Attribute `config` (required)
-
-Not all FIRs will have a WOF or ACT2 (which is new to P10). If either, or both,
-of these registers exist, use the following values:
-
-| Value | Description                         |
-| ----- | ----------------------------------- |
-|       | neither WOF nor ACT2 registers      |
-| W     | include WOF register                |
-| 2     | include ACT2 register               |
-| W2    | include both WOF and ACT2 registers |
-
-#### 2.8.3) Element `<instance>` (required 1 or more)
-
-The FIR instance. Defined exactly as the `<instance>` attribute of `<register>`
-where the `addr` attribute is the FIR address.
-
-Under the covers, the following registers will be generated (see the `config`
-attribute for details on the WOF and ACT2 registers):
-
-| name        | addr   | access |
-| ----------- | ------ | ------ |
-| `name`      | addr+0 | RW     |
-| `name_MASK` | addr+3 | RW     |
-| `name_ACT0` | addr+6 | RW     |
-| `name_ACT1` | addr+7 | RW     |
-| `name_WOF`  | addr+8 | RW     |
-| `name_ACT2` | addr+9 | RW     |
-
-#### 2.8.4) Element `<action>` (required 1 or more)
-
-The action registers associated with the FIR are used to configure supported
-attention types.
-
-##### 2.8.4.1) Attribute `attn_type` (required)
-
-The attention type. Defined exactly as the `attn_type` attribute of `<rule>`.
-
-##### 2.8.4.2) Attribute `config` (required)
-
-Under the covers, the following rules will be generated based on the value of
-this attribute:
-
-| Value | Rule                                |
-| ----- | ----------------------------------- |
-| 00    | FIR & ~MASK & ~ACT0 & ~ACT1         |
-| 01    | FIR & ~MASK & ~ACT0 & ACT1          |
-| 10    | FIR & ~MASK & ACT0 & ~ACT1          |
-| 11    | FIR & ~MASK & ACT0 & ACT1           |
-| 000   | FIR & ~MASK & ~ACT0 & ~ACT1 & ~ACT2 |
-| 001   | FIR & ~MASK & ~ACT0 & ~ACT1 & ACT2  |
-| 010   | FIR & ~MASK & ~ACT0 & ACT1 & ~ACT2  |
-| 011   | FIR & ~MASK & ~ACT0 & ACT1 & ACT2   |
-| 100   | FIR & ~MASK & ACT0 & ~ACT1 & ~ACT2  |
-| 101   | FIR & ~MASK & ACT0 & ~ACT1 & ACT2   |
-| 110   | FIR & ~MASK & ACT0 & ACT1 & ~ACT2   |
-| 111   | FIR & ~MASK & ACT0 & ACT1 & ACT2    |
-
-## 3) Appendix
-
-### 3.1) Number Format
-
-All numbers in this XML are unsigned integers. A hexadecimal value must start
-with '0x'. Otherwise, the value is assumed to be decimal.
-
-### 3.2) Number Lists and Ranges
-
-- Lists are expressed by a comma separated list (e.g. "0,2,4,6,8").
-- Ranges represent consecutive ascending or descending numbers (including both
-  endpoints) and are expressed using a colon (e.g. "8:15" or "15:8").
-- Lists and ranges can be combined. For example, a value of "0,2:4,6" expands to
-  0, 2, 3, 4, and 6.
-
-### 3.3) Notice Regarding `model_ec` Attributes
-
-This attribute allows us to reuse the same `<chip>` or `<attn_node>` definition
-for multiple chip models and/or EC levels. These attributes are intentionally
-limited to the root `<chip>` and `<attn_node>` elements for simplicity,
-maintainability, and readability. Separate files will be required for each
-definition if any part of the `<chip>` or `<attn_node>` definition differs
-between chip models and/or EC levels.
-
-The attribute is a comma separated list. The currently supported list values
-are:
-
-| Value         | Description          |
-| ------------- | -------------------- |
-| `EXPLORER_11` | Explorer chip EC 1.1 |
-| `EXPLORER_20` | Explorer chip EC 2.0 |
-| `P10_10`      | P10 chip EC 1.0      |
-| `P10_20`      | P10 chip EC 2.0      |
-
-### 3.4) Supported Attention Types
-
-| Value | Description                                                        |
-| ----- | ------------------------------------------------------------------ |
-| CS    | System checkstop hardware attention.                               |
-| UCS   | Unit checkstop hardware attention.                                 |
-| RE    | Recoverable hardware attention.                                    |
-| SPA   | SW or HW event requiring action by the service processor firmware. |
-| HA    | SW or HW event requiring action by the host firmware.              |
diff --git a/xml/explorer/chip_explorer.xml b/xml/explorer/chip_explorer.xml
deleted file mode 100644
index df092fa..0000000
--- a/xml/explorer/chip_explorer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chip name="Explorer" model_ec="EXPLORER_11,EXPLORER_20">
-
-    <attn_tree attn_type="UCS" root_node="CHIPLET_OCMB_FIR"     node_inst="0" />
-    <attn_tree attn_type="RE"  root_node="CHIPLET_OCMB_FIR"     node_inst="0" />
-    <attn_tree attn_type="HA"  root_node="CHIPLET_OCMB_SPA_FIR" node_inst="0" />
-
-</chip>
diff --git a/xml/explorer/node_chiplet_ocmb_fir.xml b/xml/explorer/node_chiplet_ocmb_fir.xml
deleted file mode 100644
index 2d0cc9e..0000000
--- a/xml/explorer/node_chiplet_ocmb_fir.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="CHIPLET_OCMB_FIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <register name="CHIPLET_OCMB_CS_FIR">
-        <instance reg_inst="0" addr="0x08040000" />
-    </register>
-
-    <register name="CHIPLET_OCMB_RE_FIR">
-        <instance reg_inst="0" addr="0x08040001" />
-    </register>
-
-    <register name="CHIPLET_OCMB_FIR_MASK">
-        <instance reg_inst="0" addr="0x08040002" />
-    </register>
-
-    <rule attn_type="UCS" node_inst="0">
-        <!-- FIR & ~MASK & 0x1fffffffffffffff -->
-        <expr type="and">
-            <expr type="reg" value1="CHIPLET_OCMB_CS_FIR" />
-            <expr type="not">
-                <expr type="reg" value1="CHIPLET_OCMB_FIR_MASK" />
-            </expr>
-            <expr type="int" value1="0x1fffffffffffffff" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <!-- (FIR >> 2) & ~MASK & 0x1fffffffffffffff -->
-        <expr type="and">
-            <expr type="rshift" value1="2">
-                <expr type="reg" value1="CHIPLET_OCMB_RE_FIR" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="CHIPLET_OCMB_FIR_MASK" />
-            </expr>
-            <expr type="int" value1="0x1fffffffffffffff" />
-        </expr>
-    </rule>
-
-    <bit pos= "3" child_node="OCMB_LFIR" >Attention from OCMB_LFIR</bit>
-    <bit pos= "4" child_node="MMIOFIR"   >Attention from MMIOFIR</bit>
-    <bit pos= "7" child_node="SRQFIR"    >Attention from SRQFIR</bit>
-    <bit pos= "8" child_node="MCBISTFIR" >Attention from MCBISTFIR</bit>
-    <bit pos= "9" child_node="RDFFIR"    >Attention from RDFFIR</bit>
-    <bit pos="11" child_node="TLXFIR"    >Attention from TLXFIR</bit>
-    <bit pos="12" child_node="OMI_DL_FIR">Attention from OMI_DL_FIR</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_chiplet_ocmb_spa_fir.xml b/xml/explorer/node_chiplet_ocmb_spa_fir.xml
deleted file mode 100644
index 40869d2..0000000
--- a/xml/explorer/node_chiplet_ocmb_spa_fir.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="CHIPLET_OCMB_SPA_FIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <register name="CHIPLET_OCMB_SPA_FIR">
-        <instance reg_inst="0" addr="0x08040004" />
-    </register>
-
-    <register name="CHIPLET_OCMB_SPA_FIR_MASK">
-        <instance reg_inst="0" addr="0x08040007" />
-    </register>
-
-    <rule attn_type="HA" node_inst="0">
-        <!-- FIR & ~MASK -->
-        <expr type="and">
-            <expr type="reg" value1="CHIPLET_OCMB_SPA_FIR" />
-            <expr type="not">
-                <expr type="reg" value1="CHIPLET_OCMB_SPA_FIR_MASK" />
-            </expr>
-        </expr>
-    </rule>
-
-    <bit pos="1" child_node="MMIOFIR"   >Attention from MMIOFIR</bit>
-    <bit pos="4" child_node="SRQFIR"    >Attention from SRQFIR</bit>
-    <bit pos="5" child_node="MCBISTFIR" >Attention from MCBISTFIR</bit>
-    <bit pos="6" child_node="RDFFIR"    >Attention from RDFFIR</bit>
-    <bit pos="8" child_node="TLXFIR"    >Attention from TLXFIR</bit>
-    <bit pos="9" child_node="OMI_DL_FIR">Attention from OMI_DL_FIR</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_mcbistfir.xml b/xml/explorer/node_mcbistfir.xml
deleted file mode 100644
index 784c989..0000000
--- a/xml/explorer/node_mcbistfir.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="MCBISTFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="MCBISTFIR" config="W">
-        <instance reg_inst="0" addr="0x08011800" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="MCB_ERR_RPT_0">
-        <instance reg_inst="0" addr="0x080118E7" />
-    </register>
-
-    <register name="MCB_ERR_RPT_1">
-        <instance reg_inst="0" addr="0x080118EC" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="MCB_ERR_RPT_0" reg_inst="0" />
-        <capture_register reg_name="MCB_ERR_RPT_1" reg_inst="0" />
-    </capture_group>
-
-    <bit pos= "0"   >Invalid maint address</bit>
-    <bit pos= "1"   >Command address timeout</bit>
-    <bit pos= "2"   >Internal FSM error</bit>
-    <bit pos= "3"   >MCBIST broadcast out of sync</bit>
-    <bit pos= "4"   >MCBIST data error</bit>
-    <bit pos= "5"   >Hard NCE ETE attn</bit>
-    <bit pos= "6"   >Soft NCE ETE attn</bit>
-    <bit pos= "7"   >Int NCE ETE attn</bit>
-    <bit pos= "8"   >RCE ETE attn</bit>
-    <bit pos= "9"   >ICE (IMPE) ETE attn</bit>
-    <bit pos="10"   >MCBIST program complete</bit>
-    <bit pos="11"   >MCBIST CCS subtest done</bit>
-    <bit pos="12"   >WAT debug bus attn</bit>
-    <bit pos="13"   >SCOM recoverable register parity error</bit>
-    <bit pos="14"   >SCOM fatal reg parity error</bit>
-    <bit pos="15"   >SCOM WAT and debug reg parity error</bit>
-    <bit pos="16:17">Reserved</bit>
-    <bit pos="18"   >Internal SCOM error</bit>
-    <bit pos="19"   >Internal SCOM error clone</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_mmiofir.xml b/xml/explorer/node_mmiofir.xml
deleted file mode 100644
index 40dbf0e..0000000
--- a/xml/explorer/node_mmiofir.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="MMIOFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="MMIOFIR" config="W">
-        <instance reg_inst="0" addr="0x08010870" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="MMIO_ERR_RPT_0">
-        <instance reg_inst="0" addr="0x0801087C" />
-    </register>
-
-    <register name="MMIO_ERR_RPT_1">
-        <instance reg_inst="0" addr="0x0801087E" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="MMIO_ERR_RPT_0" reg_inst="0" />
-        <capture_register reg_name="MMIO_ERR_RPT_1" reg_inst="0" />
-    </capture_group>
-
-    <bit pos= "0">AFU desc unimp</bit>
-    <bit pos= "1">MMIO err</bit>
-    <bit pos= "2">SCOM err</bit>
-    <bit pos= "3">FSM perr</bit>
-    <bit pos= "4">FIFO overflow</bit>
-    <bit pos= "5">Ctl reg parity err</bit>
-    <bit pos= "6">Info reg parity error</bit>
-    <bit pos= "7">SNSC both starts err</bit>
-    <bit pos= "8">SNSC mult seq parity err</bit>
-    <bit pos= "9">SNSC FSM parity err</bit>
-    <bit pos="10">SNSC reg parity err</bit>
-    <bit pos="11">acTAG PASID cfg err</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_ocmb_lfir.xml b/xml/explorer/node_ocmb_lfir.xml
deleted file mode 100644
index 639cc0e..0000000
--- a/xml/explorer/node_ocmb_lfir.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="OCMB_LFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="OCMB_LFIR" config="">
-        <instance reg_inst="0" addr="0x0804000a" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-    </local_fir>
-
-    <!--
-        These registers are on the MicroChip side of Explorer and are not in
-        the SCOM def.
-    -->
-
-    <register name="ADSP_PCBI">
-        <instance reg_inst="0" addr="0x00200860" />
-        <instance reg_inst="1" addr="0x00201860" />
-        <instance reg_inst="2" addr="0x00202860" />
-        <instance reg_inst="3" addr="0x00203860" />
-        <instance reg_inst="4" addr="0x00204860" />
-        <instance reg_inst="5" addr="0x00205860" />
-        <instance reg_inst="6" addr="0x00206860" />
-        <instance reg_inst="7" addr="0x00207860" />
-    </register>
-
-    <register name="CSU_PCBI">
-        <instance reg_inst="0" addr="0x002000B0" />
-        <instance reg_inst="1" addr="0x002010B0" />
-        <instance reg_inst="2" addr="0x002020B0" />
-        <instance reg_inst="3" addr="0x002030B0" />
-        <instance reg_inst="4" addr="0x002040B0" />
-        <instance reg_inst="5" addr="0x002050B0" />
-        <instance reg_inst="6" addr="0x002060B0" />
-        <instance reg_inst="7" addr="0x002070B0" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="ADSP_PCBI" reg_inst="0" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="1" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="2" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="3" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="4" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="5" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="6" />
-        <capture_register reg_name="ADSP_PCBI" reg_inst="7" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="0" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="1" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="2" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="3" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="4" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="5" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="6" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="7" />
-    </capture_group>
-
-    <bit pos= "0"   >CFIR access PCB error</bit>
-    <bit pos= "1"   >CFIR internal parity error</bit>
-    <bit pos= "2"   >LFIR internal parity error</bit>
-    <bit pos= "3"   >Debug scom satellite error</bit>
-    <bit pos= "4"   >PSCOM Logic: PCB Access Error</bit>
-    <bit pos= "5"   >PSCOM Logic: Summarized internal errors</bit>
-    <bit pos= "6"   >Trace Logic : Scom Satellite Error - Trace0</bit>
-    <bit pos= "7"   >Trace Logic : Scom Satellite Error - Trace1</bit>
-    <bit pos= "8"   >PIB2GIF parity error on FSM or Registers</bit>
-    <bit pos= "9"   >MSG access PCB error</bit>
-    <bit pos="10:18">unused</bit>
-    <bit pos="19"   >DLL IRQ</bit>
-    <bit pos="20"   >Watchdog timer interrupt</bit>
-    <bit pos="21"   >internal temp sensor tripped a threshold</bit>
-    <bit pos="22"   >GPBC_FATAL_ERROR</bit>
-    <bit pos="23"   >GPBC_NON_FATAL_ERROR</bit>
-    <bit pos="24"   >early power off warning</bit>
-    <bit pos="25"   >TOP fatal interrupts</bit>
-    <bit pos="26"   >TOP non fatal interrupts</bit>
-    <bit pos="27:30">Interrupt from OPSe to OCMB</bit>
-    <bit pos="31"   >SerDes continuous calibration failure</bit>
-    <bit pos="32"   >Firmware Assert or CPU Exception</bit>
-    <bit pos="33"   >Extended error information ready</bit>
-    <bit pos="34"   >Interrupt from OPSe to OCMB</bit>
-    <bit pos="35"   >DDR thermal event</bit>
-    <bit pos="36"   >DDR4 PHY fatal</bit>
-    <bit pos="37"   >DDR4 PHY non fatal</bit>
-    <bit pos="38"   >DDR4 PHY interrupt</bit>
-    <bit pos="39"   >foxhound fatal lane 7</bit>
-    <bit pos="40"   >foxhound fatal lane 6</bit>
-    <bit pos="41"   >foxhound fatal lane 5</bit>
-    <bit pos="42"   >foxhound fatal lane 4</bit>
-    <bit pos="43"   >foxhound fatal lane 3</bit>
-    <bit pos="44"   >foxhound fatal lane 2</bit>
-    <bit pos="45"   >foxhound fatal lane 1</bit>
-    <bit pos="46"   >foxhound fatal lane 0</bit>
-    <bit pos="47:54">foxhound non fatal</bit>
-    <bit pos="55:62">foxhound serdes interrupt</bit>
-    <bit pos="63"   >GIF2PCB parity error on FSM or Registers</bit>
-
-</attn_node>
-
diff --git a/xml/explorer/node_omi_dl_err_rpt.xml b/xml/explorer/node_omi_dl_err_rpt.xml
deleted file mode 100644
index 2444c9a..0000000
--- a/xml/explorer/node_omi_dl_err_rpt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="EXPLORER_11,EXPLORER_20" name="OMI_DL_ERR_RPT" reg_type="SCOM">
-
-    <rule attn_type="UCS" node_inst="0">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <rule attn_type="HA" node_inst="0">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <bit pos="52">spare</bit>
-    <bit pos="53">spare</bit>
-    <bit pos="54">spare</bit>
-    <bit pos="55">RX receiving slow A</bit>
-    <bit pos="56">RX receiving illegal run length</bit>
-    <bit pos="57">control parity error</bit>
-    <bit pos="58">data parity error</bit>
-    <bit pos="59">truncated flit from TL</bit>
-    <bit pos="60">illegal run length from TL</bit>
-    <bit pos="61">Ack pointer overflow</bit>
-    <bit pos="62">UE on control flit replay buffer</bit>
-    <bit pos="63">UE on control flit frame buffer</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_omi_dl_fir.xml b/xml/explorer/node_omi_dl_fir.xml
deleted file mode 100644
index ebbeba9..0000000
--- a/xml/explorer/node_omi_dl_fir.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="OMI_DL_FIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="OMI_DL_FIR" config="W">
-        <instance reg_inst="0" addr="0x08012800" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="CMN_CONFIG">
-        <instance reg_inst="0" addr="0x0801280E" />
-    </register>
-
-    <register name="PMU_CNTR">
-        <instance reg_inst="0" addr="0x0801280F" />
-    </register>
-
-    <register name="OMI_DL_CONFIG0">
-        <instance reg_inst="0" addr="0x08012810" />
-    </register>
-
-    <register name="OMI_DL_CONFIG1">
-        <instance reg_inst="0" addr="0x08012811" />
-    </register>
-
-    <register name="OMI_DL_ERR_MASK">
-        <instance reg_inst="0" addr="0x08012812" />
-    </register>
-
-    <register name="OMI_DL_ERR_RPT">
-        <instance reg_inst="0" addr="0x08012813" />
-    </register>
-
-    <register name="OMI_DL_ERR_CAPTURE">
-        <instance reg_inst="0" addr="0x08012814" />
-    </register>
-
-    <register name="OMI_DL_EDPL_MAX_COUNT">
-        <instance reg_inst="0" addr="0x08012815" />
-    </register>
-
-    <register name="OMI_DL_STATUS">
-        <instance reg_inst="0" addr="0x08012816" />
-    </register>
-
-    <register name="OMI_DL_TRAINING_STATUS">
-        <instance reg_inst="0" addr="0x08012817" />
-    </register>
-
-    <register name="OMI_DL_DLX_CONFIG">
-        <instance reg_inst="0" addr="0x08012818" />
-    </register>
-
-    <register name="OMI_DL_DLX_INFO">
-        <instance reg_inst="0" addr="0x08012819" />
-    </register>
-
-    <register name="OMI_DL_ERR_ACTION">
-        <instance reg_inst="0" addr="0x0801281D" />
-    </register>
-
-    <register name="OMI_DL_DEBUG_AID">
-        <instance reg_inst="0" addr="0x0801281E" />
-    </register>
-
-    <register name="OMI_DL_CYA_BITS">
-        <instance reg_inst="0" addr="0x0801281F" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="CMN_CONFIG"             reg_inst="0" />
-        <capture_register reg_name="PMU_CNTR"               reg_inst="0" />
-        <capture_register reg_name="OMI_DL_CONFIG0"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_CONFIG1"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_MASK"        reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_RPT"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_CAPTURE"     reg_inst="0" />
-        <capture_register reg_name="OMI_DL_EDPL_MAX_COUNT"  reg_inst="0" />
-        <capture_register reg_name="OMI_DL_STATUS"          reg_inst="0" />
-        <capture_register reg_name="OMI_DL_TRAINING_STATUS" reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DLX_CONFIG"      reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DLX_INFO"        reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_ACTION"      reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DEBUG_AID"       reg_inst="0" />
-        <capture_register reg_name="OMI_DL_CYA_BITS"        reg_inst="0" />
-    </capture_group>
-
-    <bit pos= "0" child_node="OMI_DL_ERR_RPT" node_inst="0">OMI-DL0 fatal error</bit>
-    <bit pos= "1">OMI-DL0 UE on data flit</bit>
-    <bit pos= "2">OMI-DL0 CE on TL flit</bit>
-    <bit pos= "3">OMI-DL0 detected a CRC error</bit>
-    <bit pos= "4">OMI-DL0 received a nack</bit>
-    <bit pos= "5">OMI-DL0 running in degraded mode</bit>
-    <bit pos= "6">OMI-DL0 parity error detection on a lane</bit>
-    <bit pos= "7">OMI-DL0 retrained due to no forward progress</bit>
-    <bit pos= "8">OMI-DL0 remote side initiated a retrain</bit>
-    <bit pos= "9">OMI-DL0 retrain due to internal error or software</bit>
-    <bit pos="10">OMI-DL0 threshold reached</bit>
-    <bit pos="11">OMI-DL0 trained</bit>
-    <bit pos="12">OMI-DL0 endpoint error bit 0</bit>
-    <bit pos="13">OMI-DL0 endpoint error bit 1</bit>
-    <bit pos="14">OMI-DL0 endpoint error bit 2</bit>
-    <bit pos="15">OMI-DL0 endpoint error bit 3</bit>
-    <bit pos="16">OMI-DL0 endpoint error bit 4</bit>
-    <bit pos="17">OMI-DL0 endpoint error bit 5</bit>
-    <bit pos="18">OMI-DL0 endpoint error bit 6</bit>
-    <bit pos="19">OMI-DL0 endpoint error bit 7</bit>
-    <bit pos="20:39">OMI-DL1</bit>
-    <bit pos="40:59">OMI-DL2</bit>
-    <bit pos="60">Performance monitor wrapped</bit>
-    <bit pos="61">reserved</bit>
-    <bit pos="62">LFIR internal parity error</bit>
-    <bit pos="63">SCOM Satellite Error</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_rdffir.xml b/xml/explorer/node_rdffir.xml
deleted file mode 100644
index 2601b6d..0000000
--- a/xml/explorer/node_rdffir.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="RDFFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="RDFFIR" config="W">
-        <instance reg_inst="0" addr="0x08011c00" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="FARB0">
-        <instance reg_inst="0" addr="0x08011415" />
-    </register>
-
-    <register name="MBSEC0">
-        <instance reg_inst="0" addr="0x08011855" />
-    </register>
-
-    <register name="MBSEC1">
-        <instance reg_inst="0" addr="0x08011856" />
-    </register>
-
-    <register name="MBSTR">
-        <instance reg_inst="0" addr="0x08011857" />
-    </register>
-
-    <register name="MBSSYMEC">
-        <instance reg_inst="0" addr="0x08011858" />
-        <instance reg_inst="1" addr="0x08011859" />
-        <instance reg_inst="2" addr="0x0801185A" />
-        <instance reg_inst="3" addr="0x0801185B" />
-        <instance reg_inst="4" addr="0x0801185C" />
-        <instance reg_inst="5" addr="0x0801185D" />
-        <instance reg_inst="6" addr="0x0801185E" />
-        <instance reg_inst="7" addr="0x0801185F" />
-        <instance reg_inst="8" addr="0x08011860" />
-    </register>
-
-    <register name="MBSMSEC">
-        <instance reg_inst="0" addr="0x08011869" />
-    </register>
-
-    <register name="MBNCER">
-        <instance reg_inst="0" addr="0x0801186A" />
-    </register>
-
-    <register name="MBRCER">
-        <instance reg_inst="0" addr="0x0801186B" />
-    </register>
-
-    <register name="MBMPER">
-        <instance reg_inst="0" addr="0x0801186C" />
-    </register>
-
-    <register name="MBUER">
-        <instance reg_inst="0" addr="0x0801186D" />
-    </register>
-
-    <register name="MBAUER">
-        <instance reg_inst="0" addr="0x0801186E" />
-    </register>
-
-    <register name="MC_ADDR_TRANS0">
-        <instance reg_inst="0" addr="0x0801186F" />
-    </register>
-
-    <register name="MC_ADDR_TRANS1">
-        <instance reg_inst="0" addr="0x08011870" />
-    </register>
-
-    <register name="MC_ADDR_TRANS2">
-        <instance reg_inst="0" addr="0x08011871" />
-    </register>
-
-    <register name="MBSEVR0">
-        <instance reg_inst="0" addr="0x0801187E" />
-    </register>
-
-    <register name="MCBAGRA">
-        <instance reg_inst="0" addr="0x080118D6" />
-    </register>
-
-    <register name="MCBMCAT">
-        <instance reg_inst="0" addr="0x080118D7" />
-    </register>
-
-    <register name="MCB_CNTL">
-        <instance reg_inst="0" addr="0x080118DB" />
-    </register>
-
-    <register name="MCB_CNTLSTAT">
-        <instance reg_inst="0" addr="0x080118DC" />
-    </register>
-
-    <register name="MCBCFG">
-        <instance reg_inst="0" addr="0x080118E0" />
-    </register>
-
-    <register name="EXP_MSR">
-        <instance reg_inst="0" addr="0x08011C0C" />
-    </register>
-
-    <register name="RDF_ERR_RPT_0">
-        <instance reg_inst="0" addr="0x08011C0E" />
-    </register>
-
-    <register name="RDF_ERR_RPT_1">
-        <instance reg_inst="0" addr="0x08011C0F" />
-    </register>
-
-    <register name="HW_MS">
-        <instance reg_inst="0" addr="0x08011C10" />
-        <instance reg_inst="1" addr="0x08011C11" />
-        <instance reg_inst="2" addr="0x08011C12" />
-        <instance reg_inst="3" addr="0x08011C13" />
-        <instance reg_inst="4" addr="0x08011C14" />
-        <instance reg_inst="5" addr="0x08011C15" />
-        <instance reg_inst="6" addr="0x08011C16" />
-        <instance reg_inst="7" addr="0x08011C17" />
-    </register>
-
-    <register name="FW_MS">
-        <instance reg_inst="0" addr="0x08011C18" />
-        <instance reg_inst="1" addr="0x08011C19" />
-        <instance reg_inst="2" addr="0x08011C1A" />
-        <instance reg_inst="3" addr="0x08011C1B" />
-        <instance reg_inst="4" addr="0x08011C1C" />
-        <instance reg_inst="5" addr="0x08011C1D" />
-        <instance reg_inst="6" addr="0x08011C1E" />
-        <instance reg_inst="7" addr="0x08011C1F" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="FARB0" reg_inst="0" />
-        <capture_register reg_name="MBSEC0" reg_inst="0" />
-        <capture_register reg_name="MBSEC1" reg_inst="0" />
-        <capture_register reg_name="MBSTR" reg_inst="0" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="0" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="1" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="2" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="3" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="4" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="5" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="6" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="7" />
-        <capture_register reg_name="MBSSYMEC" reg_inst="8" />
-        <capture_register reg_name="MBSMSEC" reg_inst="0" />
-        <capture_register reg_name="MBNCER" reg_inst="0" />
-        <capture_register reg_name="MBRCER" reg_inst="0" />
-        <capture_register reg_name="MBMPER" reg_inst="0" />
-        <capture_register reg_name="MBUER" reg_inst="0" />
-        <capture_register reg_name="MBAUER" reg_inst="0" />
-        <capture_register reg_name="MC_ADDR_TRANS0" reg_inst="0" />
-        <capture_register reg_name="MC_ADDR_TRANS1" reg_inst="0" />
-        <capture_register reg_name="MC_ADDR_TRANS2" reg_inst="0" />
-        <capture_register reg_name="MBSEVR0" reg_inst="0" />
-        <capture_register reg_name="MCBAGRA" reg_inst="0" />
-        <capture_register reg_name="MCBMCAT" reg_inst="0" />
-        <capture_register reg_name="MCB_CNTL" reg_inst="0" />
-        <capture_register reg_name="MCB_CNTLSTAT" reg_inst="0" />
-        <capture_register reg_name="MCBCFG" reg_inst="0" />
-        <capture_register reg_name="EXP_MSR" reg_inst="0" />
-        <capture_register reg_name="RDF_ERR_RPT_0" reg_inst="0" />
-        <capture_register reg_name="RDF_ERR_RPT_1" reg_inst="0" />
-        <capture_register reg_name="HW_MS" reg_inst="0" />
-        <capture_register reg_name="HW_MS" reg_inst="1" />
-        <capture_register reg_name="HW_MS" reg_inst="2" />
-        <capture_register reg_name="HW_MS" reg_inst="3" />
-        <capture_register reg_name="HW_MS" reg_inst="4" />
-        <capture_register reg_name="HW_MS" reg_inst="5" />
-        <capture_register reg_name="HW_MS" reg_inst="6" />
-        <capture_register reg_name="HW_MS" reg_inst="7" />
-        <capture_register reg_name="FW_MS" reg_inst="0" />
-        <capture_register reg_name="FW_MS" reg_inst="1" />
-        <capture_register reg_name="FW_MS" reg_inst="2" />
-        <capture_register reg_name="FW_MS" reg_inst="3" />
-        <capture_register reg_name="FW_MS" reg_inst="4" />
-        <capture_register reg_name="FW_MS" reg_inst="5" />
-        <capture_register reg_name="FW_MS" reg_inst="6" />
-        <capture_register reg_name="FW_MS" reg_inst="7" />
-    </capture_group>
-
-    <bit pos= "0"   >Mainline read MPE on rank 0</bit>
-    <bit pos= "1"   >Mainline read MPE on rank 1</bit>
-    <bit pos= "2"   >Mainline read MPE on rank 2</bit>
-    <bit pos= "3"   >Mainline read MPE on rank 3</bit>
-    <bit pos= "4"   >Mainline read MPE on rank 4</bit>
-    <bit pos= "5"   >Mainline read MPE on rank 5</bit>
-    <bit pos= "6"   >Mainline read MPE on rank 6</bit>
-    <bit pos= "7"   >Mainline read MPE on rank 7</bit>
-    <bit pos= "8"   >Mainline read NCE</bit>
-    <bit pos= "9"   >Mainline read TCE</bit>
-    <bit pos="10"   >Mainline read SCE</bit>
-    <bit pos="11"   >Mainline read MCE</bit>
-    <bit pos="12"   >Mainline read SUE</bit>
-    <bit pos="13"   >Mainline read AUE</bit>
-    <bit pos="14"   >Mainline read UE</bit>
-    <bit pos="15"   >Mainline read RCD</bit>
-    <bit pos="16"   >Mainline read IAUE</bit>
-    <bit pos="17"   >Mainline read IUE</bit>
-    <bit pos="18"   >Mainline read IRCD</bit>
-    <bit pos="19"   >Mainline read IMPE</bit>
-    <bit pos="20"   >Maintenance MPE on rank 0</bit>
-    <bit pos="21"   >Maintenance MPE on rank 1</bit>
-    <bit pos="22"   >Maintenance MPE on rank 2</bit>
-    <bit pos="23"   >Maintenance MPE on rank 3</bit>
-    <bit pos="24"   >Maintenance MPE on rank 4</bit>
-    <bit pos="25"   >Maintenance MPE on rank 5</bit>
-    <bit pos="26"   >Maintenance MPE on rank 6</bit>
-    <bit pos="27"   >Maintenance MPE on rank 7</bit>
-    <bit pos="28"   >Maintenance NCE</bit>
-    <bit pos="29"   >Maintenance TCE</bit>
-    <bit pos="30"   >Maintenance SCE</bit>
-    <bit pos="31"   >Maintenance MCE</bit>
-    <bit pos="32"   >Maintenance SUE</bit>
-    <bit pos="33"   >Maintenance AUE</bit>
-    <bit pos="34"   >Maintenance UE</bit>
-    <bit pos="35"   >Maintenance RCD</bit>
-    <bit pos="36"   >Maintenance IAUE</bit>
-    <bit pos="37"   >Maintenance IUE</bit>
-    <bit pos="38"   >Maintenance IRCD</bit>
-    <bit pos="39"   >Maintenance IMPE</bit>
-    <bit pos="40"   >RDDATA valid error</bit>
-    <bit pos="41"   >SCOM status register parity error</bit>
-    <bit pos="42"   >SCOM recoverable register parity error</bit>
-    <bit pos="43"   >SCOM unrecoverable register parity error</bit>
-    <bit pos="44"   >ECC corrector internal parity error</bit>
-    <bit pos="45"   >Rd Buff ECC CHK Cor CE DW0 Detected</bit>
-    <bit pos="46"   >Rd Buff ECC CHK Cor CE DW1 Detected</bit>
-    <bit pos="47"   >Rd Buff ECC CHK Cor UE DW0 Detected</bit>
-    <bit pos="48"   >Rd Buff ECC CHK Cor UE DW1 Detected</bit>
-    <bit pos="49:59">Reserved</bit>
-    <bit pos="60"   >SCOM register parity error for debug/wat control</bit>
-    <bit pos="61"   >Reserved</bit>
-    <bit pos="62"   >Internal SCOM error</bit>
-    <bit pos="63"   >Internal SCOM error copy</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_srqfir.xml b/xml/explorer/node_srqfir.xml
deleted file mode 100644
index f4a9440..0000000
--- a/xml/explorer/node_srqfir.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="SRQFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="SRQFIR" config="W">
-        <instance reg_inst="0" addr="0x08011400" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="SRQ_ERR_RPT">
-        <instance reg_inst="0" addr="0x0801141C" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="SRQ_ERR_RPT" reg_inst="0" />
-    </capture_group>
-
-    <bit pos= "0">SRQ recoverable error</bit>
-    <bit pos= "1">SRQ nonrecoverable error</bit>
-    <bit pos= "2">Refresh overrun</bit>
-    <bit pos= "3">WAT error</bit>
-    <bit pos= "4">RCD parity error</bit>
-    <bit pos= "5">MCB logic error</bit>
-    <bit pos= "6">Emergency throttle</bit>
-    <bit pos= "7">NCF MCB parity error</bit>
-    <bit pos= "8">DDR MBA event n</bit>
-    <bit pos= "9">WRQ RRQ hang err</bit>
-    <bit pos="10">SM one hot error</bit>
-    <bit pos="11">Reg parity error</bit>
-    <bit pos="12">Cmd parity error</bit>
-    <bit pos="13">Port fail</bit>
-    <bit pos="14">informational register parity error bit</bit>
-    <bit pos="15">Debug parity error</bit>
-    <bit pos="16">WDF unrecoverable mainline error</bit>
-    <bit pos="17">WDF mmio error</bit>
-    <bit pos="18">WDF array UE on mainline operations (SUE put in mem)</bit>
-    <bit pos="19">WDF mainline dataflow error (SUE not reliably put in mem)</bit>
-    <bit pos="20">WDF scom register parity err, affecting mainline config</bit>
-    <bit pos="21">WDF scom register parity err, affecting scom ops only</bit>
-    <bit pos="22">WDF SCOM fsm parity error</bit>
-    <bit pos="23">WDF write buffer array CE</bit>
-    <bit pos="24">NCF UE</bit>
-    <bit pos="25">Firmware initiated channel fail</bit>
-    <bit pos="26">NCF logic error</bit>
-    <bit pos="27">NCF parity error</bit>
-    <bit pos="28">NCF correctable error</bit>
-    <bit pos="29">Internal scom error</bit>
-    <bit pos="30">Internal scom error copy</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_tlx_err_rpt_1.xml b/xml/explorer/node_tlx_err_rpt_1.xml
deleted file mode 100644
index d7aced3..0000000
--- a/xml/explorer/node_tlx_err_rpt_1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="TLX_ERR_RPT_1" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <rule attn_type="UCS" node_inst="0">
-        <!-- REG & ~MASK & 0x0000000005C00000 -->
-        <expr type="and">
-            <expr type="reg" value1="TLX_ERR_RPT_1" />
-            <expr type="not">
-                <expr type="reg" value1="TLX_ERR_RPT_1_MASK" />
-            </expr>
-            <expr type="int" value1="0x0000000005C00000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <!-- REG & ~MASK & 0x0000000005C00000 -->
-        <expr type="and">
-            <expr type="reg" value1="TLX_ERR_RPT_1" />
-            <expr type="not">
-                <expr type="reg" value1="TLX_ERR_RPT_1_MASK" />
-            </expr>
-            <expr type="int" value1="0x0000000005C00000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="HA" node_inst="0">
-        <!-- REG & ~MASK & 0x0000000005C00000 -->
-        <expr type="and">
-            <expr type="reg" value1="TLX_ERR_RPT_1" />
-            <expr type="not">
-                <expr type="reg" value1="TLX_ERR_RPT_1_MASK" />
-            </expr>
-            <expr type="int" value1="0x0000000005C00000" />
-        </expr>
-    </rule>
-
-    <bit pos= "37">TLXT FIFO CE</bit>
-    <bit pos= "39">Unexpected Interrupt Response</bit>
-    <bit pos= "40">BDI Poisoned</bit>
-    <bit pos= "41">TLXT Metadata UE</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_tlxfir.xml b/xml/explorer/node_tlxfir.xml
deleted file mode 100644
index 4cf08f8..0000000
--- a/xml/explorer/node_tlxfir.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="TLXFIR" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <local_fir name="TLXFIR" config="W">
-        <instance reg_inst="0" addr="0x08012400" />
-        <action attn_type="UCS" config="00" />
-        <action attn_type="RE"  config="01" />
-        <action attn_type="HA"  config="10" />
-    </local_fir>
-
-    <register name="TLX_ERR_RPT_0">
-        <instance reg_inst="0" addr="0x0801241C" />
-    </register>
-
-    <register name="TLX_ERR_RPT_1">
-        <instance reg_inst="0" addr="0x0801241D" />
-    </register>
-
-    <register name="TLX_ERR_RPT_2">
-        <instance reg_inst="0" addr="0x0801241E" />
-    </register>
-
-    <register name="TLX_ERR_RPT_0_MASK">
-        <instance reg_inst="0" addr="0x08012414" />
-    </register>
-
-    <register name="TLX_ERR_RPT_1_MASK">
-        <instance reg_inst="0" addr="0x08012415" />
-    </register>
-
-    <register name="TLX_ERR_RPT_2_MASK">
-        <instance reg_inst="0" addr="0x08012416" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="TLX_ERR_RPT_0"      reg_inst="0" />
-        <capture_register reg_name="TLX_ERR_RPT_1"      reg_inst="0" />
-        <capture_register reg_name="TLX_ERR_RPT_2"      reg_inst="0" />
-        <capture_register reg_name="TLX_ERR_RPT_0_MASK" reg_inst="0" />
-        <capture_register reg_name="TLX_ERR_RPT_1_MASK" reg_inst="0" />
-        <capture_register reg_name="TLX_ERR_RPT_2_MASK" reg_inst="0" />
-    </capture_group>
-
-    <bit pos= "0"   >Info reg parity error</bit>
-    <bit pos= "1"   >Ctrl reg parity error</bit>
-    <bit pos= "2"   >TLX VC0 return credit counter overflow</bit>
-    <bit pos= "3"   >TLX VC1 return credit counter overflow</bit>
-    <bit pos= "4"   >TLX dcp0 return credit counter overflow</bit>
-    <bit pos= "5"   >TLX dcp1 return credit counter overflow</bit>
-    <bit pos= "6"   >TLX credit management block error</bit>
-    <bit pos= "7"   >TLX credit management block parity error</bit>
-    <bit pos= "8"   >TLXT fatal parity error</bit>
-    <bit pos= "9" child_node="TLX_ERR_RPT_1">TLXT recoverable error</bit>
-    <bit pos="10"   >TLXT configuration error</bit>
-    <bit pos="11"   >TLXT informational parity error</bit>
-    <bit pos="12"   >TLXT hard error</bit>
-    <bit pos="13:15">Reserved</bit>
-    <bit pos="16"   >Corrupted pad mem pattern</bit>
-    <bit pos="17"   >Downstream OC parity error</bit>
-    <bit pos="18"   >OC malformed</bit>
-    <bit pos="19"   >OC protocol error</bit>
-    <bit pos="20"   >Address translate error</bit>
-    <bit pos="21"   >Metadata unc or data parity error</bit>
-    <bit pos="22"   >OC unsupported group 2</bit>
-    <bit pos="23"   >OC unsupported group 1</bit>
-    <bit pos="24"   >Bit flip control error</bit>
-    <bit pos="25"   >Control HW error</bit>
-    <bit pos="26"   >ECC corrected and others</bit>
-    <bit pos="27"   >Trace stop</bit>
-    <bit pos="28"   >Internal SCOM error</bit>
-    <bit pos="29"   >Internal SCOM error clone</bit>
-
-</attn_node>
diff --git a/xml/lib/BitRange.pm b/xml/lib/BitRange.pm
deleted file mode 100644
index e9bce35..0000000
--- a/xml/lib/BitRange.pm
+++ /dev/null
@@ -1,114 +0,0 @@
-package BitRange;
-
-use warnings;
-use strict;
-
-use Data::Dumper;
-
-#-------------------------------------------------------------------------------
-
-# Takes a string of integers separated by ',' (concat) and ':' (range). Will
-# return a sorted list of the expanded strings.
-sub expand($)
-{
-    my ( $str ) = @_;
-
-    my @list;
-    for my $e ( split(/,/, $str) )
-    {
-        if ( $e =~ /([0-9]+):([0-9]+)/ )
-        {
-            push @list, $_ foreach ( int($1)..int($2) );
-        }
-        else
-        {
-            push @list, int($e);
-        }
-    }
-
-    return @list;
-}
-
-#-------------------------------------------------------------------------------
-
-sub __combineConsecutiveRanges($$;$$); # because it is called recursively
-
-sub __combineConsecutiveRanges($$;$$)
-{
-    my ( $in, $out, $first, $last ) = @_;
-
-    # Check if there are any elements in the input list.
-    if ( 0 < scalar @{$in} )
-    {
-        # Check if we have found any previous range elements.
-        if ( defined $first )
-        {
-            if ( defined $last )
-            {
-                # We have at least two in a range. Check if the next one is in
-                # the consecutive range.
-                if ( $last + 1 == $in->[0] )
-                {
-                    $last = shift @{$in};
-                }
-                # This range is done. Add to the list and start the next range.
-                else
-                {
-                    push @{$out}, "$first:$last";
-                    $first = shift @{$in};
-                    $last = undef;
-                }
-            }
-            else
-            {
-                # Only the first element in the range so far. Check if the next
-                # one is in the consecutive range.
-                if ( $first + 1 == $in->[0] )
-                {
-                    $last = shift @{$in};
-                }
-                # This range is done. Add to the list and start the next range.
-                else
-                {
-                    push @{$out}, "$first";
-                    $first = shift @{$in};
-                    $last = undef;
-                }
-            }
-        }
-        # No previous range elements. Get the first one.
-        else
-        {
-            $first = shift @{$in};
-            $last  = undef; # Just in case.
-        }
-
-        # Iterate again.
-        __combineConsecutiveRanges($in, $out, $first, $last);
-    }
-    # Nothing else in the input list. Add any trailing range elements.
-    elsif ( defined $first )
-    {
-        push @{$out}, "$first" . ((defined $last) ? ":$last" : "");
-    }
-}
-
-# Takes a reference to a list of integers. Any set of consecutive integers will
-# be combined using the ':' character to represent a range
-# (i.e. 0,1,2,3 => 0:3). The remaining non-consecutive integers will be combined
-# with ',' character (i.e. 0,2,3,5 => 0,2:3,5).
-sub compress($)
-{
-    my ( $in ) = @_;
-
-    # Next, combine all of the consecutive ranges.
-    my $out = [];
-    __combineConsecutiveRanges( $in, $out );
-
-    # Now, combine the non-consecutive elements and return the string.
-    return join( ',', @{$out} );
-}
-
-#-------------------------------------------------------------------------------
-
-1;
diff --git a/xml/meson.build b/xml/meson.build
deleted file mode 100644
index 7e56fbb..0000000
--- a/xml/meson.build
+++ /dev/null
@@ -1,47 +0,0 @@
-#-------------------------------------------------------------------------------
-# Chip Data Files
-#-------------------------------------------------------------------------------
-
-build_cdb = find_program('parse_chip_data_xml')
-
-# The key for each entry in this dictionary is a subdirectory containing XML for
-# a chip model. The value for each entry contains the expected output files that
-# will be produced for each chip model. It is important to note that the script
-# will generate all output files, regardless of what is listed, when the script
-# is run. However, this list must be kept in sync with the expected output so
-# that meson will know to run the script when an output file has changed or is
-# missing.
-cdb_files = {}
-
-chip_config = get_option('chip_config')
-if 'p10' in chip_config
-    cdb_files += {'p10' : ['chip_data_p10_10.cdb', 'chip_data_p10_20.cdb']}
-endif
-
-if 'explorer' in chip_config
-    cdb_files += {'explorer' : ['chip_data_explorer_11.cdb',
-                                'chip_data_explorer_20.cdb']}
-endif
-
-foreach chip_dir, out_files : cdb_files
-
-    source_dir = meson.current_source_dir() + '/' + chip_dir
-    build_dir  = meson.current_build_dir()
-
-    # Get all XML files in the chip directory. This is a bit of a workaround
-    # because meson does not allow wildcards.
-    xml_list = run_command('xml_list.sh', source_dir)
-    in_files = xml_list.stdout().strip().split('\n')
-
-    custom_target('build_cdb_' + chip_dir, build_by_default : true,
-                  input : in_files, output : out_files,
-                  command : [ build_cdb, '--cdb',
-                              '-i', source_dir,
-                              '-o', build_dir ],
-                  install : true,
-                  install_dir : join_paths(get_option('prefix'),
-                                           get_option('datadir'),
-                                           meson.project_name()))
-
-endforeach
-
diff --git a/xml/p10/chip_p10.xml b/xml/p10/chip_p10.xml
deleted file mode 100644
index d019d34..0000000
--- a/xml/p10/chip_p10.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chip model_ec="P10_10,P10_20" name="P10">
-    <attn_tree attn_type="CS" node_inst="0" root_node="GFIR_CS"/>
-    <attn_tree attn_type="RE" node_inst="0" root_node="GFIR_RE"/>
-    <attn_tree attn_type="SPA" node_inst="0" root_node="GFIR_SPA"/>
-    <attn_tree attn_type="UCS" node_inst="0" root_node="GFIR_UCS"/>
-    <attn_tree attn_type="HA" node_inst="0" root_node="GFIR_HA"/>
-</chip>
diff --git a/xml/p10/node_cfir_eq_cs.xml b/xml/p10/node_cfir_eq_cs.xml
deleted file mode 100644
index 85a8240..0000000
--- a/xml/p10/node_cfir_eq_cs.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_CS" reg_type="SCOM">
-    <register name="CFIR_EQ_CS">
-        <instance addr="0x20040000" reg_inst="0"/>
-        <instance addr="0x21040000" reg_inst="1"/>
-        <instance addr="0x22040000" reg_inst="2"/>
-        <instance addr="0x23040000" reg_inst="3"/>
-        <instance addr="0x24040000" reg_inst="4"/>
-        <instance addr="0x25040000" reg_inst="5"/>
-        <instance addr="0x26040000" reg_inst="6"/>
-        <instance addr="0x27040000" reg_inst="7"/>
-    </register>
-    <register name="CFIR_EQ_CS_MASK">
-        <instance addr="0x20040040" reg_inst="0"/>
-        <instance addr="0x21040040" reg_inst="1"/>
-        <instance addr="0x22040040" reg_inst="2"/>
-        <instance addr="0x23040040" reg_inst="3"/>
-        <instance addr="0x24040040" reg_inst="4"/>
-        <instance addr="0x25040040" reg_inst="5"/>
-        <instance addr="0x26040040" reg_inst="6"/>
-        <instance addr="0x27040040" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="EQ_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from EQ_LOCAL_FIR</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="0,4,8,12,16,20,24,28" pos="9">Attention from EQ_L2_FIR 0</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="1,5,9,13,17,21,25,29" pos="10">Attention from EQ_L2_FIR 1</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="2,6,10,14,18,22,26,30" pos="11">Attention from EQ_L2_FIR 2</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="3,7,11,15,19,23,27,31" pos="12">Attention from EQ_L2_FIR 2</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="0,4,8,12,16,20,24,28" pos="13">Attention from EQ_L3_FIR 0</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="1,5,9,13,17,21,25,29" pos="14">Attention from EQ_L3_FIR 1</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="2,6,10,14,18,22,26,30" pos="15">Attention from EQ_L3_FIR 2</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="3,7,11,15,19,23,27,31" pos="16">Attention from EQ_L3_FIR 3</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="0,4,8,12,16,20,24,28" pos="17">Attention from EQ_NCU_FIR 0</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="1,5,9,13,17,21,25,29" pos="18">Attention from EQ_NCU_FIR 1</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="2,6,10,14,18,22,26,30" pos="19">Attention from EQ_NCU_FIR 2</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="3,7,11,15,19,23,27,31" pos="20">Attention from EQ_NCU_FIR 3</bit>
-    <bit child_node="EQ_QME_FIR" node_inst="0,1,2,3,4,5,6,7" pos="21">Attention from EQ_QME_FIR</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="0,4,8,12,16,20,24,28" pos="5">Attention from EQ_CORE_FIR 0</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="1,5,9,13,17,21,25,29" pos="6">Attention from EQ_CORE_FIR 1</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="2,6,10,14,18,22,26,30" pos="7">Attention from EQ_CORE_FIR 2</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="3,7,11,15,19,23,27,31" pos="8">Attention from EQ_CORE_FIR 3</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_eq_ha.xml b/xml/p10/node_cfir_eq_ha.xml
deleted file mode 100644
index f46b6f6..0000000
--- a/xml/p10/node_cfir_eq_ha.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_HA" reg_type="SCOM">
-    <register name="CFIR_EQ_HA">
-        <instance addr="0x20040004" reg_inst="0"/>
-        <instance addr="0x21040004" reg_inst="1"/>
-        <instance addr="0x22040004" reg_inst="2"/>
-        <instance addr="0x23040004" reg_inst="3"/>
-        <instance addr="0x24040004" reg_inst="4"/>
-        <instance addr="0x25040004" reg_inst="5"/>
-        <instance addr="0x26040004" reg_inst="6"/>
-        <instance addr="0x27040004" reg_inst="7"/>
-    </register>
-    <register name="CFIR_EQ_HA_MASK">
-        <instance addr="0x20040044" reg_inst="0"/>
-        <instance addr="0x21040044" reg_inst="1"/>
-        <instance addr="0x22040044" reg_inst="2"/>
-        <instance addr="0x23040044" reg_inst="3"/>
-        <instance addr="0x24040044" reg_inst="4"/>
-        <instance addr="0x25040044" reg_inst="5"/>
-        <instance addr="0x26040044" reg_inst="6"/>
-        <instance addr="0x27040044" reg_inst="7"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="EQ_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from EQ_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_eq_re.xml b/xml/p10/node_cfir_eq_re.xml
deleted file mode 100644
index 9cdd8c8..0000000
--- a/xml/p10/node_cfir_eq_re.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_RE" reg_type="SCOM">
-    <register name="CFIR_EQ_RE">
-        <instance addr="0x20040001" reg_inst="0"/>
-        <instance addr="0x21040001" reg_inst="1"/>
-        <instance addr="0x22040001" reg_inst="2"/>
-        <instance addr="0x23040001" reg_inst="3"/>
-        <instance addr="0x24040001" reg_inst="4"/>
-        <instance addr="0x25040001" reg_inst="5"/>
-        <instance addr="0x26040001" reg_inst="6"/>
-        <instance addr="0x27040001" reg_inst="7"/>
-    </register>
-    <register name="CFIR_EQ_RE_MASK">
-        <instance addr="0x20040041" reg_inst="0"/>
-        <instance addr="0x21040041" reg_inst="1"/>
-        <instance addr="0x22040041" reg_inst="2"/>
-        <instance addr="0x23040041" reg_inst="3"/>
-        <instance addr="0x24040041" reg_inst="4"/>
-        <instance addr="0x25040041" reg_inst="5"/>
-        <instance addr="0x26040041" reg_inst="6"/>
-        <instance addr="0x27040041" reg_inst="7"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x2FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="EQ_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from EQ_LOCAL_FIR</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="0,4,8,12,16,20,24,28" pos="9">Attention from EQ_L2_FIR 0</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="1,5,9,13,17,21,25,29" pos="10">Attention from EQ_L2_FIR 1</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="2,6,10,14,18,22,26,30" pos="11">Attention from EQ_L2_FIR 2</bit>
-    <bit child_node="EQ_L2_FIR" node_inst="3,7,11,15,19,23,27,31" pos="12">Attention from EQ_L2_FIR 3</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="0,4,8,12,16,20,24,28" pos="13">Attention from EQ_L3_FIR 0</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="1,5,9,13,17,21,25,29" pos="14">Attention from EQ_L3_FIR 1</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="2,6,10,14,18,22,26,30" pos="15">Attention from EQ_L3_FIR 2</bit>
-    <bit child_node="EQ_L3_FIR" node_inst="3,7,11,15,19,23,27,31" pos="16">Attention from EQ_L3_FIR 3</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="0,4,8,12,16,20,24,28" pos="17">Attention from EQ_NCU_FIR 0</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="1,5,9,13,17,21,25,29" pos="18">Attention from EQ_NCU_FIR 1</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="2,6,10,14,18,22,26,30" pos="19">Attention from EQ_NCU_FIR 2</bit>
-    <bit child_node="EQ_NCU_FIR" node_inst="3,7,11,15,19,23,27,31" pos="20">Attention from EQ_NCU_FIR 3</bit>
-    <bit child_node="EQ_QME_FIR" node_inst="0,1,2,3,4,5,6,7" pos="21">Attention from EQ_QME_FIR</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="0,4,8,12,16,20,24,28" pos="5">Attention from EQ_CORE_FIR 0</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="1,5,9,13,17,21,25,29" pos="6">Attention from EQ_CORE_FIR 1</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="2,6,10,14,18,22,26,30" pos="7">Attention from EQ_CORE_FIR 2</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="3,7,11,15,19,23,27,31" pos="8">Attention from EQ_CORE_FIR 3</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_eq_spa.xml b/xml/p10/node_cfir_eq_spa.xml
deleted file mode 100644
index 9026f19..0000000
--- a/xml/p10/node_cfir_eq_spa.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_SPA" reg_type="SCOM">
-    <register name="CFIR_EQ_SPA">
-        <instance addr="0x20040002" reg_inst="0"/>
-        <instance addr="0x21040002" reg_inst="1"/>
-        <instance addr="0x22040002" reg_inst="2"/>
-        <instance addr="0x23040002" reg_inst="3"/>
-        <instance addr="0x24040002" reg_inst="4"/>
-        <instance addr="0x25040002" reg_inst="5"/>
-        <instance addr="0x26040002" reg_inst="6"/>
-        <instance addr="0x27040002" reg_inst="7"/>
-    </register>
-    <register name="CFIR_EQ_SPA_MASK">
-        <instance addr="0x20040042" reg_inst="0"/>
-        <instance addr="0x21040042" reg_inst="1"/>
-        <instance addr="0x22040042" reg_inst="2"/>
-        <instance addr="0x23040042" reg_inst="3"/>
-        <instance addr="0x24040042" reg_inst="4"/>
-        <instance addr="0x25040042" reg_inst="5"/>
-        <instance addr="0x26040042" reg_inst="6"/>
-        <instance addr="0x27040042" reg_inst="7"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="EQ_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from EQ_LOCAL_FIR</bit>
-    <!-- NOTE: Attentions routed to this node from the EQ_SPATTN registers
-         depend if the cores are configured in Normal or Fused Core mode.
-         Therefore the core thread state must be queried first. -->
-    <bit child_node="EQ_CORE_THREAD_STATE" node_inst="0,4,8,12,16,20,24,28" pos="5:8">Core Special Attention Register</bit>
-    <bit child_node="EQ_CORE_THREAD_STATE" node_inst="1,5,9,13,17,21,25,29" pos="9:12">Core Special Attention Register</bit>
-    <bit child_node="EQ_CORE_THREAD_STATE" node_inst="2,6,10,14,18,22,26,30" pos="13:16">Core Special Attention Register</bit>
-    <bit child_node="EQ_CORE_THREAD_STATE" node_inst="3,7,11,15,19,23,27,31" pos="17:20">Core Special Attention Register</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_eq_ucs.xml b/xml/p10/node_cfir_eq_ucs.xml
deleted file mode 100644
index d2ce8ab..0000000
--- a/xml/p10/node_cfir_eq_ucs.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_UCS" reg_type="SCOM">
-    <register name="CFIR_EQ_UCS">
-        <instance addr="0x20040003" reg_inst="0"/>
-        <instance addr="0x21040003" reg_inst="1"/>
-        <instance addr="0x22040003" reg_inst="2"/>
-        <instance addr="0x23040003" reg_inst="3"/>
-        <instance addr="0x24040003" reg_inst="4"/>
-        <instance addr="0x25040003" reg_inst="5"/>
-        <instance addr="0x26040003" reg_inst="6"/>
-        <instance addr="0x27040003" reg_inst="7"/>
-    </register>
-    <register name="CFIR_EQ_UCS_MASK">
-        <instance addr="0x20040043" reg_inst="0"/>
-        <instance addr="0x21040043" reg_inst="1"/>
-        <instance addr="0x22040043" reg_inst="2"/>
-        <instance addr="0x23040043" reg_inst="3"/>
-        <instance addr="0x24040043" reg_inst="4"/>
-        <instance addr="0x25040043" reg_inst="5"/>
-        <instance addr="0x26040043" reg_inst="6"/>
-        <instance addr="0x27040043" reg_inst="7"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="EQ_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from EQ_LOCAL_FIR</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="0,4,8,12,16,20,24,28" pos="5">Attention from EQ_CORE_FIR 0</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="1,5,9,13,17,21,25,29" pos="6">Attention from EQ_CORE_FIR 1</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="2,6,10,14,18,22,26,30" pos="7">Attention from EQ_CORE_FIR 2</bit>
-    <bit child_node="EQ_CORE_FIR" node_inst="3,7,11,15,19,23,27,31" pos="8">Attention from EQ_CORE_FIR 3</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_cs.xml b/xml/p10/node_cfir_iohs_cs.xml
deleted file mode 100644
index fc31cf2..0000000
--- a/xml/p10/node_cfir_iohs_cs.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_CS" reg_type="SCOM">
-    <register name="CFIR_IOHS_CS">
-        <instance addr="0x18040000" reg_inst="0"/>
-        <instance addr="0x19040000" reg_inst="1"/>
-        <instance addr="0x1A040000" reg_inst="2"/>
-        <instance addr="0x1B040000" reg_inst="3"/>
-        <instance addr="0x1C040000" reg_inst="4"/>
-        <instance addr="0x1D040000" reg_inst="5"/>
-        <instance addr="0x1E040000" reg_inst="6"/>
-        <instance addr="0x1F040000" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_CS_MASK">
-        <instance addr="0x18040040" reg_inst="0"/>
-        <instance addr="0x19040040" reg_inst="1"/>
-        <instance addr="0x1A040040" reg_inst="2"/>
-        <instance addr="0x1B040040" reg_inst="3"/>
-        <instance addr="0x1C040040" reg_inst="4"/>
-        <instance addr="0x1D040040" reg_inst="5"/>
-        <instance addr="0x1E040040" reg_inst="6"/>
-        <instance addr="0x1F040040" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-    <bit child_node="IOHS_DLP_PHY_CONFIG" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_ha.xml b/xml/p10/node_cfir_iohs_ha.xml
deleted file mode 100644
index 5fe6507..0000000
--- a/xml/p10/node_cfir_iohs_ha.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_HA" reg_type="SCOM">
-    <register name="CFIR_IOHS_HA">
-        <instance addr="0x18040004" reg_inst="0"/>
-        <instance addr="0x19040004" reg_inst="1"/>
-        <instance addr="0x1A040004" reg_inst="2"/>
-        <instance addr="0x1B040004" reg_inst="3"/>
-        <instance addr="0x1C040004" reg_inst="4"/>
-        <instance addr="0x1D040004" reg_inst="5"/>
-        <instance addr="0x1E040004" reg_inst="6"/>
-        <instance addr="0x1F040004" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_HA_MASK">
-        <instance addr="0x18040044" reg_inst="0"/>
-        <instance addr="0x19040044" reg_inst="1"/>
-        <instance addr="0x1A040044" reg_inst="2"/>
-        <instance addr="0x1B040044" reg_inst="3"/>
-        <instance addr="0x1C040044" reg_inst="4"/>
-        <instance addr="0x1D040044" reg_inst="5"/>
-        <instance addr="0x1E040044" reg_inst="6"/>
-        <instance addr="0x1F040044" reg_inst="7"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_re.xml b/xml/p10/node_cfir_iohs_re.xml
deleted file mode 100644
index 5ce1228..0000000
--- a/xml/p10/node_cfir_iohs_re.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_RE" reg_type="SCOM">
-    <register name="CFIR_IOHS_RE">
-        <instance addr="0x18040001" reg_inst="0"/>
-        <instance addr="0x19040001" reg_inst="1"/>
-        <instance addr="0x1A040001" reg_inst="2"/>
-        <instance addr="0x1B040001" reg_inst="3"/>
-        <instance addr="0x1C040001" reg_inst="4"/>
-        <instance addr="0x1D040001" reg_inst="5"/>
-        <instance addr="0x1E040001" reg_inst="6"/>
-        <instance addr="0x1F040001" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_RE_MASK">
-        <instance addr="0x18040041" reg_inst="0"/>
-        <instance addr="0x19040041" reg_inst="1"/>
-        <instance addr="0x1A040041" reg_inst="2"/>
-        <instance addr="0x1B040041" reg_inst="3"/>
-        <instance addr="0x1C040041" reg_inst="4"/>
-        <instance addr="0x1D040041" reg_inst="5"/>
-        <instance addr="0x1E040041" reg_inst="6"/>
-        <instance addr="0x1F040041" reg_inst="7"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-    <bit child_node="IOHS_DLP_PHY_CONFIG" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_spa.xml b/xml/p10/node_cfir_iohs_spa.xml
deleted file mode 100644
index 6e488d5..0000000
--- a/xml/p10/node_cfir_iohs_spa.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_SPA" reg_type="SCOM">
-    <register name="CFIR_IOHS_SPA">
-        <instance addr="0x18040002" reg_inst="0"/>
-        <instance addr="0x19040002" reg_inst="1"/>
-        <instance addr="0x1A040002" reg_inst="2"/>
-        <instance addr="0x1B040002" reg_inst="3"/>
-        <instance addr="0x1C040002" reg_inst="4"/>
-        <instance addr="0x1D040002" reg_inst="5"/>
-        <instance addr="0x1E040002" reg_inst="6"/>
-        <instance addr="0x1F040002" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_SPA_MASK">
-        <instance addr="0x18040042" reg_inst="0"/>
-        <instance addr="0x19040042" reg_inst="1"/>
-        <instance addr="0x1A040042" reg_inst="2"/>
-        <instance addr="0x1B040042" reg_inst="3"/>
-        <instance addr="0x1C040042" reg_inst="4"/>
-        <instance addr="0x1D040042" reg_inst="5"/>
-        <instance addr="0x1E040042" reg_inst="6"/>
-        <instance addr="0x1F040042" reg_inst="7"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-    <bit child_node="IOHS_DLP_PHY_CONFIG" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_ucs.xml b/xml/p10/node_cfir_iohs_ucs.xml
deleted file mode 100644
index 05e771c..0000000
--- a/xml/p10/node_cfir_iohs_ucs.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_UCS" reg_type="SCOM">
-    <register name="CFIR_IOHS_UCS">
-        <instance addr="0x18040003" reg_inst="0"/>
-        <instance addr="0x19040003" reg_inst="1"/>
-        <instance addr="0x1A040003" reg_inst="2"/>
-        <instance addr="0x1B040003" reg_inst="3"/>
-        <instance addr="0x1C040003" reg_inst="4"/>
-        <instance addr="0x1D040003" reg_inst="5"/>
-        <instance addr="0x1E040003" reg_inst="6"/>
-        <instance addr="0x1F040003" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_UCS_MASK">
-        <instance addr="0x18040043" reg_inst="0"/>
-        <instance addr="0x19040043" reg_inst="1"/>
-        <instance addr="0x1A040043" reg_inst="2"/>
-        <instance addr="0x1B040043" reg_inst="3"/>
-        <instance addr="0x1C040043" reg_inst="4"/>
-        <instance addr="0x1D040043" reg_inst="5"/>
-        <instance addr="0x1E040043" reg_inst="6"/>
-        <instance addr="0x1F040043" reg_inst="7"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_cs.xml b/xml/p10/node_cfir_mc_cs.xml
deleted file mode 100644
index c6ccfa3..0000000
--- a/xml/p10/node_cfir_mc_cs.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_CS" reg_type="SCOM">
-    <register name="CFIR_MC_CS">
-        <instance addr="0x0C040000" reg_inst="0"/>
-        <instance addr="0x0D040000" reg_inst="1"/>
-        <instance addr="0x0E040000" reg_inst="2"/>
-        <instance addr="0x0F040000" reg_inst="3"/>
-    </register>
-    <register name="CFIR_MC_CS_MASK">
-        <instance addr="0x0C040040" reg_inst="0"/>
-        <instance addr="0x0D040040" reg_inst="1"/>
-        <instance addr="0x0E040040" reg_inst="2"/>
-        <instance addr="0x0F040040" reg_inst="3"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_ha.xml b/xml/p10/node_cfir_mc_ha.xml
deleted file mode 100644
index 5b82c6c..0000000
--- a/xml/p10/node_cfir_mc_ha.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_HA" reg_type="SCOM">
-    <register name="CFIR_MC_HA">
-        <instance addr="0x0C040004" reg_inst="0"/>
-        <instance addr="0x0D040004" reg_inst="1"/>
-        <instance addr="0x0E040004" reg_inst="2"/>
-        <instance addr="0x0F040004" reg_inst="3"/>
-    </register>
-    <register name="CFIR_MC_HA_MASK">
-        <instance addr="0x0C040044" reg_inst="0"/>
-        <instance addr="0x0D040044" reg_inst="1"/>
-        <instance addr="0x0E040044" reg_inst="2"/>
-        <instance addr="0x0F040044" reg_inst="3"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_re.xml b/xml/p10/node_cfir_mc_re.xml
deleted file mode 100644
index a36b867..0000000
--- a/xml/p10/node_cfir_mc_re.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_RE" reg_type="SCOM">
-    <register name="CFIR_MC_RE">
-        <instance addr="0x0C040001" reg_inst="0"/>
-        <instance addr="0x0D040001" reg_inst="1"/>
-        <instance addr="0x0E040001" reg_inst="2"/>
-        <instance addr="0x0F040001" reg_inst="3"/>
-    </register>
-    <register name="CFIR_MC_RE_MASK">
-        <instance addr="0x0C040041" reg_inst="0"/>
-        <instance addr="0x0D040041" reg_inst="1"/>
-        <instance addr="0x0E040041" reg_inst="2"/>
-        <instance addr="0x0F040041" reg_inst="3"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_spa.xml b/xml/p10/node_cfir_mc_spa.xml
deleted file mode 100644
index 1c3e1d3..0000000
--- a/xml/p10/node_cfir_mc_spa.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_SPA" reg_type="SCOM">
-    <register name="CFIR_MC_SPA">
-        <instance addr="0x0C040002" reg_inst="0"/>
-        <instance addr="0x0D040002" reg_inst="1"/>
-        <instance addr="0x0E040002" reg_inst="2"/>
-        <instance addr="0x0F040002" reg_inst="3"/>
-    </register>
-    <register name="CFIR_MC_SPA_MASK">
-        <instance addr="0x0C040042" reg_inst="0"/>
-        <instance addr="0x0D040042" reg_inst="1"/>
-        <instance addr="0x0E040042" reg_inst="2"/>
-        <instance addr="0x0F040042" reg_inst="3"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_ucs.xml b/xml/p10/node_cfir_mc_ucs.xml
deleted file mode 100644
index fa50cae..0000000
--- a/xml/p10/node_cfir_mc_ucs.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_UCS" reg_type="SCOM">
-    <register name="CFIR_MC_UCS">
-        <instance addr="0x0C040003" reg_inst="0"/>
-        <instance addr="0x0D040003" reg_inst="1"/>
-        <instance addr="0x0E040003" reg_inst="2"/>
-        <instance addr="0x0F040003" reg_inst="3"/>
-    </register>
-    <register name="CFIR_MC_UCS_MASK">
-        <instance addr="0x0C040043" reg_inst="0"/>
-        <instance addr="0x0D040043" reg_inst="1"/>
-        <instance addr="0x0E040043" reg_inst="2"/>
-        <instance addr="0x0F040043" reg_inst="3"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n0_cs.xml b/xml/p10/node_cfir_n0_cs.xml
deleted file mode 100644
index 3e1241e..0000000
--- a/xml/p10/node_cfir_n0_cs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_CS" reg_type="SCOM">
-    <register name="CFIR_N0_CS">
-        <instance addr="0x02040000" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_CS_MASK">
-        <instance addr="0x02040040" reg_inst="0"/>
-    </register>
-    <rule attn_type="CS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="0" pos="5">Attention from NMMU_CQ_FIR 0</bit>
-    <bit child_node="NMMU_FIR" node_inst="0" pos="6">Attention from NMMU_FIR 0</bit>
-    <bit child_node="INT_CQ_FIR" node_inst="0" pos="7">Attention from INT_CQ_FIR</bit>
-    <bit child_node="VAS_FIR" node_inst="0" pos="8">Attention from VAS_FIR</bit>
-    <bit child_node="NX_DMA_ENG_FIR" node_inst="0" pos="9">Attention from NX_DMA_ENG_FIR</bit>
-    <bit child_node="NX_CQ_FIR" node_inst="0" pos="10">Attention from NX_CQ_FIR</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="3" pos="13">Attention from PCI_NEST_FIR 3</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="4" pos="14">Attention from PCI_NEST_FIR 4</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="5" pos="15">Attention from PCI_NEST_FIR 5</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n0_ha.xml b/xml/p10/node_cfir_n0_ha.xml
deleted file mode 100644
index 14d161d..0000000
--- a/xml/p10/node_cfir_n0_ha.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_HA" reg_type="SCOM">
-    <register name="CFIR_N0_HA">
-        <instance addr="0x02040004" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_HA_MASK">
-        <instance addr="0x02040044" reg_inst="0"/>
-    </register>
-    <rule attn_type="HA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n0_re.xml b/xml/p10/node_cfir_n0_re.xml
deleted file mode 100644
index 784691d..0000000
--- a/xml/p10/node_cfir_n0_re.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_RE" reg_type="SCOM">
-    <register name="CFIR_N0_RE">
-        <instance addr="0x02040001" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_RE_MASK">
-        <instance addr="0x02040041" reg_inst="0"/>
-    </register>
-    <rule attn_type="RE" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="0" pos="5">Attention from NMMU_CQ_FIR 0</bit>
-    <bit child_node="NMMU_FIR" node_inst="0" pos="6">Attention from NMMU_FIR 0</bit>
-    <bit child_node="INT_CQ_FIR" node_inst="0" pos="7">Attention from INT_CQ_FIR</bit>
-    <bit child_node="VAS_FIR" node_inst="0" pos="8">Attention from VAS_FIR</bit>
-    <bit child_node="NX_DMA_ENG_FIR" node_inst="0" pos="9">Attention from NX_DMA_ENG_FIR</bit>
-    <bit child_node="NX_CQ_FIR" node_inst="0" pos="10">Attention from NX_CQ_FIR</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="3" pos="13">Attention from PCI_NEST_FIR 3</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="4" pos="14">Attention from PCI_NEST_FIR 4</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="5" pos="15">Attention from PCI_NEST_FIR 5</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n0_spa.xml b/xml/p10/node_cfir_n0_spa.xml
deleted file mode 100644
index 5250961..0000000
--- a/xml/p10/node_cfir_n0_spa.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_SPA" reg_type="SCOM">
-    <register name="CFIR_N0_SPA">
-        <instance addr="0x02040002" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_SPA_MASK">
-        <instance addr="0x02040042" reg_inst="0"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
-    <bit child_node="INT_CQ_FIR" node_inst="0" pos="7">Attention from INT_CQ_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n0_ucs.xml b/xml/p10/node_cfir_n0_ucs.xml
deleted file mode 100644
index fadd459..0000000
--- a/xml/p10/node_cfir_n0_ucs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_UCS" reg_type="SCOM">
-    <register name="CFIR_N0_UCS">
-        <instance addr="0x02040003" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_UCS_MASK">
-        <instance addr="0x02040043" reg_inst="0"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="0" pos="5">Attention from NMMU_CQ_FIR 0</bit>
-    <bit child_node="NMMU_FIR" node_inst="0" pos="6">Attention from NMMU_FIR 0</bit>
-    <bit child_node="VAS_FIR" node_inst="0" pos="8">Attention from VAS_FIR</bit>
-    <bit child_node="NX_DMA_ENG_FIR" node_inst="0" pos="9">Attention from NX_DMA_ENG_FIR</bit>
-    <bit child_node="NX_CQ_FIR" node_inst="0" pos="10">Attention from NX_CQ_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n1_cs.xml b/xml/p10/node_cfir_n1_cs.xml
deleted file mode 100644
index bf7c764..0000000
--- a/xml/p10/node_cfir_n1_cs.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N1_CS" reg_type="SCOM">
-    <register name="CFIR_N1_CS">
-        <instance addr="0x03040000" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N1_CS_MASK">
-        <instance addr="0x03040040" reg_inst="0"/>
-    </register>
-    <rule attn_type="CS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N1_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N1_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="1" pos="5">Attention from NMMU_CQ_FIR 1</bit>
-    <bit child_node="NMMU_FIR" node_inst="1" pos="6">Attention from NMMU_FIR 1</bit>
-    <bit child_node="MCD_FIR" node_inst="0" pos="7">Attention from MCD_FIR</bit>
-    <bit child_node="HCA_FIR" node_inst="0" pos="9">Attention from HCA_FIR</bit>
-    <bit child_node="LPC_FIR" node_inst="0" pos="11">Attention from LPC_FIR</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="0" pos="13">Attention from PCI_NEST_FIR 0</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="1" pos="14">Attention from PCI_NEST_FIR 1</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="2" pos="15">Attention from PCI_NEST_FIR 2</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="0" pos="17">Attention from PB_STATION_FIR_EQ 0</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="1" pos="18">Attention from PB_STATION_FIR_EQ 1</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="2" pos="19">Attention from PB_STATION_FIR_EQ 2</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="3" pos="20">Attention from PB_STATION_FIR_EQ 3</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="4" pos="21">Attention from PB_STATION_FIR_EQ 4</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="5" pos="22">Attention from PB_STATION_FIR_EQ 5</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="6" pos="23">Attention from PB_STATION_FIR_EQ 6</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="7" pos="24">Attention from PB_STATION_FIR_EQ 7</bit>
-    <bit child_node="PB_STATION_FIR_EN1" node_inst="0" pos="25">Attention from PB_STATION_FIR_EN1</bit>
-    <bit child_node="PB_STATION_FIR_EN2" node_inst="0" pos="26">Attention from PB_STATION_FIR_EN2</bit>
-    <bit child_node="PB_STATION_FIR_EN3" node_inst="0" pos="27">Attention from PB_STATION_FIR_EN3</bit>
-    <bit child_node="PB_STATION_FIR_EN4" node_inst="0" pos="28">Attention from PB_STATION_FIR_EN4</bit>
-    <bit child_node="PB_STATION_FIR_ES1" node_inst="0" pos="29">Attention from PB_STATION_FIR_ES1</bit>
-    <bit child_node="PB_STATION_FIR_ES2" node_inst="0" pos="30">Attention from PB_STATION_FIR_ES2</bit>
-    <bit child_node="PB_STATION_FIR_ES3" node_inst="0" pos="31">Attention from PB_STATION_FIR_ES3</bit>
-    <bit child_node="PB_STATION_FIR_ES4" node_inst="0" pos="32">Attention from PB_STATION_FIR_ES4</bit>
-    <bit child_node="PB_EXT_FIR" node_inst="0" pos="33">Attention from PB_EXT_FIR</bit>
-    <bit child_node="PSIHB_FIR" node_inst="0" pos="38">Attention from PSIHB_FIR</bit>
-    <bit child_node="PBAF_FIR" node_inst="0" pos="39">Attention from PBAF_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n1_ha.xml b/xml/p10/node_cfir_n1_ha.xml
deleted file mode 100644
index d445f15..0000000
--- a/xml/p10/node_cfir_n1_ha.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N1_HA" reg_type="SCOM">
-    <register name="CFIR_N1_HA">
-        <instance addr="0x03040004" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N1_HA_MASK">
-        <instance addr="0x03040044" reg_inst="0"/>
-    </register>
-    <rule attn_type="HA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N1_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N1_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n1_re.xml b/xml/p10/node_cfir_n1_re.xml
deleted file mode 100644
index a74acad..0000000
--- a/xml/p10/node_cfir_n1_re.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N1_RE" reg_type="SCOM">
-    <register name="CFIR_N1_RE">
-        <instance addr="0x03040001" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N1_RE_MASK">
-        <instance addr="0x03040041" reg_inst="0"/>
-    </register>
-    <rule attn_type="RE" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N1_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N1_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="1" pos="5">Attention from NMMU_CQ_FIR 1</bit>
-    <bit child_node="NMMU_FIR" node_inst="1" pos="6">Attention from NMMU_FIR 1</bit>
-    <bit child_node="MCD_FIR" node_inst="0" pos="7">Attention from MCD_FIR</bit>
-    <bit child_node="HCA_FIR" node_inst="0" pos="9">Attention from HCA_FIR</bit>
-    <bit child_node="LPC_FIR" node_inst="0" pos="11">Attention from LPC_FIR</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="0" pos="13">Attention from PCI_NEST_FIR 0</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="1" pos="14">Attention from PCI_NEST_FIR 1</bit>
-    <bit child_node="PCI_NEST_FIR" node_inst="2" pos="15">Attention from PCI_NEST_FIR 2</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="0" pos="17">Attention from PB_STATION_FIR_EQ 0</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="1" pos="18">Attention from PB_STATION_FIR_EQ 1</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="2" pos="19">Attention from PB_STATION_FIR_EQ 2</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="3" pos="20">Attention from PB_STATION_FIR_EQ 3</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="4" pos="21">Attention from PB_STATION_FIR_EQ 4</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="5" pos="22">Attention from PB_STATION_FIR_EQ 5</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="6" pos="23">Attention from PB_STATION_FIR_EQ 6</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="7" pos="24">Attention from PB_STATION_FIR_EQ 7</bit>
-    <bit child_node="PB_STATION_FIR_EN1" node_inst="0" pos="25">Attention from PB_STATION_FIR_EN1</bit>
-    <bit child_node="PB_STATION_FIR_EN2" node_inst="0" pos="26">Attention from PB_STATION_FIR_EN2</bit>
-    <bit child_node="PB_STATION_FIR_EN3" node_inst="0" pos="27">Attention from PB_STATION_FIR_EN3</bit>
-    <bit child_node="PB_STATION_FIR_EN4" node_inst="0" pos="28">Attention from PB_STATION_FIR_EN4</bit>
-    <bit child_node="PB_STATION_FIR_ES1" node_inst="0" pos="29">Attention from PB_STATION_FIR_ES1</bit>
-    <bit child_node="PB_STATION_FIR_ES2" node_inst="0" pos="30">Attention from PB_STATION_FIR_ES2</bit>
-    <bit child_node="PB_STATION_FIR_ES3" node_inst="0" pos="31">Attention from PB_STATION_FIR_ES3</bit>
-    <bit child_node="PB_STATION_FIR_ES4" node_inst="0" pos="32">Attention from PB_STATION_FIR_ES4</bit>
-    <bit child_node="PSIHB_FIR" node_inst="0" pos="38">Attention from PSIHB_FIR</bit>
-    <bit child_node="PBAF_FIR" node_inst="0" pos="39">Attention from PBAF_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n1_spa.xml b/xml/p10/node_cfir_n1_spa.xml
deleted file mode 100644
index 5286a4c..0000000
--- a/xml/p10/node_cfir_n1_spa.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N1_SPA" reg_type="SCOM">
-    <register name="CFIR_N1_SPA">
-        <instance addr="0x03040002" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N1_SPA_MASK">
-        <instance addr="0x03040042" reg_inst="0"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N1_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N1_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
-    <bit child_node="MCD_FIR" node_inst="0" pos="7">Attention from MCD_FIR</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="0" pos="17">Attention from PB_STATION_FIR_EQ 0</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="1" pos="18">Attention from PB_STATION_FIR_EQ 1</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="2" pos="19">Attention from PB_STATION_FIR_EQ 2</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="3" pos="20">Attention from PB_STATION_FIR_EQ 3</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="4" pos="21">Attention from PB_STATION_FIR_EQ 4</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="5" pos="22">Attention from PB_STATION_FIR_EQ 5</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="6" pos="23">Attention from PB_STATION_FIR_EQ 6</bit>
-    <bit child_node="PB_STATION_FIR_EQ" node_inst="7" pos="24">Attention from PB_STATION_FIR_EQ 7</bit>
-    <bit child_node="PB_STATION_FIR_EN1" node_inst="0" pos="25">Attention from PB_STATION_FIR_EN1</bit>
-    <bit child_node="PB_STATION_FIR_EN2" node_inst="0" pos="26">Attention from PB_STATION_FIR_EN2</bit>
-    <bit child_node="PB_STATION_FIR_EN3" node_inst="0" pos="27">Attention from PB_STATION_FIR_EN3</bit>
-    <bit child_node="PB_STATION_FIR_EN4" node_inst="0" pos="28">Attention from PB_STATION_FIR_EN4</bit>
-    <bit child_node="PB_STATION_FIR_ES1" node_inst="0" pos="29">Attention from PB_STATION_FIR_ES1</bit>
-    <bit child_node="PB_STATION_FIR_ES2" node_inst="0" pos="30">Attention from PB_STATION_FIR_ES2</bit>
-    <bit child_node="PB_STATION_FIR_ES3" node_inst="0" pos="31">Attention from PB_STATION_FIR_ES3</bit>
-    <bit child_node="PB_STATION_FIR_ES4" node_inst="0" pos="32">Attention from PB_STATION_FIR_ES4</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_n1_ucs.xml b/xml/p10/node_cfir_n1_ucs.xml
deleted file mode 100644
index bfcd9af..0000000
--- a/xml/p10/node_cfir_n1_ucs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N1_UCS" reg_type="SCOM">
-    <register name="CFIR_N1_UCS">
-        <instance addr="0x03040003" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N1_UCS_MASK">
-        <instance addr="0x03040043" reg_inst="0"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N1_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N1_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
-    <bit child_node="NMMU_CQ_FIR" node_inst="1" pos="5">Attention from NMMU_CQ_FIR 1</bit>
-    <bit child_node="NMMU_FIR" node_inst="1" pos="6">Attention from NMMU_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_cs.xml b/xml/p10/node_cfir_paue_cs.xml
deleted file mode 100644
index 9cff2ff..0000000
--- a/xml/p10/node_cfir_paue_cs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUE_CS" reg_type="SCOM">
-    <register name="CFIR_PAUE_CS">
-        <instance addr="0x10040000" reg_inst="0"/>
-        <instance addr="0x11040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_CS_MASK">
-        <instance addr="0x10040040" reg_inst="0"/>
-        <instance addr="0x11040040" reg_inst="1"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_cs_p10_10.xml b/xml/p10/node_cfir_paue_cs_p10_10.xml
deleted file mode 100644
index e9e5717..0000000
--- a/xml/p10/node_cfir_paue_cs_p10_10.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUE_CS" reg_type="SCOM">
-    <register name="CFIR_PAUE_CS">
-        <instance addr="0x10040000" reg_inst="0"/>
-        <instance addr="0x11040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_CS_MASK">
-        <instance addr="0x10040040" reg_inst="0"/>
-        <instance addr="0x11040040" reg_inst="1"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="0,1" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_ha.xml b/xml/p10/node_cfir_paue_ha.xml
deleted file mode 100644
index 00c551f..0000000
--- a/xml/p10/node_cfir_paue_ha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PAUE_HA" reg_type="SCOM">
-    <register name="CFIR_PAUE_HA">
-        <instance addr="0x10040004" reg_inst="0"/>
-        <instance addr="0x11040004" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_HA_MASK">
-        <instance addr="0x10040044" reg_inst="0"/>
-        <instance addr="0x11040044" reg_inst="1"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_re.xml b/xml/p10/node_cfir_paue_re.xml
deleted file mode 100644
index baaabc1..0000000
--- a/xml/p10/node_cfir_paue_re.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUE_RE" reg_type="SCOM">
-    <register name="CFIR_PAUE_RE">
-        <instance addr="0x10040001" reg_inst="0"/>
-        <instance addr="0x11040001" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_RE_MASK">
-        <instance addr="0x10040041" reg_inst="0"/>
-        <instance addr="0x11040041" reg_inst="1"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_re_p10_10.xml b/xml/p10/node_cfir_paue_re_p10_10.xml
deleted file mode 100644
index 443b743..0000000
--- a/xml/p10/node_cfir_paue_re_p10_10.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUE_RE" reg_type="SCOM">
-    <register name="CFIR_PAUE_RE">
-        <instance addr="0x10040001" reg_inst="0"/>
-        <instance addr="0x11040001" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_RE_MASK">
-        <instance addr="0x10040041" reg_inst="0"/>
-        <instance addr="0x11040041" reg_inst="1"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="0,1" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_spa.xml b/xml/p10/node_cfir_paue_spa.xml
deleted file mode 100644
index aa1c9a0..0000000
--- a/xml/p10/node_cfir_paue_spa.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUE_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUE_SPA">
-        <instance addr="0x10040002" reg_inst="0"/>
-        <instance addr="0x11040002" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_SPA_MASK">
-        <instance addr="0x10040042" reg_inst="0"/>
-        <instance addr="0x11040042" reg_inst="1"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_spa_p10_10.xml b/xml/p10/node_cfir_paue_spa_p10_10.xml
deleted file mode 100644
index e377117..0000000
--- a/xml/p10/node_cfir_paue_spa_p10_10.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUE_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUE_SPA">
-        <instance addr="0x10040002" reg_inst="0"/>
-        <instance addr="0x11040002" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_SPA_MASK">
-        <instance addr="0x10040042" reg_inst="0"/>
-        <instance addr="0x11040042" reg_inst="1"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="0,1" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="0,1" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_ucs.xml b/xml/p10/node_cfir_paue_ucs.xml
deleted file mode 100644
index 1011656..0000000
--- a/xml/p10/node_cfir_paue_ucs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUE_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUE_UCS">
-        <instance addr="0x10040003" reg_inst="0"/>
-        <instance addr="0x11040003" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_UCS_MASK">
-        <instance addr="0x10040043" reg_inst="0"/>
-        <instance addr="0x11040043" reg_inst="1"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_paue_ucs_p10_10.xml b/xml/p10/node_cfir_paue_ucs_p10_10.xml
deleted file mode 100644
index 6d24216..0000000
--- a/xml/p10/node_cfir_paue_ucs_p10_10.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUE_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUE_UCS">
-        <instance addr="0x10040003" reg_inst="0"/>
-        <instance addr="0x11040003" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_UCS_MASK">
-        <instance addr="0x10040043" reg_inst="0"/>
-        <instance addr="0x11040043" reg_inst="1"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="0,3" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="0,1" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="0,1" pos="14">Attention from PAU_DL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_cs.xml b/xml/p10/node_cfir_pauw_cs.xml
deleted file mode 100644
index aefa466..0000000
--- a/xml/p10/node_cfir_pauw_cs.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUW_CS" reg_type="SCOM">
-    <register name="CFIR_PAUW_CS">
-        <instance addr="0x12040000" reg_inst="0"/>
-        <instance addr="0x13040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_CS_MASK">
-        <instance addr="0x12040040" reg_inst="0"/>
-        <instance addr="0x13040040" reg_inst="1"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_cs_p10_10.xml b/xml/p10/node_cfir_pauw_cs_p10_10.xml
deleted file mode 100644
index 83c6bf6..0000000
--- a/xml/p10/node_cfir_pauw_cs_p10_10.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUW_CS" reg_type="SCOM">
-    <register name="CFIR_PAUW_CS">
-        <instance addr="0x12040000" reg_inst="0"/>
-        <instance addr="0x13040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_CS_MASK">
-        <instance addr="0x12040040" reg_inst="0"/>
-        <instance addr="0x13040040" reg_inst="1"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="2,3" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_ha.xml b/xml/p10/node_cfir_pauw_ha.xml
deleted file mode 100644
index 6521416..0000000
--- a/xml/p10/node_cfir_pauw_ha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PAUW_HA" reg_type="SCOM">
-    <register name="CFIR_PAUW_HA">
-        <instance addr="0x12040004" reg_inst="0"/>
-        <instance addr="0x13040004" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_HA_MASK">
-        <instance addr="0x12040044" reg_inst="0"/>
-        <instance addr="0x13040044" reg_inst="1"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_re.xml b/xml/p10/node_cfir_pauw_re.xml
deleted file mode 100644
index 4e6831a..0000000
--- a/xml/p10/node_cfir_pauw_re.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUW_RE" reg_type="SCOM">
-    <register name="CFIR_PAUW_RE">
-        <instance addr="0x12040001" reg_inst="0"/>
-        <instance addr="0x13040001" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_RE_MASK">
-        <instance addr="0x12040041" reg_inst="0"/>
-        <instance addr="0x13040041" reg_inst="1"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_re_p10_10.xml b/xml/p10/node_cfir_pauw_re_p10_10.xml
deleted file mode 100644
index 72c4d78..0000000
--- a/xml/p10/node_cfir_pauw_re_p10_10.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUW_RE" reg_type="SCOM">
-    <register name="CFIR_PAUW_RE">
-        <instance addr="0x12040001" reg_inst="0"/>
-        <instance addr="0x13040001" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_RE_MASK">
-        <instance addr="0x12040041" reg_inst="0"/>
-        <instance addr="0x13040041" reg_inst="1"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="2,3" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_spa.xml b/xml/p10/node_cfir_pauw_spa.xml
deleted file mode 100644
index def81b4..0000000
--- a/xml/p10/node_cfir_pauw_spa.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUW_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUW_SPA">
-        <instance addr="0x12040002" reg_inst="0"/>
-        <instance addr="0x13040002" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_SPA_MASK">
-        <instance addr="0x12040042" reg_inst="0"/>
-        <instance addr="0x13040042" reg_inst="1"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_spa_p10_10.xml b/xml/p10/node_cfir_pauw_spa_p10_10.xml
deleted file mode 100644
index f4b964b..0000000
--- a/xml/p10/node_cfir_pauw_spa_p10_10.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUW_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUW_SPA">
-        <instance addr="0x12040002" reg_inst="0"/>
-        <instance addr="0x13040002" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_SPA_MASK">
-        <instance addr="0x12040042" reg_inst="0"/>
-        <instance addr="0x13040042" reg_inst="1"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="2,3" pos="14">Attention from PAU_DL_FIR</bit>
-    <bit child_node="PAU_PTL_FIR" node_inst="2,3" pos="16">Attention from PAU_PTL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_ucs.xml b/xml/p10/node_cfir_pauw_ucs.xml
deleted file mode 100644
index 6c51deb..0000000
--- a/xml/p10/node_cfir_pauw_ucs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUW_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUW_UCS">
-        <instance addr="0x12040003" reg_inst="0"/>
-        <instance addr="0x13040003" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_UCS_MASK">
-        <instance addr="0x12040043" reg_inst="0"/>
-        <instance addr="0x13040043" reg_inst="1"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pauw_ucs_p10_10.xml b/xml/p10/node_cfir_pauw_ucs_p10_10.xml
deleted file mode 100644
index 605fde6..0000000
--- a/xml/p10/node_cfir_pauw_ucs_p10_10.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUW_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUW_UCS">
-        <instance addr="0x12040003" reg_inst="0"/>
-        <instance addr="0x13040003" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_UCS_MASK">
-        <instance addr="0x12040043" reg_inst="0"/>
-        <instance addr="0x13040043" reg_inst="1"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
-    <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="4,6" pos="7">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_FIR_0" node_inst="5,7" pos="9">Attention from PAU_FIR_0</bit>
-    <bit child_node="PAU_FIR_1" node_inst="5,7" pos="10">Attention from PAU_FIR_1</bit>
-    <bit child_node="PAU_FIR_2" node_inst="5,7" pos="11">Attention from PAU_FIR_2</bit>
-    <bit child_node="PAU_PHY_FIR" node_inst="2,3" pos="13">Attention from PAU_PHY_FIR</bit>
-    <bit child_node="PAU_DL_FIR" node_inst="2,3" pos="14">Attention from PAU_DL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pci_cs.xml b/xml/p10/node_cfir_pci_cs.xml
deleted file mode 100644
index e004e2f..0000000
--- a/xml/p10/node_cfir_pci_cs.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_CS" reg_type="SCOM">
-    <register name="CFIR_PCI_CS">
-        <instance addr="0x08040000" reg_inst="0"/>
-        <instance addr="0x09040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_CS_MASK">
-        <instance addr="0x08040040" reg_inst="0"/>
-        <instance addr="0x09040040" reg_inst="1"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="0,3" pos="5">Attention from PCI_ETU_FIR 0</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="1,4" pos="6">Attention from PCI_ETU_FIR 1</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="2,5" pos="7">Attention from PCI_ETU_FIR 2</bit>
-    <bit child_node="PCI_FIR" node_inst="0,3" pos="9">Attention from PCI_FIR 0</bit>
-    <bit child_node="PCI_FIR" node_inst="1,4" pos="10">Attention from PCI_FIR 1</bit>
-    <bit child_node="PCI_FIR" node_inst="2,5" pos="11">Attention from PCI_FIR 2</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="0,2" pos="12">Attention from PCI_IOP_FIR 0</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="1,3" pos="13">Attention from PCI_IOP_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pci_ha.xml b/xml/p10/node_cfir_pci_ha.xml
deleted file mode 100644
index 9aae28e..0000000
--- a/xml/p10/node_cfir_pci_ha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_HA" reg_type="SCOM">
-    <register name="CFIR_PCI_HA">
-        <instance addr="0x08040004" reg_inst="0"/>
-        <instance addr="0x09040004" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_HA_MASK">
-        <instance addr="0x08040044" reg_inst="0"/>
-        <instance addr="0x09040044" reg_inst="1"/>
-    </register>
-    <rule attn_type="HA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pci_re.xml b/xml/p10/node_cfir_pci_re.xml
deleted file mode 100644
index f4cb1f5..0000000
--- a/xml/p10/node_cfir_pci_re.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_RE" reg_type="SCOM">
-    <register name="CFIR_PCI_RE">
-        <instance addr="0x08040001" reg_inst="0"/>
-        <instance addr="0x09040001" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_RE_MASK">
-        <instance addr="0x08040041" reg_inst="0"/>
-        <instance addr="0x09040041" reg_inst="1"/>
-    </register>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="0,3" pos="5">Attention from PCI_ETU_FIR 0</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="1,4" pos="6">Attention from PCI_ETU_FIR 1</bit>
-    <bit child_node="PCI_ETU_FIR" node_inst="2,5" pos="7">Attention from PCI_ETU_FIR 2</bit>
-    <bit child_node="PCI_FIR" node_inst="0,3" pos="9">Attention from PCI_FIR 0</bit>
-    <bit child_node="PCI_FIR" node_inst="1,4" pos="10">Attention from PCI_FIR 1</bit>
-    <bit child_node="PCI_FIR" node_inst="2,5" pos="11">Attention from PCI_FIR 2</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="0,2" pos="12">Attention from PCI_IOP_FIR 0</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="1,3" pos="13">Attention from PCI_IOP_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pci_spa.xml b/xml/p10/node_cfir_pci_spa.xml
deleted file mode 100644
index a57ddc6..0000000
--- a/xml/p10/node_cfir_pci_spa.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_SPA" reg_type="SCOM">
-    <register name="CFIR_PCI_SPA">
-        <instance addr="0x08040002" reg_inst="0"/>
-        <instance addr="0x09040002" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_SPA_MASK">
-        <instance addr="0x08040042" reg_inst="0"/>
-        <instance addr="0x09040042" reg_inst="1"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_pci_ucs.xml b/xml/p10/node_cfir_pci_ucs.xml
deleted file mode 100644
index edc6c14..0000000
--- a/xml/p10/node_cfir_pci_ucs.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_UCS" reg_type="SCOM">
-    <register name="CFIR_PCI_UCS">
-        <instance addr="0x08040003" reg_inst="0"/>
-        <instance addr="0x09040003" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_UCS_MASK">
-        <instance addr="0x08040043" reg_inst="0"/>
-        <instance addr="0x09040043" reg_inst="1"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="0,2" pos="12">Attention from PCI_IOP_FIR 0</bit>
-    <bit child_node="PCI_IOP_FIR" node_inst="1,3" pos="13">Attention from PCI_IOP_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_cs.xml b/xml/p10/node_cfir_tp_cs.xml
deleted file mode 100644
index edaab89..0000000
--- a/xml/p10/node_cfir_tp_cs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_CS" reg_type="SCOM">
-    <register name="CFIR_TP_CS">
-        <instance addr="0x01040000" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_CS_MASK">
-        <instance addr="0x01040040" reg_inst="0"/>
-    </register>
-    <rule attn_type="CS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_TP_CS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_CS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-    <bit child_node="OCC_FIR" node_inst="0" pos="5">Attention from OCC_FIR</bit>
-    <bit child_node="PBAO_FIR" node_inst="0" pos="6">Attention from PBAO_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_ha.xml b/xml/p10/node_cfir_tp_ha.xml
deleted file mode 100644
index 9649730..0000000
--- a/xml/p10/node_cfir_tp_ha.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_HA" reg_type="SCOM">
-    <register name="CFIR_TP_HA">
-        <instance addr="0x01040004" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_HA_MASK">
-        <instance addr="0x01040044" reg_inst="0"/>
-    </register>
-    <rule attn_type="HA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_TP_HA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_HA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_re.xml b/xml/p10/node_cfir_tp_re.xml
deleted file mode 100644
index 28d1b09..0000000
--- a/xml/p10/node_cfir_tp_re.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_RE" reg_type="SCOM">
-    <register name="CFIR_TP_RE">
-        <instance addr="0x01040001" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_RE_MASK">
-        <instance addr="0x01040041" reg_inst="0"/>
-    </register>
-    <rule attn_type="RE" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_TP_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit pos="2">recovery with any local checkstop</bit>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-    <bit child_node="OCC_FIR" node_inst="0" pos="5">Attention from OCC_FIR</bit>
-    <bit child_node="PBAO_FIR" node_inst="0" pos="6">Attention from PBAO_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_spa.xml b/xml/p10/node_cfir_tp_spa.xml
deleted file mode 100644
index c3d3b37..0000000
--- a/xml/p10/node_cfir_tp_spa.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_SPA" reg_type="SCOM">
-    <register name="CFIR_TP_SPA">
-        <instance addr="0x01040002" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_SPA_MASK">
-        <instance addr="0x01040042" reg_inst="0"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_TP_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_ucs.xml b/xml/p10/node_cfir_tp_ucs.xml
deleted file mode 100644
index e265fe3..0000000
--- a/xml/p10/node_cfir_tp_ucs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_UCS" reg_type="SCOM">
-    <register name="CFIR_TP_UCS">
-        <instance addr="0x01040003" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_UCS_MASK">
-        <instance addr="0x01040043" reg_inst="0"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_TP_UCS"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_UCS_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_core_fir.xml b/xml/p10/node_eq_core_fir.xml
deleted file mode 100644
index 92864c0..0000000
--- a/xml/p10/node_eq_core_fir.xml
+++ /dev/null
@@ -1,1436 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="EQ_CORE_FIR" reg_type="SCOM">
-    <register name="EQ_CORE_FIR">
-        <instance addr="0x20028440" reg_inst="0"/>
-        <instance addr="0x20024440" reg_inst="1"/>
-        <instance addr="0x20022440" reg_inst="2"/>
-        <instance addr="0x20021440" reg_inst="3"/>
-        <instance addr="0x21028440" reg_inst="4"/>
-        <instance addr="0x21024440" reg_inst="5"/>
-        <instance addr="0x21022440" reg_inst="6"/>
-        <instance addr="0x21021440" reg_inst="7"/>
-        <instance addr="0x22028440" reg_inst="8"/>
-        <instance addr="0x22024440" reg_inst="9"/>
-        <instance addr="0x22022440" reg_inst="10"/>
-        <instance addr="0x22021440" reg_inst="11"/>
-        <instance addr="0x23028440" reg_inst="12"/>
-        <instance addr="0x23024440" reg_inst="13"/>
-        <instance addr="0x23022440" reg_inst="14"/>
-        <instance addr="0x23021440" reg_inst="15"/>
-        <instance addr="0x24028440" reg_inst="16"/>
-        <instance addr="0x24024440" reg_inst="17"/>
-        <instance addr="0x24022440" reg_inst="18"/>
-        <instance addr="0x24021440" reg_inst="19"/>
-        <instance addr="0x25028440" reg_inst="20"/>
-        <instance addr="0x25024440" reg_inst="21"/>
-        <instance addr="0x25022440" reg_inst="22"/>
-        <instance addr="0x25021440" reg_inst="23"/>
-        <instance addr="0x26028440" reg_inst="24"/>
-        <instance addr="0x26024440" reg_inst="25"/>
-        <instance addr="0x26022440" reg_inst="26"/>
-        <instance addr="0x26021440" reg_inst="27"/>
-        <instance addr="0x27028440" reg_inst="28"/>
-        <instance addr="0x27024440" reg_inst="29"/>
-        <instance addr="0x27022440" reg_inst="30"/>
-        <instance addr="0x27021440" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_MASK">
-        <instance addr="0x20028443" reg_inst="0"/>
-        <instance addr="0x20024443" reg_inst="1"/>
-        <instance addr="0x20022443" reg_inst="2"/>
-        <instance addr="0x20021443" reg_inst="3"/>
-        <instance addr="0x21028443" reg_inst="4"/>
-        <instance addr="0x21024443" reg_inst="5"/>
-        <instance addr="0x21022443" reg_inst="6"/>
-        <instance addr="0x21021443" reg_inst="7"/>
-        <instance addr="0x22028443" reg_inst="8"/>
-        <instance addr="0x22024443" reg_inst="9"/>
-        <instance addr="0x22022443" reg_inst="10"/>
-        <instance addr="0x22021443" reg_inst="11"/>
-        <instance addr="0x23028443" reg_inst="12"/>
-        <instance addr="0x23024443" reg_inst="13"/>
-        <instance addr="0x23022443" reg_inst="14"/>
-        <instance addr="0x23021443" reg_inst="15"/>
-        <instance addr="0x24028443" reg_inst="16"/>
-        <instance addr="0x24024443" reg_inst="17"/>
-        <instance addr="0x24022443" reg_inst="18"/>
-        <instance addr="0x24021443" reg_inst="19"/>
-        <instance addr="0x25028443" reg_inst="20"/>
-        <instance addr="0x25024443" reg_inst="21"/>
-        <instance addr="0x25022443" reg_inst="22"/>
-        <instance addr="0x25021443" reg_inst="23"/>
-        <instance addr="0x26028443" reg_inst="24"/>
-        <instance addr="0x26024443" reg_inst="25"/>
-        <instance addr="0x26022443" reg_inst="26"/>
-        <instance addr="0x26021443" reg_inst="27"/>
-        <instance addr="0x27028443" reg_inst="28"/>
-        <instance addr="0x27024443" reg_inst="29"/>
-        <instance addr="0x27022443" reg_inst="30"/>
-        <instance addr="0x27021443" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_ACT0">
-        <instance addr="0x20028446" reg_inst="0"/>
-        <instance addr="0x20024446" reg_inst="1"/>
-        <instance addr="0x20022446" reg_inst="2"/>
-        <instance addr="0x20021446" reg_inst="3"/>
-        <instance addr="0x21028446" reg_inst="4"/>
-        <instance addr="0x21024446" reg_inst="5"/>
-        <instance addr="0x21022446" reg_inst="6"/>
-        <instance addr="0x21021446" reg_inst="7"/>
-        <instance addr="0x22028446" reg_inst="8"/>
-        <instance addr="0x22024446" reg_inst="9"/>
-        <instance addr="0x22022446" reg_inst="10"/>
-        <instance addr="0x22021446" reg_inst="11"/>
-        <instance addr="0x23028446" reg_inst="12"/>
-        <instance addr="0x23024446" reg_inst="13"/>
-        <instance addr="0x23022446" reg_inst="14"/>
-        <instance addr="0x23021446" reg_inst="15"/>
-        <instance addr="0x24028446" reg_inst="16"/>
-        <instance addr="0x24024446" reg_inst="17"/>
-        <instance addr="0x24022446" reg_inst="18"/>
-        <instance addr="0x24021446" reg_inst="19"/>
-        <instance addr="0x25028446" reg_inst="20"/>
-        <instance addr="0x25024446" reg_inst="21"/>
-        <instance addr="0x25022446" reg_inst="22"/>
-        <instance addr="0x25021446" reg_inst="23"/>
-        <instance addr="0x26028446" reg_inst="24"/>
-        <instance addr="0x26024446" reg_inst="25"/>
-        <instance addr="0x26022446" reg_inst="26"/>
-        <instance addr="0x26021446" reg_inst="27"/>
-        <instance addr="0x27028446" reg_inst="28"/>
-        <instance addr="0x27024446" reg_inst="29"/>
-        <instance addr="0x27022446" reg_inst="30"/>
-        <instance addr="0x27021446" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_ACT1">
-        <instance addr="0x20028447" reg_inst="0"/>
-        <instance addr="0x20024447" reg_inst="1"/>
-        <instance addr="0x20022447" reg_inst="2"/>
-        <instance addr="0x20021447" reg_inst="3"/>
-        <instance addr="0x21028447" reg_inst="4"/>
-        <instance addr="0x21024447" reg_inst="5"/>
-        <instance addr="0x21022447" reg_inst="6"/>
-        <instance addr="0x21021447" reg_inst="7"/>
-        <instance addr="0x22028447" reg_inst="8"/>
-        <instance addr="0x22024447" reg_inst="9"/>
-        <instance addr="0x22022447" reg_inst="10"/>
-        <instance addr="0x22021447" reg_inst="11"/>
-        <instance addr="0x23028447" reg_inst="12"/>
-        <instance addr="0x23024447" reg_inst="13"/>
-        <instance addr="0x23022447" reg_inst="14"/>
-        <instance addr="0x23021447" reg_inst="15"/>
-        <instance addr="0x24028447" reg_inst="16"/>
-        <instance addr="0x24024447" reg_inst="17"/>
-        <instance addr="0x24022447" reg_inst="18"/>
-        <instance addr="0x24021447" reg_inst="19"/>
-        <instance addr="0x25028447" reg_inst="20"/>
-        <instance addr="0x25024447" reg_inst="21"/>
-        <instance addr="0x25022447" reg_inst="22"/>
-        <instance addr="0x25021447" reg_inst="23"/>
-        <instance addr="0x26028447" reg_inst="24"/>
-        <instance addr="0x26024447" reg_inst="25"/>
-        <instance addr="0x26022447" reg_inst="26"/>
-        <instance addr="0x26021447" reg_inst="27"/>
-        <instance addr="0x27028447" reg_inst="28"/>
-        <instance addr="0x27024447" reg_inst="29"/>
-        <instance addr="0x27022447" reg_inst="30"/>
-        <instance addr="0x27021447" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_WOF">
-        <instance addr="0x20028448" reg_inst="0"/>
-        <instance addr="0x20024448" reg_inst="1"/>
-        <instance addr="0x20022448" reg_inst="2"/>
-        <instance addr="0x20021448" reg_inst="3"/>
-        <instance addr="0x21028448" reg_inst="4"/>
-        <instance addr="0x21024448" reg_inst="5"/>
-        <instance addr="0x21022448" reg_inst="6"/>
-        <instance addr="0x21021448" reg_inst="7"/>
-        <instance addr="0x22028448" reg_inst="8"/>
-        <instance addr="0x22024448" reg_inst="9"/>
-        <instance addr="0x22022448" reg_inst="10"/>
-        <instance addr="0x22021448" reg_inst="11"/>
-        <instance addr="0x23028448" reg_inst="12"/>
-        <instance addr="0x23024448" reg_inst="13"/>
-        <instance addr="0x23022448" reg_inst="14"/>
-        <instance addr="0x23021448" reg_inst="15"/>
-        <instance addr="0x24028448" reg_inst="16"/>
-        <instance addr="0x24024448" reg_inst="17"/>
-        <instance addr="0x24022448" reg_inst="18"/>
-        <instance addr="0x24021448" reg_inst="19"/>
-        <instance addr="0x25028448" reg_inst="20"/>
-        <instance addr="0x25024448" reg_inst="21"/>
-        <instance addr="0x25022448" reg_inst="22"/>
-        <instance addr="0x25021448" reg_inst="23"/>
-        <instance addr="0x26028448" reg_inst="24"/>
-        <instance addr="0x26024448" reg_inst="25"/>
-        <instance addr="0x26022448" reg_inst="26"/>
-        <instance addr="0x26021448" reg_inst="27"/>
-        <instance addr="0x27028448" reg_inst="28"/>
-        <instance addr="0x27024448" reg_inst="29"/>
-        <instance addr="0x27022448" reg_inst="30"/>
-        <instance addr="0x27021448" reg_inst="31"/>
-    </register>
-    <register name="HV_PR_STATE">
-        <instance addr="0x2002840D" reg_inst="0"/>
-        <instance addr="0x2002440D" reg_inst="1"/>
-        <instance addr="0x2002240D" reg_inst="2"/>
-        <instance addr="0x2002140D" reg_inst="3"/>
-        <instance addr="0x2102840D" reg_inst="4"/>
-        <instance addr="0x2102440D" reg_inst="5"/>
-        <instance addr="0x2102240D" reg_inst="6"/>
-        <instance addr="0x2102140D" reg_inst="7"/>
-        <instance addr="0x2202840D" reg_inst="8"/>
-        <instance addr="0x2202440D" reg_inst="9"/>
-        <instance addr="0x2202240D" reg_inst="10"/>
-        <instance addr="0x2202140D" reg_inst="11"/>
-        <instance addr="0x2302840D" reg_inst="12"/>
-        <instance addr="0x2302440D" reg_inst="13"/>
-        <instance addr="0x2302240D" reg_inst="14"/>
-        <instance addr="0x2302140D" reg_inst="15"/>
-        <instance addr="0x2402840D" reg_inst="16"/>
-        <instance addr="0x2402440D" reg_inst="17"/>
-        <instance addr="0x2402240D" reg_inst="18"/>
-        <instance addr="0x2402140D" reg_inst="19"/>
-        <instance addr="0x2502840D" reg_inst="20"/>
-        <instance addr="0x2502440D" reg_inst="21"/>
-        <instance addr="0x2502240D" reg_inst="22"/>
-        <instance addr="0x2502140D" reg_inst="23"/>
-        <instance addr="0x2602840D" reg_inst="24"/>
-        <instance addr="0x2602440D" reg_inst="25"/>
-        <instance addr="0x2602240D" reg_inst="26"/>
-        <instance addr="0x2602140D" reg_inst="27"/>
-        <instance addr="0x2702840D" reg_inst="28"/>
-        <instance addr="0x2702440D" reg_inst="29"/>
-        <instance addr="0x2702240D" reg_inst="30"/>
-        <instance addr="0x2702140D" reg_inst="31"/>
-    </register>
-    <register name="PC_FIR_HOLD_OUT">
-        <instance addr="0x20028451" reg_inst="0"/>
-        <instance addr="0x20024451" reg_inst="1"/>
-        <instance addr="0x20022451" reg_inst="2"/>
-        <instance addr="0x20021451" reg_inst="3"/>
-        <instance addr="0x21028451" reg_inst="4"/>
-        <instance addr="0x21024451" reg_inst="5"/>
-        <instance addr="0x21022451" reg_inst="6"/>
-        <instance addr="0x21021451" reg_inst="7"/>
-        <instance addr="0x22028451" reg_inst="8"/>
-        <instance addr="0x22024451" reg_inst="9"/>
-        <instance addr="0x22022451" reg_inst="10"/>
-        <instance addr="0x22021451" reg_inst="11"/>
-        <instance addr="0x23028451" reg_inst="12"/>
-        <instance addr="0x23024451" reg_inst="13"/>
-        <instance addr="0x23022451" reg_inst="14"/>
-        <instance addr="0x23021451" reg_inst="15"/>
-        <instance addr="0x24028451" reg_inst="16"/>
-        <instance addr="0x24024451" reg_inst="17"/>
-        <instance addr="0x24022451" reg_inst="18"/>
-        <instance addr="0x24021451" reg_inst="19"/>
-        <instance addr="0x25028451" reg_inst="20"/>
-        <instance addr="0x25024451" reg_inst="21"/>
-        <instance addr="0x25022451" reg_inst="22"/>
-        <instance addr="0x25021451" reg_inst="23"/>
-        <instance addr="0x26028451" reg_inst="24"/>
-        <instance addr="0x26024451" reg_inst="25"/>
-        <instance addr="0x26022451" reg_inst="26"/>
-        <instance addr="0x26021451" reg_inst="27"/>
-        <instance addr="0x27028451" reg_inst="28"/>
-        <instance addr="0x27024451" reg_inst="29"/>
-        <instance addr="0x27022451" reg_inst="30"/>
-        <instance addr="0x27021451" reg_inst="31"/>
-    </register>
-    <register name="THRCTL_HOLD_OUT">
-        <instance addr="0x20028455" reg_inst="0"/>
-        <instance addr="0x20024455" reg_inst="1"/>
-        <instance addr="0x20022455" reg_inst="2"/>
-        <instance addr="0x20021455" reg_inst="3"/>
-        <instance addr="0x21028455" reg_inst="4"/>
-        <instance addr="0x21024455" reg_inst="5"/>
-        <instance addr="0x21022455" reg_inst="6"/>
-        <instance addr="0x21021455" reg_inst="7"/>
-        <instance addr="0x22028455" reg_inst="8"/>
-        <instance addr="0x22024455" reg_inst="9"/>
-        <instance addr="0x22022455" reg_inst="10"/>
-        <instance addr="0x22021455" reg_inst="11"/>
-        <instance addr="0x23028455" reg_inst="12"/>
-        <instance addr="0x23024455" reg_inst="13"/>
-        <instance addr="0x23022455" reg_inst="14"/>
-        <instance addr="0x23021455" reg_inst="15"/>
-        <instance addr="0x24028455" reg_inst="16"/>
-        <instance addr="0x24024455" reg_inst="17"/>
-        <instance addr="0x24022455" reg_inst="18"/>
-        <instance addr="0x24021455" reg_inst="19"/>
-        <instance addr="0x25028455" reg_inst="20"/>
-        <instance addr="0x25024455" reg_inst="21"/>
-        <instance addr="0x25022455" reg_inst="22"/>
-        <instance addr="0x25021455" reg_inst="23"/>
-        <instance addr="0x26028455" reg_inst="24"/>
-        <instance addr="0x26024455" reg_inst="25"/>
-        <instance addr="0x26022455" reg_inst="26"/>
-        <instance addr="0x26021455" reg_inst="27"/>
-        <instance addr="0x27028455" reg_inst="28"/>
-        <instance addr="0x27024455" reg_inst="29"/>
-        <instance addr="0x27022455" reg_inst="30"/>
-        <instance addr="0x27021455" reg_inst="31"/>
-    </register>
-    <register name="VSU_HOLD_OUT">
-        <instance addr="0x200284B6" reg_inst="0"/>
-        <instance addr="0x200244B6" reg_inst="1"/>
-        <instance addr="0x200224B6" reg_inst="2"/>
-        <instance addr="0x200214B6" reg_inst="3"/>
-        <instance addr="0x210284B6" reg_inst="4"/>
-        <instance addr="0x210244B6" reg_inst="5"/>
-        <instance addr="0x210224B6" reg_inst="6"/>
-        <instance addr="0x210214B6" reg_inst="7"/>
-        <instance addr="0x220284B6" reg_inst="8"/>
-        <instance addr="0x220244B6" reg_inst="9"/>
-        <instance addr="0x220224B6" reg_inst="10"/>
-        <instance addr="0x220214B6" reg_inst="11"/>
-        <instance addr="0x230284B6" reg_inst="12"/>
-        <instance addr="0x230244B6" reg_inst="13"/>
-        <instance addr="0x230224B6" reg_inst="14"/>
-        <instance addr="0x230214B6" reg_inst="15"/>
-        <instance addr="0x240284B6" reg_inst="16"/>
-        <instance addr="0x240244B6" reg_inst="17"/>
-        <instance addr="0x240224B6" reg_inst="18"/>
-        <instance addr="0x240214B6" reg_inst="19"/>
-        <instance addr="0x250284B6" reg_inst="20"/>
-        <instance addr="0x250244B6" reg_inst="21"/>
-        <instance addr="0x250224B6" reg_inst="22"/>
-        <instance addr="0x250214B6" reg_inst="23"/>
-        <instance addr="0x260284B6" reg_inst="24"/>
-        <instance addr="0x260244B6" reg_inst="25"/>
-        <instance addr="0x260224B6" reg_inst="26"/>
-        <instance addr="0x260214B6" reg_inst="27"/>
-        <instance addr="0x270284B6" reg_inst="28"/>
-        <instance addr="0x270244B6" reg_inst="29"/>
-        <instance addr="0x270224B6" reg_inst="30"/>
-        <instance addr="0x270214B6" reg_inst="31"/>
-    </register>
-    <register name="TFAC_HOLD_OUT">
-        <instance addr="0x200284B7" reg_inst="0"/>
-        <instance addr="0x200244B7" reg_inst="1"/>
-        <instance addr="0x200224B7" reg_inst="2"/>
-        <instance addr="0x200214B7" reg_inst="3"/>
-        <instance addr="0x210284B7" reg_inst="4"/>
-        <instance addr="0x210244B7" reg_inst="5"/>
-        <instance addr="0x210224B7" reg_inst="6"/>
-        <instance addr="0x210214B7" reg_inst="7"/>
-        <instance addr="0x220284B7" reg_inst="8"/>
-        <instance addr="0x220244B7" reg_inst="9"/>
-        <instance addr="0x220224B7" reg_inst="10"/>
-        <instance addr="0x220214B7" reg_inst="11"/>
-        <instance addr="0x230284B7" reg_inst="12"/>
-        <instance addr="0x230244B7" reg_inst="13"/>
-        <instance addr="0x230224B7" reg_inst="14"/>
-        <instance addr="0x230214B7" reg_inst="15"/>
-        <instance addr="0x240284B7" reg_inst="16"/>
-        <instance addr="0x240244B7" reg_inst="17"/>
-        <instance addr="0x240224B7" reg_inst="18"/>
-        <instance addr="0x240214B7" reg_inst="19"/>
-        <instance addr="0x250284B7" reg_inst="20"/>
-        <instance addr="0x250244B7" reg_inst="21"/>
-        <instance addr="0x250224B7" reg_inst="22"/>
-        <instance addr="0x250214B7" reg_inst="23"/>
-        <instance addr="0x260284B7" reg_inst="24"/>
-        <instance addr="0x260244B7" reg_inst="25"/>
-        <instance addr="0x260224B7" reg_inst="26"/>
-        <instance addr="0x260214B7" reg_inst="27"/>
-        <instance addr="0x270284B7" reg_inst="28"/>
-        <instance addr="0x270244B7" reg_inst="29"/>
-        <instance addr="0x270224B7" reg_inst="30"/>
-        <instance addr="0x270214B7" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT0">
-        <instance addr="0x20028600" reg_inst="0"/>
-        <instance addr="0x20024600" reg_inst="1"/>
-        <instance addr="0x20022600" reg_inst="2"/>
-        <instance addr="0x20021600" reg_inst="3"/>
-        <instance addr="0x21028600" reg_inst="4"/>
-        <instance addr="0x21024600" reg_inst="5"/>
-        <instance addr="0x21022600" reg_inst="6"/>
-        <instance addr="0x21021600" reg_inst="7"/>
-        <instance addr="0x22028600" reg_inst="8"/>
-        <instance addr="0x22024600" reg_inst="9"/>
-        <instance addr="0x22022600" reg_inst="10"/>
-        <instance addr="0x22021600" reg_inst="11"/>
-        <instance addr="0x23028600" reg_inst="12"/>
-        <instance addr="0x23024600" reg_inst="13"/>
-        <instance addr="0x23022600" reg_inst="14"/>
-        <instance addr="0x23021600" reg_inst="15"/>
-        <instance addr="0x24028600" reg_inst="16"/>
-        <instance addr="0x24024600" reg_inst="17"/>
-        <instance addr="0x24022600" reg_inst="18"/>
-        <instance addr="0x24021600" reg_inst="19"/>
-        <instance addr="0x25028600" reg_inst="20"/>
-        <instance addr="0x25024600" reg_inst="21"/>
-        <instance addr="0x25022600" reg_inst="22"/>
-        <instance addr="0x25021600" reg_inst="23"/>
-        <instance addr="0x26028600" reg_inst="24"/>
-        <instance addr="0x26024600" reg_inst="25"/>
-        <instance addr="0x26022600" reg_inst="26"/>
-        <instance addr="0x26021600" reg_inst="27"/>
-        <instance addr="0x27028600" reg_inst="28"/>
-        <instance addr="0x27024600" reg_inst="29"/>
-        <instance addr="0x27022600" reg_inst="30"/>
-        <instance addr="0x27021600" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT1">
-        <instance addr="0x20028601" reg_inst="0"/>
-        <instance addr="0x20024601" reg_inst="1"/>
-        <instance addr="0x20022601" reg_inst="2"/>
-        <instance addr="0x20021601" reg_inst="3"/>
-        <instance addr="0x21028601" reg_inst="4"/>
-        <instance addr="0x21024601" reg_inst="5"/>
-        <instance addr="0x21022601" reg_inst="6"/>
-        <instance addr="0x21021601" reg_inst="7"/>
-        <instance addr="0x22028601" reg_inst="8"/>
-        <instance addr="0x22024601" reg_inst="9"/>
-        <instance addr="0x22022601" reg_inst="10"/>
-        <instance addr="0x22021601" reg_inst="11"/>
-        <instance addr="0x23028601" reg_inst="12"/>
-        <instance addr="0x23024601" reg_inst="13"/>
-        <instance addr="0x23022601" reg_inst="14"/>
-        <instance addr="0x23021601" reg_inst="15"/>
-        <instance addr="0x24028601" reg_inst="16"/>
-        <instance addr="0x24024601" reg_inst="17"/>
-        <instance addr="0x24022601" reg_inst="18"/>
-        <instance addr="0x24021601" reg_inst="19"/>
-        <instance addr="0x25028601" reg_inst="20"/>
-        <instance addr="0x25024601" reg_inst="21"/>
-        <instance addr="0x25022601" reg_inst="22"/>
-        <instance addr="0x25021601" reg_inst="23"/>
-        <instance addr="0x26028601" reg_inst="24"/>
-        <instance addr="0x26024601" reg_inst="25"/>
-        <instance addr="0x26022601" reg_inst="26"/>
-        <instance addr="0x26021601" reg_inst="27"/>
-        <instance addr="0x27028601" reg_inst="28"/>
-        <instance addr="0x27024601" reg_inst="29"/>
-        <instance addr="0x27022601" reg_inst="30"/>
-        <instance addr="0x27021601" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT2">
-        <instance addr="0x20028602" reg_inst="0"/>
-        <instance addr="0x20024602" reg_inst="1"/>
-        <instance addr="0x20022602" reg_inst="2"/>
-        <instance addr="0x20021602" reg_inst="3"/>
-        <instance addr="0x21028602" reg_inst="4"/>
-        <instance addr="0x21024602" reg_inst="5"/>
-        <instance addr="0x21022602" reg_inst="6"/>
-        <instance addr="0x21021602" reg_inst="7"/>
-        <instance addr="0x22028602" reg_inst="8"/>
-        <instance addr="0x22024602" reg_inst="9"/>
-        <instance addr="0x22022602" reg_inst="10"/>
-        <instance addr="0x22021602" reg_inst="11"/>
-        <instance addr="0x23028602" reg_inst="12"/>
-        <instance addr="0x23024602" reg_inst="13"/>
-        <instance addr="0x23022602" reg_inst="14"/>
-        <instance addr="0x23021602" reg_inst="15"/>
-        <instance addr="0x24028602" reg_inst="16"/>
-        <instance addr="0x24024602" reg_inst="17"/>
-        <instance addr="0x24022602" reg_inst="18"/>
-        <instance addr="0x24021602" reg_inst="19"/>
-        <instance addr="0x25028602" reg_inst="20"/>
-        <instance addr="0x25024602" reg_inst="21"/>
-        <instance addr="0x25022602" reg_inst="22"/>
-        <instance addr="0x25021602" reg_inst="23"/>
-        <instance addr="0x26028602" reg_inst="24"/>
-        <instance addr="0x26024602" reg_inst="25"/>
-        <instance addr="0x26022602" reg_inst="26"/>
-        <instance addr="0x26021602" reg_inst="27"/>
-        <instance addr="0x27028602" reg_inst="28"/>
-        <instance addr="0x27024602" reg_inst="29"/>
-        <instance addr="0x27022602" reg_inst="30"/>
-        <instance addr="0x27021602" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT3">
-        <instance addr="0x20028603" reg_inst="0"/>
-        <instance addr="0x20024603" reg_inst="1"/>
-        <instance addr="0x20022603" reg_inst="2"/>
-        <instance addr="0x20021603" reg_inst="3"/>
-        <instance addr="0x21028603" reg_inst="4"/>
-        <instance addr="0x21024603" reg_inst="5"/>
-        <instance addr="0x21022603" reg_inst="6"/>
-        <instance addr="0x21021603" reg_inst="7"/>
-        <instance addr="0x22028603" reg_inst="8"/>
-        <instance addr="0x22024603" reg_inst="9"/>
-        <instance addr="0x22022603" reg_inst="10"/>
-        <instance addr="0x22021603" reg_inst="11"/>
-        <instance addr="0x23028603" reg_inst="12"/>
-        <instance addr="0x23024603" reg_inst="13"/>
-        <instance addr="0x23022603" reg_inst="14"/>
-        <instance addr="0x23021603" reg_inst="15"/>
-        <instance addr="0x24028603" reg_inst="16"/>
-        <instance addr="0x24024603" reg_inst="17"/>
-        <instance addr="0x24022603" reg_inst="18"/>
-        <instance addr="0x24021603" reg_inst="19"/>
-        <instance addr="0x25028603" reg_inst="20"/>
-        <instance addr="0x25024603" reg_inst="21"/>
-        <instance addr="0x25022603" reg_inst="22"/>
-        <instance addr="0x25021603" reg_inst="23"/>
-        <instance addr="0x26028603" reg_inst="24"/>
-        <instance addr="0x26024603" reg_inst="25"/>
-        <instance addr="0x26022603" reg_inst="26"/>
-        <instance addr="0x26021603" reg_inst="27"/>
-        <instance addr="0x27028603" reg_inst="28"/>
-        <instance addr="0x27024603" reg_inst="29"/>
-        <instance addr="0x27022603" reg_inst="30"/>
-        <instance addr="0x27021603" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT0">
-        <instance addr="0x20028640" reg_inst="0"/>
-        <instance addr="0x20024640" reg_inst="1"/>
-        <instance addr="0x20022640" reg_inst="2"/>
-        <instance addr="0x20021640" reg_inst="3"/>
-        <instance addr="0x21028640" reg_inst="4"/>
-        <instance addr="0x21024640" reg_inst="5"/>
-        <instance addr="0x21022640" reg_inst="6"/>
-        <instance addr="0x21021640" reg_inst="7"/>
-        <instance addr="0x22028640" reg_inst="8"/>
-        <instance addr="0x22024640" reg_inst="9"/>
-        <instance addr="0x22022640" reg_inst="10"/>
-        <instance addr="0x22021640" reg_inst="11"/>
-        <instance addr="0x23028640" reg_inst="12"/>
-        <instance addr="0x23024640" reg_inst="13"/>
-        <instance addr="0x23022640" reg_inst="14"/>
-        <instance addr="0x23021640" reg_inst="15"/>
-        <instance addr="0x24028640" reg_inst="16"/>
-        <instance addr="0x24024640" reg_inst="17"/>
-        <instance addr="0x24022640" reg_inst="18"/>
-        <instance addr="0x24021640" reg_inst="19"/>
-        <instance addr="0x25028640" reg_inst="20"/>
-        <instance addr="0x25024640" reg_inst="21"/>
-        <instance addr="0x25022640" reg_inst="22"/>
-        <instance addr="0x25021640" reg_inst="23"/>
-        <instance addr="0x26028640" reg_inst="24"/>
-        <instance addr="0x26024640" reg_inst="25"/>
-        <instance addr="0x26022640" reg_inst="26"/>
-        <instance addr="0x26021640" reg_inst="27"/>
-        <instance addr="0x27028640" reg_inst="28"/>
-        <instance addr="0x27024640" reg_inst="29"/>
-        <instance addr="0x27022640" reg_inst="30"/>
-        <instance addr="0x27021640" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT1">
-        <instance addr="0x20028641" reg_inst="0"/>
-        <instance addr="0x20024641" reg_inst="1"/>
-        <instance addr="0x20022641" reg_inst="2"/>
-        <instance addr="0x20021641" reg_inst="3"/>
-        <instance addr="0x21028641" reg_inst="4"/>
-        <instance addr="0x21024641" reg_inst="5"/>
-        <instance addr="0x21022641" reg_inst="6"/>
-        <instance addr="0x21021641" reg_inst="7"/>
-        <instance addr="0x22028641" reg_inst="8"/>
-        <instance addr="0x22024641" reg_inst="9"/>
-        <instance addr="0x22022641" reg_inst="10"/>
-        <instance addr="0x22021641" reg_inst="11"/>
-        <instance addr="0x23028641" reg_inst="12"/>
-        <instance addr="0x23024641" reg_inst="13"/>
-        <instance addr="0x23022641" reg_inst="14"/>
-        <instance addr="0x23021641" reg_inst="15"/>
-        <instance addr="0x24028641" reg_inst="16"/>
-        <instance addr="0x24024641" reg_inst="17"/>
-        <instance addr="0x24022641" reg_inst="18"/>
-        <instance addr="0x24021641" reg_inst="19"/>
-        <instance addr="0x25028641" reg_inst="20"/>
-        <instance addr="0x25024641" reg_inst="21"/>
-        <instance addr="0x25022641" reg_inst="22"/>
-        <instance addr="0x25021641" reg_inst="23"/>
-        <instance addr="0x26028641" reg_inst="24"/>
-        <instance addr="0x26024641" reg_inst="25"/>
-        <instance addr="0x26022641" reg_inst="26"/>
-        <instance addr="0x26021641" reg_inst="27"/>
-        <instance addr="0x27028641" reg_inst="28"/>
-        <instance addr="0x27024641" reg_inst="29"/>
-        <instance addr="0x27022641" reg_inst="30"/>
-        <instance addr="0x27021641" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT2">
-        <instance addr="0x20028642" reg_inst="0"/>
-        <instance addr="0x20024642" reg_inst="1"/>
-        <instance addr="0x20022642" reg_inst="2"/>
-        <instance addr="0x20021642" reg_inst="3"/>
-        <instance addr="0x21028642" reg_inst="4"/>
-        <instance addr="0x21024642" reg_inst="5"/>
-        <instance addr="0x21022642" reg_inst="6"/>
-        <instance addr="0x21021642" reg_inst="7"/>
-        <instance addr="0x22028642" reg_inst="8"/>
-        <instance addr="0x22024642" reg_inst="9"/>
-        <instance addr="0x22022642" reg_inst="10"/>
-        <instance addr="0x22021642" reg_inst="11"/>
-        <instance addr="0x23028642" reg_inst="12"/>
-        <instance addr="0x23024642" reg_inst="13"/>
-        <instance addr="0x23022642" reg_inst="14"/>
-        <instance addr="0x23021642" reg_inst="15"/>
-        <instance addr="0x24028642" reg_inst="16"/>
-        <instance addr="0x24024642" reg_inst="17"/>
-        <instance addr="0x24022642" reg_inst="18"/>
-        <instance addr="0x24021642" reg_inst="19"/>
-        <instance addr="0x25028642" reg_inst="20"/>
-        <instance addr="0x25024642" reg_inst="21"/>
-        <instance addr="0x25022642" reg_inst="22"/>
-        <instance addr="0x25021642" reg_inst="23"/>
-        <instance addr="0x26028642" reg_inst="24"/>
-        <instance addr="0x26024642" reg_inst="25"/>
-        <instance addr="0x26022642" reg_inst="26"/>
-        <instance addr="0x26021642" reg_inst="27"/>
-        <instance addr="0x27028642" reg_inst="28"/>
-        <instance addr="0x27024642" reg_inst="29"/>
-        <instance addr="0x27022642" reg_inst="30"/>
-        <instance addr="0x27021642" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT3">
-        <instance addr="0x20028643" reg_inst="0"/>
-        <instance addr="0x20024643" reg_inst="1"/>
-        <instance addr="0x20022643" reg_inst="2"/>
-        <instance addr="0x20021643" reg_inst="3"/>
-        <instance addr="0x21028643" reg_inst="4"/>
-        <instance addr="0x21024643" reg_inst="5"/>
-        <instance addr="0x21022643" reg_inst="6"/>
-        <instance addr="0x21021643" reg_inst="7"/>
-        <instance addr="0x22028643" reg_inst="8"/>
-        <instance addr="0x22024643" reg_inst="9"/>
-        <instance addr="0x22022643" reg_inst="10"/>
-        <instance addr="0x22021643" reg_inst="11"/>
-        <instance addr="0x23028643" reg_inst="12"/>
-        <instance addr="0x23024643" reg_inst="13"/>
-        <instance addr="0x23022643" reg_inst="14"/>
-        <instance addr="0x23021643" reg_inst="15"/>
-        <instance addr="0x24028643" reg_inst="16"/>
-        <instance addr="0x24024643" reg_inst="17"/>
-        <instance addr="0x24022643" reg_inst="18"/>
-        <instance addr="0x24021643" reg_inst="19"/>
-        <instance addr="0x25028643" reg_inst="20"/>
-        <instance addr="0x25024643" reg_inst="21"/>
-        <instance addr="0x25022643" reg_inst="22"/>
-        <instance addr="0x25021643" reg_inst="23"/>
-        <instance addr="0x26028643" reg_inst="24"/>
-        <instance addr="0x26024643" reg_inst="25"/>
-        <instance addr="0x26022643" reg_inst="26"/>
-        <instance addr="0x26021643" reg_inst="27"/>
-        <instance addr="0x27028643" reg_inst="28"/>
-        <instance addr="0x27024643" reg_inst="29"/>
-        <instance addr="0x27022643" reg_inst="30"/>
-        <instance addr="0x27021643" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT0">
-        <instance addr="0x20028680" reg_inst="0"/>
-        <instance addr="0x20024680" reg_inst="1"/>
-        <instance addr="0x20022680" reg_inst="2"/>
-        <instance addr="0x20021680" reg_inst="3"/>
-        <instance addr="0x21028680" reg_inst="4"/>
-        <instance addr="0x21024680" reg_inst="5"/>
-        <instance addr="0x21022680" reg_inst="6"/>
-        <instance addr="0x21021680" reg_inst="7"/>
-        <instance addr="0x22028680" reg_inst="8"/>
-        <instance addr="0x22024680" reg_inst="9"/>
-        <instance addr="0x22022680" reg_inst="10"/>
-        <instance addr="0x22021680" reg_inst="11"/>
-        <instance addr="0x23028680" reg_inst="12"/>
-        <instance addr="0x23024680" reg_inst="13"/>
-        <instance addr="0x23022680" reg_inst="14"/>
-        <instance addr="0x23021680" reg_inst="15"/>
-        <instance addr="0x24028680" reg_inst="16"/>
-        <instance addr="0x24024680" reg_inst="17"/>
-        <instance addr="0x24022680" reg_inst="18"/>
-        <instance addr="0x24021680" reg_inst="19"/>
-        <instance addr="0x25028680" reg_inst="20"/>
-        <instance addr="0x25024680" reg_inst="21"/>
-        <instance addr="0x25022680" reg_inst="22"/>
-        <instance addr="0x25021680" reg_inst="23"/>
-        <instance addr="0x26028680" reg_inst="24"/>
-        <instance addr="0x26024680" reg_inst="25"/>
-        <instance addr="0x26022680" reg_inst="26"/>
-        <instance addr="0x26021680" reg_inst="27"/>
-        <instance addr="0x27028680" reg_inst="28"/>
-        <instance addr="0x27024680" reg_inst="29"/>
-        <instance addr="0x27022680" reg_inst="30"/>
-        <instance addr="0x27021680" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT1">
-        <instance addr="0x20028681" reg_inst="0"/>
-        <instance addr="0x20024681" reg_inst="1"/>
-        <instance addr="0x20022681" reg_inst="2"/>
-        <instance addr="0x20021681" reg_inst="3"/>
-        <instance addr="0x21028681" reg_inst="4"/>
-        <instance addr="0x21024681" reg_inst="5"/>
-        <instance addr="0x21022681" reg_inst="6"/>
-        <instance addr="0x21021681" reg_inst="7"/>
-        <instance addr="0x22028681" reg_inst="8"/>
-        <instance addr="0x22024681" reg_inst="9"/>
-        <instance addr="0x22022681" reg_inst="10"/>
-        <instance addr="0x22021681" reg_inst="11"/>
-        <instance addr="0x23028681" reg_inst="12"/>
-        <instance addr="0x23024681" reg_inst="13"/>
-        <instance addr="0x23022681" reg_inst="14"/>
-        <instance addr="0x23021681" reg_inst="15"/>
-        <instance addr="0x24028681" reg_inst="16"/>
-        <instance addr="0x24024681" reg_inst="17"/>
-        <instance addr="0x24022681" reg_inst="18"/>
-        <instance addr="0x24021681" reg_inst="19"/>
-        <instance addr="0x25028681" reg_inst="20"/>
-        <instance addr="0x25024681" reg_inst="21"/>
-        <instance addr="0x25022681" reg_inst="22"/>
-        <instance addr="0x25021681" reg_inst="23"/>
-        <instance addr="0x26028681" reg_inst="24"/>
-        <instance addr="0x26024681" reg_inst="25"/>
-        <instance addr="0x26022681" reg_inst="26"/>
-        <instance addr="0x26021681" reg_inst="27"/>
-        <instance addr="0x27028681" reg_inst="28"/>
-        <instance addr="0x27024681" reg_inst="29"/>
-        <instance addr="0x27022681" reg_inst="30"/>
-        <instance addr="0x27021681" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT2">
-        <instance addr="0x20028682" reg_inst="0"/>
-        <instance addr="0x20024682" reg_inst="1"/>
-        <instance addr="0x20022682" reg_inst="2"/>
-        <instance addr="0x20021682" reg_inst="3"/>
-        <instance addr="0x21028682" reg_inst="4"/>
-        <instance addr="0x21024682" reg_inst="5"/>
-        <instance addr="0x21022682" reg_inst="6"/>
-        <instance addr="0x21021682" reg_inst="7"/>
-        <instance addr="0x22028682" reg_inst="8"/>
-        <instance addr="0x22024682" reg_inst="9"/>
-        <instance addr="0x22022682" reg_inst="10"/>
-        <instance addr="0x22021682" reg_inst="11"/>
-        <instance addr="0x23028682" reg_inst="12"/>
-        <instance addr="0x23024682" reg_inst="13"/>
-        <instance addr="0x23022682" reg_inst="14"/>
-        <instance addr="0x23021682" reg_inst="15"/>
-        <instance addr="0x24028682" reg_inst="16"/>
-        <instance addr="0x24024682" reg_inst="17"/>
-        <instance addr="0x24022682" reg_inst="18"/>
-        <instance addr="0x24021682" reg_inst="19"/>
-        <instance addr="0x25028682" reg_inst="20"/>
-        <instance addr="0x25024682" reg_inst="21"/>
-        <instance addr="0x25022682" reg_inst="22"/>
-        <instance addr="0x25021682" reg_inst="23"/>
-        <instance addr="0x26028682" reg_inst="24"/>
-        <instance addr="0x26024682" reg_inst="25"/>
-        <instance addr="0x26022682" reg_inst="26"/>
-        <instance addr="0x26021682" reg_inst="27"/>
-        <instance addr="0x27028682" reg_inst="28"/>
-        <instance addr="0x27024682" reg_inst="29"/>
-        <instance addr="0x27022682" reg_inst="30"/>
-        <instance addr="0x27021682" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT3">
-        <instance addr="0x20028683" reg_inst="0"/>
-        <instance addr="0x20024683" reg_inst="1"/>
-        <instance addr="0x20022683" reg_inst="2"/>
-        <instance addr="0x20021683" reg_inst="3"/>
-        <instance addr="0x21028683" reg_inst="4"/>
-        <instance addr="0x21024683" reg_inst="5"/>
-        <instance addr="0x21022683" reg_inst="6"/>
-        <instance addr="0x21021683" reg_inst="7"/>
-        <instance addr="0x22028683" reg_inst="8"/>
-        <instance addr="0x22024683" reg_inst="9"/>
-        <instance addr="0x22022683" reg_inst="10"/>
-        <instance addr="0x22021683" reg_inst="11"/>
-        <instance addr="0x23028683" reg_inst="12"/>
-        <instance addr="0x23024683" reg_inst="13"/>
-        <instance addr="0x23022683" reg_inst="14"/>
-        <instance addr="0x23021683" reg_inst="15"/>
-        <instance addr="0x24028683" reg_inst="16"/>
-        <instance addr="0x24024683" reg_inst="17"/>
-        <instance addr="0x24022683" reg_inst="18"/>
-        <instance addr="0x24021683" reg_inst="19"/>
-        <instance addr="0x25028683" reg_inst="20"/>
-        <instance addr="0x25024683" reg_inst="21"/>
-        <instance addr="0x25022683" reg_inst="22"/>
-        <instance addr="0x25021683" reg_inst="23"/>
-        <instance addr="0x26028683" reg_inst="24"/>
-        <instance addr="0x26024683" reg_inst="25"/>
-        <instance addr="0x26022683" reg_inst="26"/>
-        <instance addr="0x26021683" reg_inst="27"/>
-        <instance addr="0x27028683" reg_inst="28"/>
-        <instance addr="0x27024683" reg_inst="29"/>
-        <instance addr="0x27022683" reg_inst="30"/>
-        <instance addr="0x27021683" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT4">
-        <instance addr="0x20028684" reg_inst="0"/>
-        <instance addr="0x20024684" reg_inst="1"/>
-        <instance addr="0x20022684" reg_inst="2"/>
-        <instance addr="0x20021684" reg_inst="3"/>
-        <instance addr="0x21028684" reg_inst="4"/>
-        <instance addr="0x21024684" reg_inst="5"/>
-        <instance addr="0x21022684" reg_inst="6"/>
-        <instance addr="0x21021684" reg_inst="7"/>
-        <instance addr="0x22028684" reg_inst="8"/>
-        <instance addr="0x22024684" reg_inst="9"/>
-        <instance addr="0x22022684" reg_inst="10"/>
-        <instance addr="0x22021684" reg_inst="11"/>
-        <instance addr="0x23028684" reg_inst="12"/>
-        <instance addr="0x23024684" reg_inst="13"/>
-        <instance addr="0x23022684" reg_inst="14"/>
-        <instance addr="0x23021684" reg_inst="15"/>
-        <instance addr="0x24028684" reg_inst="16"/>
-        <instance addr="0x24024684" reg_inst="17"/>
-        <instance addr="0x24022684" reg_inst="18"/>
-        <instance addr="0x24021684" reg_inst="19"/>
-        <instance addr="0x25028684" reg_inst="20"/>
-        <instance addr="0x25024684" reg_inst="21"/>
-        <instance addr="0x25022684" reg_inst="22"/>
-        <instance addr="0x25021684" reg_inst="23"/>
-        <instance addr="0x26028684" reg_inst="24"/>
-        <instance addr="0x26024684" reg_inst="25"/>
-        <instance addr="0x26022684" reg_inst="26"/>
-        <instance addr="0x26021684" reg_inst="27"/>
-        <instance addr="0x27028684" reg_inst="28"/>
-        <instance addr="0x27024684" reg_inst="29"/>
-        <instance addr="0x27022684" reg_inst="30"/>
-        <instance addr="0x27021684" reg_inst="31"/>
-    </register>
-    <register name="MMU_HOLD_OUT5">
-        <instance addr="0x20028685" reg_inst="0"/>
-        <instance addr="0x20024685" reg_inst="1"/>
-        <instance addr="0x20022685" reg_inst="2"/>
-        <instance addr="0x20021685" reg_inst="3"/>
-        <instance addr="0x21028685" reg_inst="4"/>
-        <instance addr="0x21024685" reg_inst="5"/>
-        <instance addr="0x21022685" reg_inst="6"/>
-        <instance addr="0x21021685" reg_inst="7"/>
-        <instance addr="0x22028685" reg_inst="8"/>
-        <instance addr="0x22024685" reg_inst="9"/>
-        <instance addr="0x22022685" reg_inst="10"/>
-        <instance addr="0x22021685" reg_inst="11"/>
-        <instance addr="0x23028685" reg_inst="12"/>
-        <instance addr="0x23024685" reg_inst="13"/>
-        <instance addr="0x23022685" reg_inst="14"/>
-        <instance addr="0x23021685" reg_inst="15"/>
-        <instance addr="0x24028685" reg_inst="16"/>
-        <instance addr="0x24024685" reg_inst="17"/>
-        <instance addr="0x24022685" reg_inst="18"/>
-        <instance addr="0x24021685" reg_inst="19"/>
-        <instance addr="0x25028685" reg_inst="20"/>
-        <instance addr="0x25024685" reg_inst="21"/>
-        <instance addr="0x25022685" reg_inst="22"/>
-        <instance addr="0x25021685" reg_inst="23"/>
-        <instance addr="0x26028685" reg_inst="24"/>
-        <instance addr="0x26024685" reg_inst="25"/>
-        <instance addr="0x26022685" reg_inst="26"/>
-        <instance addr="0x26021685" reg_inst="27"/>
-        <instance addr="0x27028685" reg_inst="28"/>
-        <instance addr="0x27024685" reg_inst="29"/>
-        <instance addr="0x27022685" reg_inst="30"/>
-        <instance addr="0x27021685" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG0">
-        <instance addr="0x200286C0" reg_inst="0"/>
-        <instance addr="0x200246C0" reg_inst="1"/>
-        <instance addr="0x200226C0" reg_inst="2"/>
-        <instance addr="0x200216C0" reg_inst="3"/>
-        <instance addr="0x210286C0" reg_inst="4"/>
-        <instance addr="0x210246C0" reg_inst="5"/>
-        <instance addr="0x210226C0" reg_inst="6"/>
-        <instance addr="0x210216C0" reg_inst="7"/>
-        <instance addr="0x220286C0" reg_inst="8"/>
-        <instance addr="0x220246C0" reg_inst="9"/>
-        <instance addr="0x220226C0" reg_inst="10"/>
-        <instance addr="0x220216C0" reg_inst="11"/>
-        <instance addr="0x230286C0" reg_inst="12"/>
-        <instance addr="0x230246C0" reg_inst="13"/>
-        <instance addr="0x230226C0" reg_inst="14"/>
-        <instance addr="0x230216C0" reg_inst="15"/>
-        <instance addr="0x240286C0" reg_inst="16"/>
-        <instance addr="0x240246C0" reg_inst="17"/>
-        <instance addr="0x240226C0" reg_inst="18"/>
-        <instance addr="0x240216C0" reg_inst="19"/>
-        <instance addr="0x250286C0" reg_inst="20"/>
-        <instance addr="0x250246C0" reg_inst="21"/>
-        <instance addr="0x250226C0" reg_inst="22"/>
-        <instance addr="0x250216C0" reg_inst="23"/>
-        <instance addr="0x260286C0" reg_inst="24"/>
-        <instance addr="0x260246C0" reg_inst="25"/>
-        <instance addr="0x260226C0" reg_inst="26"/>
-        <instance addr="0x260216C0" reg_inst="27"/>
-        <instance addr="0x270286C0" reg_inst="28"/>
-        <instance addr="0x270246C0" reg_inst="29"/>
-        <instance addr="0x270226C0" reg_inst="30"/>
-        <instance addr="0x270216C0" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG1">
-        <instance addr="0x200286C1" reg_inst="0"/>
-        <instance addr="0x200246C1" reg_inst="1"/>
-        <instance addr="0x200226C1" reg_inst="2"/>
-        <instance addr="0x200216C1" reg_inst="3"/>
-        <instance addr="0x210286C1" reg_inst="4"/>
-        <instance addr="0x210246C1" reg_inst="5"/>
-        <instance addr="0x210226C1" reg_inst="6"/>
-        <instance addr="0x210216C1" reg_inst="7"/>
-        <instance addr="0x220286C1" reg_inst="8"/>
-        <instance addr="0x220246C1" reg_inst="9"/>
-        <instance addr="0x220226C1" reg_inst="10"/>
-        <instance addr="0x220216C1" reg_inst="11"/>
-        <instance addr="0x230286C1" reg_inst="12"/>
-        <instance addr="0x230246C1" reg_inst="13"/>
-        <instance addr="0x230226C1" reg_inst="14"/>
-        <instance addr="0x230216C1" reg_inst="15"/>
-        <instance addr="0x240286C1" reg_inst="16"/>
-        <instance addr="0x240246C1" reg_inst="17"/>
-        <instance addr="0x240226C1" reg_inst="18"/>
-        <instance addr="0x240216C1" reg_inst="19"/>
-        <instance addr="0x250286C1" reg_inst="20"/>
-        <instance addr="0x250246C1" reg_inst="21"/>
-        <instance addr="0x250226C1" reg_inst="22"/>
-        <instance addr="0x250216C1" reg_inst="23"/>
-        <instance addr="0x260286C1" reg_inst="24"/>
-        <instance addr="0x260246C1" reg_inst="25"/>
-        <instance addr="0x260226C1" reg_inst="26"/>
-        <instance addr="0x260216C1" reg_inst="27"/>
-        <instance addr="0x270286C1" reg_inst="28"/>
-        <instance addr="0x270246C1" reg_inst="29"/>
-        <instance addr="0x270226C1" reg_inst="30"/>
-        <instance addr="0x270216C1" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG2">
-        <instance addr="0x200286C2" reg_inst="0"/>
-        <instance addr="0x200246C2" reg_inst="1"/>
-        <instance addr="0x200226C2" reg_inst="2"/>
-        <instance addr="0x200216C2" reg_inst="3"/>
-        <instance addr="0x210286C2" reg_inst="4"/>
-        <instance addr="0x210246C2" reg_inst="5"/>
-        <instance addr="0x210226C2" reg_inst="6"/>
-        <instance addr="0x210216C2" reg_inst="7"/>
-        <instance addr="0x220286C2" reg_inst="8"/>
-        <instance addr="0x220246C2" reg_inst="9"/>
-        <instance addr="0x220226C2" reg_inst="10"/>
-        <instance addr="0x220216C2" reg_inst="11"/>
-        <instance addr="0x230286C2" reg_inst="12"/>
-        <instance addr="0x230246C2" reg_inst="13"/>
-        <instance addr="0x230226C2" reg_inst="14"/>
-        <instance addr="0x230216C2" reg_inst="15"/>
-        <instance addr="0x240286C2" reg_inst="16"/>
-        <instance addr="0x240246C2" reg_inst="17"/>
-        <instance addr="0x240226C2" reg_inst="18"/>
-        <instance addr="0x240216C2" reg_inst="19"/>
-        <instance addr="0x250286C2" reg_inst="20"/>
-        <instance addr="0x250246C2" reg_inst="21"/>
-        <instance addr="0x250226C2" reg_inst="22"/>
-        <instance addr="0x250216C2" reg_inst="23"/>
-        <instance addr="0x260286C2" reg_inst="24"/>
-        <instance addr="0x260246C2" reg_inst="25"/>
-        <instance addr="0x260226C2" reg_inst="26"/>
-        <instance addr="0x260216C2" reg_inst="27"/>
-        <instance addr="0x270286C2" reg_inst="28"/>
-        <instance addr="0x270246C2" reg_inst="29"/>
-        <instance addr="0x270226C2" reg_inst="30"/>
-        <instance addr="0x270216C2" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG3">
-        <instance addr="0x200286C3" reg_inst="0"/>
-        <instance addr="0x200246C3" reg_inst="1"/>
-        <instance addr="0x200226C3" reg_inst="2"/>
-        <instance addr="0x200216C3" reg_inst="3"/>
-        <instance addr="0x210286C3" reg_inst="4"/>
-        <instance addr="0x210246C3" reg_inst="5"/>
-        <instance addr="0x210226C3" reg_inst="6"/>
-        <instance addr="0x210216C3" reg_inst="7"/>
-        <instance addr="0x220286C3" reg_inst="8"/>
-        <instance addr="0x220246C3" reg_inst="9"/>
-        <instance addr="0x220226C3" reg_inst="10"/>
-        <instance addr="0x220216C3" reg_inst="11"/>
-        <instance addr="0x230286C3" reg_inst="12"/>
-        <instance addr="0x230246C3" reg_inst="13"/>
-        <instance addr="0x230226C3" reg_inst="14"/>
-        <instance addr="0x230216C3" reg_inst="15"/>
-        <instance addr="0x240286C3" reg_inst="16"/>
-        <instance addr="0x240246C3" reg_inst="17"/>
-        <instance addr="0x240226C3" reg_inst="18"/>
-        <instance addr="0x240216C3" reg_inst="19"/>
-        <instance addr="0x250286C3" reg_inst="20"/>
-        <instance addr="0x250246C3" reg_inst="21"/>
-        <instance addr="0x250226C3" reg_inst="22"/>
-        <instance addr="0x250216C3" reg_inst="23"/>
-        <instance addr="0x260286C3" reg_inst="24"/>
-        <instance addr="0x260246C3" reg_inst="25"/>
-        <instance addr="0x260226C3" reg_inst="26"/>
-        <instance addr="0x260216C3" reg_inst="27"/>
-        <instance addr="0x270286C3" reg_inst="28"/>
-        <instance addr="0x270246C3" reg_inst="29"/>
-        <instance addr="0x270226C3" reg_inst="30"/>
-        <instance addr="0x270216C3" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG4">
-        <instance addr="0x200286C4" reg_inst="0"/>
-        <instance addr="0x200246C4" reg_inst="1"/>
-        <instance addr="0x200226C4" reg_inst="2"/>
-        <instance addr="0x200216C4" reg_inst="3"/>
-        <instance addr="0x210286C4" reg_inst="4"/>
-        <instance addr="0x210246C4" reg_inst="5"/>
-        <instance addr="0x210226C4" reg_inst="6"/>
-        <instance addr="0x210216C4" reg_inst="7"/>
-        <instance addr="0x220286C4" reg_inst="8"/>
-        <instance addr="0x220246C4" reg_inst="9"/>
-        <instance addr="0x220226C4" reg_inst="10"/>
-        <instance addr="0x220216C4" reg_inst="11"/>
-        <instance addr="0x230286C4" reg_inst="12"/>
-        <instance addr="0x230246C4" reg_inst="13"/>
-        <instance addr="0x230226C4" reg_inst="14"/>
-        <instance addr="0x230216C4" reg_inst="15"/>
-        <instance addr="0x240286C4" reg_inst="16"/>
-        <instance addr="0x240246C4" reg_inst="17"/>
-        <instance addr="0x240226C4" reg_inst="18"/>
-        <instance addr="0x240216C4" reg_inst="19"/>
-        <instance addr="0x250286C4" reg_inst="20"/>
-        <instance addr="0x250246C4" reg_inst="21"/>
-        <instance addr="0x250226C4" reg_inst="22"/>
-        <instance addr="0x250216C4" reg_inst="23"/>
-        <instance addr="0x260286C4" reg_inst="24"/>
-        <instance addr="0x260246C4" reg_inst="25"/>
-        <instance addr="0x260226C4" reg_inst="26"/>
-        <instance addr="0x260216C4" reg_inst="27"/>
-        <instance addr="0x270286C4" reg_inst="28"/>
-        <instance addr="0x270246C4" reg_inst="29"/>
-        <instance addr="0x270226C4" reg_inst="30"/>
-        <instance addr="0x270216C4" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG5">
-        <instance addr="0x200286C5" reg_inst="0"/>
-        <instance addr="0x200246C5" reg_inst="1"/>
-        <instance addr="0x200226C5" reg_inst="2"/>
-        <instance addr="0x200216C5" reg_inst="3"/>
-        <instance addr="0x210286C5" reg_inst="4"/>
-        <instance addr="0x210246C5" reg_inst="5"/>
-        <instance addr="0x210226C5" reg_inst="6"/>
-        <instance addr="0x210216C5" reg_inst="7"/>
-        <instance addr="0x220286C5" reg_inst="8"/>
-        <instance addr="0x220246C5" reg_inst="9"/>
-        <instance addr="0x220226C5" reg_inst="10"/>
-        <instance addr="0x220216C5" reg_inst="11"/>
-        <instance addr="0x230286C5" reg_inst="12"/>
-        <instance addr="0x230246C5" reg_inst="13"/>
-        <instance addr="0x230226C5" reg_inst="14"/>
-        <instance addr="0x230216C5" reg_inst="15"/>
-        <instance addr="0x240286C5" reg_inst="16"/>
-        <instance addr="0x240246C5" reg_inst="17"/>
-        <instance addr="0x240226C5" reg_inst="18"/>
-        <instance addr="0x240216C5" reg_inst="19"/>
-        <instance addr="0x250286C5" reg_inst="20"/>
-        <instance addr="0x250246C5" reg_inst="21"/>
-        <instance addr="0x250226C5" reg_inst="22"/>
-        <instance addr="0x250216C5" reg_inst="23"/>
-        <instance addr="0x260286C5" reg_inst="24"/>
-        <instance addr="0x260246C5" reg_inst="25"/>
-        <instance addr="0x260226C5" reg_inst="26"/>
-        <instance addr="0x260216C5" reg_inst="27"/>
-        <instance addr="0x270286C5" reg_inst="28"/>
-        <instance addr="0x270246C5" reg_inst="29"/>
-        <instance addr="0x270226C5" reg_inst="30"/>
-        <instance addr="0x270216C5" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG6">
-        <instance addr="0x200286C6" reg_inst="0"/>
-        <instance addr="0x200246C6" reg_inst="1"/>
-        <instance addr="0x200226C6" reg_inst="2"/>
-        <instance addr="0x200216C6" reg_inst="3"/>
-        <instance addr="0x210286C6" reg_inst="4"/>
-        <instance addr="0x210246C6" reg_inst="5"/>
-        <instance addr="0x210226C6" reg_inst="6"/>
-        <instance addr="0x210216C6" reg_inst="7"/>
-        <instance addr="0x220286C6" reg_inst="8"/>
-        <instance addr="0x220246C6" reg_inst="9"/>
-        <instance addr="0x220226C6" reg_inst="10"/>
-        <instance addr="0x220216C6" reg_inst="11"/>
-        <instance addr="0x230286C6" reg_inst="12"/>
-        <instance addr="0x230246C6" reg_inst="13"/>
-        <instance addr="0x230226C6" reg_inst="14"/>
-        <instance addr="0x230216C6" reg_inst="15"/>
-        <instance addr="0x240286C6" reg_inst="16"/>
-        <instance addr="0x240246C6" reg_inst="17"/>
-        <instance addr="0x240226C6" reg_inst="18"/>
-        <instance addr="0x240216C6" reg_inst="19"/>
-        <instance addr="0x250286C6" reg_inst="20"/>
-        <instance addr="0x250246C6" reg_inst="21"/>
-        <instance addr="0x250226C6" reg_inst="22"/>
-        <instance addr="0x250216C6" reg_inst="23"/>
-        <instance addr="0x260286C6" reg_inst="24"/>
-        <instance addr="0x260246C6" reg_inst="25"/>
-        <instance addr="0x260226C6" reg_inst="26"/>
-        <instance addr="0x260216C6" reg_inst="27"/>
-        <instance addr="0x270286C6" reg_inst="28"/>
-        <instance addr="0x270246C6" reg_inst="29"/>
-        <instance addr="0x270226C6" reg_inst="30"/>
-        <instance addr="0x270216C6" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG7">
-        <instance addr="0x200286C7" reg_inst="0"/>
-        <instance addr="0x200246C7" reg_inst="1"/>
-        <instance addr="0x200226C7" reg_inst="2"/>
-        <instance addr="0x200216C7" reg_inst="3"/>
-        <instance addr="0x210286C7" reg_inst="4"/>
-        <instance addr="0x210246C7" reg_inst="5"/>
-        <instance addr="0x210226C7" reg_inst="6"/>
-        <instance addr="0x210216C7" reg_inst="7"/>
-        <instance addr="0x220286C7" reg_inst="8"/>
-        <instance addr="0x220246C7" reg_inst="9"/>
-        <instance addr="0x220226C7" reg_inst="10"/>
-        <instance addr="0x220216C7" reg_inst="11"/>
-        <instance addr="0x230286C7" reg_inst="12"/>
-        <instance addr="0x230246C7" reg_inst="13"/>
-        <instance addr="0x230226C7" reg_inst="14"/>
-        <instance addr="0x230216C7" reg_inst="15"/>
-        <instance addr="0x240286C7" reg_inst="16"/>
-        <instance addr="0x240246C7" reg_inst="17"/>
-        <instance addr="0x240226C7" reg_inst="18"/>
-        <instance addr="0x240216C7" reg_inst="19"/>
-        <instance addr="0x250286C7" reg_inst="20"/>
-        <instance addr="0x250246C7" reg_inst="21"/>
-        <instance addr="0x250226C7" reg_inst="22"/>
-        <instance addr="0x250216C7" reg_inst="23"/>
-        <instance addr="0x260286C7" reg_inst="24"/>
-        <instance addr="0x260246C7" reg_inst="25"/>
-        <instance addr="0x260226C7" reg_inst="26"/>
-        <instance addr="0x260216C7" reg_inst="27"/>
-        <instance addr="0x270286C7" reg_inst="28"/>
-        <instance addr="0x270246C7" reg_inst="29"/>
-        <instance addr="0x270226C7" reg_inst="30"/>
-        <instance addr="0x270216C7" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG8">
-        <instance addr="0x200286C8" reg_inst="0"/>
-        <instance addr="0x200246C8" reg_inst="1"/>
-        <instance addr="0x200226C8" reg_inst="2"/>
-        <instance addr="0x200216C8" reg_inst="3"/>
-        <instance addr="0x210286C8" reg_inst="4"/>
-        <instance addr="0x210246C8" reg_inst="5"/>
-        <instance addr="0x210226C8" reg_inst="6"/>
-        <instance addr="0x210216C8" reg_inst="7"/>
-        <instance addr="0x220286C8" reg_inst="8"/>
-        <instance addr="0x220246C8" reg_inst="9"/>
-        <instance addr="0x220226C8" reg_inst="10"/>
-        <instance addr="0x220216C8" reg_inst="11"/>
-        <instance addr="0x230286C8" reg_inst="12"/>
-        <instance addr="0x230246C8" reg_inst="13"/>
-        <instance addr="0x230226C8" reg_inst="14"/>
-        <instance addr="0x230216C8" reg_inst="15"/>
-        <instance addr="0x240286C8" reg_inst="16"/>
-        <instance addr="0x240246C8" reg_inst="17"/>
-        <instance addr="0x240226C8" reg_inst="18"/>
-        <instance addr="0x240216C8" reg_inst="19"/>
-        <instance addr="0x250286C8" reg_inst="20"/>
-        <instance addr="0x250246C8" reg_inst="21"/>
-        <instance addr="0x250226C8" reg_inst="22"/>
-        <instance addr="0x250216C8" reg_inst="23"/>
-        <instance addr="0x260286C8" reg_inst="24"/>
-        <instance addr="0x260246C8" reg_inst="25"/>
-        <instance addr="0x260226C8" reg_inst="26"/>
-        <instance addr="0x260216C8" reg_inst="27"/>
-        <instance addr="0x270286C8" reg_inst="28"/>
-        <instance addr="0x270246C8" reg_inst="29"/>
-        <instance addr="0x270226C8" reg_inst="30"/>
-        <instance addr="0x270216C8" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG9">
-        <instance addr="0x200286C9" reg_inst="0"/>
-        <instance addr="0x200246C9" reg_inst="1"/>
-        <instance addr="0x200226C9" reg_inst="2"/>
-        <instance addr="0x200216C9" reg_inst="3"/>
-        <instance addr="0x210286C9" reg_inst="4"/>
-        <instance addr="0x210246C9" reg_inst="5"/>
-        <instance addr="0x210226C9" reg_inst="6"/>
-        <instance addr="0x210216C9" reg_inst="7"/>
-        <instance addr="0x220286C9" reg_inst="8"/>
-        <instance addr="0x220246C9" reg_inst="9"/>
-        <instance addr="0x220226C9" reg_inst="10"/>
-        <instance addr="0x220216C9" reg_inst="11"/>
-        <instance addr="0x230286C9" reg_inst="12"/>
-        <instance addr="0x230246C9" reg_inst="13"/>
-        <instance addr="0x230226C9" reg_inst="14"/>
-        <instance addr="0x230216C9" reg_inst="15"/>
-        <instance addr="0x240286C9" reg_inst="16"/>
-        <instance addr="0x240246C9" reg_inst="17"/>
-        <instance addr="0x240226C9" reg_inst="18"/>
-        <instance addr="0x240216C9" reg_inst="19"/>
-        <instance addr="0x250286C9" reg_inst="20"/>
-        <instance addr="0x250246C9" reg_inst="21"/>
-        <instance addr="0x250226C9" reg_inst="22"/>
-        <instance addr="0x250216C9" reg_inst="23"/>
-        <instance addr="0x260286C9" reg_inst="24"/>
-        <instance addr="0x260246C9" reg_inst="25"/>
-        <instance addr="0x260226C9" reg_inst="26"/>
-        <instance addr="0x260216C9" reg_inst="27"/>
-        <instance addr="0x270286C9" reg_inst="28"/>
-        <instance addr="0x270246C9" reg_inst="29"/>
-        <instance addr="0x270226C9" reg_inst="30"/>
-        <instance addr="0x270216C9" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG10">
-        <instance addr="0x200286CA" reg_inst="0"/>
-        <instance addr="0x200246CA" reg_inst="1"/>
-        <instance addr="0x200226CA" reg_inst="2"/>
-        <instance addr="0x200216CA" reg_inst="3"/>
-        <instance addr="0x210286CA" reg_inst="4"/>
-        <instance addr="0x210246CA" reg_inst="5"/>
-        <instance addr="0x210226CA" reg_inst="6"/>
-        <instance addr="0x210216CA" reg_inst="7"/>
-        <instance addr="0x220286CA" reg_inst="8"/>
-        <instance addr="0x220246CA" reg_inst="9"/>
-        <instance addr="0x220226CA" reg_inst="10"/>
-        <instance addr="0x220216CA" reg_inst="11"/>
-        <instance addr="0x230286CA" reg_inst="12"/>
-        <instance addr="0x230246CA" reg_inst="13"/>
-        <instance addr="0x230226CA" reg_inst="14"/>
-        <instance addr="0x230216CA" reg_inst="15"/>
-        <instance addr="0x240286CA" reg_inst="16"/>
-        <instance addr="0x240246CA" reg_inst="17"/>
-        <instance addr="0x240226CA" reg_inst="18"/>
-        <instance addr="0x240216CA" reg_inst="19"/>
-        <instance addr="0x250286CA" reg_inst="20"/>
-        <instance addr="0x250246CA" reg_inst="21"/>
-        <instance addr="0x250226CA" reg_inst="22"/>
-        <instance addr="0x250216CA" reg_inst="23"/>
-        <instance addr="0x260286CA" reg_inst="24"/>
-        <instance addr="0x260246CA" reg_inst="25"/>
-        <instance addr="0x260226CA" reg_inst="26"/>
-        <instance addr="0x260216CA" reg_inst="27"/>
-        <instance addr="0x270286CA" reg_inst="28"/>
-        <instance addr="0x270246CA" reg_inst="29"/>
-        <instance addr="0x270226CA" reg_inst="30"/>
-        <instance addr="0x270216CA" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG11">
-        <instance addr="0x200286CB" reg_inst="0"/>
-        <instance addr="0x200246CB" reg_inst="1"/>
-        <instance addr="0x200226CB" reg_inst="2"/>
-        <instance addr="0x200216CB" reg_inst="3"/>
-        <instance addr="0x210286CB" reg_inst="4"/>
-        <instance addr="0x210246CB" reg_inst="5"/>
-        <instance addr="0x210226CB" reg_inst="6"/>
-        <instance addr="0x210216CB" reg_inst="7"/>
-        <instance addr="0x220286CB" reg_inst="8"/>
-        <instance addr="0x220246CB" reg_inst="9"/>
-        <instance addr="0x220226CB" reg_inst="10"/>
-        <instance addr="0x220216CB" reg_inst="11"/>
-        <instance addr="0x230286CB" reg_inst="12"/>
-        <instance addr="0x230246CB" reg_inst="13"/>
-        <instance addr="0x230226CB" reg_inst="14"/>
-        <instance addr="0x230216CB" reg_inst="15"/>
-        <instance addr="0x240286CB" reg_inst="16"/>
-        <instance addr="0x240246CB" reg_inst="17"/>
-        <instance addr="0x240226CB" reg_inst="18"/>
-        <instance addr="0x240216CB" reg_inst="19"/>
-        <instance addr="0x250286CB" reg_inst="20"/>
-        <instance addr="0x250246CB" reg_inst="21"/>
-        <instance addr="0x250226CB" reg_inst="22"/>
-        <instance addr="0x250216CB" reg_inst="23"/>
-        <instance addr="0x260286CB" reg_inst="24"/>
-        <instance addr="0x260246CB" reg_inst="25"/>
-        <instance addr="0x260226CB" reg_inst="26"/>
-        <instance addr="0x260216CB" reg_inst="27"/>
-        <instance addr="0x270286CB" reg_inst="28"/>
-        <instance addr="0x270246CB" reg_inst="29"/>
-        <instance addr="0x270226CB" reg_inst="30"/>
-        <instance addr="0x270216CB" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG12">
-        <instance addr="0x200286CC" reg_inst="0"/>
-        <instance addr="0x200246CC" reg_inst="1"/>
-        <instance addr="0x200226CC" reg_inst="2"/>
-        <instance addr="0x200216CC" reg_inst="3"/>
-        <instance addr="0x210286CC" reg_inst="4"/>
-        <instance addr="0x210246CC" reg_inst="5"/>
-        <instance addr="0x210226CC" reg_inst="6"/>
-        <instance addr="0x210216CC" reg_inst="7"/>
-        <instance addr="0x220286CC" reg_inst="8"/>
-        <instance addr="0x220246CC" reg_inst="9"/>
-        <instance addr="0x220226CC" reg_inst="10"/>
-        <instance addr="0x220216CC" reg_inst="11"/>
-        <instance addr="0x230286CC" reg_inst="12"/>
-        <instance addr="0x230246CC" reg_inst="13"/>
-        <instance addr="0x230226CC" reg_inst="14"/>
-        <instance addr="0x230216CC" reg_inst="15"/>
-        <instance addr="0x240286CC" reg_inst="16"/>
-        <instance addr="0x240246CC" reg_inst="17"/>
-        <instance addr="0x240226CC" reg_inst="18"/>
-        <instance addr="0x240216CC" reg_inst="19"/>
-        <instance addr="0x250286CC" reg_inst="20"/>
-        <instance addr="0x250246CC" reg_inst="21"/>
-        <instance addr="0x250226CC" reg_inst="22"/>
-        <instance addr="0x250216CC" reg_inst="23"/>
-        <instance addr="0x260286CC" reg_inst="24"/>
-        <instance addr="0x260246CC" reg_inst="25"/>
-        <instance addr="0x260226CC" reg_inst="26"/>
-        <instance addr="0x260216CC" reg_inst="27"/>
-        <instance addr="0x270286CC" reg_inst="28"/>
-        <instance addr="0x270246CC" reg_inst="29"/>
-        <instance addr="0x270226CC" reg_inst="30"/>
-        <instance addr="0x270216CC" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG13">
-        <instance addr="0x200286CD" reg_inst="0"/>
-        <instance addr="0x200246CD" reg_inst="1"/>
-        <instance addr="0x200226CD" reg_inst="2"/>
-        <instance addr="0x200216CD" reg_inst="3"/>
-        <instance addr="0x210286CD" reg_inst="4"/>
-        <instance addr="0x210246CD" reg_inst="5"/>
-        <instance addr="0x210226CD" reg_inst="6"/>
-        <instance addr="0x210216CD" reg_inst="7"/>
-        <instance addr="0x220286CD" reg_inst="8"/>
-        <instance addr="0x220246CD" reg_inst="9"/>
-        <instance addr="0x220226CD" reg_inst="10"/>
-        <instance addr="0x220216CD" reg_inst="11"/>
-        <instance addr="0x230286CD" reg_inst="12"/>
-        <instance addr="0x230246CD" reg_inst="13"/>
-        <instance addr="0x230226CD" reg_inst="14"/>
-        <instance addr="0x230216CD" reg_inst="15"/>
-        <instance addr="0x240286CD" reg_inst="16"/>
-        <instance addr="0x240246CD" reg_inst="17"/>
-        <instance addr="0x240226CD" reg_inst="18"/>
-        <instance addr="0x240216CD" reg_inst="19"/>
-        <instance addr="0x250286CD" reg_inst="20"/>
-        <instance addr="0x250246CD" reg_inst="21"/>
-        <instance addr="0x250226CD" reg_inst="22"/>
-        <instance addr="0x250216CD" reg_inst="23"/>
-        <instance addr="0x260286CD" reg_inst="24"/>
-        <instance addr="0x260246CD" reg_inst="25"/>
-        <instance addr="0x260226CD" reg_inst="26"/>
-        <instance addr="0x260216CD" reg_inst="27"/>
-        <instance addr="0x270286CD" reg_inst="28"/>
-        <instance addr="0x270246CD" reg_inst="29"/>
-        <instance addr="0x270226CD" reg_inst="30"/>
-        <instance addr="0x270216CD" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="HV_PR_STATE"        reg_inst= "0:31" />
-        <capture_register reg_name="PC_FIR_HOLD_OUT"    reg_inst= "0:31" />
-        <capture_register reg_name="THRCTL_HOLD_OUT"    reg_inst= "0:31" />
-        <capture_register reg_name="VSU_HOLD_OUT"       reg_inst= "0:31" />
-        <capture_register reg_name="TFAC_HOLD_OUT"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT0"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT1"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT2"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT3"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT0"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT1"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT2"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT3"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT0"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT1"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT2"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT3"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT4"      reg_inst= "0:31" />
-        <capture_register reg_name="MMU_HOLD_OUT5"      reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG0"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG1"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG2"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG3"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG4"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG5"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG6"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG7"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG8"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG9"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG10" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG11" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG12" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG13" reg_inst= "0:31" />
-    </capture_group>
-    <rule attn_type="CS" node_inst="0:31">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_CORE_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-            </expr>
-        </expr>
-    </rule>
-    <rule attn_type="RE" node_inst="0:31">
-        <!-- WOF & ~MASK & ~ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_CORE_FIR_WOF"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            </expr>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <rule attn_type="UCS" node_inst="0:31">
-        <!-- (FIR | WOF) & ~MASK & ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="or">
-                <expr type="reg" value1="EQ_CORE_FIR"/>
-                <expr type="reg" value1="EQ_CORE_FIR_WOF"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <bit pos="0">IFU SRAM recoverable error (ICACHE parity error, etc)</bit>
-    <bit pos="1">TC checkstop</bit>
-    <bit pos="2">IFU RegFile recoverable error</bit>
-    <bit pos="3">IFU RegFile core checkstop</bit>
-    <bit pos="4">IFU logic recoverable error</bit>
-    <bit pos="5">IFU logic core checkstop</bit>
-    <bit pos="6">reserved</bit>
-    <bit pos="7">VSU Inference Accumulator recoverable error</bit>
-    <bit pos="8">Recovery core checkstop</bit>
-    <bit pos="9">VSU Slice Targeted File (STF) recoverable error</bit>
-    <bit pos="10">reserved</bit>
-    <bit pos="11">ISU logic recoverable error</bit>
-    <bit pos="12">ISU logic core checkstop</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">MCHK received while ME=0 - non recoverable</bit>
-    <bit pos="15">UE from L2</bit>
-    <bit pos="16">Number of UEs from L2 above threshold</bit>
-    <bit pos="17">UE on CI load</bit>
-    <bit pos="18">MMU TLB parity recoverable error</bit>
-    <bit pos="19">MMU SLB parity recoverable error</bit>
-    <bit pos="20">reserved</bit>
-    <bit pos="21">MMU CXT recoverable error</bit>
-    <bit pos="22">MMU logic core checkstop</bit>
-    <bit pos="23">MMU system checkstop</bit>
-    <bit pos="24">VSU logic recoverable error</bit>
-    <bit pos="25">VSU logic core checkstop</bit>
-    <bit pos="26">Thread in maintenance mode and receives recovery request</bit>
-    <bit pos="27">reserved</bit>
-    <bit pos="28">PC system checkstop - Recoverable error received when recovery disabled</bit>
-    <bit pos="29">LSU SRAM recoverable error (DCACHE parity error, ERAT parity error, etc)</bit>
-    <bit pos="30">LSU set deleted</bit>
-    <bit pos="31">LSU RegFile recoverable error</bit>
-    <bit pos="32">LSU RegFile core checkstop</bit>
-    <bit pos="33">MMU TLB multi hit error occurred</bit>
-    <bit pos="34">MMU SLB multi hit error occurred</bit>
-    <bit pos="35">LSU ERAT multi hit error occurred</bit>
-    <bit pos="36">PC forward progress error</bit>
-    <bit pos="37">LSU logic recoverable error</bit>
-    <bit pos="38">LSU logic core checkstop</bit>
-    <bit pos="39">reserved</bit>
-    <bit pos="40">reserved</bit>
-    <bit pos="41">LSU system checkstop</bit>
-    <bit pos="42">reserved</bit>
-    <bit pos="43">PC thread hang recoverable error</bit>
-    <bit pos="44">reserved</bit>
-    <bit pos="45">PC logic checkstop</bit>
-    <bit pos="46">PC TimeBase Facility checkstop</bit>
-    <bit pos="47">PC TimeBase Facility checkstop</bit>
-    <bit pos="48">reserved</bit>
-    <bit pos="49">reserved</bit>
-    <bit pos="50">reserved</bit>
-    <bit pos="51">reserved</bit>
-    <bit pos="52">Hang Recovery Failed</bit>
-    <bit pos="53">Core Hang detected</bit>
-    <bit pos="54">reserved</bit>
-    <bit pos="55">Nest Hang detected</bit>
-    <bit pos="56">Other Core Chiplet recoverable error</bit>
-    <bit pos="57">Other Core Chiplet core checkstop</bit>
-    <bit pos="58">Other Core Chiplet system checkstop</bit>
-    <bit pos="59">SCOM satellite error detected</bit>
-    <bit pos="60">Debug Trigger error inject</bit>
-    <bit pos="61">SCOM or Firmware recoverable error inject</bit>
-    <bit pos="62">Firmware checkstop error inject</bit>
-    <bit pos="63">PHYP checkstop via SPRC/SPRD</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_core_fir_p10_10.xml b/xml/p10/node_eq_core_fir_p10_10.xml
deleted file mode 100644
index d9d5364..0000000
--- a/xml/p10/node_eq_core_fir_p10_10.xml
+++ /dev/null
@@ -1,1188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="EQ_CORE_FIR" reg_type="SCOM">
-    <register name="EQ_CORE_FIR">
-        <instance addr="0x20028440" reg_inst="0"/>
-        <instance addr="0x20024440" reg_inst="1"/>
-        <instance addr="0x20022440" reg_inst="2"/>
-        <instance addr="0x20021440" reg_inst="3"/>
-        <instance addr="0x21028440" reg_inst="4"/>
-        <instance addr="0x21024440" reg_inst="5"/>
-        <instance addr="0x21022440" reg_inst="6"/>
-        <instance addr="0x21021440" reg_inst="7"/>
-        <instance addr="0x22028440" reg_inst="8"/>
-        <instance addr="0x22024440" reg_inst="9"/>
-        <instance addr="0x22022440" reg_inst="10"/>
-        <instance addr="0x22021440" reg_inst="11"/>
-        <instance addr="0x23028440" reg_inst="12"/>
-        <instance addr="0x23024440" reg_inst="13"/>
-        <instance addr="0x23022440" reg_inst="14"/>
-        <instance addr="0x23021440" reg_inst="15"/>
-        <instance addr="0x24028440" reg_inst="16"/>
-        <instance addr="0x24024440" reg_inst="17"/>
-        <instance addr="0x24022440" reg_inst="18"/>
-        <instance addr="0x24021440" reg_inst="19"/>
-        <instance addr="0x25028440" reg_inst="20"/>
-        <instance addr="0x25024440" reg_inst="21"/>
-        <instance addr="0x25022440" reg_inst="22"/>
-        <instance addr="0x25021440" reg_inst="23"/>
-        <instance addr="0x26028440" reg_inst="24"/>
-        <instance addr="0x26024440" reg_inst="25"/>
-        <instance addr="0x26022440" reg_inst="26"/>
-        <instance addr="0x26021440" reg_inst="27"/>
-        <instance addr="0x27028440" reg_inst="28"/>
-        <instance addr="0x27024440" reg_inst="29"/>
-        <instance addr="0x27022440" reg_inst="30"/>
-        <instance addr="0x27021440" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_MASK">
-        <instance addr="0x20028443" reg_inst="0"/>
-        <instance addr="0x20024443" reg_inst="1"/>
-        <instance addr="0x20022443" reg_inst="2"/>
-        <instance addr="0x20021443" reg_inst="3"/>
-        <instance addr="0x21028443" reg_inst="4"/>
-        <instance addr="0x21024443" reg_inst="5"/>
-        <instance addr="0x21022443" reg_inst="6"/>
-        <instance addr="0x21021443" reg_inst="7"/>
-        <instance addr="0x22028443" reg_inst="8"/>
-        <instance addr="0x22024443" reg_inst="9"/>
-        <instance addr="0x22022443" reg_inst="10"/>
-        <instance addr="0x22021443" reg_inst="11"/>
-        <instance addr="0x23028443" reg_inst="12"/>
-        <instance addr="0x23024443" reg_inst="13"/>
-        <instance addr="0x23022443" reg_inst="14"/>
-        <instance addr="0x23021443" reg_inst="15"/>
-        <instance addr="0x24028443" reg_inst="16"/>
-        <instance addr="0x24024443" reg_inst="17"/>
-        <instance addr="0x24022443" reg_inst="18"/>
-        <instance addr="0x24021443" reg_inst="19"/>
-        <instance addr="0x25028443" reg_inst="20"/>
-        <instance addr="0x25024443" reg_inst="21"/>
-        <instance addr="0x25022443" reg_inst="22"/>
-        <instance addr="0x25021443" reg_inst="23"/>
-        <instance addr="0x26028443" reg_inst="24"/>
-        <instance addr="0x26024443" reg_inst="25"/>
-        <instance addr="0x26022443" reg_inst="26"/>
-        <instance addr="0x26021443" reg_inst="27"/>
-        <instance addr="0x27028443" reg_inst="28"/>
-        <instance addr="0x27024443" reg_inst="29"/>
-        <instance addr="0x27022443" reg_inst="30"/>
-        <instance addr="0x27021443" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_ACT0">
-        <instance addr="0x20028446" reg_inst="0"/>
-        <instance addr="0x20024446" reg_inst="1"/>
-        <instance addr="0x20022446" reg_inst="2"/>
-        <instance addr="0x20021446" reg_inst="3"/>
-        <instance addr="0x21028446" reg_inst="4"/>
-        <instance addr="0x21024446" reg_inst="5"/>
-        <instance addr="0x21022446" reg_inst="6"/>
-        <instance addr="0x21021446" reg_inst="7"/>
-        <instance addr="0x22028446" reg_inst="8"/>
-        <instance addr="0x22024446" reg_inst="9"/>
-        <instance addr="0x22022446" reg_inst="10"/>
-        <instance addr="0x22021446" reg_inst="11"/>
-        <instance addr="0x23028446" reg_inst="12"/>
-        <instance addr="0x23024446" reg_inst="13"/>
-        <instance addr="0x23022446" reg_inst="14"/>
-        <instance addr="0x23021446" reg_inst="15"/>
-        <instance addr="0x24028446" reg_inst="16"/>
-        <instance addr="0x24024446" reg_inst="17"/>
-        <instance addr="0x24022446" reg_inst="18"/>
-        <instance addr="0x24021446" reg_inst="19"/>
-        <instance addr="0x25028446" reg_inst="20"/>
-        <instance addr="0x25024446" reg_inst="21"/>
-        <instance addr="0x25022446" reg_inst="22"/>
-        <instance addr="0x25021446" reg_inst="23"/>
-        <instance addr="0x26028446" reg_inst="24"/>
-        <instance addr="0x26024446" reg_inst="25"/>
-        <instance addr="0x26022446" reg_inst="26"/>
-        <instance addr="0x26021446" reg_inst="27"/>
-        <instance addr="0x27028446" reg_inst="28"/>
-        <instance addr="0x27024446" reg_inst="29"/>
-        <instance addr="0x27022446" reg_inst="30"/>
-        <instance addr="0x27021446" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_ACT1">
-        <instance addr="0x20028447" reg_inst="0"/>
-        <instance addr="0x20024447" reg_inst="1"/>
-        <instance addr="0x20022447" reg_inst="2"/>
-        <instance addr="0x20021447" reg_inst="3"/>
-        <instance addr="0x21028447" reg_inst="4"/>
-        <instance addr="0x21024447" reg_inst="5"/>
-        <instance addr="0x21022447" reg_inst="6"/>
-        <instance addr="0x21021447" reg_inst="7"/>
-        <instance addr="0x22028447" reg_inst="8"/>
-        <instance addr="0x22024447" reg_inst="9"/>
-        <instance addr="0x22022447" reg_inst="10"/>
-        <instance addr="0x22021447" reg_inst="11"/>
-        <instance addr="0x23028447" reg_inst="12"/>
-        <instance addr="0x23024447" reg_inst="13"/>
-        <instance addr="0x23022447" reg_inst="14"/>
-        <instance addr="0x23021447" reg_inst="15"/>
-        <instance addr="0x24028447" reg_inst="16"/>
-        <instance addr="0x24024447" reg_inst="17"/>
-        <instance addr="0x24022447" reg_inst="18"/>
-        <instance addr="0x24021447" reg_inst="19"/>
-        <instance addr="0x25028447" reg_inst="20"/>
-        <instance addr="0x25024447" reg_inst="21"/>
-        <instance addr="0x25022447" reg_inst="22"/>
-        <instance addr="0x25021447" reg_inst="23"/>
-        <instance addr="0x26028447" reg_inst="24"/>
-        <instance addr="0x26024447" reg_inst="25"/>
-        <instance addr="0x26022447" reg_inst="26"/>
-        <instance addr="0x26021447" reg_inst="27"/>
-        <instance addr="0x27028447" reg_inst="28"/>
-        <instance addr="0x27024447" reg_inst="29"/>
-        <instance addr="0x27022447" reg_inst="30"/>
-        <instance addr="0x27021447" reg_inst="31"/>
-    </register>
-    <register name="EQ_CORE_FIR_WOF">
-        <instance addr="0x20028448" reg_inst="0"/>
-        <instance addr="0x20024448" reg_inst="1"/>
-        <instance addr="0x20022448" reg_inst="2"/>
-        <instance addr="0x20021448" reg_inst="3"/>
-        <instance addr="0x21028448" reg_inst="4"/>
-        <instance addr="0x21024448" reg_inst="5"/>
-        <instance addr="0x21022448" reg_inst="6"/>
-        <instance addr="0x21021448" reg_inst="7"/>
-        <instance addr="0x22028448" reg_inst="8"/>
-        <instance addr="0x22024448" reg_inst="9"/>
-        <instance addr="0x22022448" reg_inst="10"/>
-        <instance addr="0x22021448" reg_inst="11"/>
-        <instance addr="0x23028448" reg_inst="12"/>
-        <instance addr="0x23024448" reg_inst="13"/>
-        <instance addr="0x23022448" reg_inst="14"/>
-        <instance addr="0x23021448" reg_inst="15"/>
-        <instance addr="0x24028448" reg_inst="16"/>
-        <instance addr="0x24024448" reg_inst="17"/>
-        <instance addr="0x24022448" reg_inst="18"/>
-        <instance addr="0x24021448" reg_inst="19"/>
-        <instance addr="0x25028448" reg_inst="20"/>
-        <instance addr="0x25024448" reg_inst="21"/>
-        <instance addr="0x25022448" reg_inst="22"/>
-        <instance addr="0x25021448" reg_inst="23"/>
-        <instance addr="0x26028448" reg_inst="24"/>
-        <instance addr="0x26024448" reg_inst="25"/>
-        <instance addr="0x26022448" reg_inst="26"/>
-        <instance addr="0x26021448" reg_inst="27"/>
-        <instance addr="0x27028448" reg_inst="28"/>
-        <instance addr="0x27024448" reg_inst="29"/>
-        <instance addr="0x27022448" reg_inst="30"/>
-        <instance addr="0x27021448" reg_inst="31"/>
-    </register>
-    <register name="PC_FIR_HOLD_OUT">
-        <instance addr="0x20028451" reg_inst="0"/>
-        <instance addr="0x20024451" reg_inst="1"/>
-        <instance addr="0x20022451" reg_inst="2"/>
-        <instance addr="0x20021451" reg_inst="3"/>
-        <instance addr="0x21028451" reg_inst="4"/>
-        <instance addr="0x21024451" reg_inst="5"/>
-        <instance addr="0x21022451" reg_inst="6"/>
-        <instance addr="0x21021451" reg_inst="7"/>
-        <instance addr="0x22028451" reg_inst="8"/>
-        <instance addr="0x22024451" reg_inst="9"/>
-        <instance addr="0x22022451" reg_inst="10"/>
-        <instance addr="0x22021451" reg_inst="11"/>
-        <instance addr="0x23028451" reg_inst="12"/>
-        <instance addr="0x23024451" reg_inst="13"/>
-        <instance addr="0x23022451" reg_inst="14"/>
-        <instance addr="0x23021451" reg_inst="15"/>
-        <instance addr="0x24028451" reg_inst="16"/>
-        <instance addr="0x24024451" reg_inst="17"/>
-        <instance addr="0x24022451" reg_inst="18"/>
-        <instance addr="0x24021451" reg_inst="19"/>
-        <instance addr="0x25028451" reg_inst="20"/>
-        <instance addr="0x25024451" reg_inst="21"/>
-        <instance addr="0x25022451" reg_inst="22"/>
-        <instance addr="0x25021451" reg_inst="23"/>
-        <instance addr="0x26028451" reg_inst="24"/>
-        <instance addr="0x26024451" reg_inst="25"/>
-        <instance addr="0x26022451" reg_inst="26"/>
-        <instance addr="0x26021451" reg_inst="27"/>
-        <instance addr="0x27028451" reg_inst="28"/>
-        <instance addr="0x27024451" reg_inst="29"/>
-        <instance addr="0x27022451" reg_inst="30"/>
-        <instance addr="0x27021451" reg_inst="31"/>
-    </register>
-    <register name="THRCTL_HOLD_OUT">
-        <instance addr="0x20028455" reg_inst="0"/>
-        <instance addr="0x20024455" reg_inst="1"/>
-        <instance addr="0x20022455" reg_inst="2"/>
-        <instance addr="0x20021455" reg_inst="3"/>
-        <instance addr="0x21028455" reg_inst="4"/>
-        <instance addr="0x21024455" reg_inst="5"/>
-        <instance addr="0x21022455" reg_inst="6"/>
-        <instance addr="0x21021455" reg_inst="7"/>
-        <instance addr="0x22028455" reg_inst="8"/>
-        <instance addr="0x22024455" reg_inst="9"/>
-        <instance addr="0x22022455" reg_inst="10"/>
-        <instance addr="0x22021455" reg_inst="11"/>
-        <instance addr="0x23028455" reg_inst="12"/>
-        <instance addr="0x23024455" reg_inst="13"/>
-        <instance addr="0x23022455" reg_inst="14"/>
-        <instance addr="0x23021455" reg_inst="15"/>
-        <instance addr="0x24028455" reg_inst="16"/>
-        <instance addr="0x24024455" reg_inst="17"/>
-        <instance addr="0x24022455" reg_inst="18"/>
-        <instance addr="0x24021455" reg_inst="19"/>
-        <instance addr="0x25028455" reg_inst="20"/>
-        <instance addr="0x25024455" reg_inst="21"/>
-        <instance addr="0x25022455" reg_inst="22"/>
-        <instance addr="0x25021455" reg_inst="23"/>
-        <instance addr="0x26028455" reg_inst="24"/>
-        <instance addr="0x26024455" reg_inst="25"/>
-        <instance addr="0x26022455" reg_inst="26"/>
-        <instance addr="0x26021455" reg_inst="27"/>
-        <instance addr="0x27028455" reg_inst="28"/>
-        <instance addr="0x27024455" reg_inst="29"/>
-        <instance addr="0x27022455" reg_inst="30"/>
-        <instance addr="0x27021455" reg_inst="31"/>
-    </register>
-    <register name="VSU_HOLD_OUT">
-        <instance addr="0x200284B6" reg_inst="0"/>
-        <instance addr="0x200244B6" reg_inst="1"/>
-        <instance addr="0x200224B6" reg_inst="2"/>
-        <instance addr="0x200214B6" reg_inst="3"/>
-        <instance addr="0x210284B6" reg_inst="4"/>
-        <instance addr="0x210244B6" reg_inst="5"/>
-        <instance addr="0x210224B6" reg_inst="6"/>
-        <instance addr="0x210214B6" reg_inst="7"/>
-        <instance addr="0x220284B6" reg_inst="8"/>
-        <instance addr="0x220244B6" reg_inst="9"/>
-        <instance addr="0x220224B6" reg_inst="10"/>
-        <instance addr="0x220214B6" reg_inst="11"/>
-        <instance addr="0x230284B6" reg_inst="12"/>
-        <instance addr="0x230244B6" reg_inst="13"/>
-        <instance addr="0x230224B6" reg_inst="14"/>
-        <instance addr="0x230214B6" reg_inst="15"/>
-        <instance addr="0x240284B6" reg_inst="16"/>
-        <instance addr="0x240244B6" reg_inst="17"/>
-        <instance addr="0x240224B6" reg_inst="18"/>
-        <instance addr="0x240214B6" reg_inst="19"/>
-        <instance addr="0x250284B6" reg_inst="20"/>
-        <instance addr="0x250244B6" reg_inst="21"/>
-        <instance addr="0x250224B6" reg_inst="22"/>
-        <instance addr="0x250214B6" reg_inst="23"/>
-        <instance addr="0x260284B6" reg_inst="24"/>
-        <instance addr="0x260244B6" reg_inst="25"/>
-        <instance addr="0x260224B6" reg_inst="26"/>
-        <instance addr="0x260214B6" reg_inst="27"/>
-        <instance addr="0x270284B6" reg_inst="28"/>
-        <instance addr="0x270244B6" reg_inst="29"/>
-        <instance addr="0x270224B6" reg_inst="30"/>
-        <instance addr="0x270214B6" reg_inst="31"/>
-    </register>
-    <register name="TFAC_HOLD_OUT">
-        <instance addr="0x200284B7" reg_inst="0"/>
-        <instance addr="0x200244B7" reg_inst="1"/>
-        <instance addr="0x200224B7" reg_inst="2"/>
-        <instance addr="0x200214B7" reg_inst="3"/>
-        <instance addr="0x210284B7" reg_inst="4"/>
-        <instance addr="0x210244B7" reg_inst="5"/>
-        <instance addr="0x210224B7" reg_inst="6"/>
-        <instance addr="0x210214B7" reg_inst="7"/>
-        <instance addr="0x220284B7" reg_inst="8"/>
-        <instance addr="0x220244B7" reg_inst="9"/>
-        <instance addr="0x220224B7" reg_inst="10"/>
-        <instance addr="0x220214B7" reg_inst="11"/>
-        <instance addr="0x230284B7" reg_inst="12"/>
-        <instance addr="0x230244B7" reg_inst="13"/>
-        <instance addr="0x230224B7" reg_inst="14"/>
-        <instance addr="0x230214B7" reg_inst="15"/>
-        <instance addr="0x240284B7" reg_inst="16"/>
-        <instance addr="0x240244B7" reg_inst="17"/>
-        <instance addr="0x240224B7" reg_inst="18"/>
-        <instance addr="0x240214B7" reg_inst="19"/>
-        <instance addr="0x250284B7" reg_inst="20"/>
-        <instance addr="0x250244B7" reg_inst="21"/>
-        <instance addr="0x250224B7" reg_inst="22"/>
-        <instance addr="0x250214B7" reg_inst="23"/>
-        <instance addr="0x260284B7" reg_inst="24"/>
-        <instance addr="0x260244B7" reg_inst="25"/>
-        <instance addr="0x260224B7" reg_inst="26"/>
-        <instance addr="0x260214B7" reg_inst="27"/>
-        <instance addr="0x270284B7" reg_inst="28"/>
-        <instance addr="0x270244B7" reg_inst="29"/>
-        <instance addr="0x270224B7" reg_inst="30"/>
-        <instance addr="0x270214B7" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT0">
-        <instance addr="0x20028600" reg_inst="0"/>
-        <instance addr="0x20024600" reg_inst="1"/>
-        <instance addr="0x20022600" reg_inst="2"/>
-        <instance addr="0x20021600" reg_inst="3"/>
-        <instance addr="0x21028600" reg_inst="4"/>
-        <instance addr="0x21024600" reg_inst="5"/>
-        <instance addr="0x21022600" reg_inst="6"/>
-        <instance addr="0x21021600" reg_inst="7"/>
-        <instance addr="0x22028600" reg_inst="8"/>
-        <instance addr="0x22024600" reg_inst="9"/>
-        <instance addr="0x22022600" reg_inst="10"/>
-        <instance addr="0x22021600" reg_inst="11"/>
-        <instance addr="0x23028600" reg_inst="12"/>
-        <instance addr="0x23024600" reg_inst="13"/>
-        <instance addr="0x23022600" reg_inst="14"/>
-        <instance addr="0x23021600" reg_inst="15"/>
-        <instance addr="0x24028600" reg_inst="16"/>
-        <instance addr="0x24024600" reg_inst="17"/>
-        <instance addr="0x24022600" reg_inst="18"/>
-        <instance addr="0x24021600" reg_inst="19"/>
-        <instance addr="0x25028600" reg_inst="20"/>
-        <instance addr="0x25024600" reg_inst="21"/>
-        <instance addr="0x25022600" reg_inst="22"/>
-        <instance addr="0x25021600" reg_inst="23"/>
-        <instance addr="0x26028600" reg_inst="24"/>
-        <instance addr="0x26024600" reg_inst="25"/>
-        <instance addr="0x26022600" reg_inst="26"/>
-        <instance addr="0x26021600" reg_inst="27"/>
-        <instance addr="0x27028600" reg_inst="28"/>
-        <instance addr="0x27024600" reg_inst="29"/>
-        <instance addr="0x27022600" reg_inst="30"/>
-        <instance addr="0x27021600" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT1">
-        <instance addr="0x20028601" reg_inst="0"/>
-        <instance addr="0x20024601" reg_inst="1"/>
-        <instance addr="0x20022601" reg_inst="2"/>
-        <instance addr="0x20021601" reg_inst="3"/>
-        <instance addr="0x21028601" reg_inst="4"/>
-        <instance addr="0x21024601" reg_inst="5"/>
-        <instance addr="0x21022601" reg_inst="6"/>
-        <instance addr="0x21021601" reg_inst="7"/>
-        <instance addr="0x22028601" reg_inst="8"/>
-        <instance addr="0x22024601" reg_inst="9"/>
-        <instance addr="0x22022601" reg_inst="10"/>
-        <instance addr="0x22021601" reg_inst="11"/>
-        <instance addr="0x23028601" reg_inst="12"/>
-        <instance addr="0x23024601" reg_inst="13"/>
-        <instance addr="0x23022601" reg_inst="14"/>
-        <instance addr="0x23021601" reg_inst="15"/>
-        <instance addr="0x24028601" reg_inst="16"/>
-        <instance addr="0x24024601" reg_inst="17"/>
-        <instance addr="0x24022601" reg_inst="18"/>
-        <instance addr="0x24021601" reg_inst="19"/>
-        <instance addr="0x25028601" reg_inst="20"/>
-        <instance addr="0x25024601" reg_inst="21"/>
-        <instance addr="0x25022601" reg_inst="22"/>
-        <instance addr="0x25021601" reg_inst="23"/>
-        <instance addr="0x26028601" reg_inst="24"/>
-        <instance addr="0x26024601" reg_inst="25"/>
-        <instance addr="0x26022601" reg_inst="26"/>
-        <instance addr="0x26021601" reg_inst="27"/>
-        <instance addr="0x27028601" reg_inst="28"/>
-        <instance addr="0x27024601" reg_inst="29"/>
-        <instance addr="0x27022601" reg_inst="30"/>
-        <instance addr="0x27021601" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT2">
-        <instance addr="0x20028602" reg_inst="0"/>
-        <instance addr="0x20024602" reg_inst="1"/>
-        <instance addr="0x20022602" reg_inst="2"/>
-        <instance addr="0x20021602" reg_inst="3"/>
-        <instance addr="0x21028602" reg_inst="4"/>
-        <instance addr="0x21024602" reg_inst="5"/>
-        <instance addr="0x21022602" reg_inst="6"/>
-        <instance addr="0x21021602" reg_inst="7"/>
-        <instance addr="0x22028602" reg_inst="8"/>
-        <instance addr="0x22024602" reg_inst="9"/>
-        <instance addr="0x22022602" reg_inst="10"/>
-        <instance addr="0x22021602" reg_inst="11"/>
-        <instance addr="0x23028602" reg_inst="12"/>
-        <instance addr="0x23024602" reg_inst="13"/>
-        <instance addr="0x23022602" reg_inst="14"/>
-        <instance addr="0x23021602" reg_inst="15"/>
-        <instance addr="0x24028602" reg_inst="16"/>
-        <instance addr="0x24024602" reg_inst="17"/>
-        <instance addr="0x24022602" reg_inst="18"/>
-        <instance addr="0x24021602" reg_inst="19"/>
-        <instance addr="0x25028602" reg_inst="20"/>
-        <instance addr="0x25024602" reg_inst="21"/>
-        <instance addr="0x25022602" reg_inst="22"/>
-        <instance addr="0x25021602" reg_inst="23"/>
-        <instance addr="0x26028602" reg_inst="24"/>
-        <instance addr="0x26024602" reg_inst="25"/>
-        <instance addr="0x26022602" reg_inst="26"/>
-        <instance addr="0x26021602" reg_inst="27"/>
-        <instance addr="0x27028602" reg_inst="28"/>
-        <instance addr="0x27024602" reg_inst="29"/>
-        <instance addr="0x27022602" reg_inst="30"/>
-        <instance addr="0x27021602" reg_inst="31"/>
-    </register>
-    <register name="IFU_HOLD_OUT3">
-        <instance addr="0x20028603" reg_inst="0"/>
-        <instance addr="0x20024603" reg_inst="1"/>
-        <instance addr="0x20022603" reg_inst="2"/>
-        <instance addr="0x20021603" reg_inst="3"/>
-        <instance addr="0x21028603" reg_inst="4"/>
-        <instance addr="0x21024603" reg_inst="5"/>
-        <instance addr="0x21022603" reg_inst="6"/>
-        <instance addr="0x21021603" reg_inst="7"/>
-        <instance addr="0x22028603" reg_inst="8"/>
-        <instance addr="0x22024603" reg_inst="9"/>
-        <instance addr="0x22022603" reg_inst="10"/>
-        <instance addr="0x22021603" reg_inst="11"/>
-        <instance addr="0x23028603" reg_inst="12"/>
-        <instance addr="0x23024603" reg_inst="13"/>
-        <instance addr="0x23022603" reg_inst="14"/>
-        <instance addr="0x23021603" reg_inst="15"/>
-        <instance addr="0x24028603" reg_inst="16"/>
-        <instance addr="0x24024603" reg_inst="17"/>
-        <instance addr="0x24022603" reg_inst="18"/>
-        <instance addr="0x24021603" reg_inst="19"/>
-        <instance addr="0x25028603" reg_inst="20"/>
-        <instance addr="0x25024603" reg_inst="21"/>
-        <instance addr="0x25022603" reg_inst="22"/>
-        <instance addr="0x25021603" reg_inst="23"/>
-        <instance addr="0x26028603" reg_inst="24"/>
-        <instance addr="0x26024603" reg_inst="25"/>
-        <instance addr="0x26022603" reg_inst="26"/>
-        <instance addr="0x26021603" reg_inst="27"/>
-        <instance addr="0x27028603" reg_inst="28"/>
-        <instance addr="0x27024603" reg_inst="29"/>
-        <instance addr="0x27022603" reg_inst="30"/>
-        <instance addr="0x27021603" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT0">
-        <instance addr="0x20028640" reg_inst="0"/>
-        <instance addr="0x20024640" reg_inst="1"/>
-        <instance addr="0x20022640" reg_inst="2"/>
-        <instance addr="0x20021640" reg_inst="3"/>
-        <instance addr="0x21028640" reg_inst="4"/>
-        <instance addr="0x21024640" reg_inst="5"/>
-        <instance addr="0x21022640" reg_inst="6"/>
-        <instance addr="0x21021640" reg_inst="7"/>
-        <instance addr="0x22028640" reg_inst="8"/>
-        <instance addr="0x22024640" reg_inst="9"/>
-        <instance addr="0x22022640" reg_inst="10"/>
-        <instance addr="0x22021640" reg_inst="11"/>
-        <instance addr="0x23028640" reg_inst="12"/>
-        <instance addr="0x23024640" reg_inst="13"/>
-        <instance addr="0x23022640" reg_inst="14"/>
-        <instance addr="0x23021640" reg_inst="15"/>
-        <instance addr="0x24028640" reg_inst="16"/>
-        <instance addr="0x24024640" reg_inst="17"/>
-        <instance addr="0x24022640" reg_inst="18"/>
-        <instance addr="0x24021640" reg_inst="19"/>
-        <instance addr="0x25028640" reg_inst="20"/>
-        <instance addr="0x25024640" reg_inst="21"/>
-        <instance addr="0x25022640" reg_inst="22"/>
-        <instance addr="0x25021640" reg_inst="23"/>
-        <instance addr="0x26028640" reg_inst="24"/>
-        <instance addr="0x26024640" reg_inst="25"/>
-        <instance addr="0x26022640" reg_inst="26"/>
-        <instance addr="0x26021640" reg_inst="27"/>
-        <instance addr="0x27028640" reg_inst="28"/>
-        <instance addr="0x27024640" reg_inst="29"/>
-        <instance addr="0x27022640" reg_inst="30"/>
-        <instance addr="0x27021640" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT1">
-        <instance addr="0x20028641" reg_inst="0"/>
-        <instance addr="0x20024641" reg_inst="1"/>
-        <instance addr="0x20022641" reg_inst="2"/>
-        <instance addr="0x20021641" reg_inst="3"/>
-        <instance addr="0x21028641" reg_inst="4"/>
-        <instance addr="0x21024641" reg_inst="5"/>
-        <instance addr="0x21022641" reg_inst="6"/>
-        <instance addr="0x21021641" reg_inst="7"/>
-        <instance addr="0x22028641" reg_inst="8"/>
-        <instance addr="0x22024641" reg_inst="9"/>
-        <instance addr="0x22022641" reg_inst="10"/>
-        <instance addr="0x22021641" reg_inst="11"/>
-        <instance addr="0x23028641" reg_inst="12"/>
-        <instance addr="0x23024641" reg_inst="13"/>
-        <instance addr="0x23022641" reg_inst="14"/>
-        <instance addr="0x23021641" reg_inst="15"/>
-        <instance addr="0x24028641" reg_inst="16"/>
-        <instance addr="0x24024641" reg_inst="17"/>
-        <instance addr="0x24022641" reg_inst="18"/>
-        <instance addr="0x24021641" reg_inst="19"/>
-        <instance addr="0x25028641" reg_inst="20"/>
-        <instance addr="0x25024641" reg_inst="21"/>
-        <instance addr="0x25022641" reg_inst="22"/>
-        <instance addr="0x25021641" reg_inst="23"/>
-        <instance addr="0x26028641" reg_inst="24"/>
-        <instance addr="0x26024641" reg_inst="25"/>
-        <instance addr="0x26022641" reg_inst="26"/>
-        <instance addr="0x26021641" reg_inst="27"/>
-        <instance addr="0x27028641" reg_inst="28"/>
-        <instance addr="0x27024641" reg_inst="29"/>
-        <instance addr="0x27022641" reg_inst="30"/>
-        <instance addr="0x27021641" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT2">
-        <instance addr="0x20028642" reg_inst="0"/>
-        <instance addr="0x20024642" reg_inst="1"/>
-        <instance addr="0x20022642" reg_inst="2"/>
-        <instance addr="0x20021642" reg_inst="3"/>
-        <instance addr="0x21028642" reg_inst="4"/>
-        <instance addr="0x21024642" reg_inst="5"/>
-        <instance addr="0x21022642" reg_inst="6"/>
-        <instance addr="0x21021642" reg_inst="7"/>
-        <instance addr="0x22028642" reg_inst="8"/>
-        <instance addr="0x22024642" reg_inst="9"/>
-        <instance addr="0x22022642" reg_inst="10"/>
-        <instance addr="0x22021642" reg_inst="11"/>
-        <instance addr="0x23028642" reg_inst="12"/>
-        <instance addr="0x23024642" reg_inst="13"/>
-        <instance addr="0x23022642" reg_inst="14"/>
-        <instance addr="0x23021642" reg_inst="15"/>
-        <instance addr="0x24028642" reg_inst="16"/>
-        <instance addr="0x24024642" reg_inst="17"/>
-        <instance addr="0x24022642" reg_inst="18"/>
-        <instance addr="0x24021642" reg_inst="19"/>
-        <instance addr="0x25028642" reg_inst="20"/>
-        <instance addr="0x25024642" reg_inst="21"/>
-        <instance addr="0x25022642" reg_inst="22"/>
-        <instance addr="0x25021642" reg_inst="23"/>
-        <instance addr="0x26028642" reg_inst="24"/>
-        <instance addr="0x26024642" reg_inst="25"/>
-        <instance addr="0x26022642" reg_inst="26"/>
-        <instance addr="0x26021642" reg_inst="27"/>
-        <instance addr="0x27028642" reg_inst="28"/>
-        <instance addr="0x27024642" reg_inst="29"/>
-        <instance addr="0x27022642" reg_inst="30"/>
-        <instance addr="0x27021642" reg_inst="31"/>
-    </register>
-    <register name="ISU_HOLD_OUT3">
-        <instance addr="0x20028643" reg_inst="0"/>
-        <instance addr="0x20024643" reg_inst="1"/>
-        <instance addr="0x20022643" reg_inst="2"/>
-        <instance addr="0x20021643" reg_inst="3"/>
-        <instance addr="0x21028643" reg_inst="4"/>
-        <instance addr="0x21024643" reg_inst="5"/>
-        <instance addr="0x21022643" reg_inst="6"/>
-        <instance addr="0x21021643" reg_inst="7"/>
-        <instance addr="0x22028643" reg_inst="8"/>
-        <instance addr="0x22024643" reg_inst="9"/>
-        <instance addr="0x22022643" reg_inst="10"/>
-        <instance addr="0x22021643" reg_inst="11"/>
-        <instance addr="0x23028643" reg_inst="12"/>
-        <instance addr="0x23024643" reg_inst="13"/>
-        <instance addr="0x23022643" reg_inst="14"/>
-        <instance addr="0x23021643" reg_inst="15"/>
-        <instance addr="0x24028643" reg_inst="16"/>
-        <instance addr="0x24024643" reg_inst="17"/>
-        <instance addr="0x24022643" reg_inst="18"/>
-        <instance addr="0x24021643" reg_inst="19"/>
-        <instance addr="0x25028643" reg_inst="20"/>
-        <instance addr="0x25024643" reg_inst="21"/>
-        <instance addr="0x25022643" reg_inst="22"/>
-        <instance addr="0x25021643" reg_inst="23"/>
-        <instance addr="0x26028643" reg_inst="24"/>
-        <instance addr="0x26024643" reg_inst="25"/>
-        <instance addr="0x26022643" reg_inst="26"/>
-        <instance addr="0x26021643" reg_inst="27"/>
-        <instance addr="0x27028643" reg_inst="28"/>
-        <instance addr="0x27024643" reg_inst="29"/>
-        <instance addr="0x27022643" reg_inst="30"/>
-        <instance addr="0x27021643" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG0">
-        <instance addr="0x200286C0" reg_inst="0"/>
-        <instance addr="0x200246C0" reg_inst="1"/>
-        <instance addr="0x200226C0" reg_inst="2"/>
-        <instance addr="0x200216C0" reg_inst="3"/>
-        <instance addr="0x210286C0" reg_inst="4"/>
-        <instance addr="0x210246C0" reg_inst="5"/>
-        <instance addr="0x210226C0" reg_inst="6"/>
-        <instance addr="0x210216C0" reg_inst="7"/>
-        <instance addr="0x220286C0" reg_inst="8"/>
-        <instance addr="0x220246C0" reg_inst="9"/>
-        <instance addr="0x220226C0" reg_inst="10"/>
-        <instance addr="0x220216C0" reg_inst="11"/>
-        <instance addr="0x230286C0" reg_inst="12"/>
-        <instance addr="0x230246C0" reg_inst="13"/>
-        <instance addr="0x230226C0" reg_inst="14"/>
-        <instance addr="0x230216C0" reg_inst="15"/>
-        <instance addr="0x240286C0" reg_inst="16"/>
-        <instance addr="0x240246C0" reg_inst="17"/>
-        <instance addr="0x240226C0" reg_inst="18"/>
-        <instance addr="0x240216C0" reg_inst="19"/>
-        <instance addr="0x250286C0" reg_inst="20"/>
-        <instance addr="0x250246C0" reg_inst="21"/>
-        <instance addr="0x250226C0" reg_inst="22"/>
-        <instance addr="0x250216C0" reg_inst="23"/>
-        <instance addr="0x260286C0" reg_inst="24"/>
-        <instance addr="0x260246C0" reg_inst="25"/>
-        <instance addr="0x260226C0" reg_inst="26"/>
-        <instance addr="0x260216C0" reg_inst="27"/>
-        <instance addr="0x270286C0" reg_inst="28"/>
-        <instance addr="0x270246C0" reg_inst="29"/>
-        <instance addr="0x270226C0" reg_inst="30"/>
-        <instance addr="0x270216C0" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG1">
-        <instance addr="0x200286C1" reg_inst="0"/>
-        <instance addr="0x200246C1" reg_inst="1"/>
-        <instance addr="0x200226C1" reg_inst="2"/>
-        <instance addr="0x200216C1" reg_inst="3"/>
-        <instance addr="0x210286C1" reg_inst="4"/>
-        <instance addr="0x210246C1" reg_inst="5"/>
-        <instance addr="0x210226C1" reg_inst="6"/>
-        <instance addr="0x210216C1" reg_inst="7"/>
-        <instance addr="0x220286C1" reg_inst="8"/>
-        <instance addr="0x220246C1" reg_inst="9"/>
-        <instance addr="0x220226C1" reg_inst="10"/>
-        <instance addr="0x220216C1" reg_inst="11"/>
-        <instance addr="0x230286C1" reg_inst="12"/>
-        <instance addr="0x230246C1" reg_inst="13"/>
-        <instance addr="0x230226C1" reg_inst="14"/>
-        <instance addr="0x230216C1" reg_inst="15"/>
-        <instance addr="0x240286C1" reg_inst="16"/>
-        <instance addr="0x240246C1" reg_inst="17"/>
-        <instance addr="0x240226C1" reg_inst="18"/>
-        <instance addr="0x240216C1" reg_inst="19"/>
-        <instance addr="0x250286C1" reg_inst="20"/>
-        <instance addr="0x250246C1" reg_inst="21"/>
-        <instance addr="0x250226C1" reg_inst="22"/>
-        <instance addr="0x250216C1" reg_inst="23"/>
-        <instance addr="0x260286C1" reg_inst="24"/>
-        <instance addr="0x260246C1" reg_inst="25"/>
-        <instance addr="0x260226C1" reg_inst="26"/>
-        <instance addr="0x260216C1" reg_inst="27"/>
-        <instance addr="0x270286C1" reg_inst="28"/>
-        <instance addr="0x270246C1" reg_inst="29"/>
-        <instance addr="0x270226C1" reg_inst="30"/>
-        <instance addr="0x270216C1" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG2">
-        <instance addr="0x200286C2" reg_inst="0"/>
-        <instance addr="0x200246C2" reg_inst="1"/>
-        <instance addr="0x200226C2" reg_inst="2"/>
-        <instance addr="0x200216C2" reg_inst="3"/>
-        <instance addr="0x210286C2" reg_inst="4"/>
-        <instance addr="0x210246C2" reg_inst="5"/>
-        <instance addr="0x210226C2" reg_inst="6"/>
-        <instance addr="0x210216C2" reg_inst="7"/>
-        <instance addr="0x220286C2" reg_inst="8"/>
-        <instance addr="0x220246C2" reg_inst="9"/>
-        <instance addr="0x220226C2" reg_inst="10"/>
-        <instance addr="0x220216C2" reg_inst="11"/>
-        <instance addr="0x230286C2" reg_inst="12"/>
-        <instance addr="0x230246C2" reg_inst="13"/>
-        <instance addr="0x230226C2" reg_inst="14"/>
-        <instance addr="0x230216C2" reg_inst="15"/>
-        <instance addr="0x240286C2" reg_inst="16"/>
-        <instance addr="0x240246C2" reg_inst="17"/>
-        <instance addr="0x240226C2" reg_inst="18"/>
-        <instance addr="0x240216C2" reg_inst="19"/>
-        <instance addr="0x250286C2" reg_inst="20"/>
-        <instance addr="0x250246C2" reg_inst="21"/>
-        <instance addr="0x250226C2" reg_inst="22"/>
-        <instance addr="0x250216C2" reg_inst="23"/>
-        <instance addr="0x260286C2" reg_inst="24"/>
-        <instance addr="0x260246C2" reg_inst="25"/>
-        <instance addr="0x260226C2" reg_inst="26"/>
-        <instance addr="0x260216C2" reg_inst="27"/>
-        <instance addr="0x270286C2" reg_inst="28"/>
-        <instance addr="0x270246C2" reg_inst="29"/>
-        <instance addr="0x270226C2" reg_inst="30"/>
-        <instance addr="0x270216C2" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG3">
-        <instance addr="0x200286C3" reg_inst="0"/>
-        <instance addr="0x200246C3" reg_inst="1"/>
-        <instance addr="0x200226C3" reg_inst="2"/>
-        <instance addr="0x200216C3" reg_inst="3"/>
-        <instance addr="0x210286C3" reg_inst="4"/>
-        <instance addr="0x210246C3" reg_inst="5"/>
-        <instance addr="0x210226C3" reg_inst="6"/>
-        <instance addr="0x210216C3" reg_inst="7"/>
-        <instance addr="0x220286C3" reg_inst="8"/>
-        <instance addr="0x220246C3" reg_inst="9"/>
-        <instance addr="0x220226C3" reg_inst="10"/>
-        <instance addr="0x220216C3" reg_inst="11"/>
-        <instance addr="0x230286C3" reg_inst="12"/>
-        <instance addr="0x230246C3" reg_inst="13"/>
-        <instance addr="0x230226C3" reg_inst="14"/>
-        <instance addr="0x230216C3" reg_inst="15"/>
-        <instance addr="0x240286C3" reg_inst="16"/>
-        <instance addr="0x240246C3" reg_inst="17"/>
-        <instance addr="0x240226C3" reg_inst="18"/>
-        <instance addr="0x240216C3" reg_inst="19"/>
-        <instance addr="0x250286C3" reg_inst="20"/>
-        <instance addr="0x250246C3" reg_inst="21"/>
-        <instance addr="0x250226C3" reg_inst="22"/>
-        <instance addr="0x250216C3" reg_inst="23"/>
-        <instance addr="0x260286C3" reg_inst="24"/>
-        <instance addr="0x260246C3" reg_inst="25"/>
-        <instance addr="0x260226C3" reg_inst="26"/>
-        <instance addr="0x260216C3" reg_inst="27"/>
-        <instance addr="0x270286C3" reg_inst="28"/>
-        <instance addr="0x270246C3" reg_inst="29"/>
-        <instance addr="0x270226C3" reg_inst="30"/>
-        <instance addr="0x270216C3" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG4">
-        <instance addr="0x200286C4" reg_inst="0"/>
-        <instance addr="0x200246C4" reg_inst="1"/>
-        <instance addr="0x200226C4" reg_inst="2"/>
-        <instance addr="0x200216C4" reg_inst="3"/>
-        <instance addr="0x210286C4" reg_inst="4"/>
-        <instance addr="0x210246C4" reg_inst="5"/>
-        <instance addr="0x210226C4" reg_inst="6"/>
-        <instance addr="0x210216C4" reg_inst="7"/>
-        <instance addr="0x220286C4" reg_inst="8"/>
-        <instance addr="0x220246C4" reg_inst="9"/>
-        <instance addr="0x220226C4" reg_inst="10"/>
-        <instance addr="0x220216C4" reg_inst="11"/>
-        <instance addr="0x230286C4" reg_inst="12"/>
-        <instance addr="0x230246C4" reg_inst="13"/>
-        <instance addr="0x230226C4" reg_inst="14"/>
-        <instance addr="0x230216C4" reg_inst="15"/>
-        <instance addr="0x240286C4" reg_inst="16"/>
-        <instance addr="0x240246C4" reg_inst="17"/>
-        <instance addr="0x240226C4" reg_inst="18"/>
-        <instance addr="0x240216C4" reg_inst="19"/>
-        <instance addr="0x250286C4" reg_inst="20"/>
-        <instance addr="0x250246C4" reg_inst="21"/>
-        <instance addr="0x250226C4" reg_inst="22"/>
-        <instance addr="0x250216C4" reg_inst="23"/>
-        <instance addr="0x260286C4" reg_inst="24"/>
-        <instance addr="0x260246C4" reg_inst="25"/>
-        <instance addr="0x260226C4" reg_inst="26"/>
-        <instance addr="0x260216C4" reg_inst="27"/>
-        <instance addr="0x270286C4" reg_inst="28"/>
-        <instance addr="0x270246C4" reg_inst="29"/>
-        <instance addr="0x270226C4" reg_inst="30"/>
-        <instance addr="0x270216C4" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG5">
-        <instance addr="0x200286C5" reg_inst="0"/>
-        <instance addr="0x200246C5" reg_inst="1"/>
-        <instance addr="0x200226C5" reg_inst="2"/>
-        <instance addr="0x200216C5" reg_inst="3"/>
-        <instance addr="0x210286C5" reg_inst="4"/>
-        <instance addr="0x210246C5" reg_inst="5"/>
-        <instance addr="0x210226C5" reg_inst="6"/>
-        <instance addr="0x210216C5" reg_inst="7"/>
-        <instance addr="0x220286C5" reg_inst="8"/>
-        <instance addr="0x220246C5" reg_inst="9"/>
-        <instance addr="0x220226C5" reg_inst="10"/>
-        <instance addr="0x220216C5" reg_inst="11"/>
-        <instance addr="0x230286C5" reg_inst="12"/>
-        <instance addr="0x230246C5" reg_inst="13"/>
-        <instance addr="0x230226C5" reg_inst="14"/>
-        <instance addr="0x230216C5" reg_inst="15"/>
-        <instance addr="0x240286C5" reg_inst="16"/>
-        <instance addr="0x240246C5" reg_inst="17"/>
-        <instance addr="0x240226C5" reg_inst="18"/>
-        <instance addr="0x240216C5" reg_inst="19"/>
-        <instance addr="0x250286C5" reg_inst="20"/>
-        <instance addr="0x250246C5" reg_inst="21"/>
-        <instance addr="0x250226C5" reg_inst="22"/>
-        <instance addr="0x250216C5" reg_inst="23"/>
-        <instance addr="0x260286C5" reg_inst="24"/>
-        <instance addr="0x260246C5" reg_inst="25"/>
-        <instance addr="0x260226C5" reg_inst="26"/>
-        <instance addr="0x260216C5" reg_inst="27"/>
-        <instance addr="0x270286C5" reg_inst="28"/>
-        <instance addr="0x270246C5" reg_inst="29"/>
-        <instance addr="0x270226C5" reg_inst="30"/>
-        <instance addr="0x270216C5" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG6">
-        <instance addr="0x200286C6" reg_inst="0"/>
-        <instance addr="0x200246C6" reg_inst="1"/>
-        <instance addr="0x200226C6" reg_inst="2"/>
-        <instance addr="0x200216C6" reg_inst="3"/>
-        <instance addr="0x210286C6" reg_inst="4"/>
-        <instance addr="0x210246C6" reg_inst="5"/>
-        <instance addr="0x210226C6" reg_inst="6"/>
-        <instance addr="0x210216C6" reg_inst="7"/>
-        <instance addr="0x220286C6" reg_inst="8"/>
-        <instance addr="0x220246C6" reg_inst="9"/>
-        <instance addr="0x220226C6" reg_inst="10"/>
-        <instance addr="0x220216C6" reg_inst="11"/>
-        <instance addr="0x230286C6" reg_inst="12"/>
-        <instance addr="0x230246C6" reg_inst="13"/>
-        <instance addr="0x230226C6" reg_inst="14"/>
-        <instance addr="0x230216C6" reg_inst="15"/>
-        <instance addr="0x240286C6" reg_inst="16"/>
-        <instance addr="0x240246C6" reg_inst="17"/>
-        <instance addr="0x240226C6" reg_inst="18"/>
-        <instance addr="0x240216C6" reg_inst="19"/>
-        <instance addr="0x250286C6" reg_inst="20"/>
-        <instance addr="0x250246C6" reg_inst="21"/>
-        <instance addr="0x250226C6" reg_inst="22"/>
-        <instance addr="0x250216C6" reg_inst="23"/>
-        <instance addr="0x260286C6" reg_inst="24"/>
-        <instance addr="0x260246C6" reg_inst="25"/>
-        <instance addr="0x260226C6" reg_inst="26"/>
-        <instance addr="0x260216C6" reg_inst="27"/>
-        <instance addr="0x270286C6" reg_inst="28"/>
-        <instance addr="0x270246C6" reg_inst="29"/>
-        <instance addr="0x270226C6" reg_inst="30"/>
-        <instance addr="0x270216C6" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG7">
-        <instance addr="0x200286C7" reg_inst="0"/>
-        <instance addr="0x200246C7" reg_inst="1"/>
-        <instance addr="0x200226C7" reg_inst="2"/>
-        <instance addr="0x200216C7" reg_inst="3"/>
-        <instance addr="0x210286C7" reg_inst="4"/>
-        <instance addr="0x210246C7" reg_inst="5"/>
-        <instance addr="0x210226C7" reg_inst="6"/>
-        <instance addr="0x210216C7" reg_inst="7"/>
-        <instance addr="0x220286C7" reg_inst="8"/>
-        <instance addr="0x220246C7" reg_inst="9"/>
-        <instance addr="0x220226C7" reg_inst="10"/>
-        <instance addr="0x220216C7" reg_inst="11"/>
-        <instance addr="0x230286C7" reg_inst="12"/>
-        <instance addr="0x230246C7" reg_inst="13"/>
-        <instance addr="0x230226C7" reg_inst="14"/>
-        <instance addr="0x230216C7" reg_inst="15"/>
-        <instance addr="0x240286C7" reg_inst="16"/>
-        <instance addr="0x240246C7" reg_inst="17"/>
-        <instance addr="0x240226C7" reg_inst="18"/>
-        <instance addr="0x240216C7" reg_inst="19"/>
-        <instance addr="0x250286C7" reg_inst="20"/>
-        <instance addr="0x250246C7" reg_inst="21"/>
-        <instance addr="0x250226C7" reg_inst="22"/>
-        <instance addr="0x250216C7" reg_inst="23"/>
-        <instance addr="0x260286C7" reg_inst="24"/>
-        <instance addr="0x260246C7" reg_inst="25"/>
-        <instance addr="0x260226C7" reg_inst="26"/>
-        <instance addr="0x260216C7" reg_inst="27"/>
-        <instance addr="0x270286C7" reg_inst="28"/>
-        <instance addr="0x270246C7" reg_inst="29"/>
-        <instance addr="0x270226C7" reg_inst="30"/>
-        <instance addr="0x270216C7" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG8">
-        <instance addr="0x200286C8" reg_inst="0"/>
-        <instance addr="0x200246C8" reg_inst="1"/>
-        <instance addr="0x200226C8" reg_inst="2"/>
-        <instance addr="0x200216C8" reg_inst="3"/>
-        <instance addr="0x210286C8" reg_inst="4"/>
-        <instance addr="0x210246C8" reg_inst="5"/>
-        <instance addr="0x210226C8" reg_inst="6"/>
-        <instance addr="0x210216C8" reg_inst="7"/>
-        <instance addr="0x220286C8" reg_inst="8"/>
-        <instance addr="0x220246C8" reg_inst="9"/>
-        <instance addr="0x220226C8" reg_inst="10"/>
-        <instance addr="0x220216C8" reg_inst="11"/>
-        <instance addr="0x230286C8" reg_inst="12"/>
-        <instance addr="0x230246C8" reg_inst="13"/>
-        <instance addr="0x230226C8" reg_inst="14"/>
-        <instance addr="0x230216C8" reg_inst="15"/>
-        <instance addr="0x240286C8" reg_inst="16"/>
-        <instance addr="0x240246C8" reg_inst="17"/>
-        <instance addr="0x240226C8" reg_inst="18"/>
-        <instance addr="0x240216C8" reg_inst="19"/>
-        <instance addr="0x250286C8" reg_inst="20"/>
-        <instance addr="0x250246C8" reg_inst="21"/>
-        <instance addr="0x250226C8" reg_inst="22"/>
-        <instance addr="0x250216C8" reg_inst="23"/>
-        <instance addr="0x260286C8" reg_inst="24"/>
-        <instance addr="0x260246C8" reg_inst="25"/>
-        <instance addr="0x260226C8" reg_inst="26"/>
-        <instance addr="0x260216C8" reg_inst="27"/>
-        <instance addr="0x270286C8" reg_inst="28"/>
-        <instance addr="0x270246C8" reg_inst="29"/>
-        <instance addr="0x270226C8" reg_inst="30"/>
-        <instance addr="0x270216C8" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG9">
-        <instance addr="0x200286C9" reg_inst="0"/>
-        <instance addr="0x200246C9" reg_inst="1"/>
-        <instance addr="0x200226C9" reg_inst="2"/>
-        <instance addr="0x200216C9" reg_inst="3"/>
-        <instance addr="0x210286C9" reg_inst="4"/>
-        <instance addr="0x210246C9" reg_inst="5"/>
-        <instance addr="0x210226C9" reg_inst="6"/>
-        <instance addr="0x210216C9" reg_inst="7"/>
-        <instance addr="0x220286C9" reg_inst="8"/>
-        <instance addr="0x220246C9" reg_inst="9"/>
-        <instance addr="0x220226C9" reg_inst="10"/>
-        <instance addr="0x220216C9" reg_inst="11"/>
-        <instance addr="0x230286C9" reg_inst="12"/>
-        <instance addr="0x230246C9" reg_inst="13"/>
-        <instance addr="0x230226C9" reg_inst="14"/>
-        <instance addr="0x230216C9" reg_inst="15"/>
-        <instance addr="0x240286C9" reg_inst="16"/>
-        <instance addr="0x240246C9" reg_inst="17"/>
-        <instance addr="0x240226C9" reg_inst="18"/>
-        <instance addr="0x240216C9" reg_inst="19"/>
-        <instance addr="0x250286C9" reg_inst="20"/>
-        <instance addr="0x250246C9" reg_inst="21"/>
-        <instance addr="0x250226C9" reg_inst="22"/>
-        <instance addr="0x250216C9" reg_inst="23"/>
-        <instance addr="0x260286C9" reg_inst="24"/>
-        <instance addr="0x260246C9" reg_inst="25"/>
-        <instance addr="0x260226C9" reg_inst="26"/>
-        <instance addr="0x260216C9" reg_inst="27"/>
-        <instance addr="0x270286C9" reg_inst="28"/>
-        <instance addr="0x270246C9" reg_inst="29"/>
-        <instance addr="0x270226C9" reg_inst="30"/>
-        <instance addr="0x270216C9" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG10">
-        <instance addr="0x200286CA" reg_inst="0"/>
-        <instance addr="0x200246CA" reg_inst="1"/>
-        <instance addr="0x200226CA" reg_inst="2"/>
-        <instance addr="0x200216CA" reg_inst="3"/>
-        <instance addr="0x210286CA" reg_inst="4"/>
-        <instance addr="0x210246CA" reg_inst="5"/>
-        <instance addr="0x210226CA" reg_inst="6"/>
-        <instance addr="0x210216CA" reg_inst="7"/>
-        <instance addr="0x220286CA" reg_inst="8"/>
-        <instance addr="0x220246CA" reg_inst="9"/>
-        <instance addr="0x220226CA" reg_inst="10"/>
-        <instance addr="0x220216CA" reg_inst="11"/>
-        <instance addr="0x230286CA" reg_inst="12"/>
-        <instance addr="0x230246CA" reg_inst="13"/>
-        <instance addr="0x230226CA" reg_inst="14"/>
-        <instance addr="0x230216CA" reg_inst="15"/>
-        <instance addr="0x240286CA" reg_inst="16"/>
-        <instance addr="0x240246CA" reg_inst="17"/>
-        <instance addr="0x240226CA" reg_inst="18"/>
-        <instance addr="0x240216CA" reg_inst="19"/>
-        <instance addr="0x250286CA" reg_inst="20"/>
-        <instance addr="0x250246CA" reg_inst="21"/>
-        <instance addr="0x250226CA" reg_inst="22"/>
-        <instance addr="0x250216CA" reg_inst="23"/>
-        <instance addr="0x260286CA" reg_inst="24"/>
-        <instance addr="0x260246CA" reg_inst="25"/>
-        <instance addr="0x260226CA" reg_inst="26"/>
-        <instance addr="0x260216CA" reg_inst="27"/>
-        <instance addr="0x270286CA" reg_inst="28"/>
-        <instance addr="0x270246CA" reg_inst="29"/>
-        <instance addr="0x270226CA" reg_inst="30"/>
-        <instance addr="0x270216CA" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG11">
-        <instance addr="0x200286CB" reg_inst="0"/>
-        <instance addr="0x200246CB" reg_inst="1"/>
-        <instance addr="0x200226CB" reg_inst="2"/>
-        <instance addr="0x200216CB" reg_inst="3"/>
-        <instance addr="0x210286CB" reg_inst="4"/>
-        <instance addr="0x210246CB" reg_inst="5"/>
-        <instance addr="0x210226CB" reg_inst="6"/>
-        <instance addr="0x210216CB" reg_inst="7"/>
-        <instance addr="0x220286CB" reg_inst="8"/>
-        <instance addr="0x220246CB" reg_inst="9"/>
-        <instance addr="0x220226CB" reg_inst="10"/>
-        <instance addr="0x220216CB" reg_inst="11"/>
-        <instance addr="0x230286CB" reg_inst="12"/>
-        <instance addr="0x230246CB" reg_inst="13"/>
-        <instance addr="0x230226CB" reg_inst="14"/>
-        <instance addr="0x230216CB" reg_inst="15"/>
-        <instance addr="0x240286CB" reg_inst="16"/>
-        <instance addr="0x240246CB" reg_inst="17"/>
-        <instance addr="0x240226CB" reg_inst="18"/>
-        <instance addr="0x240216CB" reg_inst="19"/>
-        <instance addr="0x250286CB" reg_inst="20"/>
-        <instance addr="0x250246CB" reg_inst="21"/>
-        <instance addr="0x250226CB" reg_inst="22"/>
-        <instance addr="0x250216CB" reg_inst="23"/>
-        <instance addr="0x260286CB" reg_inst="24"/>
-        <instance addr="0x260246CB" reg_inst="25"/>
-        <instance addr="0x260226CB" reg_inst="26"/>
-        <instance addr="0x260216CB" reg_inst="27"/>
-        <instance addr="0x270286CB" reg_inst="28"/>
-        <instance addr="0x270246CB" reg_inst="29"/>
-        <instance addr="0x270226CB" reg_inst="30"/>
-        <instance addr="0x270216CB" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG12">
-        <instance addr="0x200286CC" reg_inst="0"/>
-        <instance addr="0x200246CC" reg_inst="1"/>
-        <instance addr="0x200226CC" reg_inst="2"/>
-        <instance addr="0x200216CC" reg_inst="3"/>
-        <instance addr="0x210286CC" reg_inst="4"/>
-        <instance addr="0x210246CC" reg_inst="5"/>
-        <instance addr="0x210226CC" reg_inst="6"/>
-        <instance addr="0x210216CC" reg_inst="7"/>
-        <instance addr="0x220286CC" reg_inst="8"/>
-        <instance addr="0x220246CC" reg_inst="9"/>
-        <instance addr="0x220226CC" reg_inst="10"/>
-        <instance addr="0x220216CC" reg_inst="11"/>
-        <instance addr="0x230286CC" reg_inst="12"/>
-        <instance addr="0x230246CC" reg_inst="13"/>
-        <instance addr="0x230226CC" reg_inst="14"/>
-        <instance addr="0x230216CC" reg_inst="15"/>
-        <instance addr="0x240286CC" reg_inst="16"/>
-        <instance addr="0x240246CC" reg_inst="17"/>
-        <instance addr="0x240226CC" reg_inst="18"/>
-        <instance addr="0x240216CC" reg_inst="19"/>
-        <instance addr="0x250286CC" reg_inst="20"/>
-        <instance addr="0x250246CC" reg_inst="21"/>
-        <instance addr="0x250226CC" reg_inst="22"/>
-        <instance addr="0x250216CC" reg_inst="23"/>
-        <instance addr="0x260286CC" reg_inst="24"/>
-        <instance addr="0x260246CC" reg_inst="25"/>
-        <instance addr="0x260226CC" reg_inst="26"/>
-        <instance addr="0x260216CC" reg_inst="27"/>
-        <instance addr="0x270286CC" reg_inst="28"/>
-        <instance addr="0x270246CC" reg_inst="29"/>
-        <instance addr="0x270226CC" reg_inst="30"/>
-        <instance addr="0x270216CC" reg_inst="31"/>
-    </register>
-    <register name="LSU_HOLD_OUT_REG13">
-        <instance addr="0x200286CD" reg_inst="0"/>
-        <instance addr="0x200246CD" reg_inst="1"/>
-        <instance addr="0x200226CD" reg_inst="2"/>
-        <instance addr="0x200216CD" reg_inst="3"/>
-        <instance addr="0x210286CD" reg_inst="4"/>
-        <instance addr="0x210246CD" reg_inst="5"/>
-        <instance addr="0x210226CD" reg_inst="6"/>
-        <instance addr="0x210216CD" reg_inst="7"/>
-        <instance addr="0x220286CD" reg_inst="8"/>
-        <instance addr="0x220246CD" reg_inst="9"/>
-        <instance addr="0x220226CD" reg_inst="10"/>
-        <instance addr="0x220216CD" reg_inst="11"/>
-        <instance addr="0x230286CD" reg_inst="12"/>
-        <instance addr="0x230246CD" reg_inst="13"/>
-        <instance addr="0x230226CD" reg_inst="14"/>
-        <instance addr="0x230216CD" reg_inst="15"/>
-        <instance addr="0x240286CD" reg_inst="16"/>
-        <instance addr="0x240246CD" reg_inst="17"/>
-        <instance addr="0x240226CD" reg_inst="18"/>
-        <instance addr="0x240216CD" reg_inst="19"/>
-        <instance addr="0x250286CD" reg_inst="20"/>
-        <instance addr="0x250246CD" reg_inst="21"/>
-        <instance addr="0x250226CD" reg_inst="22"/>
-        <instance addr="0x250216CD" reg_inst="23"/>
-        <instance addr="0x260286CD" reg_inst="24"/>
-        <instance addr="0x260246CD" reg_inst="25"/>
-        <instance addr="0x260226CD" reg_inst="26"/>
-        <instance addr="0x260216CD" reg_inst="27"/>
-        <instance addr="0x270286CD" reg_inst="28"/>
-        <instance addr="0x270246CD" reg_inst="29"/>
-        <instance addr="0x270226CD" reg_inst="30"/>
-        <instance addr="0x270216CD" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="PC_FIR_HOLD_OUT"    reg_inst= "0:31" />
-        <capture_register reg_name="THRCTL_HOLD_OUT"    reg_inst= "0:31" />
-        <capture_register reg_name="VSU_HOLD_OUT"       reg_inst= "0:31" />
-        <capture_register reg_name="TFAC_HOLD_OUT"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT0"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT1"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT2"      reg_inst= "0:31" />
-        <capture_register reg_name="IFU_HOLD_OUT3"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT0"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT1"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT2"      reg_inst= "0:31" />
-        <capture_register reg_name="ISU_HOLD_OUT3"      reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG0"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG1"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG2"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG3"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG4"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG5"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG6"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG7"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG8"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG9"  reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG10" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG11" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG12" reg_inst= "0:31" />
-        <capture_register reg_name="LSU_HOLD_OUT_REG13" reg_inst= "0:31" />
-    </capture_group>
-    <rule attn_type="CS" node_inst="0:31">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_CORE_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-            </expr>
-        </expr>
-    </rule>
-    <rule attn_type="RE" node_inst="0:31">
-        <!-- WOF & ~MASK & ~ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_CORE_FIR_WOF"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            </expr>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <rule attn_type="UCS" node_inst="0:31">
-        <!-- FIR & ~MASK & ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_CORE_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_CORE_FIR_MASK"/>
-            </expr>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT0"/>
-            <expr type="reg" value1="EQ_CORE_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <bit pos="0">IFU SRAM recoverable error (ICACHE parity error, etc)</bit>
-    <bit pos="1">TC checkstop</bit>
-    <bit pos="2">IFU RegFile recoverable error</bit>
-    <bit pos="3">IFU RegFile core checkstop</bit>
-    <bit pos="4">IFU logic recoverable error</bit>
-    <bit pos="5">IFU logic core checkstop</bit>
-    <bit pos="6">reserved</bit>
-    <bit pos="7">VSU Inference Accumulator recoverable error</bit>
-    <bit pos="8">Recovery core checkstop</bit>
-    <bit pos="9">VSU Slice Targeted File (STF) recoverable error</bit>
-    <bit pos="10">reserved</bit>
-    <bit pos="11">ISU logic recoverable error</bit>
-    <bit pos="12">ISU logic core checkstop</bit>
-    <bit pos="13">ISU recoverable if not in MT window</bit>
-    <bit pos="14">MCHK received while ME=0 - non recoverable</bit>
-    <bit pos="15">UE from L2</bit>
-    <bit pos="16">Number of UEs from L2 above threshold</bit>
-    <bit pos="17">UE on CI load</bit>
-    <bit pos="18">MMU TLB parity recoverable error</bit>
-    <bit pos="19">MMU SLB parity recoverable error</bit>
-    <bit pos="20">reserved</bit>
-    <bit pos="21">MMU CXT recoverable error</bit>
-    <bit pos="22">MMU logic core checkstop</bit>
-    <bit pos="23">MMU system checkstop</bit>
-    <bit pos="24">VSU logic recoverable error</bit>
-    <bit pos="25">VSU logic core checkstop</bit>
-    <bit pos="26">Thread in maintenance mode and receives recovery request</bit>
-    <bit pos="27">reserved</bit>
-    <bit pos="28">PC system checkstop - Recoverable error received when recovery disabled</bit>
-    <bit pos="29">LSU SRAM recoverable error (DCACHE parity error, ERAT parity error, etc)</bit>
-    <bit pos="30">LSU set deleted</bit>
-    <bit pos="31">LSU RegFile recoverable error</bit>
-    <bit pos="32">LSU RegFile core checkstop</bit>
-    <bit pos="33">MMU TLB multi hit error occurred</bit>
-    <bit pos="34">MMU SLB multi hit error occurred</bit>
-    <bit pos="35">LSU ERAT multi hit error occurred</bit>
-    <bit pos="36">PC forward progress error</bit>
-    <bit pos="37">LSU logic recoverable error</bit>
-    <bit pos="38">LSU logic core checkstop</bit>
-    <bit pos="39">reserved</bit>
-    <bit pos="40">reserved</bit>
-    <bit pos="41">LSU system checkstop</bit>
-    <bit pos="42">reserved</bit>
-    <bit pos="43">PC thread hang recoverable error</bit>
-    <bit pos="44">reserved</bit>
-    <bit pos="45">PC logic checkstop</bit>
-    <bit pos="46">PC TimeBase Facility checkstop</bit>
-    <bit pos="47">PC TimeBase Facility checkstop</bit>
-    <bit pos="48">reserved</bit>
-    <bit pos="49">reserved</bit>
-    <bit pos="50">reserved</bit>
-    <bit pos="51">reserved</bit>
-    <bit pos="52">Hang Recovery Failed</bit>
-    <bit pos="53">Core Hang detected</bit>
-    <bit pos="54">reserved</bit>
-    <bit pos="55">Nest Hang detected</bit>
-    <bit pos="56">Other Core Chiplet recoverable error</bit>
-    <bit pos="57">Other Core Chiplet core checkstop</bit>
-    <bit pos="58">Other Core Chiplet system checkstop</bit>
-    <bit pos="59">SCOM satellite error detected</bit>
-    <bit pos="60">Debug Trigger error inject</bit>
-    <bit pos="61">SCOM or Firmware recoverable error inject</bit>
-    <bit pos="62">Firmware checkstop error inject</bit>
-    <bit pos="63">PHYP checkstop via SPRC/SPRD</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_core_thread_state.xml b/xml/p10/node_eq_core_thread_state.xml
deleted file mode 100644
index d95ac0c..0000000
--- a/xml/p10/node_eq_core_thread_state.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_CORE_THREAD_STATE" reg_type="SCOM">
-    <register name="CORE_THREAD_STATE">
-        <instance addr="0x20028412" reg_inst="0"/>
-        <instance addr="0x20024412" reg_inst="1"/>
-        <instance addr="0x20022412" reg_inst="2"/>
-        <instance addr="0x20021412" reg_inst="3"/>
-        <instance addr="0x21028412" reg_inst="4"/>
-        <instance addr="0x21024412" reg_inst="5"/>
-        <instance addr="0x21022412" reg_inst="6"/>
-        <instance addr="0x21021412" reg_inst="7"/>
-        <instance addr="0x22028412" reg_inst="8"/>
-        <instance addr="0x22024412" reg_inst="9"/>
-        <instance addr="0x22022412" reg_inst="10"/>
-        <instance addr="0x22021412" reg_inst="11"/>
-        <instance addr="0x23028412" reg_inst="12"/>
-        <instance addr="0x23024412" reg_inst="13"/>
-        <instance addr="0x23022412" reg_inst="14"/>
-        <instance addr="0x23021412" reg_inst="15"/>
-        <instance addr="0x24028412" reg_inst="16"/>
-        <instance addr="0x24024412" reg_inst="17"/>
-        <instance addr="0x24022412" reg_inst="18"/>
-        <instance addr="0x24021412" reg_inst="19"/>
-        <instance addr="0x25028412" reg_inst="20"/>
-        <instance addr="0x25024412" reg_inst="21"/>
-        <instance addr="0x25022412" reg_inst="22"/>
-        <instance addr="0x25021412" reg_inst="23"/>
-        <instance addr="0x26028412" reg_inst="24"/>
-        <instance addr="0x26024412" reg_inst="25"/>
-        <instance addr="0x26022412" reg_inst="26"/>
-        <instance addr="0x26021412" reg_inst="27"/>
-        <instance addr="0x27028412" reg_inst="28"/>
-        <instance addr="0x27024412" reg_inst="29"/>
-        <instance addr="0x27022412" reg_inst="30"/>
-        <instance addr="0x27021412" reg_inst="31"/>
-    </register>
-    <!-- Each EQ_SPATTN will only report 4 of the possible 8 threads back to the
-         CFIR_EQ_SPA. The reported threads are dependent on the core mode. In
-         Normal Core Mode (CORE_THREAD_STATE[63]=0), only threads 0-3 report to
-         the CFIR_EQ_SPA. In Fused Core Mode (CORE_THREAD_STATE[63]=1), both
-         EQ_SPATTN in the fused core pair display the exact same information for
-         all eight threads in the pair. However, only the even threads on the
-         even cores and the odd threads on the odd cores report to the
-         CFIR_EQ_SPA. -->
-    <rule attn_type="SPA" node_inst="0:31">
-        <!-- (~CORE_THREAD_STATE[63] << 63) | (CORE_THREAD_STATE[63] << 62) -->
-        <expr type="or">
-            <expr type="lshift" value1="63">
-                <expr type="and">
-                    <expr type="not">
-                        <expr type="reg" value1="CORE_THREAD_STATE"/>
-                    </expr>
-                    <expr type="int" value1="0x0000000000000001"/>
-                </expr>
-            </expr>
-            <expr type="lshift" value1="62">
-                <expr type="and">
-                    <expr type="reg" value1="CORE_THREAD_STATE"/>
-                    <expr type="int" value1="0x0000000000000001"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-    <bit child_node="EQ_SPATTN_NORMAL" node_inst="0:31" pos="0">EQ_SPATTN normal core mode</bit>
-    <bit child_node="EQ_SPATTN_FUSED"  node_inst="0:31" pos="1">EQ_SPATTN fused core mode</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_l2_fir.xml b/xml/p10/node_eq_l2_fir.xml
deleted file mode 100644
index 1e82173..0000000
--- a/xml/p10/node_eq_l2_fir.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_L2_FIR" reg_type="SCOM">
-    <local_fir config="" name="EQ_L2_FIR">
-        <instance addr="0x20028000" reg_inst="0"/>
-        <instance addr="0x20024000" reg_inst="1"/>
-        <instance addr="0x20022000" reg_inst="2"/>
-        <instance addr="0x20021000" reg_inst="3"/>
-        <instance addr="0x21028000" reg_inst="4"/>
-        <instance addr="0x21024000" reg_inst="5"/>
-        <instance addr="0x21022000" reg_inst="6"/>
-        <instance addr="0x21021000" reg_inst="7"/>
-        <instance addr="0x22028000" reg_inst="8"/>
-        <instance addr="0x22024000" reg_inst="9"/>
-        <instance addr="0x22022000" reg_inst="10"/>
-        <instance addr="0x22021000" reg_inst="11"/>
-        <instance addr="0x23028000" reg_inst="12"/>
-        <instance addr="0x23024000" reg_inst="13"/>
-        <instance addr="0x23022000" reg_inst="14"/>
-        <instance addr="0x23021000" reg_inst="15"/>
-        <instance addr="0x24028000" reg_inst="16"/>
-        <instance addr="0x24024000" reg_inst="17"/>
-        <instance addr="0x24022000" reg_inst="18"/>
-        <instance addr="0x24021000" reg_inst="19"/>
-        <instance addr="0x25028000" reg_inst="20"/>
-        <instance addr="0x25024000" reg_inst="21"/>
-        <instance addr="0x25022000" reg_inst="22"/>
-        <instance addr="0x25021000" reg_inst="23"/>
-        <instance addr="0x26028000" reg_inst="24"/>
-        <instance addr="0x26024000" reg_inst="25"/>
-        <instance addr="0x26022000" reg_inst="26"/>
-        <instance addr="0x26021000" reg_inst="27"/>
-        <instance addr="0x27028000" reg_inst="28"/>
-        <instance addr="0x27024000" reg_inst="29"/>
-        <instance addr="0x27022000" reg_inst="30"/>
-        <instance addr="0x27021000" reg_inst="31"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="L2_ERR_RPT0">
-        <instance addr="0x20028012" reg_inst="0"/>
-        <instance addr="0x20024012" reg_inst="1"/>
-        <instance addr="0x20022012" reg_inst="2"/>
-        <instance addr="0x20021012" reg_inst="3"/>
-        <instance addr="0x21028012" reg_inst="4"/>
-        <instance addr="0x21024012" reg_inst="5"/>
-        <instance addr="0x21022012" reg_inst="6"/>
-        <instance addr="0x21021012" reg_inst="7"/>
-        <instance addr="0x22028012" reg_inst="8"/>
-        <instance addr="0x22024012" reg_inst="9"/>
-        <instance addr="0x22022012" reg_inst="10"/>
-        <instance addr="0x22021012" reg_inst="11"/>
-        <instance addr="0x23028012" reg_inst="12"/>
-        <instance addr="0x23024012" reg_inst="13"/>
-        <instance addr="0x23022012" reg_inst="14"/>
-        <instance addr="0x23021012" reg_inst="15"/>
-        <instance addr="0x24028012" reg_inst="16"/>
-        <instance addr="0x24024012" reg_inst="17"/>
-        <instance addr="0x24022012" reg_inst="18"/>
-        <instance addr="0x24021012" reg_inst="19"/>
-        <instance addr="0x25028012" reg_inst="20"/>
-        <instance addr="0x25024012" reg_inst="21"/>
-        <instance addr="0x25022012" reg_inst="22"/>
-        <instance addr="0x25021012" reg_inst="23"/>
-        <instance addr="0x26028012" reg_inst="24"/>
-        <instance addr="0x26024012" reg_inst="25"/>
-        <instance addr="0x26022012" reg_inst="26"/>
-        <instance addr="0x26021012" reg_inst="27"/>
-        <instance addr="0x27028012" reg_inst="28"/>
-        <instance addr="0x27024012" reg_inst="29"/>
-        <instance addr="0x27022012" reg_inst="30"/>
-        <instance addr="0x27021012" reg_inst="31"/>
-    </register>
-    <register name="L2_ERR_RPT1">
-        <instance addr="0x20028013" reg_inst="0"/>
-        <instance addr="0x20024013" reg_inst="1"/>
-        <instance addr="0x20022013" reg_inst="2"/>
-        <instance addr="0x20021013" reg_inst="3"/>
-        <instance addr="0x21028013" reg_inst="4"/>
-        <instance addr="0x21024013" reg_inst="5"/>
-        <instance addr="0x21022013" reg_inst="6"/>
-        <instance addr="0x21021013" reg_inst="7"/>
-        <instance addr="0x22028013" reg_inst="8"/>
-        <instance addr="0x22024013" reg_inst="9"/>
-        <instance addr="0x22022013" reg_inst="10"/>
-        <instance addr="0x22021013" reg_inst="11"/>
-        <instance addr="0x23028013" reg_inst="12"/>
-        <instance addr="0x23024013" reg_inst="13"/>
-        <instance addr="0x23022013" reg_inst="14"/>
-        <instance addr="0x23021013" reg_inst="15"/>
-        <instance addr="0x24028013" reg_inst="16"/>
-        <instance addr="0x24024013" reg_inst="17"/>
-        <instance addr="0x24022013" reg_inst="18"/>
-        <instance addr="0x24021013" reg_inst="19"/>
-        <instance addr="0x25028013" reg_inst="20"/>
-        <instance addr="0x25024013" reg_inst="21"/>
-        <instance addr="0x25022013" reg_inst="22"/>
-        <instance addr="0x25021013" reg_inst="23"/>
-        <instance addr="0x26028013" reg_inst="24"/>
-        <instance addr="0x26024013" reg_inst="25"/>
-        <instance addr="0x26022013" reg_inst="26"/>
-        <instance addr="0x26021013" reg_inst="27"/>
-        <instance addr="0x27028013" reg_inst="28"/>
-        <instance addr="0x27024013" reg_inst="29"/>
-        <instance addr="0x27022013" reg_inst="30"/>
-        <instance addr="0x27021013" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="L2_ERR_RPT0" reg_inst= "0:31" />
-        <capture_register reg_name="L2_ERR_RPT1" reg_inst= "0:31" />
-    </capture_group>
-    <bit pos="0">L2 cache read CE</bit>
-    <bit pos="1">L2 cache read UE</bit>
-    <bit pos="2">L2 cache read SUE</bit>
-    <bit pos="3">Hw directory initiated line delete</bit>
-    <bit pos="4">UE or SUE detected by on modified line</bit>
-    <bit pos="5">UE or SUE detected on non-modified line</bit>
-    <bit pos="6">L2 directory read CE</bit>
-    <bit pos="7">L2 directory read UE</bit>
-    <bit pos="8">L2 directory CE due to stuck bit</bit>
-    <bit pos="9">L2 directory stuck bit CE repair failed</bit>
-    <bit pos="10">reserved</bit>
-    <bit pos="11">LRU read error detected</bit>
-    <bit pos="12">RC timed out waiting for powerbus to return data</bit>
-    <bit pos="13">NCU timed out waiting for powerbus to return data</bit>
-    <bit pos="14">Internal h/w control error</bit>
-    <bit pos="15">LRU all members in a class line deleted</bit>
-    <bit pos="16">Cache Inhibited Ld/St hit a line in the L2 cache</bit>
-    <bit pos="17">(RC) load received pb cresp addr error</bit>
-    <bit pos="18">(RC) store received pb cresp addr error</bit>
-    <bit pos="19">RC incoming Power Bus data had a CE error</bit>
-    <bit pos="20">RC incoming Power Bus data had a UE error</bit>
-    <bit pos="21">RC incoming Power Bus data had a SUE error</bit>
-    <bit pos="22">Targetted nodal request got rty_inc cresp</bit>
-    <bit pos="23">RC fabric op Ld cresp addr error for hyp</bit>
-    <bit pos="24">RCDAT read parity error</bit>
-    <bit pos="25">L2 castout or CN cresp addr err</bit>
-    <bit pos="26">LVDIR took a parity error</bit>
-    <bit pos="27">Bad topology table config software error</bit>
-    <bit pos="28">Darn timed out waiting for data</bit>
-    <bit pos="29">Early hang in L2</bit>
-    <bit pos="30">Unexpected cast-out or push during chip_contained</bit>
-    <bit pos="31">reserved</bit>
-    <bit pos="32">Time out during PEC sequence trying to correct l2dir error</bit>
-    <bit pos="33">reserved</bit>
-    <bit pos="34">reserved</bit>
-    <bit pos="35">reserved</bit>
-    <bit pos="36">Cache CE and UE in short time period</bit>
-    <bit pos="37">reserved</bit>
-    <bit pos="38">reserved</bit>
-    <bit pos="39">reserved</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_l3_fir.xml b/xml/p10/node_eq_l3_fir.xml
deleted file mode 100644
index 3faf1ef..0000000
--- a/xml/p10/node_eq_l3_fir.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_L3_FIR" reg_type="SCOM">
-    <local_fir config="" name="EQ_L3_FIR">
-        <instance addr="0x20018600" reg_inst="0"/>
-        <instance addr="0x20014600" reg_inst="1"/>
-        <instance addr="0x20012600" reg_inst="2"/>
-        <instance addr="0x20011600" reg_inst="3"/>
-        <instance addr="0x21018600" reg_inst="4"/>
-        <instance addr="0x21014600" reg_inst="5"/>
-        <instance addr="0x21012600" reg_inst="6"/>
-        <instance addr="0x21011600" reg_inst="7"/>
-        <instance addr="0x22018600" reg_inst="8"/>
-        <instance addr="0x22014600" reg_inst="9"/>
-        <instance addr="0x22012600" reg_inst="10"/>
-        <instance addr="0x22011600" reg_inst="11"/>
-        <instance addr="0x23018600" reg_inst="12"/>
-        <instance addr="0x23014600" reg_inst="13"/>
-        <instance addr="0x23012600" reg_inst="14"/>
-        <instance addr="0x23011600" reg_inst="15"/>
-        <instance addr="0x24018600" reg_inst="16"/>
-        <instance addr="0x24014600" reg_inst="17"/>
-        <instance addr="0x24012600" reg_inst="18"/>
-        <instance addr="0x24011600" reg_inst="19"/>
-        <instance addr="0x25018600" reg_inst="20"/>
-        <instance addr="0x25014600" reg_inst="21"/>
-        <instance addr="0x25012600" reg_inst="22"/>
-        <instance addr="0x25011600" reg_inst="23"/>
-        <instance addr="0x26018600" reg_inst="24"/>
-        <instance addr="0x26014600" reg_inst="25"/>
-        <instance addr="0x26012600" reg_inst="26"/>
-        <instance addr="0x26011600" reg_inst="27"/>
-        <instance addr="0x27018600" reg_inst="28"/>
-        <instance addr="0x27014600" reg_inst="29"/>
-        <instance addr="0x27012600" reg_inst="30"/>
-        <instance addr="0x27011600" reg_inst="31"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="L3_ERR_RPT0">
-        <instance addr="0x20018610" reg_inst="0"/>
-        <instance addr="0x20014610" reg_inst="1"/>
-        <instance addr="0x20012610" reg_inst="2"/>
-        <instance addr="0x20011610" reg_inst="3"/>
-        <instance addr="0x21018610" reg_inst="4"/>
-        <instance addr="0x21014610" reg_inst="5"/>
-        <instance addr="0x21012610" reg_inst="6"/>
-        <instance addr="0x21011610" reg_inst="7"/>
-        <instance addr="0x22018610" reg_inst="8"/>
-        <instance addr="0x22014610" reg_inst="9"/>
-        <instance addr="0x22012610" reg_inst="10"/>
-        <instance addr="0x22011610" reg_inst="11"/>
-        <instance addr="0x23018610" reg_inst="12"/>
-        <instance addr="0x23014610" reg_inst="13"/>
-        <instance addr="0x23012610" reg_inst="14"/>
-        <instance addr="0x23011610" reg_inst="15"/>
-        <instance addr="0x24018610" reg_inst="16"/>
-        <instance addr="0x24014610" reg_inst="17"/>
-        <instance addr="0x24012610" reg_inst="18"/>
-        <instance addr="0x24011610" reg_inst="19"/>
-        <instance addr="0x25018610" reg_inst="20"/>
-        <instance addr="0x25014610" reg_inst="21"/>
-        <instance addr="0x25012610" reg_inst="22"/>
-        <instance addr="0x25011610" reg_inst="23"/>
-        <instance addr="0x26018610" reg_inst="24"/>
-        <instance addr="0x26014610" reg_inst="25"/>
-        <instance addr="0x26012610" reg_inst="26"/>
-        <instance addr="0x26011610" reg_inst="27"/>
-        <instance addr="0x27018610" reg_inst="28"/>
-        <instance addr="0x27014610" reg_inst="29"/>
-        <instance addr="0x27012610" reg_inst="30"/>
-        <instance addr="0x27011610" reg_inst="31"/>
-    </register>
-    <register name="L3_ERR_RPT1">
-        <instance addr="0x20018617" reg_inst="0"/>
-        <instance addr="0x20014617" reg_inst="1"/>
-        <instance addr="0x20012617" reg_inst="2"/>
-        <instance addr="0x20011617" reg_inst="3"/>
-        <instance addr="0x21018617" reg_inst="4"/>
-        <instance addr="0x21014617" reg_inst="5"/>
-        <instance addr="0x21012617" reg_inst="6"/>
-        <instance addr="0x21011617" reg_inst="7"/>
-        <instance addr="0x22018617" reg_inst="8"/>
-        <instance addr="0x22014617" reg_inst="9"/>
-        <instance addr="0x22012617" reg_inst="10"/>
-        <instance addr="0x22011617" reg_inst="11"/>
-        <instance addr="0x23018617" reg_inst="12"/>
-        <instance addr="0x23014617" reg_inst="13"/>
-        <instance addr="0x23012617" reg_inst="14"/>
-        <instance addr="0x23011617" reg_inst="15"/>
-        <instance addr="0x24018617" reg_inst="16"/>
-        <instance addr="0x24014617" reg_inst="17"/>
-        <instance addr="0x24012617" reg_inst="18"/>
-        <instance addr="0x24011617" reg_inst="19"/>
-        <instance addr="0x25018617" reg_inst="20"/>
-        <instance addr="0x25014617" reg_inst="21"/>
-        <instance addr="0x25012617" reg_inst="22"/>
-        <instance addr="0x25011617" reg_inst="23"/>
-        <instance addr="0x26018617" reg_inst="24"/>
-        <instance addr="0x26014617" reg_inst="25"/>
-        <instance addr="0x26012617" reg_inst="26"/>
-        <instance addr="0x26011617" reg_inst="27"/>
-        <instance addr="0x27018617" reg_inst="28"/>
-        <instance addr="0x27014617" reg_inst="29"/>
-        <instance addr="0x27012617" reg_inst="30"/>
-        <instance addr="0x27011617" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="L3_ERR_RPT0" reg_inst= "0:31" />
-        <capture_register reg_name="L3_ERR_RPT1" reg_inst= "0:31" />
-    </capture_group>
-    <bit pos="0">No members available for a CGC</bit>
-    <bit pos="1">L3 attempted to master a CP (Castout/Push) command</bit>
-    <bit pos="2">Access attempted to use invalid topology table entry</bit>
-    <bit pos="3">L3 cache CE and UE within a short period</bit>
-    <bit pos="4">CE detected on L3 cache read</bit>
-    <bit pos="5">UE detected on L3 cache read</bit>
-    <bit pos="6">SUE detected on L3 cache read</bit>
-    <bit pos="7">L3 cache write data CE from Power Bus</bit>
-    <bit pos="8">L3 cache write data UE from Power Bus</bit>
-    <bit pos="9">L3 cache write data sue from Power Bus</bit>
-    <bit pos="10">L3 cache write data CE from L2</bit>
-    <bit pos="11">L3 cache write data UE from L2</bit>
-    <bit pos="12">L3 cache write SUE from L2</bit>
-    <bit pos="13">L3 DIR read CE</bit>
-    <bit pos="14">L3 Dir read UE</bit>
-    <bit pos="15">Dir error not found during corr seq</bit>
-    <bit pos="16">Received addr_error cresp on Snoop Machine or Castout Operation</bit>
-    <bit pos="17">Received addr_error cresp for Prefetch Operation</bit>
-    <bit pos="18">L3_PB_HANG_POLL</bit>
-    <bit pos="19">Invalid LRU count error</bit>
-    <bit pos="20">Reserved</bit>
-    <bit pos="21">Reserved</bit>
-    <bit pos="22">Reserved</bit>
-    <bit pos="23">Prefetch or Write Inject machine PowerBus data hang check</bit>
-    <bit pos="24">L3 Hw control err</bit>
-    <bit pos="25">Cache inhibited op in L3 directory</bit>
-    <bit pos="26">L3 line delete CE done</bit>
-    <bit pos="27">L3  snooped an incoming LCO</bit>
-    <bit pos="28">LRU intended to victimize a line, but invalid line selected</bit>
-    <bit pos="29">L3 cache congruence class deleted</bit>
-    <bit pos="30">Incoming LCO ID mismatch</bit>
-    <bit pos="31">L3 PowerBus Master Write CRESP ack_dead</bit>
-    <bit pos="32">PB Master Read received ack_dead CRESP</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_local_fir.xml b/xml/p10/node_eq_local_fir.xml
deleted file mode 100644
index 9752f6f..0000000
--- a/xml/p10/node_eq_local_fir.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="EQ_LOCAL_FIR">
-        <instance addr="0x20040100" reg_inst="0"/>
-        <instance addr="0x21040100" reg_inst="1"/>
-        <instance addr="0x22040100" reg_inst="2"/>
-        <instance addr="0x23040100" reg_inst="3"/>
-        <instance addr="0x24040100" reg_inst="4"/>
-        <instance addr="0x25040100" reg_inst="5"/>
-        <instance addr="0x26040100" reg_inst="6"/>
-        <instance addr="0x27040100" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM1 - internal error</bit>
-    <bit pos="7">THERM1 - pcb error</bit>
-    <bit pos="8">THERMTRIP1 - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP1 - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP1 - Voltage sense error</bit>
-    <bit pos="11">THERM2 - internal error</bit>
-    <bit pos="12">THERM2 - pcb error</bit>
-    <bit pos="13">THERMTRIP2 - Critical temperature indicator</bit>
-    <bit pos="14">THERMTRIP2 - Fatal temperature indicator</bit>
-    <bit pos="15">VOLTTRIP2 - Voltage sense error</bit>
-    <bit pos="16">DBG - scom parity fail</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">L30 Trace Err</bit>
-    <bit pos="21">L31 Trace Err</bit>
-    <bit pos="22">L32 Trace Err</bit>
-    <bit pos="23">L33 Trace Err</bit>
-    <bit pos="24">DCADJ FIR ERR Core 0</bit>
-    <bit pos="25">DCADJ FIR ERR Core 1</bit>
-    <bit pos="26">DCADJ FIR ERR Core 2</bit>
-    <bit pos="27">DCADJ FIR ERR Core 3</bit>
-    <bit pos="28">SKEWADJ FIR ERR Core0</bit>
-    <bit pos="29">SKEWADJ FIR ERR Core1</bit>
-    <bit pos="30">SKEWADJ FIR ERR Core2</bit>
-    <bit pos="31">SKEWADJ FIR ERR Core3</bit>
-    <bit pos="32">DC_SCOM_ERR_0</bit>
-    <bit pos="33">DC_SCOM_ERR_1</bit>
-    <bit pos="34">DC_SCOM_ERR_2</bit>
-    <bit pos="35">DC_SCOM_ERR_3</bit>
-    <bit pos="36">SKEW_SCOM_ERR_0</bit>
-    <bit pos="37">SKEW_SCOM_ERR_1</bit>
-    <bit pos="38">SKEW_SCOM_ERR_2</bit>
-    <bit pos="39">SKEW_SCOM_ERR_3</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_ncu_fir.xml b/xml/p10/node_eq_ncu_fir.xml
deleted file mode 100644
index 20b7850..0000000
--- a/xml/p10/node_eq_ncu_fir.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="EQ_NCU_FIR" reg_type="SCOM">
-    <local_fir config="" name="EQ_NCU_FIR">
-        <instance addr="0x20018640" reg_inst="0"/>
-        <instance addr="0x20014640" reg_inst="1"/>
-        <instance addr="0x20012640" reg_inst="2"/>
-        <instance addr="0x20011640" reg_inst="3"/>
-        <instance addr="0x21018640" reg_inst="4"/>
-        <instance addr="0x21014640" reg_inst="5"/>
-        <instance addr="0x21012640" reg_inst="6"/>
-        <instance addr="0x21011640" reg_inst="7"/>
-        <instance addr="0x22018640" reg_inst="8"/>
-        <instance addr="0x22014640" reg_inst="9"/>
-        <instance addr="0x22012640" reg_inst="10"/>
-        <instance addr="0x22011640" reg_inst="11"/>
-        <instance addr="0x23018640" reg_inst="12"/>
-        <instance addr="0x23014640" reg_inst="13"/>
-        <instance addr="0x23012640" reg_inst="14"/>
-        <instance addr="0x23011640" reg_inst="15"/>
-        <instance addr="0x24018640" reg_inst="16"/>
-        <instance addr="0x24014640" reg_inst="17"/>
-        <instance addr="0x24012640" reg_inst="18"/>
-        <instance addr="0x24011640" reg_inst="19"/>
-        <instance addr="0x25018640" reg_inst="20"/>
-        <instance addr="0x25014640" reg_inst="21"/>
-        <instance addr="0x25012640" reg_inst="22"/>
-        <instance addr="0x25011640" reg_inst="23"/>
-        <instance addr="0x26018640" reg_inst="24"/>
-        <instance addr="0x26014640" reg_inst="25"/>
-        <instance addr="0x26012640" reg_inst="26"/>
-        <instance addr="0x26011640" reg_inst="27"/>
-        <instance addr="0x27018640" reg_inst="28"/>
-        <instance addr="0x27014640" reg_inst="29"/>
-        <instance addr="0x27012640" reg_inst="30"/>
-        <instance addr="0x27011640" reg_inst="31"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="NCU_ERR_RPT_REG">
-        <instance addr="0x2001864E" reg_inst="0"/>
-        <instance addr="0x2001464E" reg_inst="1"/>
-        <instance addr="0x2001264E" reg_inst="2"/>
-        <instance addr="0x2001164E" reg_inst="3"/>
-        <instance addr="0x2101864E" reg_inst="4"/>
-        <instance addr="0x2101464E" reg_inst="5"/>
-        <instance addr="0x2101264E" reg_inst="6"/>
-        <instance addr="0x2101164E" reg_inst="7"/>
-        <instance addr="0x2201864E" reg_inst="8"/>
-        <instance addr="0x2201464E" reg_inst="9"/>
-        <instance addr="0x2201264E" reg_inst="10"/>
-        <instance addr="0x2201164E" reg_inst="11"/>
-        <instance addr="0x2301864E" reg_inst="12"/>
-        <instance addr="0x2301464E" reg_inst="13"/>
-        <instance addr="0x2301264E" reg_inst="14"/>
-        <instance addr="0x2301164E" reg_inst="15"/>
-        <instance addr="0x2401864E" reg_inst="16"/>
-        <instance addr="0x2401464E" reg_inst="17"/>
-        <instance addr="0x2401264E" reg_inst="18"/>
-        <instance addr="0x2401164E" reg_inst="19"/>
-        <instance addr="0x2501864E" reg_inst="20"/>
-        <instance addr="0x2501464E" reg_inst="21"/>
-        <instance addr="0x2501264E" reg_inst="22"/>
-        <instance addr="0x2501164E" reg_inst="23"/>
-        <instance addr="0x2601864E" reg_inst="24"/>
-        <instance addr="0x2601464E" reg_inst="25"/>
-        <instance addr="0x2601264E" reg_inst="26"/>
-        <instance addr="0x2601164E" reg_inst="27"/>
-        <instance addr="0x2701864E" reg_inst="28"/>
-        <instance addr="0x2701464E" reg_inst="29"/>
-        <instance addr="0x2701264E" reg_inst="30"/>
-        <instance addr="0x2701164E" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="NCU_ERR_RPT_REG" reg_inst= "0:31" />
-    </capture_group>
-    <bit pos="0">NCU store queue control error</bit>
-    <bit pos="1">TLBIE control error</bit>
-    <bit pos="2">TLBIE or SLBIEG received illegal fields from core</bit>
-    <bit pos="3">Store address machine received addr_err cresp</bit>
-    <bit pos="4">Load address machine received addr_err cresp</bit>
-    <bit pos="5">Topology table error - tried accessing invalid entry</bit>
-    <bit pos="6">An NCU machine triggerd PB into early hang recovery</bit>
-    <bit pos="7">MSGSND received addr_err</bit>
-    <bit pos="8">Store data parity error from regfile detected</bit>
-    <bit pos="9">Store timed out on PB</bit>
-    <bit pos="10">TLBIE master timed out on PB</bit>
-    <bit pos="11">TLBIE snooper timed out waiting for core</bit>
-    <bit pos="12">IMA received addr_err cresp</bit>
-    <bit pos="13">TLBIE/sync machine received addr_err cresp</bit>
-    <bit pos="14">PMISC received address error cresp</bit>
-    <bit pos="15">cHTM logic recieve an HTM/IMA packet</bit>
-    <bit pos="16">spare</bit>
-    <bit pos="17">spare</bit>
-    <bit pos="18">spare</bit>
-    <bit pos="19">Targeted nodal request got rty_inc cresp</bit>
-    <bit pos="20">Darn ttype while darn not enabled</bit>
-    <bit pos="21">Darn Address Error cresp</bit>
-    <bit pos="22">spare</bit>
-    <bit pos="23">spare</bit>
-    <bit pos="24">spare</bit>
-    <bit pos="25">spare</bit>
-    <bit pos="26">spare</bit>
-    <bit pos="27">spare</bit>
-    <bit pos="28">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_ncu_fir_p10_10.xml b/xml/p10/node_eq_ncu_fir_p10_10.xml
deleted file mode 100644
index 3d6fe44..0000000
--- a/xml/p10/node_eq_ncu_fir_p10_10.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="EQ_NCU_FIR" reg_type="SCOM">
-    <local_fir config="" name="EQ_NCU_FIR">
-        <instance addr="0x20018640" reg_inst="0"/>
-        <instance addr="0x20014640" reg_inst="1"/>
-        <instance addr="0x20012640" reg_inst="2"/>
-        <instance addr="0x20011640" reg_inst="3"/>
-        <instance addr="0x21018640" reg_inst="4"/>
-        <instance addr="0x21014640" reg_inst="5"/>
-        <instance addr="0x21012640" reg_inst="6"/>
-        <instance addr="0x21011640" reg_inst="7"/>
-        <instance addr="0x22018640" reg_inst="8"/>
-        <instance addr="0x22014640" reg_inst="9"/>
-        <instance addr="0x22012640" reg_inst="10"/>
-        <instance addr="0x22011640" reg_inst="11"/>
-        <instance addr="0x23018640" reg_inst="12"/>
-        <instance addr="0x23014640" reg_inst="13"/>
-        <instance addr="0x23012640" reg_inst="14"/>
-        <instance addr="0x23011640" reg_inst="15"/>
-        <instance addr="0x24018640" reg_inst="16"/>
-        <instance addr="0x24014640" reg_inst="17"/>
-        <instance addr="0x24012640" reg_inst="18"/>
-        <instance addr="0x24011640" reg_inst="19"/>
-        <instance addr="0x25018640" reg_inst="20"/>
-        <instance addr="0x25014640" reg_inst="21"/>
-        <instance addr="0x25012640" reg_inst="22"/>
-        <instance addr="0x25011640" reg_inst="23"/>
-        <instance addr="0x26018640" reg_inst="24"/>
-        <instance addr="0x26014640" reg_inst="25"/>
-        <instance addr="0x26012640" reg_inst="26"/>
-        <instance addr="0x26011640" reg_inst="27"/>
-        <instance addr="0x27018640" reg_inst="28"/>
-        <instance addr="0x27014640" reg_inst="29"/>
-        <instance addr="0x27012640" reg_inst="30"/>
-        <instance addr="0x27011640" reg_inst="31"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="NCU_ERR_RPT_REG">
-        <instance addr="0x2001864E" reg_inst="0"/>
-        <instance addr="0x2001464E" reg_inst="1"/>
-        <instance addr="0x2001264E" reg_inst="2"/>
-        <instance addr="0x2001164E" reg_inst="3"/>
-        <instance addr="0x2101864E" reg_inst="4"/>
-        <instance addr="0x2101464E" reg_inst="5"/>
-        <instance addr="0x2101264E" reg_inst="6"/>
-        <instance addr="0x2101164E" reg_inst="7"/>
-        <instance addr="0x2201864E" reg_inst="8"/>
-        <instance addr="0x2201464E" reg_inst="9"/>
-        <instance addr="0x2201264E" reg_inst="10"/>
-        <instance addr="0x2201164E" reg_inst="11"/>
-        <instance addr="0x2301864E" reg_inst="12"/>
-        <instance addr="0x2301464E" reg_inst="13"/>
-        <instance addr="0x2301264E" reg_inst="14"/>
-        <instance addr="0x2301164E" reg_inst="15"/>
-        <instance addr="0x2401864E" reg_inst="16"/>
-        <instance addr="0x2401464E" reg_inst="17"/>
-        <instance addr="0x2401264E" reg_inst="18"/>
-        <instance addr="0x2401164E" reg_inst="19"/>
-        <instance addr="0x2501864E" reg_inst="20"/>
-        <instance addr="0x2501464E" reg_inst="21"/>
-        <instance addr="0x2501264E" reg_inst="22"/>
-        <instance addr="0x2501164E" reg_inst="23"/>
-        <instance addr="0x2601864E" reg_inst="24"/>
-        <instance addr="0x2601464E" reg_inst="25"/>
-        <instance addr="0x2601264E" reg_inst="26"/>
-        <instance addr="0x2601164E" reg_inst="27"/>
-        <instance addr="0x2701864E" reg_inst="28"/>
-        <instance addr="0x2701464E" reg_inst="29"/>
-        <instance addr="0x2701264E" reg_inst="30"/>
-        <instance addr="0x2701164E" reg_inst="31"/>
-    </register>
-    <capture_group node_inst="0:31">
-        <capture_register reg_name="NCU_ERR_RPT_REG" reg_inst= "0:31" />
-    </capture_group>
-    <bit pos="0">NCU store queue control error</bit>
-    <bit pos="1">TLBIE control error</bit>
-    <bit pos="2">TLBIE or SLBIEG received illegal fields from core</bit>
-    <bit pos="3">Store address machine received addr_err cresp</bit>
-    <bit pos="4">Load address machine received addr_err cresp</bit>
-    <bit pos="5">Topology table error - tried accessing invalid entry</bit>
-    <bit pos="6">An NCU machine triggerd PB into early hang recovery</bit>
-    <bit pos="7">MSGSND received addr_err</bit>
-    <bit pos="8">Store data parity error from regfile detected</bit>
-    <bit pos="9">Store timed out on PB</bit>
-    <bit pos="10">TLBIE master timed out on PB</bit>
-    <bit pos="11">TLBIE snooper timed out waiting for core</bit>
-    <bit pos="12">IMA received addr_err cresp</bit>
-    <bit pos="13">TLBIE/sync machine received addr_err cresp</bit>
-    <bit pos="14">PMISC received address error cresp</bit>
-    <bit pos="15">spare</bit>
-    <bit pos="16">spare</bit>
-    <bit pos="17">spare</bit>
-    <bit pos="18">spare</bit>
-    <bit pos="19">Targeted nodal request got rty_inc cresp</bit>
-    <bit pos="20">Darn ttype while darn not enabled</bit>
-    <bit pos="21">Darn Address Error cresp</bit>
-    <bit pos="22">spare</bit>
-    <bit pos="23">spare</bit>
-    <bit pos="24">spare</bit>
-    <bit pos="25">spare</bit>
-    <bit pos="26">spare</bit>
-    <bit pos="27">spare</bit>
-    <bit pos="28">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_qme_fir.xml b/xml/p10/node_eq_qme_fir.xml
deleted file mode 100644
index 4d6e8a5..0000000
--- a/xml/p10/node_eq_qme_fir.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="EQ_QME_FIR" reg_type="SCOM">
-    <register name="EQ_QME_FIR">
-        <instance addr="0x200E0000" reg_inst="0"/>
-        <instance addr="0x210E0000" reg_inst="1"/>
-        <instance addr="0x220E0000" reg_inst="2"/>
-        <instance addr="0x230E0000" reg_inst="3"/>
-        <instance addr="0x240E0000" reg_inst="4"/>
-        <instance addr="0x250E0000" reg_inst="5"/>
-        <instance addr="0x260E0000" reg_inst="6"/>
-        <instance addr="0x270E0000" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_MASK">
-        <instance addr="0x200E0004" reg_inst="0"/>
-        <instance addr="0x210E0004" reg_inst="1"/>
-        <instance addr="0x220E0004" reg_inst="2"/>
-        <instance addr="0x230E0004" reg_inst="3"/>
-        <instance addr="0x240E0004" reg_inst="4"/>
-        <instance addr="0x250E0004" reg_inst="5"/>
-        <instance addr="0x260E0004" reg_inst="6"/>
-        <instance addr="0x270E0004" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_ACT0">
-        <instance addr="0x200E0008" reg_inst="0"/>
-        <instance addr="0x210E0008" reg_inst="1"/>
-        <instance addr="0x220E0008" reg_inst="2"/>
-        <instance addr="0x230E0008" reg_inst="3"/>
-        <instance addr="0x240E0008" reg_inst="4"/>
-        <instance addr="0x250E0008" reg_inst="5"/>
-        <instance addr="0x260E0008" reg_inst="6"/>
-        <instance addr="0x270E0008" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_ACT1">
-        <instance addr="0x200E000c" reg_inst="0"/>
-        <instance addr="0x210E000c" reg_inst="1"/>
-        <instance addr="0x220E000c" reg_inst="2"/>
-        <instance addr="0x230E000c" reg_inst="3"/>
-        <instance addr="0x240E000c" reg_inst="4"/>
-        <instance addr="0x250E000c" reg_inst="5"/>
-        <instance addr="0x260E000c" reg_inst="6"/>
-        <instance addr="0x270E000c" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_QME_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT0"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT1"/>
-            </expr>
-        </expr>
-    </rule>
-    <rule attn_type="RE" node_inst="0:7">
-        <!-- FIR & ~MASK & ~ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_QME_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT0"/>
-            </expr>
-            <expr type="reg" value1="EQ_QME_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <bit pos="0">PPE halted due to an error</bit>
-    <bit pos="1">PPE asserted debug trigger</bit>
-    <bit pos="2">Spare trigger for testing or workarounds</bit>
-    <bit pos="3">PPE asserted a watchdog timeout condition</bit>
-    <bit pos="4">QME hardware detected its own timeout on the PCB Slave interface</bit>
-    <bit pos="5">Block Copy Engine or QME PPE direct access error from the Fabric</bit>
-    <bit pos="6">SRAM Uncorrectable Error</bit>
-    <bit pos="7">SRAM Correctable Error</bit>
-    <bit pos="8">Resonant Clock Table array Parity Error</bit>
-    <bit pos="9">PIG request of PCB interrupt before its previous interrupt completed</bit>
-    <bit pos="10">Scrub timer tick occurred when scrub is still pending</bit>
-    <bit pos="11">QME_LFIR_CTFS_ERR</bit>
-    <bit pos="12">QME_LFIR_CPMS_ERR</bit>
-    <bit pos="13">PGPE Heartbeat Lost from a hw deadman timer controlled by QHB</bit>
-    <bit pos="14">BCE forward progress error</bit>
-    <bit pos="15">Resclk TARGET_PSTATE Change Protocol Error</bit>
-    <bit pos="16">PCB Network or Endpoint Reset occurred when QME was not halted</bit>
-    <bit pos="17">Firmware cleared special wakeup request before SPECIAL_WKUP_DONE</bit>
-    <bit pos="18">A new special wakeup right after previous cleared</bit>
-    <bit pos="19">Core External Interrupt wakeup sources present but disabled by threads</bit>
-    <bit pos="20">Core External Interrupt present but the chiplet is deconfigured</bit>
-    <bit pos="21">Reserved</bit>
-    <bit pos="22">PB read cmd waited too long for lost data (hang)</bit>
-    <bit pos="23">PPE tried to write a protected addr as defined by the SWPR[n] register</bit>
-    <bit pos="24">DTC Sequencer read a UE from SRAM</bit>
-    <bit pos="25">Correctable error detected on incoming data for a PowerBus read</bit>
-    <bit pos="26">UE Detected on incoming data for a PowerBus read</bit>
-    <bit pos="27">SUE Detected on incoming data for a PowerBus read</bit>
-    <bit pos="28">PB Request address hit an invalid entry in the TOPOLOGY XLATE TABLE</bit>
-    <bit pos="29">Parity error detected on a powerbus tag</bit>
-    <bit pos="30">Code attempted to write the PIG register when the previous request was still pending</bit>
-    <bit pos="31">Local access error bit(s) set</bit>
-    <bit pos="32">CE detected on read to the SSA located in QME powerbus routing logic</bit>
-    <bit pos="33">UE detected on read to the SSA located in QME powerbus routing logic</bit>
-    <bit pos="34">Resonant clock CCFG parity error</bit>
-    <bit pos="35">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_qme_fir_p10_10.xml b/xml/p10/node_eq_qme_fir_p10_10.xml
deleted file mode 100644
index 44e406a..0000000
--- a/xml/p10/node_eq_qme_fir_p10_10.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="EQ_QME_FIR" reg_type="SCOM">
-    <register name="EQ_QME_FIR">
-        <instance addr="0x200E0000" reg_inst="0"/>
-        <instance addr="0x210E0000" reg_inst="1"/>
-        <instance addr="0x220E0000" reg_inst="2"/>
-        <instance addr="0x230E0000" reg_inst="3"/>
-        <instance addr="0x240E0000" reg_inst="4"/>
-        <instance addr="0x250E0000" reg_inst="5"/>
-        <instance addr="0x260E0000" reg_inst="6"/>
-        <instance addr="0x270E0000" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_MASK">
-        <instance addr="0x200E0004" reg_inst="0"/>
-        <instance addr="0x210E0004" reg_inst="1"/>
-        <instance addr="0x220E0004" reg_inst="2"/>
-        <instance addr="0x230E0004" reg_inst="3"/>
-        <instance addr="0x240E0004" reg_inst="4"/>
-        <instance addr="0x250E0004" reg_inst="5"/>
-        <instance addr="0x260E0004" reg_inst="6"/>
-        <instance addr="0x270E0004" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_ACT0">
-        <instance addr="0x200E0008" reg_inst="0"/>
-        <instance addr="0x210E0008" reg_inst="1"/>
-        <instance addr="0x220E0008" reg_inst="2"/>
-        <instance addr="0x230E0008" reg_inst="3"/>
-        <instance addr="0x240E0008" reg_inst="4"/>
-        <instance addr="0x250E0008" reg_inst="5"/>
-        <instance addr="0x260E0008" reg_inst="6"/>
-        <instance addr="0x270E0008" reg_inst="7"/>
-    </register>
-    <register name="EQ_QME_FIR_ACT1">
-        <instance addr="0x200E000c" reg_inst="0"/>
-        <instance addr="0x210E000c" reg_inst="1"/>
-        <instance addr="0x220E000c" reg_inst="2"/>
-        <instance addr="0x230E000c" reg_inst="3"/>
-        <instance addr="0x240E000c" reg_inst="4"/>
-        <instance addr="0x250E000c" reg_inst="5"/>
-        <instance addr="0x260E000c" reg_inst="6"/>
-        <instance addr="0x270E000c" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_QME_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT0"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT1"/>
-            </expr>
-        </expr>
-    </rule>
-    <rule attn_type="RE" node_inst="0:7">
-        <!-- FIR & ~MASK & ~ACT0 & ACT1 -->
-        <expr type="and">
-            <expr type="reg" value1="EQ_QME_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="EQ_QME_FIR_ACT0"/>
-            </expr>
-            <expr type="reg" value1="EQ_QME_FIR_ACT1"/>
-        </expr>
-    </rule>
-    <bit pos="0">PPE halted due to an error</bit>
-    <bit pos="1">PPE asserted debug trigger</bit>
-    <bit pos="2">Spare trigger for testing or workarounds</bit>
-    <bit pos="3">PPE asserted a watchdog timeout condition</bit>
-    <bit pos="4">QME hardware detected its own timeout on the PCB Slave interface</bit>
-    <bit pos="5">Block Copy Engine or QME PPE direct access error from the Fabric</bit>
-    <bit pos="6">SRAM Uncorrectable Error</bit>
-    <bit pos="7">SRAM Correctable Error</bit>
-    <bit pos="8">Resonant Clock Table array Parity Error</bit>
-    <bit pos="9">PIG request of PCB interrupt before its previous interrupt completed</bit>
-    <bit pos="10">Scrub timer tick occurred when scrub is still pending</bit>
-    <bit pos="11">QME_LFIR_CTFS_ERR</bit>
-    <bit pos="12">QME_LFIR_CPMS_ERR</bit>
-    <bit pos="13">PGPE Heartbeat Lost from a hw deadman timer controlled by QHB</bit>
-    <bit pos="14">BCE forward progress error</bit>
-    <bit pos="15">Resclk TARGET_PSTATE Change Protocol Error</bit>
-    <bit pos="16">PCB Network or Endpoint Reset occurred when QME was not halted</bit>
-    <bit pos="17">Firmware cleared special wakeup request before SPECIAL_WKUP_DONE</bit>
-    <bit pos="18">A new special wakeup right after previous cleared</bit>
-    <bit pos="19">Core External Interrupt wakeup sources present but disabled by threads</bit>
-    <bit pos="20">Core External Interrupt present but the chiplet is deconfigured</bit>
-    <bit pos="21">Reserved</bit>
-    <bit pos="22">PB read cmd waited too long for lost data (hang)</bit>
-    <bit pos="23">PPE tried to write a protected addr as defined by the SWPR[n] register</bit>
-    <bit pos="24">DTC Sequencer read a UE from SRAM</bit>
-    <bit pos="25">Correctable error detected on incoming data for a PowerBus read</bit>
-    <bit pos="26">UE Detected on incoming data for a PowerBus read</bit>
-    <bit pos="27">SUE Detected on incoming data for a PowerBus read</bit>
-    <bit pos="28">PB Request address hit an invalid entry in the TOPOLOGY XLATE TABLE</bit>
-    <bit pos="29">Parity error detected on a powerbus tag</bit>
-    <bit pos="30">Code attempted to write the PIG register when the previous request was still pending</bit>
-    <bit pos="31">Local access error bit(s) set</bit>
-    <bit pos="32">CE detected on read to the SSA located in QME powerbus routing logic</bit>
-    <bit pos="33">UE detected on read to the SSA located in QME powerbus routing logic</bit>
-    <bit pos="34">spare</bit>
-    <bit pos="35">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_spattn_fused.xml b/xml/p10/node_eq_spattn_fused.xml
deleted file mode 100644
index b85b4d5..0000000
--- a/xml/p10/node_eq_spattn_fused.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_SPATTN_FUSED" reg_type="SCOM">
-    <register name="EQ_SPATTN">
-        <instance addr="0x20028499" reg_inst="0"/>
-        <instance addr="0x20024499" reg_inst="1"/>
-        <instance addr="0x20022499" reg_inst="2"/>
-        <instance addr="0x20021499" reg_inst="3"/>
-        <instance addr="0x21028499" reg_inst="4"/>
-        <instance addr="0x21024499" reg_inst="5"/>
-        <instance addr="0x21022499" reg_inst="6"/>
-        <instance addr="0x21021499" reg_inst="7"/>
-        <instance addr="0x22028499" reg_inst="8"/>
-        <instance addr="0x22024499" reg_inst="9"/>
-        <instance addr="0x22022499" reg_inst="10"/>
-        <instance addr="0x22021499" reg_inst="11"/>
-        <instance addr="0x23028499" reg_inst="12"/>
-        <instance addr="0x23024499" reg_inst="13"/>
-        <instance addr="0x23022499" reg_inst="14"/>
-        <instance addr="0x23021499" reg_inst="15"/>
-        <instance addr="0x24028499" reg_inst="16"/>
-        <instance addr="0x24024499" reg_inst="17"/>
-        <instance addr="0x24022499" reg_inst="18"/>
-        <instance addr="0x24021499" reg_inst="19"/>
-        <instance addr="0x25028499" reg_inst="20"/>
-        <instance addr="0x25024499" reg_inst="21"/>
-        <instance addr="0x25022499" reg_inst="22"/>
-        <instance addr="0x25021499" reg_inst="23"/>
-        <instance addr="0x26028499" reg_inst="24"/>
-        <instance addr="0x26024499" reg_inst="25"/>
-        <instance addr="0x26022499" reg_inst="26"/>
-        <instance addr="0x26021499" reg_inst="27"/>
-        <instance addr="0x27028499" reg_inst="28"/>
-        <instance addr="0x27024499" reg_inst="29"/>
-        <instance addr="0x27022499" reg_inst="30"/>
-        <instance addr="0x27021499" reg_inst="31"/>
-    </register>
-    <register name="EQ_SPATTN_MASK">
-        <instance addr="0x2002849a" reg_inst="0"/>
-        <instance addr="0x2002449a" reg_inst="1"/>
-        <instance addr="0x2002249a" reg_inst="2"/>
-        <instance addr="0x2002149a" reg_inst="3"/>
-        <instance addr="0x2102849a" reg_inst="4"/>
-        <instance addr="0x2102449a" reg_inst="5"/>
-        <instance addr="0x2102249a" reg_inst="6"/>
-        <instance addr="0x2102149a" reg_inst="7"/>
-        <instance addr="0x2202849a" reg_inst="8"/>
-        <instance addr="0x2202449a" reg_inst="9"/>
-        <instance addr="0x2202249a" reg_inst="10"/>
-        <instance addr="0x2202149a" reg_inst="11"/>
-        <instance addr="0x2302849a" reg_inst="12"/>
-        <instance addr="0x2302449a" reg_inst="13"/>
-        <instance addr="0x2302249a" reg_inst="14"/>
-        <instance addr="0x2302149a" reg_inst="15"/>
-        <instance addr="0x2402849a" reg_inst="16"/>
-        <instance addr="0x2402449a" reg_inst="17"/>
-        <instance addr="0x2402249a" reg_inst="18"/>
-        <instance addr="0x2402149a" reg_inst="19"/>
-        <instance addr="0x2502849a" reg_inst="20"/>
-        <instance addr="0x2502449a" reg_inst="21"/>
-        <instance addr="0x2502249a" reg_inst="22"/>
-        <instance addr="0x2502149a" reg_inst="23"/>
-        <instance addr="0x2602849a" reg_inst="24"/>
-        <instance addr="0x2602449a" reg_inst="25"/>
-        <instance addr="0x2602249a" reg_inst="26"/>
-        <instance addr="0x2602149a" reg_inst="27"/>
-        <instance addr="0x2702849a" reg_inst="28"/>
-        <instance addr="0x2702449a" reg_inst="29"/>
-        <instance addr="0x2702249a" reg_inst="30"/>
-        <instance addr="0x2702149a" reg_inst="31"/>
-    </register>
-    <!-- In Fused Core mode, both local EQ_SPATTN in the fused core pair
-         display the exact same information for all eight threads in the pair.
-         However, only the even threads on the even cores and the odd threads on
-         the odd cores report to the CFIR_EQ_SPA. -->
-    <rule attn_type="SPA" node_inst="0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30">
-        <expr type="and">
-            <expr type="reg" value1="EQ_SPATTN"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_SPATTN_MASK"/>
-            </expr>
-            <expr type="int" value1="0xf0f0f0f000000000"/>
-        </expr>
-    </rule>
-    <rule attn_type="SPA" node_inst="1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31">
-        <expr type="and">
-            <expr type="reg" value1="EQ_SPATTN"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_SPATTN_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0f0f0f0f00000000"/>
-        </expr>
-    </rule>
-    <bit pos="0">lt0_spr_instr_stop</bit>
-    <bit pos="1">lt0_attn_complete</bit>
-    <bit pos="2">lt0_core_checkstop_recovery_handshake</bit>
-    <bit pos="3">lt0_core_code_to_sp</bit>
-    <bit pos="4">lt1_spr_instr_stop</bit>
-    <bit pos="5">lt1_attn_complete</bit>
-    <bit pos="6">lt1_core_checkstop_recovery_handshake</bit>
-    <bit pos="7">lt1_core_code_to_sp</bit>
-    <bit pos="8">lt2_spr_instr_stop</bit>
-    <bit pos="9">lt2_attn_complete</bit>
-    <bit pos="10">lt2_core_checkstop_recovery_handshake</bit>
-    <bit pos="11">lt2_core_code_to_sp</bit>
-    <bit pos="12">lt3_spr_instr_stop</bit>
-    <bit pos="13">lt3_attn_complete</bit>
-    <bit pos="14">lt3_core_checkstop_recovery_handshake</bit>
-    <bit pos="15">lt3_core_code_to_sp</bit>
-    <bit pos="16">lt4_spr_instr_stop</bit>
-    <bit pos="17">lt4_attn_complete</bit>
-    <bit pos="18">lt4_core_checkstop_recovery_handshake</bit>
-    <bit pos="19">lt4_core_code_to_sp</bit>
-    <bit pos="20">lt5_spr_instr_stop</bit>
-    <bit pos="21">lt5_attn_complete</bit>
-    <bit pos="22">lt5_core_checkstop_recovery_handshake</bit>
-    <bit pos="23">lt5_core_code_to_sp</bit>
-    <bit pos="24">lt6_spr_instr_stop</bit>
-    <bit pos="25">lt6_attn_complete</bit>
-    <bit pos="26">lt6_core_checkstop_recovery_handshake</bit>
-    <bit pos="27">lt6_core_code_to_sp</bit>
-    <bit pos="28">lt7_spr_instr_stop</bit>
-    <bit pos="29">lt7_attn_complete</bit>
-    <bit pos="30">lt7_core_checkstop_recovery_handshake</bit>
-    <bit pos="31">lt7_core_code_to_sp</bit>
-</attn_node>
diff --git a/xml/p10/node_eq_spattn_normal.xml b/xml/p10/node_eq_spattn_normal.xml
deleted file mode 100644
index c825380..0000000
--- a/xml/p10/node_eq_spattn_normal.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="EQ_SPATTN_NORMAL" reg_type="SCOM">
-    <register name="EQ_SPATTN">
-        <instance addr="0x20028499" reg_inst="0"/>
-        <instance addr="0x20024499" reg_inst="1"/>
-        <instance addr="0x20022499" reg_inst="2"/>
-        <instance addr="0x20021499" reg_inst="3"/>
-        <instance addr="0x21028499" reg_inst="4"/>
-        <instance addr="0x21024499" reg_inst="5"/>
-        <instance addr="0x21022499" reg_inst="6"/>
-        <instance addr="0x21021499" reg_inst="7"/>
-        <instance addr="0x22028499" reg_inst="8"/>
-        <instance addr="0x22024499" reg_inst="9"/>
-        <instance addr="0x22022499" reg_inst="10"/>
-        <instance addr="0x22021499" reg_inst="11"/>
-        <instance addr="0x23028499" reg_inst="12"/>
-        <instance addr="0x23024499" reg_inst="13"/>
-        <instance addr="0x23022499" reg_inst="14"/>
-        <instance addr="0x23021499" reg_inst="15"/>
-        <instance addr="0x24028499" reg_inst="16"/>
-        <instance addr="0x24024499" reg_inst="17"/>
-        <instance addr="0x24022499" reg_inst="18"/>
-        <instance addr="0x24021499" reg_inst="19"/>
-        <instance addr="0x25028499" reg_inst="20"/>
-        <instance addr="0x25024499" reg_inst="21"/>
-        <instance addr="0x25022499" reg_inst="22"/>
-        <instance addr="0x25021499" reg_inst="23"/>
-        <instance addr="0x26028499" reg_inst="24"/>
-        <instance addr="0x26024499" reg_inst="25"/>
-        <instance addr="0x26022499" reg_inst="26"/>
-        <instance addr="0x26021499" reg_inst="27"/>
-        <instance addr="0x27028499" reg_inst="28"/>
-        <instance addr="0x27024499" reg_inst="29"/>
-        <instance addr="0x27022499" reg_inst="30"/>
-        <instance addr="0x27021499" reg_inst="31"/>
-    </register>
-    <register name="EQ_SPATTN_MASK">
-        <instance addr="0x2002849a" reg_inst="0"/>
-        <instance addr="0x2002449a" reg_inst="1"/>
-        <instance addr="0x2002249a" reg_inst="2"/>
-        <instance addr="0x2002149a" reg_inst="3"/>
-        <instance addr="0x2102849a" reg_inst="4"/>
-        <instance addr="0x2102449a" reg_inst="5"/>
-        <instance addr="0x2102249a" reg_inst="6"/>
-        <instance addr="0x2102149a" reg_inst="7"/>
-        <instance addr="0x2202849a" reg_inst="8"/>
-        <instance addr="0x2202449a" reg_inst="9"/>
-        <instance addr="0x2202249a" reg_inst="10"/>
-        <instance addr="0x2202149a" reg_inst="11"/>
-        <instance addr="0x2302849a" reg_inst="12"/>
-        <instance addr="0x2302449a" reg_inst="13"/>
-        <instance addr="0x2302249a" reg_inst="14"/>
-        <instance addr="0x2302149a" reg_inst="15"/>
-        <instance addr="0x2402849a" reg_inst="16"/>
-        <instance addr="0x2402449a" reg_inst="17"/>
-        <instance addr="0x2402249a" reg_inst="18"/>
-        <instance addr="0x2402149a" reg_inst="19"/>
-        <instance addr="0x2502849a" reg_inst="20"/>
-        <instance addr="0x2502449a" reg_inst="21"/>
-        <instance addr="0x2502249a" reg_inst="22"/>
-        <instance addr="0x2502149a" reg_inst="23"/>
-        <instance addr="0x2602849a" reg_inst="24"/>
-        <instance addr="0x2602449a" reg_inst="25"/>
-        <instance addr="0x2602249a" reg_inst="26"/>
-        <instance addr="0x2602149a" reg_inst="27"/>
-        <instance addr="0x2702849a" reg_inst="28"/>
-        <instance addr="0x2702449a" reg_inst="29"/>
-        <instance addr="0x2702249a" reg_inst="30"/>
-        <instance addr="0x2702149a" reg_inst="31"/>
-    </register>
-    <!-- In Normal Core mode, only threads 0-3 report to the CFIR_EQ_SPA. -->
-    <rule attn_type="SPA" node_inst="0:31">
-        <expr type="and">
-            <expr type="reg" value1="EQ_SPATTN"/>
-            <expr type="not">
-                <expr type="reg" value1="EQ_SPATTN_MASK"/>
-            </expr>
-            <expr type="int" value1="0xffff000000000000"/>
-        </expr>
-    </rule>
-    <bit pos="0">lt0_spr_instr_stop</bit>
-    <bit pos="1">lt0_attn_complete</bit>
-    <bit pos="2">lt0_core_checkstop_recovery_handshake</bit>
-    <bit pos="3">lt0_core_code_to_sp</bit>
-    <bit pos="4">lt1_spr_instr_stop</bit>
-    <bit pos="5">lt1_attn_complete</bit>
-    <bit pos="6">lt1_core_checkstop_recovery_handshake</bit>
-    <bit pos="7">lt1_core_code_to_sp</bit>
-    <bit pos="8">lt2_spr_instr_stop</bit>
-    <bit pos="9">lt2_attn_complete</bit>
-    <bit pos="10">lt2_core_checkstop_recovery_handshake</bit>
-    <bit pos="11">lt2_core_code_to_sp</bit>
-    <bit pos="12">lt3_spr_instr_stop</bit>
-    <bit pos="13">lt3_attn_complete</bit>
-    <bit pos="14">lt3_core_checkstop_recovery_handshake</bit>
-    <bit pos="15">lt3_core_code_to_sp</bit>
-</attn_node>
diff --git a/xml/p10/node_gfir_cs.xml b/xml/p10/node_gfir_cs.xml
deleted file mode 100644
index 5d76a48..0000000
--- a/xml/p10/node_gfir_cs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="GFIR_CS" reg_type="SCOM">
-    <register name="GFIR_CS">
-        <instance addr="0x570F001C" reg_inst="0"/>
-    </register>
-    <rule attn_type="CS" node_inst="0">
-        <expr type="reg" value1="GFIR_CS"/>
-    </rule>
-    <bit child_node="CFIR_TP_CS" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_CS" node_inst="0" pos="2">Attention from N0 chiplet</bit>
-    <bit child_node="CFIR_N1_CS" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_CS" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_CS" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="3" pos="35">Attention from EQ 3 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="4" pos="36">Attention from EQ 4 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="5" pos="37">Attention from EQ 5 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="6" pos="38">Attention from EQ 6 chiplet</bit>
-    <bit child_node="CFIR_EQ_CS" node_inst="7" pos="39">Attention from EQ 7 chiplet</bit>
-</attn_node>
diff --git a/xml/p10/node_gfir_ha.xml b/xml/p10/node_gfir_ha.xml
deleted file mode 100644
index 5497b65..0000000
--- a/xml/p10/node_gfir_ha.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="GFIR_HA" reg_type="SCOM">
-    <register name="GFIR_HA">
-        <instance addr="0x570F002B" reg_inst="0"/>
-    </register>
-    <rule attn_type="HA" node_inst="0">
-        <expr type="reg" value1="GFIR_HA"/>
-    </rule>
-    <bit child_node="CFIR_TP_HA" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_HA" node_inst="0" pos="2">Attention from N0 chiplet</bit>
-    <bit child_node="CFIR_N1_HA" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_HA" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_HA" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_HA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_HA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_HA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_HA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_HA" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_HA" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_HA" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_HA" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_HA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="3" pos="35">Attention from EQ 3 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="4" pos="36">Attention from EQ 4 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="5" pos="37">Attention from EQ 5 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="6" pos="38">Attention from EQ 6 chiplet</bit>
-    <bit child_node="CFIR_EQ_HA" node_inst="7" pos="39">Attention from EQ 7 chiplet</bit>
-</attn_node>
diff --git a/xml/p10/node_gfir_re.xml b/xml/p10/node_gfir_re.xml
deleted file mode 100644
index af76e13..0000000
--- a/xml/p10/node_gfir_re.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="GFIR_RE" reg_type="SCOM">
-    <register name="GFIR_RE">
-        <instance addr="0x570F001B" reg_inst="0"/>
-    </register>
-    <rule attn_type="RE" node_inst="0">
-        <expr type="reg" value1="GFIR_RE"/>
-    </rule>
-    <bit child_node="CFIR_TP_RE" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_RE" node_inst="0" pos="2">Attention from N0 chiplet</bit>
-    <bit child_node="CFIR_N1_RE" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_RE" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_RE" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_RE" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_RE" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_RE" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_RE" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_RE" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_RE" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_RE" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_RE" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_RE" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="3" pos="35">Attention from EQ 3 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="4" pos="36">Attention from EQ 4 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="5" pos="37">Attention from EQ 5 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="6" pos="38">Attention from EQ 6 chiplet</bit>
-    <bit child_node="CFIR_EQ_RE" node_inst="7" pos="39">Attention from EQ 7 chiplet</bit>
-</attn_node>
diff --git a/xml/p10/node_gfir_spa.xml b/xml/p10/node_gfir_spa.xml
deleted file mode 100644
index f178a86..0000000
--- a/xml/p10/node_gfir_spa.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="GFIR_SPA" reg_type="SCOM">
-    <register name="GFIR_SPA">
-        <instance addr="0x570F001A" reg_inst="0"/>
-    </register>
-    <rule attn_type="SPA" node_inst="0">
-        <expr type="reg" value1="GFIR_SPA"/>
-    </rule>
-    <bit child_node="CFIR_TP_SPA" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_SPA" node_inst="0" pos="2">Attention from N0 chiplet</bit>
-    <bit child_node="CFIR_N1_SPA" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_SPA" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_SPA" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_SPA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_SPA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_SPA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_SPA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_SPA" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_SPA" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_SPA" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_SPA" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_SPA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="3" pos="35">Attention from EQ 3 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="4" pos="36">Attention from EQ 4 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="5" pos="37">Attention from EQ 5 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="6" pos="38">Attention from EQ 6 chiplet</bit>
-    <bit child_node="CFIR_EQ_SPA" node_inst="7" pos="39">Attention from EQ 7 chiplet</bit>
-</attn_node>
diff --git a/xml/p10/node_gfir_ucs.xml b/xml/p10/node_gfir_ucs.xml
deleted file mode 100644
index ce1d04c..0000000
--- a/xml/p10/node_gfir_ucs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="GFIR_UCS" reg_type="SCOM">
-    <register name="GFIR_UCS">
-        <instance addr="0x570F002A" reg_inst="0"/>
-    </register>
-    <rule attn_type="UCS" node_inst="0">
-        <expr type="reg" value1="GFIR_UCS"/>
-    </rule>
-    <bit child_node="CFIR_TP_UCS" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_UCS" node_inst="0" pos="2">Attention from N0 chiplet</bit>
-    <bit child_node="CFIR_N1_UCS" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_UCS" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_UCS" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_UCS" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_UCS" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_UCS" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_UCS" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_UCS" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_UCS" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_UCS" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_UCS" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_UCS" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="3" pos="35">Attention from EQ 3 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="4" pos="36">Attention from EQ 4 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="5" pos="37">Attention from EQ 5 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="6" pos="38">Attention from EQ 6 chiplet</bit>
-    <bit child_node="CFIR_EQ_UCS" node_inst="7" pos="39">Attention from EQ 7 chiplet</bit>
-</attn_node>
diff --git a/xml/p10/node_hca_fir.xml b/xml/p10/node_hca_fir.xml
deleted file mode 100644
index 6d3653e..0000000
--- a/xml/p10/node_hca_fir.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="HCA_FIR" reg_type="SCOM">
-    <local_fir config="W" name="HCA_FIR">
-        <instance addr="0x03011D40" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="HCA_ERR_RPT_HOLD_REG">
-        <instance addr="0x03011D56" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="HCA_ERR_RPT_HOLD_REG" />
-    </capture_group>
-    <bit pos="0">Powerbus rcmd address parity error</bit>
-    <bit pos="1">Powerbus rcmd ttag parity error</bit>
-    <bit pos="2">Powerbus cresp ttag parity error</bit>
-    <bit pos="3">Powerbus cresp atag parity error</bit>
-    <bit pos="4">HCA updt received addr_err cresp</bit>
-    <bit pos="5">HCA updt received invalid cresp</bit>
-    <bit pos="6">HCA updt received unexpected cresp</bit>
-    <bit pos="7">HCA detected powerbus hang</bit>
-    <bit pos="8">HCA rcmd hits both BARs</bit>
-    <bit pos="9">HCA cache array correctable error</bit>
-    <bit pos="10">HCA cache array uncorrectable error</bit>
-    <bit pos="11">HCA rcmd drop counter overflow</bit>
-    <bit pos="12">HCA updt command drop counter overflow</bit>
-    <bit pos="13">HCA updt lost decay request. No pbi machine available.</bit>
-    <bit pos="14">ADU or PSI SMF error</bit>
-    <bit pos="15">Spare FIR bit</bit>
-    <bit pos="16">ADU recoverable error 0</bit>
-    <bit pos="17">ADU recoverable error 1</bit>
-    <bit pos="18">ADU recoverable error 2</bit>
-    <bit pos="19">ADU recoverable error 3</bit>
-    <bit pos="20">ADU recoverable error 4</bit>
-    <bit pos="21">ADU recoverable error 5</bit>
-    <bit pos="22">ADU checkstop error 0</bit>
-    <bit pos="23">ADU checkstop error 1</bit>
-    <bit pos="24">ADU checkstop error 2</bit>
-    <bit pos="25">ADU checkstop error 3</bit>
-    <bit pos="26">ADU checkstop error 4</bit>
-    <bit pos="27">ADU checkstop error 5</bit>
-</attn_node>
diff --git a/xml/p10/node_int_cq_fir.xml b/xml/p10/node_int_cq_fir.xml
deleted file mode 100644
index abba027..0000000
--- a/xml/p10/node_int_cq_fir.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="INT_CQ_FIR" reg_type="SCOM">
-    <local_fir config="W" name="INT_CQ_FIR">
-        <instance addr="0x02010830" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="INT_CQ_ERR_RPT_HOLD">
-        <instance addr="0x02010839" reg_inst="0"/>
-    </register>
-    <register name="INT_CQ_ERR_INFO1">
-        <instance addr="0x0201083B" reg_inst="0"/>
-    </register>
-    <register name="INT_CQ_ERR_INFO2">
-        <instance addr="0x0201083C" reg_inst="0"/>
-    </register>
-    <register name="INT_CQ_ERR_INFO3">
-        <instance addr="0x0201083D" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR0_WOF">
-        <instance addr="0x02010AC2" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR0_WOF_DETAIL">
-        <instance addr="0x02010AC3" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR0_FATAL">
-        <instance addr="0x02010AC4" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR0_RECOV">
-        <instance addr="0x02010AC5" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR0_INFO">
-        <instance addr="0x02010AC6" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR1_WOF">
-        <instance addr="0x02010ACA" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR1_WOF_DETAIL">
-        <instance addr="0x02010ACB" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR1_FATAL">
-        <instance addr="0x02010ACC" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR1_RECOV">
-        <instance addr="0x02010ACD" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_ERR1_INFO">
-        <instance addr="0x02010ACE" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_NXC_WOF_ERR">
-        <instance addr="0x02010AD2" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_NXC_WOF_ERR_DETAIL">
-        <instance addr="0x02010AD3" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_NXC_FATAL_ERR">
-        <instance addr="0x02010AD4" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_NXC_RECOV_ERR">
-        <instance addr="0x02010AD5" reg_inst="0"/>
-    </register>
-    <register name="INT_PC_NXC_INFO_ERR">
-        <instance addr="0x02010AD6" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_WOF_ERR_G0">
-        <instance addr="0x020109C2" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_WOF_ERR_G0_DETAIL">
-        <instance addr="0x020109C3" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_FATAL_ERR_G0">
-        <instance addr="0x020109C4" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_RECOV_ERR_G0">
-        <instance addr="0x020109C5" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_INFO_ERR_G0">
-        <instance addr="0x020109C6" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_WOF_ERR_G1">
-        <instance addr="0x020109CA" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_WOF_ERR_G1_DETAIL">
-        <instance addr="0x020109CB" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_FATAL_ERR_G1">
-        <instance addr="0x020109CC" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_RECOV_ERR_G1">
-        <instance addr="0x020109CD" reg_inst="0"/>
-    </register>
-    <register name="INT_VC_INFO_ERR_G1">
-        <instance addr="0x020109CE" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="INT_CQ_ERR_RPT_HOLD" />
-        <capture_register reg_inst="0" reg_name="INT_CQ_ERR_INFO1" />
-        <capture_register reg_inst="0" reg_name="INT_CQ_ERR_INFO2" />
-        <capture_register reg_inst="0" reg_name="INT_CQ_ERR_INFO3" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR0_WOF" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR0_WOF_DETAIL" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR0_FATAL" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR0_RECOV" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR0_INFO" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR1_WOF" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR1_WOF_DETAIL" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR1_FATAL" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR1_RECOV" />
-        <capture_register reg_inst="0" reg_name="INT_PC_ERR1_INFO" />
-        <capture_register reg_inst="0" reg_name="INT_PC_NXC_WOF_ERR" />
-        <capture_register reg_inst="0" reg_name="INT_PC_NXC_WOF_ERR_DETAIL" />
-        <capture_register reg_inst="0" reg_name="INT_PC_NXC_FATAL_ERR" />
-        <capture_register reg_inst="0" reg_name="INT_PC_NXC_RECOV_ERR" />
-        <capture_register reg_inst="0" reg_name="INT_PC_NXC_INFO_ERR" />
-        <capture_register reg_inst="0" reg_name="INT_VC_WOF_ERR_G0" />
-        <capture_register reg_inst="0" reg_name="INT_VC_WOF_ERR_G0_DETAIL" />
-        <capture_register reg_inst="0" reg_name="INT_VC_FATAL_ERR_G0" />
-        <capture_register reg_inst="0" reg_name="INT_VC_RECOV_ERR_G0" />
-        <capture_register reg_inst="0" reg_name="INT_VC_INFO_ERR_G0" />
-        <capture_register reg_inst="0" reg_name="INT_VC_WOF_ERR_G1" />
-        <capture_register reg_inst="0" reg_name="INT_VC_WOF_ERR_G1_DETAIL" />
-        <capture_register reg_inst="0" reg_name="INT_VC_FATAL_ERR_G1" />
-        <capture_register reg_inst="0" reg_name="INT_VC_RECOV_ERR_G1" />
-        <capture_register reg_inst="0" reg_name="INT_VC_INFO_ERR_G1" />
-    </capture_group>
-    <bit pos="0">CE while consuming data from the PowerBus Data ramp</bit>
-    <bit pos="1">UE while consuming data from the PowerBus Data ramp</bit>
-    <bit pos="2">SUE while consuming data from the PowerBus Data ramp</bit>
-    <bit pos="3">CE while reading the PowerBus Data In Array</bit>
-    <bit pos="4">UE detected while reading the PowerBus Data In Array</bit>
-    <bit pos="5">CE while reading the PowerBus Data Out Array</bit>
-    <bit pos="6">UE while reading the PowerBus Data Out Array</bit>
-    <bit pos="7">CE while consuming data on the AIB Data Bus</bit>
-    <bit pos="8">UE while consuming data on the AIB Data Bus</bit>
-    <bit pos="9">Received an unsolicited master Combined Response</bit>
-    <bit pos="10">Received unsolicited PowerBus data</bit>
-    <bit pos="11">Parity error detected on AIB credit signals from PC</bit>
-    <bit pos="12">Parity error detected on AIB credit available signals from PC</bit>
-    <bit pos="13">Parity error detected on AIB credit signals from VC</bit>
-    <bit pos="14">Parity error detected on AIB credit available signals from VC</bit>
-    <bit pos="15">Parity error detected on AIB Command Control</bit>
-    <bit pos="16">Parity error detected on AIB Command Bus</bit>
-    <bit pos="17">Parity error detected on AIB Data Control</bit>
-    <bit pos="18">Parity err detected in a PowerBus interface(Rcmdx, cRespx, Data rtag)</bit>
-    <bit pos="19">Slave CI Store or CI Load to an improper location</bit>
-    <bit pos="20">Slave CI Store or CI Load to an invalid Set Translation Table entry</bit>
-    <bit pos="21">Slave CI Store or CI Load error (targeting IC_BAR)</bit>
-    <bit pos="22">Slave CI Store or CI Load error (not targetting IC_BAR)</bit>
-    <bit pos="23">Migration Register Table (MRT) access - invalid entry selected</bit>
-    <bit pos="24">Migration Register Table (MRT) access - size error</bit>
-    <bit pos="25">SCOM satellite error</bit>
-    <bit pos="26">Topology ID Index Translation Table Entry Invalid</bit>
-    <bit pos="27">Master Write Queue has flagged a PowerBus operational hang</bit>
-    <bit pos="28">Master Read Queue has flagged a PowerBus operational hang</bit>
-    <bit pos="29">Master Interrupt Queue has flagged a PowerBus operational hang</bit>
-    <bit pos="30">Master Read Queue has flagged a PowerBus data hang</bit>
-    <bit pos="31">CI Store Queue has flagged a PowerBus data hang</bit>
-    <bit pos="32">CI Load Queue has flagged an AIB data hang</bit>
-    <bit pos="33">Bad cResp received during a Master Write command</bit>
-    <bit pos="34">Bad cResp received during a Master Read command</bit>
-    <bit pos="35">Bad cResp received during a Master Interrupt command</bit>
-    <bit pos="36">A Master Read machine received cResp of abort_trm or abort_trm_ed</bit>
-    <bit pos="37">Master Interrupt Protocol Error</bit>
-    <bit pos="38">Master Memory Op Targeted Secure Memory</bit>
-    <bit pos="39">AIB Fence Raised</bit>
-    <bit pos="40">Parity error detected on CQs configuration registers</bit>
-    <bit pos="41">reserved</bit>
-    <bit pos="42">Command Queue (FSM) severe error summary</bit>
-    <bit pos="43">PC fatal error summary, as indicated on pc_cq_fatal_error(0:3)</bit>
-    <bit pos="44">PC fatal error summary, as indicated on pc_cq_fatal_error(0:3)</bit>
-    <bit pos="45">PC fatal error summary, as indicated on pc_cq_fatal_error(0:3)</bit>
-    <bit pos="46">PC fatal error summary, as indicated on pc_cq_fatal_error(0:3)</bit>
-    <bit pos="47">PC recoverable error summary, as indicated on pc_cq_recov_error(0:3)</bit>
-    <bit pos="48">PC recoverable error summary, as indicated on pc_cq_recov_error(0:3)</bit>
-    <bit pos="49">PC recoverable error summary, as indicated on pc_cq_recov_error(0:3)</bit>
-    <bit pos="50">PC recoverable error summary, as indicated on pc_cq_recov_error(0:3)</bit>
-    <bit pos="51">PC informational error summary, as indicated on pc_cq_info_error(0:3)</bit>
-    <bit pos="52">PC informational error summary, as indicated on pc_cq_info_error(0:3)</bit>
-    <bit pos="53">PC informational error summary, as indicated on pc_cq_info_error(0:3)</bit>
-    <bit pos="54">PC informational error summary, as indicated on pc_cq_info_error(0:3)</bit>
-    <bit pos="55">VC fatal error summary, as indicated on vc_cq_fatal_error(0:2)</bit>
-    <bit pos="56">VC fatal error summary, as indicated on vc_cq_fatal_error(0:2)</bit>
-    <bit pos="57">VC fatal error summary, as indicated on vc_cq_fatal_error(0:2)</bit>
-    <bit pos="58">VC recoverable error summary, as indicated on vc_cq_recov_error(0:2)</bit>
-    <bit pos="59">VC recoverable error summary, as indicated on vc_cq_recov_error(0:2)</bit>
-    <bit pos="60">VC recoverable error summary, as indicated on vc_cq_recov_error(0:2)</bit>
-    <bit pos="61">VC informational error summary, as indicated on vc_cq_info_error(0:2)</bit>
-    <bit pos="62">VC informational error summary, as indicated on vc_cq_info_error(0:2)</bit>
-    <bit pos="63">VC informational error summary, as indicated on vc_cq_info_error(0:2)</bit>
-</attn_node>
diff --git a/xml/p10/node_iohs_dlp_fir_oc.xml b/xml/p10/node_iohs_dlp_fir_oc.xml
deleted file mode 100644
index 63e9782..0000000
--- a/xml/p10/node_iohs_dlp_fir_oc.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="IOHS_DLP_FIR_OC" reg_type="SCOM">
-    <local_fir config="W" name="IOHS_DLP_FIR">
-        <instance addr="0x18011000" reg_inst="0"/>
-        <instance addr="0x19011000" reg_inst="1"/>
-        <instance addr="0x1A011000" reg_inst="2"/>
-        <instance addr="0x1B011000" reg_inst="3"/>
-        <instance addr="0x1C011000" reg_inst="4"/>
-        <instance addr="0x1D011000" reg_inst="5"/>
-        <instance addr="0x1E011000" reg_inst="6"/>
-        <instance addr="0x1F011000" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <bit pos="0">unused</bit>
-    <bit pos="1">unused</bit>
-    <bit pos="2">unused</bit>
-    <bit pos="3">unused</bit>
-    <bit pos="4">unused</bit>
-    <bit pos="5">unused</bit>
-    <bit pos="6">link0 crc error</bit>
-    <bit pos="7">link1 crc error</bit>
-    <bit pos="8">link0 nak received</bit>
-    <bit pos="9">link1 nak received</bit>
-    <bit pos="10">unused</bit>
-    <bit pos="11">unused</bit>
-    <bit pos="12">unused</bit>
-    <bit pos="13">unused</bit>
-    <bit pos="14">unused</bit>
-    <bit pos="15">unused</bit>
-    <bit pos="16">unused</bit>
-    <bit pos="17">unused</bit>
-    <bit pos="18">unused</bit>
-    <bit pos="19">unused</bit>
-    <bit pos="20">link0 loss block align</bit>
-    <bit pos="21">link1 loss block align</bit>
-    <bit pos="22">link0 invalid block</bit>
-    <bit pos="23">link1 invalid block</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">link0 deskew overflow</bit>
-    <bit pos="27">link1 deskew overflow</bit>
-    <bit pos="28">link0 sw retrain</bit>
-    <bit pos="29">link1 sw retrain</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">link0 no forward progress</bit>
-    <bit pos="35">link1 no forward progress</bit>
-    <bit pos="36">link0 training set received</bit>
-    <bit pos="37">link1 training set received</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">link0 degraded mode</bit>
-    <bit pos="45">link1 degraded mode</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">link0 dlx error</bit>
-    <bit pos="49">link1 dlx error</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">link0 correctable array error</bit>
-    <bit pos="53">link1 correctable array error</bit>
-    <bit pos="54">link0 uncorrectable array error</bit>
-    <bit pos="55">link1 uncorrectable array error</bit>
-    <bit pos="56">link0 dlx clock frequency error</bit>
-    <bit pos="57">link1 dlx clock frequency error</bit>
-    <bit pos="58">link0 unrecoverable error</bit>
-    <bit pos="59">link1 unrecoverable error</bit>
-    <bit pos="60">link0 internal error</bit>
-    <bit pos="61">link1 internal error</bit>
-</attn_node>
diff --git a/xml/p10/node_iohs_dlp_fir_smp.xml b/xml/p10/node_iohs_dlp_fir_smp.xml
deleted file mode 100644
index c68d63d..0000000
--- a/xml/p10/node_iohs_dlp_fir_smp.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="IOHS_DLP_FIR_SMP" reg_type="SCOM">
-    <local_fir config="W" name="IOHS_DLP_FIR">
-        <instance addr="0x18011000" reg_inst="0"/>
-        <instance addr="0x19011000" reg_inst="1"/>
-        <instance addr="0x1A011000" reg_inst="2"/>
-        <instance addr="0x1B011000" reg_inst="3"/>
-        <instance addr="0x1C011000" reg_inst="4"/>
-        <instance addr="0x1D011000" reg_inst="5"/>
-        <instance addr="0x1E011000" reg_inst="6"/>
-        <instance addr="0x1F011000" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="IOHS_DLP_CONFIG">
-        <instance addr="0x1801100A" reg_inst="0"/>
-        <instance addr="0x1901100A" reg_inst="1"/>
-        <instance addr="0x1A01100A" reg_inst="2"/>
-        <instance addr="0x1B01100A" reg_inst="3"/>
-        <instance addr="0x1C01100A" reg_inst="4"/>
-        <instance addr="0x1D01100A" reg_inst="5"/>
-        <instance addr="0x1E01100A" reg_inst="6"/>
-        <instance addr="0x1F01100A" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_CONTROL">
-        <instance addr="0x1801100B" reg_inst="0"/>
-        <instance addr="0x1901100B" reg_inst="1"/>
-        <instance addr="0x1A01100B" reg_inst="2"/>
-        <instance addr="0x1B01100B" reg_inst="3"/>
-        <instance addr="0x1C01100B" reg_inst="4"/>
-        <instance addr="0x1D01100B" reg_inst="5"/>
-        <instance addr="0x1E01100B" reg_inst="6"/>
-        <instance addr="0x1F01100B" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_PHY_CONFIG">
-        <instance addr="0x1801100C" reg_inst="0"/>
-        <instance addr="0x1901100C" reg_inst="1"/>
-        <instance addr="0x1A01100C" reg_inst="2"/>
-        <instance addr="0x1B01100C" reg_inst="3"/>
-        <instance addr="0x1C01100C" reg_inst="4"/>
-        <instance addr="0x1D01100C" reg_inst="5"/>
-        <instance addr="0x1E01100C" reg_inst="6"/>
-        <instance addr="0x1F01100C" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_SEC_CONFIG">
-        <instance addr="0x1801100D" reg_inst="0"/>
-        <instance addr="0x1901100D" reg_inst="1"/>
-        <instance addr="0x1A01100D" reg_inst="2"/>
-        <instance addr="0x1B01100D" reg_inst="3"/>
-        <instance addr="0x1C01100D" reg_inst="4"/>
-        <instance addr="0x1D01100D" reg_inst="5"/>
-        <instance addr="0x1E01100D" reg_inst="6"/>
-        <instance addr="0x1F01100D" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_OPTICAL_CONFIG">
-        <instance addr="0x1801100F" reg_inst="0"/>
-        <instance addr="0x1901100F" reg_inst="1"/>
-        <instance addr="0x1A01100F" reg_inst="2"/>
-        <instance addr="0x1B01100F" reg_inst="3"/>
-        <instance addr="0x1C01100F" reg_inst="4"/>
-        <instance addr="0x1D01100F" reg_inst="5"/>
-        <instance addr="0x1E01100F" reg_inst="6"/>
-        <instance addr="0x1F01100F" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_TX_LANE_CONTROL">
-        <instance addr="0x18011010" reg_inst="0"/>
-        <instance addr="0x19011010" reg_inst="1"/>
-        <instance addr="0x1A011010" reg_inst="2"/>
-        <instance addr="0x1B011010" reg_inst="3"/>
-        <instance addr="0x1C011010" reg_inst="4"/>
-        <instance addr="0x1D011010" reg_inst="5"/>
-        <instance addr="0x1E011010" reg_inst="6"/>
-        <instance addr="0x1F011010" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_TX_LANE_CONTROL">
-        <instance addr="0x18011011" reg_inst="0"/>
-        <instance addr="0x19011011" reg_inst="1"/>
-        <instance addr="0x1A011011" reg_inst="2"/>
-        <instance addr="0x1B011011" reg_inst="3"/>
-        <instance addr="0x1C011011" reg_inst="4"/>
-        <instance addr="0x1D011011" reg_inst="5"/>
-        <instance addr="0x1E011011" reg_inst="6"/>
-        <instance addr="0x1F011011" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_RX_LANE_CONTROL">
-        <instance addr="0x18011012" reg_inst="0"/>
-        <instance addr="0x19011012" reg_inst="1"/>
-        <instance addr="0x1A011012" reg_inst="2"/>
-        <instance addr="0x1B011012" reg_inst="3"/>
-        <instance addr="0x1C011012" reg_inst="4"/>
-        <instance addr="0x1D011012" reg_inst="5"/>
-        <instance addr="0x1E011012" reg_inst="6"/>
-        <instance addr="0x1F011012" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_RX_LANE_CONTROL">
-        <instance addr="0x18011013" reg_inst="0"/>
-        <instance addr="0x19011013" reg_inst="1"/>
-        <instance addr="0x1A011013" reg_inst="2"/>
-        <instance addr="0x1B011013" reg_inst="3"/>
-        <instance addr="0x1C011013" reg_inst="4"/>
-        <instance addr="0x1D011013" reg_inst="5"/>
-        <instance addr="0x1E011013" reg_inst="6"/>
-        <instance addr="0x1F011013" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_INFO">
-        <instance addr="0x18011014" reg_inst="0"/>
-        <instance addr="0x19011014" reg_inst="1"/>
-        <instance addr="0x1A011014" reg_inst="2"/>
-        <instance addr="0x1B011014" reg_inst="3"/>
-        <instance addr="0x1C011014" reg_inst="4"/>
-        <instance addr="0x1D011014" reg_inst="5"/>
-        <instance addr="0x1E011014" reg_inst="6"/>
-        <instance addr="0x1F011014" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_INFO">
-        <instance addr="0x18011015" reg_inst="0"/>
-        <instance addr="0x19011015" reg_inst="1"/>
-        <instance addr="0x1A011015" reg_inst="2"/>
-        <instance addr="0x1B011015" reg_inst="3"/>
-        <instance addr="0x1C011015" reg_inst="4"/>
-        <instance addr="0x1D011015" reg_inst="5"/>
-        <instance addr="0x1E011015" reg_inst="6"/>
-        <instance addr="0x1F011015" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_ERROR_STATUS">
-        <instance addr="0x18011016" reg_inst="0"/>
-        <instance addr="0x19011016" reg_inst="1"/>
-        <instance addr="0x1A011016" reg_inst="2"/>
-        <instance addr="0x1B011016" reg_inst="3"/>
-        <instance addr="0x1C011016" reg_inst="4"/>
-        <instance addr="0x1D011016" reg_inst="5"/>
-        <instance addr="0x1E011016" reg_inst="6"/>
-        <instance addr="0x1F011016" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_ERROR_STATUS">
-        <instance addr="0x18011017" reg_inst="0"/>
-        <instance addr="0x19011017" reg_inst="1"/>
-        <instance addr="0x1A011017" reg_inst="2"/>
-        <instance addr="0x1B011017" reg_inst="3"/>
-        <instance addr="0x1C011017" reg_inst="4"/>
-        <instance addr="0x1D011017" reg_inst="5"/>
-        <instance addr="0x1E011017" reg_inst="6"/>
-        <instance addr="0x1F011017" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_REPLAY_THRESHOLD">
-        <instance addr="0x18011018" reg_inst="0"/>
-        <instance addr="0x19011018" reg_inst="1"/>
-        <instance addr="0x1A011018" reg_inst="2"/>
-        <instance addr="0x1B011018" reg_inst="3"/>
-        <instance addr="0x1C011018" reg_inst="4"/>
-        <instance addr="0x1D011018" reg_inst="5"/>
-        <instance addr="0x1E011018" reg_inst="6"/>
-        <instance addr="0x1F011018" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_SL_ECC_THRESHOLD">
-        <instance addr="0x18011019" reg_inst="0"/>
-        <instance addr="0x19011019" reg_inst="1"/>
-        <instance addr="0x1A011019" reg_inst="2"/>
-        <instance addr="0x1B011019" reg_inst="3"/>
-        <instance addr="0x1C011019" reg_inst="4"/>
-        <instance addr="0x1D011019" reg_inst="5"/>
-        <instance addr="0x1E011019" reg_inst="6"/>
-        <instance addr="0x1F011019" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_SYN_CAPTURE">
-        <instance addr="0x18011022" reg_inst="0"/>
-        <instance addr="0x19011022" reg_inst="1"/>
-        <instance addr="0x1A011022" reg_inst="2"/>
-        <instance addr="0x1B011022" reg_inst="3"/>
-        <instance addr="0x1C011022" reg_inst="4"/>
-        <instance addr="0x1D011022" reg_inst="5"/>
-        <instance addr="0x1E011022" reg_inst="6"/>
-        <instance addr="0x1F011022" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_SYN_CAPTURE">
-        <instance addr="0x18011023" reg_inst="0"/>
-        <instance addr="0x19011023" reg_inst="1"/>
-        <instance addr="0x1A011023" reg_inst="2"/>
-        <instance addr="0x1B011023" reg_inst="3"/>
-        <instance addr="0x1C011023" reg_inst="4"/>
-        <instance addr="0x1D011023" reg_inst="5"/>
-        <instance addr="0x1E011023" reg_inst="6"/>
-        <instance addr="0x1F011023" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_EDPL_STATUS">
-        <instance addr="0x18011024" reg_inst="0"/>
-        <instance addr="0x19011024" reg_inst="1"/>
-        <instance addr="0x1A011024" reg_inst="2"/>
-        <instance addr="0x1B011024" reg_inst="3"/>
-        <instance addr="0x1C011024" reg_inst="4"/>
-        <instance addr="0x1D011024" reg_inst="5"/>
-        <instance addr="0x1E011024" reg_inst="6"/>
-        <instance addr="0x1F011024" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_EDPL_STATUS">
-        <instance addr="0x18011025" reg_inst="0"/>
-        <instance addr="0x19011025" reg_inst="1"/>
-        <instance addr="0x1A011025" reg_inst="2"/>
-        <instance addr="0x1B011025" reg_inst="3"/>
-        <instance addr="0x1C011025" reg_inst="4"/>
-        <instance addr="0x1D011025" reg_inst="5"/>
-        <instance addr="0x1E011025" reg_inst="6"/>
-        <instance addr="0x1F011025" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK0_QUALITY">
-        <instance addr="0x18011026" reg_inst="0"/>
-        <instance addr="0x19011026" reg_inst="1"/>
-        <instance addr="0x1A011026" reg_inst="2"/>
-        <instance addr="0x1B011026" reg_inst="3"/>
-        <instance addr="0x1C011026" reg_inst="4"/>
-        <instance addr="0x1D011026" reg_inst="5"/>
-        <instance addr="0x1E011026" reg_inst="6"/>
-        <instance addr="0x1F011026" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_LINK1_QUALITY">
-        <instance addr="0x18011027" reg_inst="0"/>
-        <instance addr="0x19011027" reg_inst="1"/>
-        <instance addr="0x1A011027" reg_inst="2"/>
-        <instance addr="0x1B011027" reg_inst="3"/>
-        <instance addr="0x1C011027" reg_inst="4"/>
-        <instance addr="0x1D011027" reg_inst="5"/>
-        <instance addr="0x1E011027" reg_inst="6"/>
-        <instance addr="0x1F011027" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_DLL_STATUS">
-        <instance addr="0x18011028" reg_inst="0"/>
-        <instance addr="0x19011028" reg_inst="1"/>
-        <instance addr="0x1A011028" reg_inst="2"/>
-        <instance addr="0x1B011028" reg_inst="3"/>
-        <instance addr="0x1C011028" reg_inst="4"/>
-        <instance addr="0x1D011028" reg_inst="5"/>
-        <instance addr="0x1E011028" reg_inst="6"/>
-        <instance addr="0x1F011028" reg_inst="7"/>
-    </register>
-    <register name="IOHS_DLP_MISC_ERROR_STATUS">
-        <instance addr="0x18011029" reg_inst="0"/>
-        <instance addr="0x19011029" reg_inst="1"/>
-        <instance addr="0x1A011029" reg_inst="2"/>
-        <instance addr="0x1B011029" reg_inst="3"/>
-        <instance addr="0x1C011029" reg_inst="4"/>
-        <instance addr="0x1D011029" reg_inst="5"/>
-        <instance addr="0x1E011029" reg_inst="6"/>
-        <instance addr="0x1F011029" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_CONFIG" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_CONTROL" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_PHY_CONFIG" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_SEC_CONFIG" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_OPTICAL_CONFIG" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_TX_LANE_CONTROL" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_TX_LANE_CONTROL" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_RX_LANE_CONTROL" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_RX_LANE_CONTROL" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_INFO" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_INFO" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_ERROR_STATUS" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_ERROR_STATUS" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_REPLAY_THRESHOLD" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_SL_ECC_THRESHOLD" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_SYN_CAPTURE" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_SYN_CAPTURE" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_EDPL_STATUS" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_EDPL_STATUS" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK0_QUALITY" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_LINK1_QUALITY" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_DLL_STATUS" />
-        <capture_register reg_inst="0:7" reg_name="IOHS_DLP_MISC_ERROR_STATUS" />
-    </capture_group>
-    <bit pos="0">link0 trained</bit>
-    <bit pos="1">link1 trained</bit>
-    <bit pos="2">link0 op irq</bit>
-    <bit pos="3">link1 op irq</bit>
-    <bit pos="4">link0 replay threshold</bit>
-    <bit pos="5">link1 replay threshold</bit>
-    <bit pos="6">link0 crc error</bit>
-    <bit pos="7">link1 crc error</bit>
-    <bit pos="8">link0 nak received</bit>
-    <bit pos="9">link1 nak received</bit>
-    <bit pos="10">link0 replay buffer full</bit>
-    <bit pos="11">link1 replay buffer full</bit>
-    <bit pos="12">link0 sl ecc threshold</bit>
-    <bit pos="13">link1 sl ecc threshold</bit>
-    <bit pos="14">link0 sl ecc correctable</bit>
-    <bit pos="15">link1 sl ecc correctable</bit>
-    <bit pos="16">link0 sl ecc ue</bit>
-    <bit pos="17">link1 sl ecc ue</bit>
-    <bit pos="18">link0 retrain threshold</bit>
-    <bit pos="19">link1 retrain threshold</bit>
-    <bit pos="20">link0 loss block align</bit>
-    <bit pos="21">link1 loss block align</bit>
-    <bit pos="22">link0 invalid block</bit>
-    <bit pos="23">link1 invalid block</bit>
-    <bit pos="24">link0 deskew error</bit>
-    <bit pos="25">link1 deskew error</bit>
-    <bit pos="26">link0 deskew overflow</bit>
-    <bit pos="27">link1 deskew overflow</bit>
-    <bit pos="28">link0 sw retrain</bit>
-    <bit pos="29">link1 sw retrain</bit>
-    <bit pos="30">link0 ack queue overflow</bit>
-    <bit pos="31">link1 ack queue overflow</bit>
-    <bit pos="32">link0 ack queue underflow</bit>
-    <bit pos="33">link1 ack queue underflow</bit>
-    <bit pos="34">link0 num replay</bit>
-    <bit pos="35">link1 num replay</bit>
-    <bit pos="36">link0 training set received</bit>
-    <bit pos="37">link1 training set received</bit>
-    <bit pos="38">link0 prbs select error</bit>
-    <bit pos="39">link1 prbs select error</bit>
-    <bit pos="40">link0 tcomplete bad</bit>
-    <bit pos="41">link1 tcomplete bad</bit>
-    <bit pos="42">link0 no spare lane available</bit>
-    <bit pos="43">link1 no spare lane available</bit>
-    <bit pos="44">link0 spare done</bit>
-    <bit pos="45">link1 spare done</bit>
-    <bit pos="46">link0 too many crc errors</bit>
-    <bit pos="47">link1 too many crc errors</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">link0 osc switch</bit>
-    <bit pos="51">link1 osc switch</bit>
-    <bit pos="52">link0 correctable array error</bit>
-    <bit pos="53">link1 correctable array error</bit>
-    <bit pos="54">link0 uncorrectable array error</bit>
-    <bit pos="55">link1 uncorrectable array error</bit>
-    <bit pos="56">link0 training failed</bit>
-    <bit pos="57">link1 training failed</bit>
-    <bit pos="58">link0 unrecoverable error</bit>
-    <bit pos="59">link1 unrecoverable error</bit>
-    <bit pos="60">link0 internal error</bit>
-    <bit pos="61">link1 internal error</bit>
-</attn_node>
diff --git a/xml/p10/node_iohs_dlp_phy_config.xml b/xml/p10/node_iohs_dlp_phy_config.xml
deleted file mode 100644
index 54b35e2..0000000
--- a/xml/p10/node_iohs_dlp_phy_config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="IOHS_DLP_PHY_CONFIG" reg_type="SCOM">
-    <register name="IOHS_DLP_PHY_CONFIG">
-        <instance addr="0x1801100C" reg_inst="0"/>
-        <instance addr="0x1901100C" reg_inst="1"/>
-        <instance addr="0x1A01100C" reg_inst="2"/>
-        <instance addr="0x1B01100C" reg_inst="3"/>
-        <instance addr="0x1C01100C" reg_inst="4"/>
-        <instance addr="0x1D01100C" reg_inst="5"/>
-        <instance addr="0x1E01100C" reg_inst="6"/>
-        <instance addr="0x1F01100C" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="IOHS_DLP_PHY_CONFIG"/>
-            <expr type="int" value1="0x0000000000000003"/>
-        </expr>
-    </rule>
-    <rule attn_type="RE" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="IOHS_DLP_PHY_CONFIG"/>
-            <expr type="int" value1="0x0000000000000003"/>
-        </expr>
-    </rule>
-    <rule attn_type="SPA" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="IOHS_DLP_PHY_CONFIG"/>
-            <expr type="int" value1="0x0000000000000003"/>
-        </expr>
-    </rule>
-    <bit pos="62" child_node="IOHS_DLP_FIR_OC" node_inst="0:7">Attention from IOHS_DLP_FIR in OpenCAPI mode</bit>
-    <bit pos="63" child_node="IOHS_DLP_FIR_SMP" node_inst="0:7">Attention from IOHS_DLP_FIR in SMP mode</bit>
-</attn_node>
diff --git a/xml/p10/node_iohs_local_fir.xml b/xml/p10/node_iohs_local_fir.xml
deleted file mode 100644
index 62f8000..0000000
--- a/xml/p10/node_iohs_local_fir.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="IOHS_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="IOHS_LOCAL_FIR">
-        <instance addr="0x18040100" reg_inst="0"/>
-        <instance addr="0x19040100" reg_inst="1"/>
-        <instance addr="0x1A040100" reg_inst="2"/>
-        <instance addr="0x1B040100" reg_inst="3"/>
-        <instance addr="0x1C040100" reg_inst="4"/>
-        <instance addr="0x1D040100" reg_inst="5"/>
-        <instance addr="0x1E040100" reg_inst="6"/>
-        <instance addr="0x1F040100" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - interal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_lpc_fir.xml b/xml/p10/node_lpc_fir.xml
deleted file mode 100644
index 0ef11a7..0000000
--- a/xml/p10/node_lpc_fir.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="LPC_FIR" reg_type="SCOM">
-    <local_fir config="W" name="LPC_FIR">
-        <instance addr="0x03012000" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <bit pos="0">OPB_Master_LS_received_a_transfer_size_value_unequal_to_1-_or_2-_or_4-Byte</bit>
-    <bit pos="1">OPB_Master_LS_received_a_invalid_command_no_ci_store_and_no_ci_load</bit>
-    <bit pos="2">OPB_Master_LS_received_a_address_which_was_not_aligned_to_the_received_transfer_size</bit>
-    <bit pos="3">OPB_Master_LS_detected_OPB_ErrAck_which_was_activated_by_the_accessed_OPB_slave</bit>
-    <bit pos="4">the_OPB_arbiter_activated_the_OPB_Timeout_signal_Typical_reason_is_that_the_OPB_access_did_not_hit_any_available_OPB_slave</bit>
-    <bit pos="5">the_OPB_Master_LS_was_not_able_to_end_the_requested_OPB_access_within_the_OPB_Master_LS_hang_timeout_time</bit>
-    <bit pos="6">a parity_error_was_detected_in_the_OPB_Master_LS_command_buffer</bit>
-    <bit pos="7">a parity_error_was_detected_in_the_OPB_Master_LS_data_buffer</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_dstl_fir.xml b/xml/p10/node_mc_dstl_fir.xml
deleted file mode 100644
index 2b04af8..0000000
--- a/xml/p10/node_mc_dstl_fir.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="MC_DSTL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_DSTL_FIR">
-        <instance addr="0x0C010D00" reg_inst="0"/>
-        <instance addr="0x0C010D40" reg_inst="1"/>
-        <instance addr="0x0D010D00" reg_inst="2"/>
-        <instance addr="0x0D010D40" reg_inst="3"/>
-        <instance addr="0x0E010D00" reg_inst="4"/>
-        <instance addr="0x0E010D40" reg_inst="5"/>
-        <instance addr="0x0F010D00" reg_inst="6"/>
-        <instance addr="0x0F010D40" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_DSTL_ERR_RPT">
-        <instance addr="0x0C010D0C" reg_inst="0"/>
-        <instance addr="0x0C010D4C" reg_inst="1"/>
-        <instance addr="0x0D010D0C" reg_inst="2"/>
-        <instance addr="0x0D010D4C" reg_inst="3"/>
-        <instance addr="0x0E010D0C" reg_inst="4"/>
-        <instance addr="0x0E010D4C" reg_inst="5"/>
-        <instance addr="0x0F010D0C" reg_inst="6"/>
-        <instance addr="0x0F010D4C" reg_inst="7"/>
-    </register>
-    <register name="MC_DSTL_CFG2">
-        <instance addr="0x0C010D0E" reg_inst="0"/>
-        <instance addr="0x0C010D4E" reg_inst="1"/>
-        <instance addr="0x0D010D0E" reg_inst="2"/>
-        <instance addr="0x0D010D4E" reg_inst="3"/>
-        <instance addr="0x0E010D0E" reg_inst="4"/>
-        <instance addr="0x0E010D4E" reg_inst="5"/>
-        <instance addr="0x0F010D0E" reg_inst="6"/>
-        <instance addr="0x0F010D4E" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="MC_DSTL_ERR_RPT" />
-        <capture_register reg_inst="0:7" reg_name="MC_DSTL_CFG2" />
-    </capture_group>
-    <bit pos="0">Subchannel A AFU initiated Checkstop</bit>
-    <bit pos="1">Subchannel A AFU initiated Recoverable Attention</bit>
-    <bit pos="2">Subchannel A AFU initiated Special Attention</bit>
-    <bit pos="3">Subchannel A AFU initiated Application Interrupt Attention</bit>
-    <bit pos="4">Subchannel B AFU initiated Checkstop</bit>
-    <bit pos="5">Subchannel B AFU initiated Recoverable Attention</bit>
-    <bit pos="6">Subchannel B AFU initiated Special Attention</bit>
-    <bit pos="7">Subchannel B AFU initiated Application Interrupt Attention</bit>
-    <bit pos="8">Error on parity bits protecting incoming command from MCS to DSTL</bit>
-    <bit pos="9">A credit reset was attempted while rd and wdf buffers in use</bit>
-    <bit pos="10">Config reg recoverable parity error</bit>
-    <bit pos="11">Config reg fatal parity error</bit>
-    <bit pos="12">Subchannel A counter error</bit>
-    <bit pos="13">Subchannel B counter error</bit>
-    <bit pos="14">Subchannel A valid cmd timeout error</bit>
-    <bit pos="15">Subchannel B valid cmd timeout error</bit>
-    <bit pos="16">Subchannel A buffer overuse error</bit>
-    <bit pos="17">Subchannel B buffer overuse error</bit>
-    <bit pos="18">Subchannel A DL link down</bit>
-    <bit pos="19">Subchannel B DL link down</bit>
-    <bit pos="20">Subchannel A has entered the fail state</bit>
-    <bit pos="21">Subchannel B has entered the fail state</bit>
-    <bit pos="22">Subchannel A Channel timeout</bit>
-    <bit pos="23">Subchannel B Channel timeout</bit>
-    <bit pos="24">decrypt err: scom reg has parity error</bit>
-    <bit pos="25">decrypt err: attempt to write or access key when locked</bit>
-    <bit pos="26">decrypt err: address pipe parity error</bit>
-    <bit pos="27">decrypt err: CL to decrypt parity error on valid tag</bit>
-    <bit pos="28">decrypt err: parity error on USTL decrypt DMX interface</bit>
-    <bit pos="29">encrypt err: scom reg has parity error</bit>
-    <bit pos="30">encrypt err: attempt to write or access key when locked</bit>
-    <bit pos="31">encrypt err: parity error on address encryption rounds</bit>
-    <bit pos="32">encrypt err: parity error on data encryption rounds</bit>
-    <bit pos="33">Subchannel A AFU Application Interrupt Attention while another in process</bit>
-    <bit pos="34">Subchannel B AFU Application Interrupt Attention while another in process</bit>
-    <bit pos="35">A parity error local to Subchhanel A occurred</bit>
-    <bit pos="36">A parity error local to Subchhanel B occurred</bit>
-    <bit pos="37">reserved</bit>
-    <bit pos="38">reserved</bit>
-    <bit pos="39">Subchannel A has significant traffic flow</bit>
-    <bit pos="40">Subchannel B has significant traffic flow</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_dstl_fir_p10_10.xml b/xml/p10/node_mc_dstl_fir_p10_10.xml
deleted file mode 100644
index f3b373f..0000000
--- a/xml/p10/node_mc_dstl_fir_p10_10.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="MC_DSTL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_DSTL_FIR">
-        <instance addr="0x0C010D00" reg_inst="0"/>
-        <instance addr="0x0C010D40" reg_inst="1"/>
-        <instance addr="0x0D010D00" reg_inst="2"/>
-        <instance addr="0x0D010D40" reg_inst="3"/>
-        <instance addr="0x0E010D00" reg_inst="4"/>
-        <instance addr="0x0E010D40" reg_inst="5"/>
-        <instance addr="0x0F010D00" reg_inst="6"/>
-        <instance addr="0x0F010D40" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_DSTL_ERR_RPT">
-        <instance addr="0x0C010D0C" reg_inst="0"/>
-        <instance addr="0x0C010D4C" reg_inst="1"/>
-        <instance addr="0x0D010D0C" reg_inst="2"/>
-        <instance addr="0x0D010D4C" reg_inst="3"/>
-        <instance addr="0x0E010D0C" reg_inst="4"/>
-        <instance addr="0x0E010D4C" reg_inst="5"/>
-        <instance addr="0x0F010D0C" reg_inst="6"/>
-        <instance addr="0x0F010D4C" reg_inst="7"/>
-    </register>
-    <register name="MC_DSTL_CFG2">
-        <instance addr="0x0C010D0E" reg_inst="0"/>
-        <instance addr="0x0C010D4E" reg_inst="1"/>
-        <instance addr="0x0D010D0E" reg_inst="2"/>
-        <instance addr="0x0D010D4E" reg_inst="3"/>
-        <instance addr="0x0E010D0E" reg_inst="4"/>
-        <instance addr="0x0E010D4E" reg_inst="5"/>
-        <instance addr="0x0F010D0E" reg_inst="6"/>
-        <instance addr="0x0F010D4E" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="MC_DSTL_ERR_RPT" />
-        <capture_register reg_inst="0:7" reg_name="MC_DSTL_CFG2" />
-    </capture_group>
-    <bit pos="0">Subchannel A AFU initiated Checkstop</bit>
-    <bit pos="1">Subchannel A AFU initiated Recoverable Attention</bit>
-    <bit pos="2">Subchannel A AFU initiated Special Attention</bit>
-    <bit pos="3">Subchannel A AFU initiated Application Interrupt Attention</bit>
-    <bit pos="4">Subchannel B AFU initiated Checkstop</bit>
-    <bit pos="5">Subchannel B AFU initiated Recoverable Attention</bit>
-    <bit pos="6">Subchannel B AFU initiated Special Attention</bit>
-    <bit pos="7">Subchannel B AFU initiated Application Interrupt Attention</bit>
-    <bit pos="8">Error on parity bits protecting incoming command from MCS to DSTL</bit>
-    <bit pos="9">A credit reset was attempted while rd and wdf buffers in use</bit>
-    <bit pos="10">Config reg recoverable parity error</bit>
-    <bit pos="11">Config reg fatal parity error</bit>
-    <bit pos="12">Subchannel A counter error</bit>
-    <bit pos="13">Subchannel B counter error</bit>
-    <bit pos="14">Subchannel A valid cmd timeout error</bit>
-    <bit pos="15">Subchannel B valid cmd timeout error</bit>
-    <bit pos="16">Subchannel A buffer overuse error</bit>
-    <bit pos="17">Subchannel B buffer overuse error</bit>
-    <bit pos="18">Subchannel A DL link down</bit>
-    <bit pos="19">Subchannel B DL link down</bit>
-    <bit pos="20">Subchannel A has entered the fail state</bit>
-    <bit pos="21">Subchannel B has entered the fail state</bit>
-    <bit pos="22">Subchannel A Channel timeout</bit>
-    <bit pos="23">Subchannel B Channel timeout</bit>
-    <bit pos="24">decrypt err: scom reg has parity error</bit>
-    <bit pos="25">decrypt err: attempt to write or access key when locked</bit>
-    <bit pos="26">decrypt err: address pipe parity error</bit>
-    <bit pos="27">decrypt err: CL to decrypt parity error on valid tag</bit>
-    <bit pos="28">decrypt err: parity error on USTL decrypt DMX interface</bit>
-    <bit pos="29">encrypt err: scom reg has parity error</bit>
-    <bit pos="30">encrypt err: attempt to write or access key when locked</bit>
-    <bit pos="31">encrypt err: parity error on address encryption rounds</bit>
-    <bit pos="32">encrypt err: parity error on data encryption rounds</bit>
-    <bit pos="33">Subchannel A AFU Application Interrupt Attention while another in process</bit>
-    <bit pos="34">Subchannel B AFU Application Interrupt Attention while another in process</bit>
-    <bit pos="35">A parity error local to Subchhanel A occurred</bit>
-    <bit pos="36">A parity error local to Subchhanel B occurred</bit>
-    <bit pos="37">reserved</bit>
-    <bit pos="38">reserved</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_fir.xml b/xml/p10/node_mc_fir.xml
deleted file mode 100644
index 9dc209d..0000000
--- a/xml/p10/node_mc_fir.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="MC_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_FIR">
-        <instance addr="0x0C010C00" reg_inst="0"/>
-        <instance addr="0x0D010C00" reg_inst="1"/>
-        <instance addr="0x0E010C00" reg_inst="2"/>
-        <instance addr="0x0F010C00" reg_inst="3"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_ERR_RPT0">
-        <instance addr="0x0C010C1E" reg_inst="0"/>
-        <instance addr="0x0D010C1E" reg_inst="1"/>
-        <instance addr="0x0E010C1E" reg_inst="2"/>
-        <instance addr="0x0F010C1E" reg_inst="3"/>
-    </register>
-    <register name="MC_ERR_RPT1">
-        <instance addr="0x0C010C1F" reg_inst="0"/>
-        <instance addr="0x0D010C1F" reg_inst="1"/>
-        <instance addr="0x0E010C1F" reg_inst="2"/>
-        <instance addr="0x0F010C1F" reg_inst="3"/>
-    </register>
-    <register name="MC_ERR_RPT2">
-        <instance addr="0x0C010C1A" reg_inst="0"/>
-        <instance addr="0x0D010C1A" reg_inst="1"/>
-        <instance addr="0x0E010C1A" reg_inst="2"/>
-        <instance addr="0x0F010C1A" reg_inst="3"/>
-    </register>
-    <capture_group node_inst="0:3">
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT0" />
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT1" />
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT2" />
-    </capture_group>
-    <bit pos="0">MC internal recoverable error</bit>
-    <bit pos="1">MC internal non-recoverable error</bit>
-    <bit pos="2">MC powerbus protocol error</bit>
-    <bit pos="3">MC inband bar with incorrect ttype</bit>
-    <bit pos="4">MC multiple BAR hit</bit>
-    <bit pos="5">Command list early hang trigger activated</bit>
-    <bit pos="6">reserved</bit>
-    <bit pos="7">reserved</bit>
-    <bit pos="8">Command list state machine timeout</bit>
-    <bit pos="9">reserved</bit>
-    <bit pos="10">reserved</bit>
-    <bit pos="11">WAT0 event occurred</bit>
-    <bit pos="12">WAT1 event occurred</bit>
-    <bit pos="13">WAT2 event occurred</bit>
-    <bit pos="14">WAT3 event occurred</bit>
-    <bit pos="15">Plus One Prefetch generated command did not hit any BARs</bit>
-    <bit pos="16">Plus One Prefetch generated command hit config or mmio BAR</bit>
-    <bit pos="17">Parity Error in WAT/Debug config register</bit>
-    <bit pos="18">PBI received overcommit signal from READ0</bit>
-    <bit pos="19">PBI received ocercommit signal from READ1</bit>
-    <bit pos="20">Incoming Powerbus Command hit multiple valid configured topology IDs</bit>
-    <bit pos="21">reserved</bit>
-    <bit pos="22">Secure mem facility access privilege error by originating thread</bit>
-    <bit pos="23">Multiple sync cmds received by an MC, or while one is pending</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_fir_p10_10.xml b/xml/p10/node_mc_fir_p10_10.xml
deleted file mode 100644
index e53b851..0000000
--- a/xml/p10/node_mc_fir_p10_10.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="MC_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_FIR">
-        <instance addr="0x0C010C00" reg_inst="0"/>
-        <instance addr="0x0D010C00" reg_inst="1"/>
-        <instance addr="0x0E010C00" reg_inst="2"/>
-        <instance addr="0x0F010C00" reg_inst="3"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_ERR_RPT0">
-        <instance addr="0x0C010C1E" reg_inst="0"/>
-        <instance addr="0x0D010C1E" reg_inst="1"/>
-        <instance addr="0x0E010C1E" reg_inst="2"/>
-        <instance addr="0x0F010C1E" reg_inst="3"/>
-    </register>
-    <register name="MC_ERR_RPT1">
-        <instance addr="0x0C010C1F" reg_inst="0"/>
-        <instance addr="0x0D010C1F" reg_inst="1"/>
-        <instance addr="0x0E010C1F" reg_inst="2"/>
-        <instance addr="0x0F010C1F" reg_inst="3"/>
-    </register>
-    <register name="MC_ERR_RPT2">
-        <instance addr="0x0C010C1A" reg_inst="0"/>
-        <instance addr="0x0D010C1A" reg_inst="1"/>
-        <instance addr="0x0E010C1A" reg_inst="2"/>
-        <instance addr="0x0F010C1A" reg_inst="3"/>
-    </register>
-    <capture_group node_inst="0:3">
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT0" />
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT1" />
-        <capture_register reg_inst="0:3" reg_name="MC_ERR_RPT2" />
-    </capture_group>
-    <bit pos="0">MC internal recoverable error</bit>
-    <bit pos="1">MC internal non-recoverable error</bit>
-    <bit pos="2">MC powerbus protocol error</bit>
-    <bit pos="3">MC inband bar with incorrect ttype</bit>
-    <bit pos="4">MC multiple BAR hit</bit>
-    <bit pos="5">Non-zero ECC syndrome for PowerBus write data</bit>
-    <bit pos="6">reserved</bit>
-    <bit pos="7">reserved</bit>
-    <bit pos="8">Command list state machine timeout</bit>
-    <bit pos="9">reserved</bit>
-    <bit pos="10">reserved</bit>
-    <bit pos="11">WAT0 event occurred</bit>
-    <bit pos="12">WAT1 event occurred</bit>
-    <bit pos="13">WAT2 event occurred</bit>
-    <bit pos="14">WAT3 event occurred</bit>
-    <bit pos="15">Plus One Prefetch generated command did not hit any BARs</bit>
-    <bit pos="16">Plus One Prefetch generated command hit config or mmio BAR</bit>
-    <bit pos="17">Parity Error in WAT/Debug config register</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Incoming Powerbus Command hit multiple valid configured topology IDs</bit>
-    <bit pos="21">reserved</bit>
-    <bit pos="22">Secure mem facility access privilege error by originating thread</bit>
-    <bit pos="23">Multiple sync cmds received by an MC, or while one is pending</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_local_fir.xml b/xml/p10/node_mc_local_fir.xml
deleted file mode 100644
index af2c27d..0000000
--- a/xml/p10/node_mc_local_fir.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MC_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_LOCAL_FIR">
-        <instance addr="0x0C040100" reg_inst="0"/>
-        <instance addr="0x0D040100" reg_inst="1"/>
-        <instance addr="0x0E040100" reg_inst="2"/>
-        <instance addr="0x0F040100" reg_inst="3"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_misc_fir.xml b/xml/p10/node_mc_misc_fir.xml
deleted file mode 100644
index 90732ce..0000000
--- a/xml/p10/node_mc_misc_fir.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MC_MISC_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_MISC_FIR">
-        <instance addr="0x0C010F00" reg_inst="0"/>
-        <instance addr="0x0D010F00" reg_inst="1"/>
-        <instance addr="0x0E010F00" reg_inst="2"/>
-        <instance addr="0x0F010F00" reg_inst="3"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_MISC_ERR_RPT">
-        <instance addr="0x0C010FE7" reg_inst="0"/>
-        <instance addr="0x0D010FE7" reg_inst="1"/>
-        <instance addr="0x0E010FE7" reg_inst="2"/>
-        <instance addr="0x0F010FE7" reg_inst="3"/>
-    </register>
-    <capture_group node_inst="0:3">
-        <capture_register reg_inst="0:3" reg_name="MC_MISC_ERR_RPT" />
-    </capture_group>
-    <bit pos="0">WAT Debug Bus Attention</bit>
-    <bit pos="1">SCOM DBGSRC Register parity Error</bit>
-    <bit pos="2">SCOM Recoverable Register Parity Error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">Application interrupt received from OCMB on channel 0, subchannel A</bit>
-    <bit pos="5">Application interrupt received from OCMB on channel 0, subchannel B</bit>
-    <bit pos="6">Application interrupt received from OCMB on channel 1, subchannel A</bit>
-    <bit pos="7">Application interrupt received from OCMB on channel 1, subchannel B</bit>
-    <bit pos="8">Parity Error taken on MCEBUSEN[0,1,2,3] regs</bit>
-    <bit pos="9">Parity Error taken on WAT* Regs</bit>
-    <bit pos="10">Reserved</bit>
-    <bit pos="11">Reserved</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_omi_dl.xml b/xml/p10/node_mc_omi_dl.xml
deleted file mode 100644
index 0ff22ae..0000000
--- a/xml/p10/node_mc_omi_dl.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MC_OMI_DL" reg_type="SCOM">
-
-    <register name="MC_OMI_DL_CONFIG0">
-        <instance reg_inst= "0" addr="0x0C011410" />
-        <instance reg_inst= "1" addr="0x0C011420" />
-        <instance reg_inst= "2" addr="0x0C011810" />
-        <instance reg_inst= "3" addr="0x0C011820" />
-        <instance reg_inst= "4" addr="0x0D011410" />
-        <instance reg_inst= "5" addr="0x0D011420" />
-        <instance reg_inst= "6" addr="0x0D011810" />
-        <instance reg_inst= "7" addr="0x0D011820" />
-        <instance reg_inst= "8" addr="0x0E011410" />
-        <instance reg_inst= "9" addr="0x0E011420" />
-        <instance reg_inst="10" addr="0x0E011810" />
-        <instance reg_inst="11" addr="0x0E011820" />
-        <instance reg_inst="12" addr="0x0F011410" />
-        <instance reg_inst="13" addr="0x0F011420" />
-        <instance reg_inst="14" addr="0x0F011810" />
-        <instance reg_inst="15" addr="0x0F011820" />
-    </register>
-
-    <register name="MC_OMI_DL_CONFIG1">
-        <instance reg_inst= "0" addr="0x0C011411" />
-        <instance reg_inst= "1" addr="0x0C011421" />
-        <instance reg_inst= "2" addr="0x0C011811" />
-        <instance reg_inst= "3" addr="0x0C011821" />
-        <instance reg_inst= "4" addr="0x0D011411" />
-        <instance reg_inst= "5" addr="0x0D011421" />
-        <instance reg_inst= "6" addr="0x0D011811" />
-        <instance reg_inst= "7" addr="0x0D011821" />
-        <instance reg_inst= "8" addr="0x0E011411" />
-        <instance reg_inst= "9" addr="0x0E011421" />
-        <instance reg_inst="10" addr="0x0E011811" />
-        <instance reg_inst="11" addr="0x0E011821" />
-        <instance reg_inst="12" addr="0x0F011411" />
-        <instance reg_inst="13" addr="0x0F011421" />
-        <instance reg_inst="14" addr="0x0F011811" />
-        <instance reg_inst="15" addr="0x0F011821" />
-    </register>
-
-    <register name="MC_OMI_DL_ERR_MASK">
-        <instance reg_inst= "0" addr="0x0C011412" />
-        <instance reg_inst= "1" addr="0x0C011422" />
-        <instance reg_inst= "2" addr="0x0C011812" />
-        <instance reg_inst= "3" addr="0x0C011822" />
-        <instance reg_inst= "4" addr="0x0D011412" />
-        <instance reg_inst= "5" addr="0x0D011422" />
-        <instance reg_inst= "6" addr="0x0D011812" />
-        <instance reg_inst= "7" addr="0x0D011822" />
-        <instance reg_inst= "8" addr="0x0E011412" />
-        <instance reg_inst= "9" addr="0x0E011422" />
-        <instance reg_inst="10" addr="0x0E011812" />
-        <instance reg_inst="11" addr="0x0E011822" />
-        <instance reg_inst="12" addr="0x0F011412" />
-        <instance reg_inst="13" addr="0x0F011422" />
-        <instance reg_inst="14" addr="0x0F011812" />
-        <instance reg_inst="15" addr="0x0F011822" />
-    </register>
-
-    <register name="MC_OMI_DL_ERR_RPT">
-        <instance reg_inst= "0" addr="0x0C011413" />
-        <instance reg_inst= "1" addr="0x0C011423" />
-        <instance reg_inst= "2" addr="0x0C011813" />
-        <instance reg_inst= "3" addr="0x0C011823" />
-        <instance reg_inst= "4" addr="0x0D011413" />
-        <instance reg_inst= "5" addr="0x0D011423" />
-        <instance reg_inst= "6" addr="0x0D011813" />
-        <instance reg_inst= "7" addr="0x0D011823" />
-        <instance reg_inst= "8" addr="0x0E011413" />
-        <instance reg_inst= "9" addr="0x0E011423" />
-        <instance reg_inst="10" addr="0x0E011813" />
-        <instance reg_inst="11" addr="0x0E011823" />
-        <instance reg_inst="12" addr="0x0F011413" />
-        <instance reg_inst="13" addr="0x0F011423" />
-        <instance reg_inst="14" addr="0x0F011813" />
-        <instance reg_inst="15" addr="0x0F011823" />
-    </register>
-
-    <register name="MC_OMI_DL_ERR_CAPTURE">
-        <instance reg_inst= "0" addr="0x0C011414" />
-        <instance reg_inst= "1" addr="0x0C011424" />
-        <instance reg_inst= "2" addr="0x0C011814" />
-        <instance reg_inst= "3" addr="0x0C011824" />
-        <instance reg_inst= "4" addr="0x0D011414" />
-        <instance reg_inst= "5" addr="0x0D011424" />
-        <instance reg_inst= "6" addr="0x0D011814" />
-        <instance reg_inst= "7" addr="0x0D011824" />
-        <instance reg_inst= "8" addr="0x0E011414" />
-        <instance reg_inst= "9" addr="0x0E011424" />
-        <instance reg_inst="10" addr="0x0E011814" />
-        <instance reg_inst="11" addr="0x0E011824" />
-        <instance reg_inst="12" addr="0x0F011414" />
-        <instance reg_inst="13" addr="0x0F011424" />
-        <instance reg_inst="14" addr="0x0F011814" />
-        <instance reg_inst="15" addr="0x0F011824" />
-    </register>
-
-    <register name="MC_OMI_DL_EDPL_MAX_COUNT">
-        <instance reg_inst= "0" addr="0x0C011415" />
-        <instance reg_inst= "1" addr="0x0C011425" />
-        <instance reg_inst= "2" addr="0x0C011815" />
-        <instance reg_inst= "3" addr="0x0C011825" />
-        <instance reg_inst= "4" addr="0x0D011415" />
-        <instance reg_inst= "5" addr="0x0D011425" />
-        <instance reg_inst= "6" addr="0x0D011815" />
-        <instance reg_inst= "7" addr="0x0D011825" />
-        <instance reg_inst= "8" addr="0x0E011415" />
-        <instance reg_inst= "9" addr="0x0E011425" />
-        <instance reg_inst="10" addr="0x0E011815" />
-        <instance reg_inst="11" addr="0x0E011825" />
-        <instance reg_inst="12" addr="0x0F011415" />
-        <instance reg_inst="13" addr="0x0F011425" />
-        <instance reg_inst="14" addr="0x0F011815" />
-        <instance reg_inst="15" addr="0x0F011825" />
-    </register>
-
-    <register name="MC_OMI_DL_STATUS">
-        <instance reg_inst= "0" addr="0x0C011416" />
-        <instance reg_inst= "1" addr="0x0C011426" />
-        <instance reg_inst= "2" addr="0x0C011816" />
-        <instance reg_inst= "3" addr="0x0C011826" />
-        <instance reg_inst= "4" addr="0x0D011416" />
-        <instance reg_inst= "5" addr="0x0D011426" />
-        <instance reg_inst= "6" addr="0x0D011816" />
-        <instance reg_inst= "7" addr="0x0D011826" />
-        <instance reg_inst= "8" addr="0x0E011416" />
-        <instance reg_inst= "9" addr="0x0E011426" />
-        <instance reg_inst="10" addr="0x0E011816" />
-        <instance reg_inst="11" addr="0x0E011826" />
-        <instance reg_inst="12" addr="0x0F011416" />
-        <instance reg_inst="13" addr="0x0F011426" />
-        <instance reg_inst="14" addr="0x0F011816" />
-        <instance reg_inst="15" addr="0x0F011826" />
-    </register>
-
-    <register name="MC_OMI_DL_TRAINING_STATUS">
-        <instance reg_inst= "0" addr="0x0C011417" />
-        <instance reg_inst= "1" addr="0x0C011427" />
-        <instance reg_inst= "2" addr="0x0C011817" />
-        <instance reg_inst= "3" addr="0x0C011827" />
-        <instance reg_inst= "4" addr="0x0D011417" />
-        <instance reg_inst= "5" addr="0x0D011427" />
-        <instance reg_inst= "6" addr="0x0D011817" />
-        <instance reg_inst= "7" addr="0x0D011827" />
-        <instance reg_inst= "8" addr="0x0E011417" />
-        <instance reg_inst= "9" addr="0x0E011427" />
-        <instance reg_inst="10" addr="0x0E011817" />
-        <instance reg_inst="11" addr="0x0E011827" />
-        <instance reg_inst="12" addr="0x0F011417" />
-        <instance reg_inst="13" addr="0x0F011427" />
-        <instance reg_inst="14" addr="0x0F011817" />
-        <instance reg_inst="15" addr="0x0F011827" />
-    </register>
-
-    <register name="MC_OMI_DL_DLX_CONFIG">
-        <instance reg_inst= "0" addr="0x0C011418" />
-        <instance reg_inst= "1" addr="0x0C011428" />
-        <instance reg_inst= "2" addr="0x0C011818" />
-        <instance reg_inst= "3" addr="0x0C011828" />
-        <instance reg_inst= "4" addr="0x0D011418" />
-        <instance reg_inst= "5" addr="0x0D011428" />
-        <instance reg_inst= "6" addr="0x0D011818" />
-        <instance reg_inst= "7" addr="0x0D011828" />
-        <instance reg_inst= "8" addr="0x0E011418" />
-        <instance reg_inst= "9" addr="0x0E011428" />
-        <instance reg_inst="10" addr="0x0E011818" />
-        <instance reg_inst="11" addr="0x0E011828" />
-        <instance reg_inst="12" addr="0x0F011418" />
-        <instance reg_inst="13" addr="0x0F011428" />
-        <instance reg_inst="14" addr="0x0F011818" />
-        <instance reg_inst="15" addr="0x0F011828" />
-    </register>
-
-    <register name="MC_OMI_DL_DLX_INFO">
-        <instance reg_inst= "0" addr="0x0C011419" />
-        <instance reg_inst= "1" addr="0x0C011429" />
-        <instance reg_inst= "2" addr="0x0C011819" />
-        <instance reg_inst= "3" addr="0x0C011829" />
-        <instance reg_inst= "4" addr="0x0D011419" />
-        <instance reg_inst= "5" addr="0x0D011429" />
-        <instance reg_inst= "6" addr="0x0D011819" />
-        <instance reg_inst= "7" addr="0x0D011829" />
-        <instance reg_inst= "8" addr="0x0E011419" />
-        <instance reg_inst= "9" addr="0x0E011429" />
-        <instance reg_inst="10" addr="0x0E011819" />
-        <instance reg_inst="11" addr="0x0E011829" />
-        <instance reg_inst="12" addr="0x0F011419" />
-        <instance reg_inst="13" addr="0x0F011429" />
-        <instance reg_inst="14" addr="0x0F011819" />
-        <instance reg_inst="15" addr="0x0F011829" />
-    </register>
-
-    <register name="MC_OMI_DL_ERR_ACTION">
-        <instance reg_inst= "0" addr="0x0C01141D" />
-        <instance reg_inst= "1" addr="0x0C01142D" />
-        <instance reg_inst= "2" addr="0x0C01181D" />
-        <instance reg_inst= "3" addr="0x0C01182D" />
-        <instance reg_inst= "4" addr="0x0D01141D" />
-        <instance reg_inst= "5" addr="0x0D01142D" />
-        <instance reg_inst= "6" addr="0x0D01181D" />
-        <instance reg_inst= "7" addr="0x0D01182D" />
-        <instance reg_inst= "8" addr="0x0E01141D" />
-        <instance reg_inst= "9" addr="0x0E01142D" />
-        <instance reg_inst="10" addr="0x0E01181D" />
-        <instance reg_inst="11" addr="0x0E01182D" />
-        <instance reg_inst="12" addr="0x0F01141D" />
-        <instance reg_inst="13" addr="0x0F01142D" />
-        <instance reg_inst="14" addr="0x0F01181D" />
-        <instance reg_inst="15" addr="0x0F01182D" />
-    </register>
-
-    <register name="MC_OMI_DL_DEBUG_AID">
-        <instance reg_inst= "0" addr="0x0C01141E" />
-        <instance reg_inst= "1" addr="0x0C01142E" />
-        <instance reg_inst= "2" addr="0x0C01181E" />
-        <instance reg_inst= "3" addr="0x0C01182E" />
-        <instance reg_inst= "4" addr="0x0D01141E" />
-        <instance reg_inst= "5" addr="0x0D01142E" />
-        <instance reg_inst= "6" addr="0x0D01181E" />
-        <instance reg_inst= "7" addr="0x0D01182E" />
-        <instance reg_inst= "8" addr="0x0E01141E" />
-        <instance reg_inst= "9" addr="0x0E01142E" />
-        <instance reg_inst="10" addr="0x0E01181E" />
-        <instance reg_inst="11" addr="0x0E01182E" />
-        <instance reg_inst="12" addr="0x0F01141E" />
-        <instance reg_inst="13" addr="0x0F01142E" />
-        <instance reg_inst="14" addr="0x0F01181E" />
-        <instance reg_inst="15" addr="0x0F01182E" />
-    </register>
-
-    <register name="MC_OMI_DL_CYA_BITS">
-        <instance reg_inst= "0" addr="0x0C01141F" />
-        <instance reg_inst= "1" addr="0x0C01142F" />
-        <instance reg_inst= "2" addr="0x0C01181F" />
-        <instance reg_inst= "3" addr="0x0C01182F" />
-        <instance reg_inst= "4" addr="0x0D01141F" />
-        <instance reg_inst= "5" addr="0x0D01142F" />
-        <instance reg_inst= "6" addr="0x0D01181F" />
-        <instance reg_inst= "7" addr="0x0D01182F" />
-        <instance reg_inst= "8" addr="0x0E01141F" />
-        <instance reg_inst= "9" addr="0x0E01142F" />
-        <instance reg_inst="10" addr="0x0E01181F" />
-        <instance reg_inst="11" addr="0x0E01182F" />
-        <instance reg_inst="12" addr="0x0F01141F" />
-        <instance reg_inst="13" addr="0x0F01142F" />
-        <instance reg_inst="14" addr="0x0F01181F" />
-        <instance reg_inst="15" addr="0x0F01182F" />
-    </register>
-
-    <capture_group node_inst="0:15">
-        <capture_register reg_name="MC_OMI_DL_CONFIG0"         reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_CONFIG1"         reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_ERR_MASK"        reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_ERR_RPT"         reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_ERR_CAPTURE"     reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_EDPL_MAX_COUNT"  reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_STATUS"          reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_TRAINING_STATUS" reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_DLX_CONFIG"      reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_DLX_INFO"        reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_ERR_ACTION"      reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_DEBUG_AID"       reg_inst="0:15" />
-        <capture_register reg_name="MC_OMI_DL_CYA_BITS"        reg_inst="0:15" />
-    </capture_group>
-
-    <rule attn_type="CS" node_inst="0,2,4,6,8,10,12,14">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-            </expr>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="CS" node_inst="1,3,5,7,9,11,13,15">
-        <!-- (FIR & ~MASK & ~ACT0 & ~ACT1 & 0x00000fffff000000) << 20 -->
-        <expr type="lshift" value1="20">
-            <expr type="and">
-                <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-                </expr>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-                </expr>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-                </expr>
-                <expr type="int" value1="0x00000fffff000000" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0,2,4,6,8,10,12,14">
-        <!-- FIR & ~MASK & ~ACT0 & ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-            </expr>
-            <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="1,3,5,7,9,11,13,15">
-        <!-- (FIR & ~MASK & ~ACT0 & ACT1 & 0x00000fffff000000) << 20 -->
-        <expr type="lshift" value1="20">
-            <expr type="and">
-                <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-                </expr>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-                </expr>
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-                <expr type="int" value1="0x00000fffff000000" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="SPA" node_inst="0,2,4,6,8,10,12,14">
-        <!-- FIR & ~MASK & ACT0 & ~ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-            </expr>
-            <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-            <expr type="not">
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-            </expr>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="SPA" node_inst="1,3,5,7,9,11,13,15">
-        <!-- (FIR & ~MASK & ACT0 & ~ACT1 & 0x00000fffff000000) << 20 -->
-        <expr type="lshift" value1="20">
-            <expr type="and">
-                <expr type="reg" value1="MC_OMI_DL_FIR" value2="0:7"/>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_MASK" value2="0:7"/>
-                </expr>
-                <expr type="reg" value1="MC_OMI_DL_FIR_ACT0" value2="0:7"/>
-                <expr type="not">
-                    <expr type="reg" value1="MC_OMI_DL_FIR_ACT1" value2="0:7"/>
-                </expr>
-                <expr type="int" value1="0x00000fffff000000" />
-            </expr>
-        </expr>
-    </rule>
-
-    <bit pos= "0" child_node="MC_OMI_DL_ERR_RPT" node_inst="0:15">OMI-DL fatal error</bit>
-    <bit pos= "1">OMI-DL UE on data flit</bit>
-    <bit pos= "2">OMI-DL CE on TL flit</bit>
-    <bit pos= "3">OMI-DL detected a CRC error</bit>
-    <bit pos= "4">OMI-DL received a nack</bit>
-    <bit pos= "5">OMI-DL running in degraded mode</bit>
-    <bit pos= "6">OMI-DL parity error detection on a lane</bit>
-    <bit pos= "7">OMI-DL retrained due to no forward progress</bit>
-    <bit pos= "8">OMI-DL remote side initiated a retrain</bit>
-    <bit pos= "9">OMI-DL retrain due to internal error or software</bit>
-    <bit pos="10">OMI-DL threshold reached</bit>
-    <bit pos="11">OMI-DL trained</bit>
-    <bit pos="12">OMI-DL endpoint error bit 0</bit>
-    <bit pos="13">OMI-DL endpoint error bit 1</bit>
-    <bit pos="14">OMI-DL endpoint error bit 2</bit>
-    <bit pos="15">OMI-DL endpoint error bit 3</bit>
-    <bit pos="16">OMI-DL endpoint error bit 4</bit>
-    <bit pos="17">OMI-DL endpoint error bit 5</bit>
-    <bit pos="18">OMI-DL endpoint error bit 6</bit>
-    <bit pos="19">OMI-DL endpoint error bit 7</bit>
-
-</attn_node>
diff --git a/xml/p10/node_mc_omi_dl_err_rpt.xml b/xml/p10/node_mc_omi_dl_err_rpt.xml
deleted file mode 100644
index 202784f..0000000
--- a/xml/p10/node_mc_omi_dl_err_rpt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MC_OMI_DL_ERR_RPT" reg_type="SCOM">
-
-    <rule attn_type="CS" node_inst="0:15">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0:15">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <rule attn_type="SPA" node_inst="0:15">
-        <!-- REG & 0x0000000000000fff -->
-        <expr type="and">
-            <expr type="reg" value1="MC_OMI_DL_ERR_RPT" />
-            <expr type="int" value1="0x0000000000000fff" />
-        </expr>
-    </rule>
-
-    <bit pos="52">spare</bit>
-    <bit pos="53">flit hammer</bit>
-    <bit pos="54">illegal TX lane reversal request</bit>
-    <bit pos="55">RX receiving slow A</bit>
-    <bit pos="56">RX receiving illegal run length</bit>
-    <bit pos="57">control parity error</bit>
-    <bit pos="58">spare</bit>
-    <bit pos="59">truncated flit from TL</bit>
-    <bit pos="60">illegal run length from TL</bit>
-    <bit pos="61">Ack pointer overflow</bit>
-    <bit pos="62">UE on control flit replay buffer</bit>
-    <bit pos="63">UE on control flit frame buffer</bit>
-
-</attn_node>
diff --git a/xml/p10/node_mc_omi_dl_fir.xml b/xml/p10/node_mc_omi_dl_fir.xml
deleted file mode 100644
index 50bcfe8..0000000
--- a/xml/p10/node_mc_omi_dl_fir.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MC_OMI_DL_FIR" reg_type="SCOM">
-    <local_fir config="W" name="MC_OMI_DL_FIR">
-        <instance addr="0x0C011400" reg_inst="0"/>
-        <instance addr="0x0C011800" reg_inst="1"/>
-        <instance addr="0x0D011400" reg_inst="2"/>
-        <instance addr="0x0D011800" reg_inst="3"/>
-        <instance addr="0x0E011400" reg_inst="4"/>
-        <instance addr="0x0E011800" reg_inst="5"/>
-        <instance addr="0x0F011400" reg_inst="6"/>
-        <instance addr="0x0F011800" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-
-    <register name="CMN_CONFIG">
-        <instance reg_inst="0" addr="0x0C01140E" />
-        <instance reg_inst="1" addr="0x0C01180E" />
-        <instance reg_inst="2" addr="0x0D01140E" />
-        <instance reg_inst="3" addr="0x0D01180E" />
-        <instance reg_inst="4" addr="0x0E01140E" />
-        <instance reg_inst="5" addr="0x0E01180E" />
-        <instance reg_inst="6" addr="0x0F01140E" />
-        <instance reg_inst="7" addr="0x0F01180E" />
-    </register>
-
-    <register name="PMU_CNTR">
-        <instance reg_inst="0" addr="0x0C01140F" />
-        <instance reg_inst="1" addr="0x0C01180F" />
-        <instance reg_inst="2" addr="0x0D01140F" />
-        <instance reg_inst="3" addr="0x0D01180F" />
-        <instance reg_inst="4" addr="0x0E01140F" />
-        <instance reg_inst="5" addr="0x0E01180F" />
-        <instance reg_inst="6" addr="0x0F01140F" />
-        <instance reg_inst="7" addr="0x0F01180F" />
-    </register>
-
-    <capture_group node_inst="0:7">
-        <capture_register reg_name="CMN_CONFIG" reg_inst="0:7" />
-        <capture_register reg_name="PMU_CNTR"   reg_inst="0:7" />
-    </capture_group>
-
-    <bit pos="0:19"  child_node="MC_OMI_DL" node_inst="0,2,4,6,8,10,12,14">OMI-DL0</bit>
-    <bit pos="20:39" child_node="MC_OMI_DL" node_inst="1,3,5,7,9,11,13,15">OMI-DL1</bit>
-    <bit pos="40:59">OMI-DL2</bit>
-    <bit pos="60">Performance monitor wrapped</bit>
-    <bit pos="61">OMI-DL common FIR Register</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_ustl_fir.xml b/xml/p10/node_mc_ustl_fir.xml
deleted file mode 100644
index d0e7425..0000000
--- a/xml/p10/node_mc_ustl_fir.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="MC_USTL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_USTL_FIR">
-        <instance addr="0x0C010E00" reg_inst="0"/>
-        <instance addr="0x0C010E40" reg_inst="1"/>
-        <instance addr="0x0D010E00" reg_inst="2"/>
-        <instance addr="0x0D010E40" reg_inst="3"/>
-        <instance addr="0x0E010E00" reg_inst="4"/>
-        <instance addr="0x0E010E40" reg_inst="5"/>
-        <instance addr="0x0F010E00" reg_inst="6"/>
-        <instance addr="0x0F010E40" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_USTL_ERR_RPT_0">
-        <instance addr="0x0C010E0E" reg_inst="0"/>
-        <instance addr="0x0C010E4E" reg_inst="1"/>
-        <instance addr="0x0D010E0E" reg_inst="2"/>
-        <instance addr="0x0D010E4E" reg_inst="3"/>
-        <instance addr="0x0E010E0E" reg_inst="4"/>
-        <instance addr="0x0E010E4E" reg_inst="5"/>
-        <instance addr="0x0F010E0E" reg_inst="6"/>
-        <instance addr="0x0F010E4E" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_LOL_DROP">
-        <instance addr="0x0C010E11" reg_inst="0"/>
-        <instance addr="0x0C010E51" reg_inst="1"/>
-        <instance addr="0x0D010E11" reg_inst="2"/>
-        <instance addr="0x0D010E51" reg_inst="3"/>
-        <instance addr="0x0E010E11" reg_inst="4"/>
-        <instance addr="0x0E010E51" reg_inst="5"/>
-        <instance addr="0x0F010E11" reg_inst="6"/>
-        <instance addr="0x0F010E51" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_LOL_MASK">
-        <instance addr="0x0C010E12" reg_inst="0"/>
-        <instance addr="0x0C010E52" reg_inst="1"/>
-        <instance addr="0x0D010E12" reg_inst="2"/>
-        <instance addr="0x0D010E52" reg_inst="3"/>
-        <instance addr="0x0E010E12" reg_inst="4"/>
-        <instance addr="0x0E010E52" reg_inst="5"/>
-        <instance addr="0x0F010E12" reg_inst="6"/>
-        <instance addr="0x0F010E52" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_FAIL_MASK">
-        <instance addr="0x0C010E13" reg_inst="0"/>
-        <instance addr="0x0C010E53" reg_inst="1"/>
-        <instance addr="0x0D010E13" reg_inst="2"/>
-        <instance addr="0x0D010E53" reg_inst="3"/>
-        <instance addr="0x0E010E13" reg_inst="4"/>
-        <instance addr="0x0E010E53" reg_inst="5"/>
-        <instance addr="0x0F010E13" reg_inst="6"/>
-        <instance addr="0x0F010E53" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_ERR_RPT_1">
-        <instance addr="0x0C010E16" reg_inst="0"/>
-        <instance addr="0x0C010E56" reg_inst="1"/>
-        <instance addr="0x0D010E16" reg_inst="2"/>
-        <instance addr="0x0D010E56" reg_inst="3"/>
-        <instance addr="0x0E010E16" reg_inst="4"/>
-        <instance addr="0x0E010E56" reg_inst="5"/>
-        <instance addr="0x0F010E16" reg_inst="6"/>
-        <instance addr="0x0F010E56" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_ERR_RPT_0" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_LOL_DROP" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_LOL_MASK" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_FAIL_MASK" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_ERR_RPT_1" />
-    </capture_group>
-    <bit pos="0">Unexpected Flit Data showed up for Chana</bit>
-    <bit pos="1">Unexpected Flit Data showed up for Chanb</bit>
-    <bit pos="2">A unsupported template for a command flit for chana</bit>
-    <bit pos="3">A unsupported template for a command flit for chanb</bit>
-    <bit pos="4">Reserved</bit>
-    <bit pos="5">Reserved</bit>
-    <bit pos="6">WDF CE detected on buffer output</bit>
-    <bit pos="7">WDF UE detected on buffer output</bit>
-    <bit pos="8">WDF SUE detected on buffer output</bit>
-    <bit pos="9">WDF buffer overrun detected</bit>
-    <bit pos="10">WDF detected parity on USTL tag interface</bit>
-    <bit pos="11">WDF detected a scom sequencer error</bit>
-    <bit pos="12">WDF detected a pwctl sequencer error</bit>
-    <bit pos="13">WDF detected a parity error on the misc_reg scom register</bit>
-    <bit pos="14">Parity Error detected in WDF for CL pop</bit>
-    <bit pos="15">WDF detected a non-zero syndrome (CE ore UE) from USTL</bit>
-    <bit pos="16">WDF CMD parity errror</bit>
-    <bit pos="17">Unused</bit>
-    <bit pos="18">Unused</bit>
-    <bit pos="19">Read Buffers overflowed/underflowed (more than 64 in use)</bit>
-    <bit pos="20">WRT CE detected on buffer output</bit>
-    <bit pos="21">WRT UE detected on buffer output</bit>
-    <bit pos="22">WRT SUE detected on buffer output</bit>
-    <bit pos="23">WRT detected a scom sequencer error</bit>
-    <bit pos="24">WRT detected a parity error on the misc_reg scom register</bit>
-    <bit pos="25">WRT Data Syndrome not equal to 0 for input for write buffer</bit>
-    <bit pos="26">No buffer error; Buffer manager parity error</bit>
-    <bit pos="27">A fail response set as checkstop occurred for chana</bit>
-    <bit pos="28">A fail response set as checkstop occurred for chanb</bit>
-    <bit pos="29">A fail response set as recoverable occurred for chana</bit>
-    <bit pos="30">A fail response set as recoverable occurred for chanb</bit>
-    <bit pos="31">A lol drop set as checkstop occurred for chana</bit>
-    <bit pos="32">A lol drop set as checkstop occurred for chanb</bit>
-    <bit pos="33">A lol drop set as recoverable occurred for chana</bit>
-    <bit pos="34">A lol drop set as recoverable occurred for chanb</bit>
-    <bit pos="35">flit data pariry error from dl for chana</bit>
-    <bit pos="36">flit data pariry error from dl for chanb</bit>
-    <bit pos="37">internal fifo parity error for chana</bit>
-    <bit pos="38">internal fifo parity error for chanb</bit>
-    <bit pos="39">Unexpected read or write response received, chana</bit>
-    <bit pos="40">Unexpected read or write response received, chanb</bit>
-    <bit pos="41">Bad data set for data that is not valid chana</bit>
-    <bit pos="42">Bad data set for data that is not valid chanb</bit>
-    <bit pos="43">Memory read data returned in template 0, chana</bit>
-    <bit pos="44">Memory read data returned in template 0, chanb</bit>
-    <bit pos="45">Recieved mmio response while in LOL mode chana</bit>
-    <bit pos="46">Recieved mmio response while in LOL mode chanb</bit>
-    <bit pos="47">valid bad data or SUE received channel a</bit>
-    <bit pos="48">Valid bad data or SUE received chanb</bit>
-    <bit pos="49">ChanA excessive data error</bit>
-    <bit pos="50">ChanB excessive data error</bit>
-    <bit pos="51">Commit state where commit data is not marked as valid</bit>
-    <bit pos="52">Commit state where commit data is not marked as valid</bit>
-    <bit pos="53">A fifo in the ustl chana overflowed</bit>
-    <bit pos="54">A fifo in the ustl chanb overflowed</bit>
-    <bit pos="55">Invalid command decoded in USTL FF subchannel A</bit>
-    <bit pos="56">Invalid command decoded in USTL FF subchannel B</bit>
-    <bit pos="57">Fatal register parity error</bit>
-    <bit pos="58">recov register parity error</bit>
-    <bit pos="59">ChanA response invalid(dlength and/or dpart received)</bit>
-    <bit pos="60">ChanB response invalid(dlength and/or dpart received)</bit>
-    <bit pos="61">Parity error on command bus between DSTL-USTL used for chan fail command tracking</bit>
-</attn_node>
diff --git a/xml/p10/node_mc_ustl_fir_p10_10.xml b/xml/p10/node_mc_ustl_fir_p10_10.xml
deleted file mode 100644
index a9cd1d5..0000000
--- a/xml/p10/node_mc_ustl_fir_p10_10.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="MC_USTL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="MC_USTL_FIR">
-        <instance addr="0x0C010E00" reg_inst="0"/>
-        <instance addr="0x0C010E40" reg_inst="1"/>
-        <instance addr="0x0D010E00" reg_inst="2"/>
-        <instance addr="0x0D010E40" reg_inst="3"/>
-        <instance addr="0x0E010E00" reg_inst="4"/>
-        <instance addr="0x0E010E40" reg_inst="5"/>
-        <instance addr="0x0F010E00" reg_inst="6"/>
-        <instance addr="0x0F010E40" reg_inst="7"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <register name="MC_USTL_ERR_RPT_0">
-        <instance addr="0x0C010E0E" reg_inst="0"/>
-        <instance addr="0x0C010E4E" reg_inst="1"/>
-        <instance addr="0x0D010E0E" reg_inst="2"/>
-        <instance addr="0x0D010E4E" reg_inst="3"/>
-        <instance addr="0x0E010E0E" reg_inst="4"/>
-        <instance addr="0x0E010E4E" reg_inst="5"/>
-        <instance addr="0x0F010E0E" reg_inst="6"/>
-        <instance addr="0x0F010E4E" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_LOL_DROP">
-        <instance addr="0x0C010E11" reg_inst="0"/>
-        <instance addr="0x0C010E51" reg_inst="1"/>
-        <instance addr="0x0D010E11" reg_inst="2"/>
-        <instance addr="0x0D010E51" reg_inst="3"/>
-        <instance addr="0x0E010E11" reg_inst="4"/>
-        <instance addr="0x0E010E51" reg_inst="5"/>
-        <instance addr="0x0F010E11" reg_inst="6"/>
-        <instance addr="0x0F010E51" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_LOL_MASK">
-        <instance addr="0x0C010E12" reg_inst="0"/>
-        <instance addr="0x0C010E52" reg_inst="1"/>
-        <instance addr="0x0D010E12" reg_inst="2"/>
-        <instance addr="0x0D010E52" reg_inst="3"/>
-        <instance addr="0x0E010E12" reg_inst="4"/>
-        <instance addr="0x0E010E52" reg_inst="5"/>
-        <instance addr="0x0F010E12" reg_inst="6"/>
-        <instance addr="0x0F010E52" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_FAIL_MASK">
-        <instance addr="0x0C010E13" reg_inst="0"/>
-        <instance addr="0x0C010E53" reg_inst="1"/>
-        <instance addr="0x0D010E13" reg_inst="2"/>
-        <instance addr="0x0D010E53" reg_inst="3"/>
-        <instance addr="0x0E010E13" reg_inst="4"/>
-        <instance addr="0x0E010E53" reg_inst="5"/>
-        <instance addr="0x0F010E13" reg_inst="6"/>
-        <instance addr="0x0F010E53" reg_inst="7"/>
-    </register>
-    <register name="MC_USTL_ERR_RPT_1">
-        <instance addr="0x0C010E16" reg_inst="0"/>
-        <instance addr="0x0C010E56" reg_inst="1"/>
-        <instance addr="0x0D010E16" reg_inst="2"/>
-        <instance addr="0x0D010E56" reg_inst="3"/>
-        <instance addr="0x0E010E16" reg_inst="4"/>
-        <instance addr="0x0E010E56" reg_inst="5"/>
-        <instance addr="0x0F010E16" reg_inst="6"/>
-        <instance addr="0x0F010E56" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_ERR_RPT_0" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_LOL_DROP" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_LOL_MASK" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_FAIL_MASK" />
-        <capture_register reg_inst="0:7" reg_name="MC_USTL_ERR_RPT_1" />
-    </capture_group>
-    <bit pos="0">Unexpected Flit Data showed up for Chana</bit>
-    <bit pos="1">Unexpected Flit Data showed up for Chanb</bit>
-    <bit pos="2">A unsupported template for a command flit for chana</bit>
-    <bit pos="3">A unsupported template for a command flit for chanb</bit>
-    <bit pos="4">Reserved</bit>
-    <bit pos="5">Reserved</bit>
-    <bit pos="6">WDF CE detected on buffer output</bit>
-    <bit pos="7">WDF UE detected on buffer output</bit>
-    <bit pos="8">WDF SUE detected on buffer output</bit>
-    <bit pos="9">WDF buffer overrun detected</bit>
-    <bit pos="10">WDF detected parity on USTL tag interface</bit>
-    <bit pos="11">WDF detected a scom sequencer error</bit>
-    <bit pos="12">WDF detected a pwctl sequencer error</bit>
-    <bit pos="13">WDF detected a parity error on the misc_reg scom register</bit>
-    <bit pos="14">Parity Error detected in WDF for CL pop</bit>
-    <bit pos="15">WDF detected a non-zero syndrome (CE ore UE) from USTL</bit>
-    <bit pos="16">WDF CMD parity errror</bit>
-    <bit pos="17">Unused</bit>
-    <bit pos="18">Unused</bit>
-    <bit pos="19">Read Buffers overflowed/underflowed (more than 64 in use)</bit>
-    <bit pos="20">WRT CE detected on buffer output</bit>
-    <bit pos="21">WRT UE detected on buffer output</bit>
-    <bit pos="22">WRT SUE detected on buffer output</bit>
-    <bit pos="23">WRT detected a scom sequencer error</bit>
-    <bit pos="24">WRT detected a parity error on the misc_reg scom register</bit>
-    <bit pos="25">WRT Data Syndrome not equal to 0 for input for write buffer</bit>
-    <bit pos="26">No buffer error; Buffer manager parity error</bit>
-    <bit pos="27">A fail response set as checkstop occurred for chana</bit>
-    <bit pos="28">A fail response set as checkstop occurred for chanb</bit>
-    <bit pos="29">A fail response set as recoverable occurred for chana</bit>
-    <bit pos="30">A fail response set as recoverable occurred for chanb</bit>
-    <bit pos="31">A lol drop set as checkstop occurred for chana</bit>
-    <bit pos="32">A lol drop set as checkstop occurred for chanb</bit>
-    <bit pos="33">A lol drop set as recoverable occurred for chana</bit>
-    <bit pos="34">A lol drop set as recoverable occurred for chanb</bit>
-    <bit pos="35">flit data pariry error from dl for chana</bit>
-    <bit pos="36">flit data pariry error from dl for chanb</bit>
-    <bit pos="37">internal fifo parity error for chana</bit>
-    <bit pos="38">internal fifo parity error for chanb</bit>
-    <bit pos="39">Unexpected read or write response received, chana</bit>
-    <bit pos="40">Unexpected read or write response received, chanb</bit>
-    <bit pos="41">Bad data set for data that is not valid chana</bit>
-    <bit pos="42">Bad data set for data that is not valid chanb</bit>
-    <bit pos="43">Memory read data returned in template 0, chana</bit>
-    <bit pos="44">Memory read data returned in template 0, chanb</bit>
-    <bit pos="45">Recieved mmio response while in LOL mode chana</bit>
-    <bit pos="46">Recieved mmio response while in LOL mode chanb</bit>
-    <bit pos="47">valid bad data or SUE received channel a</bit>
-    <bit pos="48">Valid bad data or SUE received chanb</bit>
-    <bit pos="49">ChanA excessive data error</bit>
-    <bit pos="50">ChanB excessive data error</bit>
-    <bit pos="51">Commit state where commit data is not marked as valid</bit>
-    <bit pos="52">Commit state where commit data is not marked as valid</bit>
-    <bit pos="53">A fifo in the ustl chana overflowed</bit>
-    <bit pos="54">A fifo in the ustl chanb overflowed</bit>
-    <bit pos="55">Invalid command decoded in USTL FF subchannel A</bit>
-    <bit pos="56">Invalid command decoded in USTL FF subchannel B</bit>
-    <bit pos="57">Fatal register parity error</bit>
-    <bit pos="58">recov register parity error</bit>
-    <bit pos="59">ChanA response invalid(dlength and/or dpart received)</bit>
-    <bit pos="60">ChanB response invalid(dlength and/or dpart received)</bit>
-    <bit pos="61">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_mcd_fir.xml b/xml/p10/node_mcd_fir.xml
deleted file mode 100644
index 186d156..0000000
--- a/xml/p10/node_mcd_fir.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="MCD_FIR" reg_type="SCOM">
-    <local_fir config="W" name="MCD_FIR">
-        <instance addr="0x03010800" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <bit pos="0">MCD array ECC correctable error</bit>
-    <bit pos="1">MCD array ECC uncorrectable error</bit>
-    <bit pos="2">MCD PowerBus address parity error</bit>
-    <bit pos="3">MCD invalid state error</bit>
-    <bit pos="4">Hang poll timer expired on cl_probe</bit>
-    <bit pos="5">PowerBus address error cresp received</bit>
-    <bit pos="6">MCD received a unsolicited CRESP</bit>
-    <bit pos="7">MCD powerbus ttag parity error</bit>
-    <bit pos="8">MCD scom register update error</bit>
-    <bit pos="9">MCD received a ack_dead_cresp</bit>
-    <bit pos="10">MCD configuration register had a parity error</bit>
-</attn_node>
diff --git a/xml/p10/node_n0_local_fir.xml b/xml/p10/node_n0_local_fir.xml
deleted file mode 100644
index 0c23279..0000000
--- a/xml/p10/node_n0_local_fir.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="N0_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="N0_LOCAL_FIR">
-        <instance addr="0x02040100" reg_inst="0"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_n1_local_fir.xml b/xml/p10/node_n1_local_fir.xml
deleted file mode 100644
index 1508dfc..0000000
--- a/xml/p10/node_n1_local_fir.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="N1_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="N1_LOCAL_FIR">
-        <instance addr="0x03040100" reg_inst="0"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">Firmware signaled power bus quiesce failed</bit>
-    <bit pos="57">Firmware signaled power bus system quiesce failed</bit>
-    <bit pos="58">Firmware signaled deadman timer tigger occurred</bit>
-    <bit pos="59">Fimware signaled power bus chip quiesce failed</bit>
-    <bit pos="60">Hypervisor / Hostboot / OPAL initiated Terminate Immediate</bit>
-    <bit pos="61">Host detected LPC timeout</bit>
-    <bit pos="62">reserved for software use</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_nmmu_cq_fir.xml b/xml/p10/node_nmmu_cq_fir.xml
deleted file mode 100644
index e5bf5e8..0000000
--- a/xml/p10/node_nmmu_cq_fir.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="NMMU_CQ_FIR" reg_type="SCOM">
-    <local_fir config="W" name="NMMU_CQ_FIR">
-        <instance addr="0x02010C00" reg_inst="0"/>
-        <instance addr="0x03010C00" reg_inst="1"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-
-    <register name="NMMU_CQ_ERR_RPT_0">
-        <instance reg_inst="0" addr="0x02010C22" />
-        <instance reg_inst="1" addr="0x03010C22" />
-    </register>
-
-    <capture_group node_inst="0:1">
-        <capture_register reg_name="NMMU_CQ_ERR_RPT_0" reg_inst="0:1" />
-    </capture_group>
-
-    <bit pos="0">PBI internal parity error</bit>
-    <bit pos="1">PowerBus command hang error</bit>
-    <bit pos="2">PowerBus read address error</bit>
-    <bit pos="3">PowerBus write address error</bit>
-    <bit pos="4">PowerBus miscellaneous error</bit>
-    <bit pos="5">Reserved</bit>
-    <bit pos="6">PowerBus Xlate UE error</bit>
-    <bit pos="7">PowerBus Xlate SUE error</bit>
-    <bit pos="8">PowerBus CE error</bit>
-    <bit pos="9">PowerBus UE error</bit>
-    <bit pos="10">PowerBus SUE error</bit>
-    <bit pos="11">Inbound LCO_ARRAY CE error</bit>
-    <bit pos="12">Inbound LCO_ARRAY UE error</bit>
-    <bit pos="13">Inbound LCO_ARRAY SUE error</bit>
-    <bit pos="14">Inbound array CE error</bit>
-    <bit pos="15">Inbound array UE error</bit>
-    <bit pos="16">internal state error</bit>
-    <bit pos="17">ACK_DEAD cresp received by read command</bit>
-    <bit pos="18">ACK_DEAD cresp received by write command</bit>
-    <bit pos="19">Link check aborted while waiting on data</bit>
-</attn_node>
diff --git a/xml/p10/node_nmmu_fir.xml b/xml/p10/node_nmmu_fir.xml
deleted file mode 100644
index ec6423c..0000000
--- a/xml/p10/node_nmmu_fir.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="NMMU_FIR" reg_type="SCOM">
-    <local_fir config="W" name="NMMU_FIR">
-        <instance addr="0x02010C40" reg_inst="0"/>
-        <instance addr="0x03010C40" reg_inst="1"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">Fabric DIn xlat array CE error detected</bit>
-    <bit pos="1">Fabric DIn xlat array UE error detected</bit>
-    <bit pos="2">Fabric DIn xlat array SUE error detected</bit>
-    <bit pos="3">Fabric mst rd array CE error detected</bit>
-    <bit pos="4">Fabric mst rd array UE error detected</bit>
-    <bit pos="5">Fabric mst rd array SUE error detected</bit>
-    <bit pos="6">Fabric xlat protocol error detected</bit>
-    <bit pos="7">Fabric xlat op timeout detected</bit>
-    <bit pos="8">SLB directory parity error detected</bit>
-    <bit pos="9">SLB cache parity error detected</bit>
-    <bit pos="10">SLB lru parity error detected</bit>
-    <bit pos="11">SLB multi-hit error detected</bit>
-    <bit pos="12">TLB directory parity error detected</bit>
-    <bit pos="13">TLB cache parity error detected</bit>
-    <bit pos="14">TLB lru parity error detected</bit>
-    <bit pos="15">TLB multi-hit error detected</bit>
-    <bit pos="16">Segment fault detected</bit>
-    <bit pos="17">Page fault detected due to no matching pte</bit>
-    <bit pos="18">Page fault detected due to basic prot chk fail</bit>
-    <bit pos="19">Page fault detected due to virt prot chk fail</bit>
-    <bit pos="20">Page fault detected due to seid mismatch</bit>
-    <bit pos="21">Address error cresp detected by twsm for read</bit>
-    <bit pos="22">PTE update fail due to armwf mismatch</bit>
-    <bit pos="23">Address error cresp detected by twsm for write</bit>
-    <bit pos="24">Unsupported radix cfg for guest-side</bit>
-    <bit pos="25">Unsupported radix cfg for host-side</bit>
-    <bit pos="26">Invalid wimg setting detected</bit>
-    <bit pos="27">Invalid radix quad access detected</bit>
-    <bit pos="28">Unexpected access to foreign address space</bit>
-    <bit pos="29">Prefetch abort/fail detected</bit>
-    <bit pos="30">Context cache array parity error detected</bit>
-    <bit pos="31">Radix pwc array parity error detected</bit>
-    <bit pos="32">Tablewalk sm control error detected</bit>
-    <bit pos="33">Castout sm control error detected</bit>
-    <bit pos="34">Check-in sm control error detected</bit>
-    <bit pos="35">Invalidate sm control error detected</bit>
-    <bit pos="36">Tablewalk sm timeout error detected</bit>
-    <bit pos="37">Castout sm timeout error detected</bit>
-    <bit pos="38">Check-in sm timeout error detected</bit>
-    <bit pos="39">Invalidate sm timeout error detected</bit>
-    <bit pos="40">NX local checkstop error detected</bit>
-    <bit pos="41">fbc snoop invalidate filter parity error</bit>
-    <bit pos="42">fabric purge threshold exceeded</bit>
-    <bit pos="43">NPU local checkstop error detected</bit>
-    <bit pos="44">FBC local checkstop error detected</bit>
-    <bit pos="45">FBC local checkstop error detected</bit>
-</attn_node>
diff --git a/xml/p10/node_nx_cq_fir.xml b/xml/p10/node_nx_cq_fir.xml
deleted file mode 100644
index f54716f..0000000
--- a/xml/p10/node_nx_cq_fir.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="NX_CQ_FIR" reg_type="SCOM">
-    <local_fir config="W" name="NX_CQ_FIR">
-        <instance addr="0x02011080" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <register name="NX_CQ_ERR_RPT_0">
-        <instance addr="0x020110A2" reg_inst="0"/>
-    </register>
-    <register name="NX_CQ_ERR_RPT_1">
-        <instance addr="0x020110A1" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="NX_CQ_ERR_RPT_0" />
-        <capture_register reg_inst="0" reg_name="NX_CQ_ERR_RPT_1" />
-    </capture_group>
-    <bit pos="0">PBI internal parity error</bit>
-    <bit pos="1">PowerBus CE error</bit>
-    <bit pos="2">PowerBus UE error</bit>
-    <bit pos="3">PowerBus SUE error</bit>
-    <bit pos="4">Inbound array CE error</bit>
-    <bit pos="5">Inbound array UE error</bit>
-    <bit pos="6">Paste request rejected</bit>
-    <bit pos="7">PowerBus command hang error</bit>
-    <bit pos="8">PowerBus read address error</bit>
-    <bit pos="9">PowerBus write address error</bit>
-    <bit pos="10">PowerBus miscellaneous error</bit>
-    <bit pos="11">MMIO BAR parity error</bit>
-    <bit pos="12">UMAC detected SUE on WC Interrupt</bit>
-    <bit pos="13">ACK_DEAD cresp received by read command</bit>
-    <bit pos="14">ACK_DEAD cresp received by write command</bit>
-    <bit pos="15">Reserved. Used to be PowerBus Link Abort in P9</bit>
-    <bit pos="16">Hang poll time expired on internal transfer</bit>
-    <bit pos="17">Parity error on ERAT arrays</bit>
-    <bit pos="18">Correctable error on ERAT arrays</bit>
-    <bit pos="19">Uncorrectable error on ERAT arrays</bit>
-    <bit pos="20">Special uncorrectable error on ERAT arrays</bit>
-    <bit pos="21">Hang on checkin/checkout request to NMMU</bit>
-    <bit pos="22">ERAT control logic error</bit>
-    <bit pos="23">Uncorrectable error on the Powerbus data for xlate</bit>
-    <bit pos="24">Special uncorrectable error on the Powerbus data for xlate</bit>
-    <bit pos="25">ACK_DEAD cresp received by UMAC read command</bit>
-    <bit pos="26">Link check aborted while waiting on UMAC data</bit>
-    <bit pos="27">Uncorrectable error on CRB QW0/4</bit>
-    <bit pos="28">Special uncorrectable error on CRB QW0/4</bit>
-    <bit pos="29">UMAC has detected a control logic error</bit>
-    <bit pos="30">Other SCOM satellite parity error</bit>
-    <bit pos="31">SCOM write to RNG when not allowed</bit>
-    <bit pos="32">A first noise source in the RNG has failed</bit>
-    <bit pos="33">A second noise source in the RNG has failed</bit>
-    <bit pos="34">RNG has detected a control logic error</bit>
-    <bit pos="35">NMMU has signaled local checkstop</bit>
-    <bit pos="36">VAS has signaled local checkstop</bit>
-    <bit pos="37">PBCQ has detected a control logic error</bit>
-    <bit pos="38">PBCQ has detected a failed link on an interrupt</bit>
-    <bit pos="39">UMAC has detected an SUE on interrupt address</bit>
-    <bit pos="40">SMF error</bit>
-    <bit pos="41">Topology index error detected in NX</bit>
-</attn_node>
diff --git a/xml/p10/node_nx_dma_eng_fir.xml b/xml/p10/node_nx_dma_eng_fir.xml
deleted file mode 100644
index 2e6b10e..0000000
--- a/xml/p10/node_nx_dma_eng_fir.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="NX_DMA_ENG_FIR" reg_type="SCOM">
-    <local_fir config="W" name="NX_DMA_ENG_FIR">
-        <instance addr="0x02011100" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <register name="SU_DMA_ERROR_REPORT_0">
-        <instance addr="0x02011057" reg_inst="0"/>
-    </register>
-    <register name="SU_DMA_ERROR_REPORT_1">
-        <instance addr="0x02011058" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="SU_DMA_ERROR_REPORT_0" />
-        <capture_register reg_inst="0" reg_name="SU_DMA_ERROR_REPORT_1" />
-    </capture_group>
-    <bit pos="0">DMA hang timer expired</bit>
-    <bit pos="1">SHM invalid state</bit>
-    <bit pos="2">reserved</bit>
-    <bit pos="3">reserved</bit>
-    <bit pos="4">Channel 0 842 engine ECC CE</bit>
-    <bit pos="5">Channel 0 842 engine ECC UE</bit>
-    <bit pos="6">Channel 1 842 engine ECC CE</bit>
-    <bit pos="7">Channel 1 842 engine ECC UE</bit>
-    <bit pos="8">DMA Non-zero CSB CC detected</bit>
-    <bit pos="9">DMA array ECC CE</bit>
-    <bit pos="10">DMA outbound write/inbound read ECC CE</bit>
-    <bit pos="11">Channel 4 GZIP ECC CE</bit>
-    <bit pos="12">Channel 4 GZIP ECC UE</bit>
-    <bit pos="13">Channel 4 GZIP ECC PE</bit>
-    <bit pos="14">Error from other SCOM satellites</bit>
-    <bit pos="15">DMA invalid state error (unrecoverable)</bit>
-    <bit pos="16">DMA invalid state error (unrecoverable)</bit>
-    <bit pos="17">DMA array ECC UE</bit>
-    <bit pos="18">DMA outbound write/inbound read ECC UE</bit>
-    <bit pos="19">DMA inbound read error</bit>
-    <bit pos="20">Channel 0 842 invalid state error</bit>
-    <bit pos="21">Channel 1 842 invalid state error</bit>
-    <bit pos="22">Channel 2 SYM invalid state error</bit>
-    <bit pos="23">Channel 3 SYM invalid state error</bit>
-    <bit pos="24">Channel 4 GZIP invalid state error</bit>
-    <bit pos="25">reserved</bit>
-    <bit pos="26">reserved</bit>
-    <bit pos="27">reserved</bit>
-    <bit pos="28">reserved</bit>
-    <bit pos="29">reserved</bit>
-    <bit pos="30">reserved</bit>
-    <bit pos="31">UE error on CRB QW0 or QW4</bit>
-    <bit pos="32">SUE error on CRB QW0 or QW4</bit>
-    <bit pos="33">SUE error on something other than CRB QW0 or QW4</bit>
-    <bit pos="34">Channel 0 842 watchdog timer expired</bit>
-    <bit pos="35">Channel 1 842 watchdog timer expired</bit>
-    <bit pos="36">Channel 2 SYM watchdog timer expired</bit>
-    <bit pos="37">Channel 3 SYM watchdog timer expired</bit>
-    <bit pos="38">Hypervisor local checkstop</bit>
-    <bit pos="39">Channel 4 Gzip watchdog timer expired</bit>
-    <bit pos="40">reserved</bit>
-    <bit pos="41">reserved</bit>
-    <bit pos="42">reserved</bit>
-    <bit pos="43">reserved</bit>
-    <bit pos="44">reserved</bit>
-    <bit pos="45">reserved</bit>
-    <bit pos="46">reserved</bit>
-    <bit pos="47">reserved</bit>
-</attn_node>
diff --git a/xml/p10/node_occ_fir.xml b/xml/p10/node_occ_fir.xml
deleted file mode 100644
index 0e6df35..0000000
--- a/xml/p10/node_occ_fir.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="OCC_FIR" reg_type="SCOM">
-    <local_fir config="" name="OCC_FIR">
-        <instance addr="0x01010800" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="OCC_SCOM_ERR_RPT">
-        <instance addr="0x0101080A" reg_inst="0"/>
-    </register>
-    <register name="OCC_SCOM_ERR_RPT2">
-        <instance addr="0x0101080B" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="OCC_SCOM_ERR_RPT" />
-        <capture_register reg_inst="0" reg_name="OCC_SCOM_ERR_RPT2" />
-    </capture_group>
-    <bit pos="0">OCC_FW0</bit>
-    <bit pos="1">OCC_FW1</bit>
-    <bit pos="2">OCC_QME_ERROR_NOTIFY</bit>
-    <bit pos="3">reserved</bit>
-    <bit pos="4">OCC Heartbeat Error</bit>
-    <bit pos="5">GPE0 asserted a watchdog timeout condition</bit>
-    <bit pos="6">GPE1 asserted a watchdog timeout condition</bit>
-    <bit pos="7">GPE2 asserted a watchdog timeout condition</bit>
-    <bit pos="8">GPE3 asserted a watchdog timeout condition</bit>
-    <bit pos="9">GPE0 asserted an error condition that caused it to halt.</bit>
-    <bit pos="10">GPE1 asserted an error condition that caused it to halt.</bit>
-    <bit pos="11">GPE2 asserted an error condition that caused it to halt.</bit>
-    <bit pos="12">GPE3 asserted an error condition that caused it to halt.</bit>
-    <bit pos="13">OCB Error to PM Hcode for PM Complex Restart</bit>
-    <bit pos="14">SRAM UE to PM Hcode for PM Complex Restart</bit>
-    <bit pos="15">SRAM CE</bit>
-    <bit pos="16">GPE0 asserted a halt condition</bit>
-    <bit pos="17">GPE1 asserted a halt condition</bit>
-    <bit pos="18">GPE2 asserted a halt condition</bit>
-    <bit pos="19">GPE3 asserted a halt condition</bit>
-    <bit pos="20">GPE0 attempted to write outside the region defined in GPESWPR</bit>
-    <bit pos="21">GPE1 attempted to write outside the region defined in GPESWPR</bit>
-    <bit pos="22">GPE2 attempted to write outside the region defined in GPESWPR</bit>
-    <bit pos="23">GPE3 attempted to write outside the region defined in GPESWPR</bit>
-    <bit pos="24">Safe Mode for debug use</bit>
-    <bit pos="25">reserved</bit>
-    <bit pos="26">EXTERNAL_TRAP</bit>
-    <bit pos="27">PPC405 Core Reset Output asserted (OCC firmware)</bit>
-    <bit pos="28">PPC405 Chip Reset Output asserted (OCC firmware)</bit>
-    <bit pos="29">PPC405 System Reset Output asserted (OCC firmware)</bit>
-    <bit pos="30">PPC405 Wait State asserted (OCC firmware)</bit>
-    <bit pos="31">PPC405 Stop Ack output asserted</bit>
-    <bit pos="32">OCB Direct Bridge Error</bit>
-    <bit pos="33">OCB PIB Address Parity Error</bit>
-    <bit pos="34">Indirect Channel Error</bit>
-    <bit pos="35">Parity error detected on OPIT interrupt bus</bit>
-    <bit pos="36">OPIT interrupt state machine error occurred</bit>
-    <bit pos="37">reserved</bit>
-    <bit pos="38">reserved</bit>
-    <bit pos="39">reserved</bit>
-    <bit pos="40">reserved</bit>
-    <bit pos="41">reserved</bit>
-    <bit pos="42">JTAG accelerator error</bit>
-    <bit pos="43">Any OCI Slave error occurreds</bit>
-    <bit pos="44">PPC405 cache UE</bit>
-    <bit pos="45">PPC405 cache CE</bit>
-    <bit pos="46">PPC405 Machine Check</bit>
-    <bit pos="47">SRAM spare direct error Summary</bit>
-    <bit pos="48">Read, write, or parity error in the SRAM tank controller</bit>
-    <bit pos="49">reserved</bit>
-    <bit pos="50">reserved</bit>
-    <bit pos="51">OCI slave error for GPE0</bit>
-    <bit pos="52">OCI slave error for GPE1</bit>
-    <bit pos="53">OCI slave error for GPE2</bit>
-    <bit pos="54">OCI slave error for GPE3</bit>
-    <bit pos="55">PPC405 ICU timeout on OCI request</bit>
-    <bit pos="56">PPC405 DCU timeout on OCI request</bit>
-    <bit pos="57">OCC fault occurred (to achieve safe mode)</bit>
-    <bit pos="58">Read by HYP as part of the communication of a Power Management fault</bit>
-    <bit pos="59">reserved</bit>
-    <bit pos="60">reserved</bit>
-    <bit pos="61">reserved</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_dl_fir.xml b/xml/p10/node_pau_dl_fir.xml
deleted file mode 100644
index 7684976..0000000
--- a/xml/p10/node_pau_dl_fir.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="PAU_DL_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PAU_DL_FIR">
-        <instance addr="0x10012C40" reg_inst="0"/>
-        <instance addr="0x11012C40" reg_inst="1"/>
-        <instance addr="0x12012C40" reg_inst="2"/>
-        <instance addr="0x13012C40" reg_inst="3"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="1">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="2">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="3">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="4">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="5">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="6">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="7">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="8">FIR Register - A TX ZCAL state machine parity or mode register parity error has occurred.</bit>
-    <bit pos="9">FIR Register - A PPE internal error has occurred.</bit>
-    <bit pos="10">FIR Register - A PPE external error has occurred.</bit>
-    <bit pos="11">FIR Register - A PPE Halt due to Watchdog or Interrupt has occurred.</bit>
-    <bit pos="12">FIR Register - A PPE Halt due to Debug has occurred.</bit>
-    <bit pos="13">FIR Register - PPE Halted.</bit>
-    <bit pos="14">FIR Register - A PPE Watchdog Timeout has occurred.</bit>
-    <bit pos="15">FIR Register - A PPE Array Scrub was missed.</bit>
-    <bit pos="16">FIR Register - A PPE Array uncorrectable error has occurred.</bit>
-    <bit pos="17">FIR Register - A PPE Array correctable error has occurred.</bit>
-    <bit pos="18">FIR Register - A PPE Code Recal Abort has occurred.</bit>
-    <bit pos="19">FIR Register - A PPE Code Fatal Error has occurred.</bit>
-    <bit pos="20">FIR Register - A PPE Code Warning has occurred.</bit>
-    <bit pos="21">FIR Register - A PPE Code DFT Error has occurred.</bit>
-    <bit pos="22">FIR Register - A PPE Code Recal Not Run has occurred.</bit>
-    <bit pos="23">FIR Register - A PPE Code Thread Locked has occurred.</bit>
-    <bit pos="24">FIR Register - A PPE Code FIR 6 has occurred.</bit>
-    <bit pos="25">FIR Register - A PPE Code FIR 7 has occurred.</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_fir_0.xml b/xml/p10/node_pau_fir_0.xml
deleted file mode 100644
index 79adfec..0000000
--- a/xml/p10/node_pau_fir_0.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PAU_FIR_0" reg_type="SCOM">
-    <local_fir config="" name="PAU_FIR_0">
-        <instance addr="0x10010C00" reg_inst="0"/>
-        <instance addr="0x11010C00" reg_inst="3"/>
-        <instance addr="0x12010C00" reg_inst="4"/>
-        <instance addr="0x12011400" reg_inst="5"/>
-        <instance addr="0x13010C00" reg_inst="6"/>
-        <instance addr="0x13011400" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">NTL array CE</bit>
-    <bit pos="1">NTL header array UE</bit>
-    <bit pos="2">NTL data array UE</bit>
-    <bit pos="3">NTL NVLInk Control/Header/AE Parity error</bit>
-    <bit pos="4">NTL NVLink Data Parity error</bit>
-    <bit pos="5">NTL NVLink Malformed Packet</bit>
-    <bit pos="6">NTL NVLink Unsupported Packet</bit>
-    <bit pos="7">NTL NVLink Config errors</bit>
-    <bit pos="8">NTL NVLink CRC errors or LMD=Stomp</bit>
-    <bit pos="9">NTL PRI errors</bit>
-    <bit pos="10">NTL logic error</bit>
-    <bit pos="11">NTL LMD=Data Poison</bit>
-    <bit pos="12">NTL data array SUE</bit>
-    <bit pos="13">CQ CTL/SM ASBE Array single-bit correctable error</bit>
-    <bit pos="14">CQ CTL/SM PBR PowerBus Recoverable</bit>
-    <bit pos="15">CQ CTL/SM REG Register ring error</bit>
-    <bit pos="16">CQ CTL/SM DUE Data Uncorrectable error for MMIO store data</bit>
-    <bit pos="17">CQ CTL/SM UT=1 to frozen PE</bit>
-    <bit pos="18">CQ CTL/SM NCF NVLink configuration error</bit>
-    <bit pos="19">CQ CTL/SM NVF NVLink fatal</bit>
-    <bit pos="20">CQ CTL/SM OCR OpenCAPI Recoverable, Command failed, and brick not fenced.</bit>
-    <bit pos="21">CQ CTL/SM AUE Array uncorrectable error</bit>
-    <bit pos="22">CQ CTL/SM PBP PowerBus parity error</bit>
-    <bit pos="23">CQ CTL/SM PBF PowerBus Fatal</bit>
-    <bit pos="24">CQ CTL/SM PBC PowerBus configuration error</bit>
-    <bit pos="25">CQ CTL/SM FWD Forward-Progress</bit>
-    <bit pos="26">CQ CTL/SM NLG PAU Logic error</bit>
-    <bit pos="27">Cresp=Addr_Error received for a load command</bit>
-    <bit pos="28">Cresp=Addr_Error received for a store command</bit>
-    <bit pos="29">CQ DAT ECC UE on data/BE arrays</bit>
-    <bit pos="30">CQ DAT ECC CE on data/BE arrays</bit>
-    <bit pos="31">CQ DAT parity error on data/BE latches</bit>
-    <bit pos="32">CQ DAT parity errors on configuration registers</bit>
-    <bit pos="33">CQ DAT parity errors on received PowerBus rtag</bit>
-    <bit pos="34">CQ DAT parity errors on internal state latches</bit>
-    <bit pos="35">CQ DAT logic error</bit>
-    <bit pos="36">CQ DAT ECC SUE on data/BE arrays</bit>
-    <bit pos="37">CQ DAT ECC SUE on PB receive data</bit>
-    <bit pos="38">CQ DAT Reserved, macro bit 9</bit>
-    <bit pos="39">CQ DAT Reserved, macro bit 10</bit>
-    <bit pos="40">XTS internal logic error</bit>
-    <bit pos="41">XTS correctable errors in XTS internal SRAM</bit>
-    <bit pos="42">XTS uncorrectable errors in XTS internal SRAM</bit>
-    <bit pos="43">XTS correctable error on incoming stack transactions</bit>
-    <bit pos="44">XTS uncorrectable/protocol errors on incoming stack transaction</bit>
-    <bit pos="45">XTS protocol errors on incoming PBUS transaction</bit>
-    <bit pos="46">XTS Translate Request Fail</bit>
-    <bit pos="47">XTS informational fir that is set when the snooper retries a rpt_hang.check or rpt_hang.poll command.</bit>
-    <bit pos="48">XTS Reserved, macro bit 8</bit>
-    <bit pos="49">XTS Reserved, macro bit 9</bit>
-    <bit pos="50">XTS Reserved, macro bit 10</bit>
-    <bit pos="51">XTS Reserved, macro bit 11</bit>
-    <bit pos="52">XTS Reserved, macro bit 12</bit>
-    <bit pos="53">XTS Reserved, macro bit 13</bit>
-    <bit pos="54">XTS Reserved, macro bit 14</bit>
-    <bit pos="55">XTS Reserved, macro bit 15</bit>
-    <bit pos="56">XTS Reserved, macro bit 16</bit>
-    <bit pos="57">XTS Reserved, macro bit 17</bit>
-    <bit pos="58">XTS Reserved, macro bit 18</bit>
-    <bit pos="59">AME Reserved, interrupt</bit>
-    <bit pos="60">AME data ECC UE</bit>
-    <bit pos="61">AME data SUE</bit>
-    <bit pos="62">Unused FIR</bit>
-    <bit pos="63">Unused FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_fir_1.xml b/xml/p10/node_pau_fir_1.xml
deleted file mode 100644
index 5ad3c95..0000000
--- a/xml/p10/node_pau_fir_1.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PAU_FIR_1" reg_type="SCOM">
-    <local_fir config="" name="PAU_FIR_1">
-        <instance addr="0x10010C40" reg_inst="0"/>
-        <instance addr="0x11010C40" reg_inst="3"/>
-        <instance addr="0x12010C40" reg_inst="4"/>
-        <instance addr="0x12011440" reg_inst="5"/>
-        <instance addr="0x13010C40" reg_inst="6"/>
-        <instance addr="0x13011440" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">NDL Brick0 stall</bit>
-    <bit pos="1">NDL Brick0 nostall</bit>
-    <bit pos="2">NDL Brick1 stall</bit>
-    <bit pos="3">NDL Brick1 nostall</bit>
-    <bit pos="4">NDL Brick2 stall</bit>
-    <bit pos="5">NDL Brick2 nostall</bit>
-    <bit pos="6">NDL Brick3 stall</bit>
-    <bit pos="7">NDL Brick3 nostall</bit>
-    <bit pos="8">NDL Brick4 stall</bit>
-    <bit pos="9">NDL Brick4 nostall</bit>
-    <bit pos="10">NDL Brick5 stall</bit>
-    <bit pos="11">NDL Brick5 nostall</bit>
-    <bit pos="12">MISC Register ring error</bit>
-    <bit pos="13">MISC Parity error from interrupt base real address register</bit>
-    <bit pos="14">MISC Parity error on Indirect SCOM Address register</bit>
-    <bit pos="15">MISC Parity error on MISC Control register</bit>
-    <bit pos="16">FIR1 Reserved, bit 16</bit>
-    <bit pos="17">ATS Invalid TVT entry</bit>
-    <bit pos="18">ATS TVT Address range error</bit>
-    <bit pos="19">ATS TCE Page access error during TCE cache lookup</bit>
-    <bit pos="20">ATS Effective Address hit multiple TCE cache entries</bit>
-    <bit pos="21">ATS TCE Page access error during TCE table-walk</bit>
-    <bit pos="22">ATS Timeout on TCE tree walk</bit>
-    <bit pos="23">ATS Parity error on TCE cache directory array</bit>
-    <bit pos="24">ATS Parity error on TCE cache data array</bit>
-    <bit pos="25">ATS ECC UE on Effective Address array</bit>
-    <bit pos="26">ATS ECC CE on Effective Address array</bit>
-    <bit pos="27">ATS ECC UE on TDRmem array</bit>
-    <bit pos="28">ATS ECC CE on TDRmem array</bit>
-    <bit pos="29">ATS ECC UE on CQ CTL DMA Read data to TDR_mem array during table-walk</bit>
-    <bit pos="30">ATS ECC CE on CQ CTL DMA Read data to TDR_mem array during table-walk</bit>
-    <bit pos="31">ATS Parity error on TVT entry</bit>
-    <bit pos="32">ATS Parity error on IODA Address Register</bit>
-    <bit pos="33">ATS Parity error on ATS Control Register</bit>
-    <bit pos="34">ATS Parity error on ATS Timeout Control register</bit>
-    <bit pos="35">ATS Invalid IODA Table Address Register Table Select entry</bit>
-    <bit pos="36">ATS Reserved, macro bit 19</bit>
-    <bit pos="37">kill xlate epoch timeout.</bit>
-    <bit pos="38">XSL Reserved, macro bit 19.</bit>
-    <bit pos="39">XSL Reserved, macro bit 20.</bit>
-    <bit pos="40">XSL Reserved, macro bit 21.</bit>
-    <bit pos="41">XSL Reserved, macro bit 22.</bit>
-    <bit pos="42">XSL Reserved, macro bit 23.</bit>
-    <bit pos="43">XSL Reserved, macro bit 24.</bit>
-    <bit pos="44">XSL Reserved, macro bit 25.</bit>
-    <bit pos="45">XSL Reserved, macro bit 26.</bit>
-    <bit pos="46">XSL Reserved, macro bit 27.</bit>
-    <bit pos="47">NDL Brick6 stall</bit>
-    <bit pos="48">NDL Brick6 nostall</bit>
-    <bit pos="49">NDL Brick7 stall</bit>
-    <bit pos="50">NDL Brick7 nostall</bit>
-    <bit pos="51">NDL Brick8 stall</bit>
-    <bit pos="52">NDL Brick8 nostall</bit>
-    <bit pos="53">NDL Brick9 stall</bit>
-    <bit pos="54">NDL Brick9 nostall</bit>
-    <bit pos="55">NDL Brick10 stall</bit>
-    <bit pos="56">NDL Brick10 nostall</bit>
-    <bit pos="57">NDL Brick11 stall</bit>
-    <bit pos="58">NDL Brick11 nostall</bit>
-    <bit pos="59">AME ECC CE</bit>
-    <bit pos="60">MISC Pervasive SCOM satellite signaled internal FSM error (ring 0, sat 0)</bit>
-    <bit pos="61">MISC Pervasive SCOM satellite signaled internal FSM error (ring 0, sat 1)</bit>
-    <bit pos="62">Unused FIR</bit>
-    <bit pos="63">Unused FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_fir_2.xml b/xml/p10/node_pau_fir_2.xml
deleted file mode 100644
index 5f1790a..0000000
--- a/xml/p10/node_pau_fir_2.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PAU_FIR_2" reg_type="SCOM">
-    <local_fir config="" name="PAU_FIR_2">
-        <instance addr="0x10010C80" reg_inst="0"/>
-        <instance addr="0x11010C80" reg_inst="3"/>
-        <instance addr="0x12010C80" reg_inst="4"/>
-        <instance addr="0x12011480" reg_inst="5"/>
-        <instance addr="0x13010C80" reg_inst="6"/>
-        <instance addr="0x13011480" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">OTL Brick2 translation fault</bit>
-    <bit pos="1">OTL Brick3 translation fault</bit>
-    <bit pos="2">OTL Brick4 translation fault</bit>
-    <bit pos="3">OTL Brick5 translation fault</bit>
-    <bit pos="4">OTL TL credit counter overflow caused by return_tl_credits</bit>
-    <bit pos="5">OTL RX acTag specified in a command is outside the configured specification set</bit>
-    <bit pos="6">OTL RX acTag specified in the command points to an invalid entry</bit>
-    <bit pos="7">OTL RX reserved opcode used</bit>
-    <bit pos="8">OTL RX return_tl_credit command found outside slot0</bit>
-    <bit pos="9">OTL RX bad opcode and template combination</bit>
-    <bit pos="10">OTL RX unsupported template format</bit>
-    <bit pos="11">OTL RX bad template x00 format</bit>
-    <bit pos="12">OTL RX control flit overrun</bit>
-    <bit pos="13">OTL RX unexpected data flit</bit>
-    <bit pos="14">OTL RX DL link down</bit>
-    <bit pos="15">OTL RX bad data received on command</bit>
-    <bit pos="16">OTL RX bad data received on response</bit>
-    <bit pos="17">OTL RX AP response not allowed (CAPPTag not recognized)</bit>
-    <bit pos="18">OR of all OTL parity errors</bit>
-    <bit pos="19">OR of all OTL ECC CE errors</bit>
-    <bit pos="20">OR of all OTL ECC UE errors</bit>
-    <bit pos="21">RXO OP Errors</bit>
-    <bit pos="22">RXO Internal Errors</bit>
-    <bit pos="23">OTL RXI fifo overrun</bit>
-    <bit pos="24">OTL RXI control flit data run length invalid</bit>
-    <bit pos="25">OTL RXI opcode utilizing dLength specifies dL=0b00 or other invalid dL</bit>
-    <bit pos="26">OTL RXI bad data received vc2</bit>
-    <bit pos="27">OTL RXI dcp2 fifo overrun</bit>
-    <bit pos="28">OTL RXI vc1 fifo overrun</bit>
-    <bit pos="29">OTL RXI vc2 fifo overrun</bit>
-    <bit pos="30">Opcode data length not supported</bit>
-    <bit pos="31">OTL TXI opcode error</bit>
-    <bit pos="32">malformed packet error type 4 (rxi_misc_error_fieldrsvdne0_tlvc2)</bit>
-    <bit pos="33">OTL Happi no bar match</bit>
-    <bit pos="34">OTL Reserved, macro bit 30</bit>
-    <bit pos="35">OTL Reserved, macro bit 31</bit>
-    <bit pos="36">MMIO invalidate requested while one is in progress</bit>
-    <bit pos="37">Unexpected ITAG returned on itag completion port 0</bit>
-    <bit pos="38">Unexpected ITAG returned on itag completion port 1</bit>
-    <bit pos="39">Unexpected Read PEE completion</bit>
-    <bit pos="40">Unexpected Checkout response</bit>
-    <bit pos="41">Translation request while SPAP is invalid</bit>
-    <bit pos="42">Read a PEE which was not valid</bit>
-    <bit pos="43">Bloom filter protection error</bit>
-    <bit pos="44">Translation request to non-valid TA</bit>
-    <bit pos="45">TA Translation request to an invalid TA</bit>
-    <bit pos="46">correctable array error (SBE)</bit>
-    <bit pos="47">uncorrectable array error (UE or parity)</bit>
-    <bit pos="48">S/TLBI buffer overflow</bit>
-    <bit pos="49">SBE correctable error on Powerbus checkout response data or Powerbus PEE read data</bit>
-    <bit pos="50">UE  uncorrectable error on Powerbus checkout response data or Powerbus PEE read data</bit>
-    <bit pos="51">SUE error on Powerbus checkout response data or Powerbus PEE read data</bit>
-    <bit pos="52">PA mem_hit when bar mode is nonzero</bit>
-    <bit pos="53">XSL Reserved, macro bit 17</bit>
-    <bit pos="54">OTL Brick0 translation fault</bit>
-    <bit pos="55">OTL Brick1 translation fault</bit>
-    <bit pos="56">AME ECC UE on control information or state bit errors that are contained within AME and ATL</bit>
-    <bit pos="57">AME ECC UE on control information or state bit errors that can affect correctness of external logic such as XSL castout</bit>
-    <bit pos="58">AME Logic errors that are contained within AME and ATL</bit>
-    <bit pos="59">AME Logic errors that can affect correctness of external logic such as XSL castout</bit>
-    <bit pos="60">AME firmware-detected fatal error conditions</bit>
-    <bit pos="61">AME Reserved</bit>
-    <bit pos="62">Unused FIR</bit>
-    <bit pos="63">Unused FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_local_fir.xml b/xml/p10/node_pau_local_fir.xml
deleted file mode 100644
index 2b28afd..0000000
--- a/xml/p10/node_pau_local_fir.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PAU_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="PAU_LOCAL_FIR">
-        <instance addr="0x10040100" reg_inst="0"/>
-        <instance addr="0x11040100" reg_inst="1"/>
-        <instance addr="0x12040100" reg_inst="2"/>
-        <instance addr="0x13040100" reg_inst="3"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_pb0123_pr_err.xml b/xml/p10/node_pau_pb0123_pr_err.xml
deleted file mode 100644
index 4ec3fd2..0000000
--- a/xml/p10/node_pau_pb0123_pr_err.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_PR0123_ERR" reg_type="SCOM">
-    <register name="PB_PR0123_ERR">
-        <instance reg_inst="0" addr="0x10011829" />
-        <instance reg_inst="1" addr="0x11011829" />
-        <instance reg_inst="2" addr="0x12011829" />
-        <instance reg_inst="3" addr="0x13011829" />
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="reg" value1="PB_PR0123_ERR"/>
-    </rule>
-    <rule attn_type="RE" node_inst="0:3">
-        <expr type="reg" value1="PB_PR0123_ERR"/>
-    </rule>
-    <rule attn_type="SPA" node_inst="0:3">
-        <expr type="reg" value1="PB_PR0123_ERR"/>
-    </rule>
-    <bit pos="0">prs0_address_pty</bit>
-    <bit pos="1">prs0_atag_pty</bit>
-    <bit pos="2">prs0_cc0_crediterr</bit>
-    <bit pos="3">prs0_cc1_crediterr</bit>
-    <bit pos="4">prs0_cc2_crediterr</bit>
-    <bit pos="5">prs0_cc3_crediterr</bit>
-    <bit pos="6">prs0_control_error</bit>
-    <bit pos="7">prs0_data_pty_err</bit>
-    <bit pos="8">prs0_rtag_misc_pty</bit>
-    <bit pos="9">prs0_rtag_pty</bit>
-    <bit pos="10">prs0_ttag_pty</bit>
-    <bit pos="11">prs0_vc0_crediterr</bit>
-    <bit pos="12">prs0_vc1_crediterr</bit>
-    <bit pos="13">prs0_link_down</bit>
-    <bit pos="16">prs1_address_pty</bit>
-    <bit pos="17">prs1_atag_pty</bit>
-    <bit pos="18">prs1_cc0_crediterr</bit>
-    <bit pos="19">prs1_cc1_crediterr</bit>
-    <bit pos="20">prs1_cc2_crediterr</bit>
-    <bit pos="21">prs1_cc3_crediterr</bit>
-    <bit pos="22">prs1_control_error</bit>
-    <bit pos="23">prs1_data_pty_err</bit>
-    <bit pos="24">prs1_rtag_misc_pty</bit>
-    <bit pos="25">prs1_rtag_pty</bit>
-    <bit pos="26">prs1_ttag_pty</bit>
-    <bit pos="27">prs1_vc0_crediterr</bit>
-    <bit pos="28">prs1_vc1_crediterr</bit>
-    <bit pos="29">prs1_link_down</bit>
-    <bit pos="32">prs2_address_pty</bit>
-    <bit pos="33">prs2_atag_pty</bit>
-    <bit pos="34">prs2_cc0_crediterr</bit>
-    <bit pos="35">prs2_cc1_crediterr</bit>
-    <bit pos="36">prs2_cc2_crediterr</bit>
-    <bit pos="37">prs2_cc3_crediterr</bit>
-    <bit pos="38">prs2_control_error</bit>
-    <bit pos="39">prs2_data_pty_err</bit>
-    <bit pos="40">prs2_rtag_misc_pty</bit>
-    <bit pos="41">prs2_rtag_pty</bit>
-    <bit pos="42">prs2_ttag_pty</bit>
-    <bit pos="43">prs2_vc0_crediterr</bit>
-    <bit pos="44">prs2_vc1_crediterr</bit>
-    <bit pos="45">prs2_link_down</bit>
-    <bit pos="48">prs3_address_pty</bit>
-    <bit pos="49">prs3_atag_pty</bit>
-    <bit pos="50">prs3_cc0_crediterr</bit>
-    <bit pos="51">prs3_cc1_crediterr</bit>
-    <bit pos="52">prs3_cc2_crediterr</bit>
-    <bit pos="53">prs3_cc3_crediterr</bit>
-    <bit pos="54">prs3_control_error</bit>
-    <bit pos="55">prs3_data_pty_err</bit>
-    <bit pos="56">prs3_rtag_misc_pty</bit>
-    <bit pos="57">prs3_rtag_pty</bit>
-    <bit pos="58">prs3_ttag_pty</bit>
-    <bit pos="59">prs3_vc0_crediterr</bit>
-    <bit pos="60">prs3_vc1_crediterr</bit>
-    <bit pos="61">prs3_link_down</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_pb_dob01_dib01_int_err.xml b/xml/p10/node_pau_pb_dob01_dib01_int_err.xml
deleted file mode 100644
index a7bc58d..0000000
--- a/xml/p10/node_pau_pb_dob01_dib01_int_err.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_DOB01_DIB01_INT_ERR" reg_type="SCOM">
-    <register name="PB_DOB01_DIB01_INT_ERR">
-        <instance reg_inst="0" addr="0x10011828" />
-        <instance reg_inst="1" addr="0x11011828" />
-        <instance reg_inst="2" addr="0x12011828" />
-        <instance reg_inst="3" addr="0x13011828" />
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB01_DIB01_INT_ERR"/>
-    </rule>
-    <rule attn_type="RE" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB01_DIB01_INT_ERR"/>
-    </rule>
-    <rule attn_type="SPA" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB01_DIB01_INT_ERR"/>
-    </rule>
-    <bit pos="0">dob01_rtag_pbiterr</bit>
-    <bit pos="1">dob01_rtag_perr</bit>
-    <bit pos="2">dob01_misc_perr</bit>
-    <bit pos="3">dob01_f0vc0_evenperr</bit>
-    <bit pos="4">dob01_f0vc0_oddperr</bit>
-    <bit pos="5">dob01_f0vc1_evenperr</bit>
-    <bit pos="6">dob01_f0vc1_oddperr</bit>
-    <bit pos="7">dob01_f1vc0_evenperr</bit>
-    <bit pos="8">dob01_f1vc0_oddperr</bit>
-    <bit pos="9">dob01_f1vc1_evenperr</bit>
-    <bit pos="10">dob01_f1vc1_oddperr</bit>
-    <bit pos="11">dob01_f0_underflow</bit>
-    <bit pos="12">dob01_f0_overflow</bit>
-    <bit pos="13">dob01_f1_underflow</bit>
-    <bit pos="14">dob01_f1_overflow</bit>
-    <bit pos="15">dob01_vc0_underflow</bit>
-    <bit pos="16">dob01_vc0_overflow</bit>
-    <bit pos="17">dob01_vc1_underflow</bit>
-    <bit pos="18">dob01_vc1_overflow</bit>
-    <bit pos="19">dob01_f0vc0_underflow</bit>
-    <bit pos="20">dob01_f0vc0_overflow</bit>
-    <bit pos="21">dob01_f0vc1_underflow</bit>
-    <bit pos="22">dob01_f0vc1_overflow</bit>
-    <bit pos="23">dob01_f1vc0_underflow</bit>
-    <bit pos="24">dob01_f1vc0_overflow</bit>
-    <bit pos="25">dob01_f1vc1_underflow</bit>
-    <bit pos="26">dob01_f1vc1_overflow</bit>
-    <bit pos="27">dob01_vc0_prefetch_overflow</bit>
-    <bit pos="28">dob01_vc1_prefetch_overflow</bit>
-    <bit pos="29">dib01_evn0_underflow</bit>
-    <bit pos="30">dib01_evn0_overflow</bit>
-    <bit pos="31">dib01_evn1_underflow</bit>
-    <bit pos="32">dib01_evn1_overflow</bit>
-    <bit pos="33">dib01_rtag_pbiterr</bit>
-    <bit pos="34">dib01_rtag_perr</bit>
-    <bit pos="35">dib01_misc_perr</bit>
-    <bit pos="36">dib01_odd0_underflow</bit>
-    <bit pos="37">dib01_odd0_overflow</bit>
-    <bit pos="38">dib01_odd1_underflow</bit>
-    <bit pos="39">dib01_odd1_overflow</bit>
-    <bit pos="40">dib01_rtag_underflow</bit>
-    <bit pos="41">dib01_rtag_overflow</bit>
-    <bit pos="42">dib01_data_underflow</bit>
-    <bit pos="43">dib01_data_overflow</bit>
-    <bit pos="44">dib01_vc0_underflow</bit>
-    <bit pos="45">dib01_vc0_overflow</bit>
-    <bit pos="46">dib01_vc1_underflow</bit>
-    <bit pos="47">dib01_vc1_overflow</bit>
-    <bit pos="48">dib01_f0vc0_over_underflow</bit>
-    <bit pos="49">dib01_f0vc1_over_underflow</bit>
-    <bit pos="50">dib01_f1vc0_over_underflow</bit>
-    <bit pos="51">dib01_f1vc1_over_underflow</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_pb_dob23_dib23_int_err.xml b/xml/p10/node_pau_pb_dob23_dib23_int_err.xml
deleted file mode 100644
index d24b7d4..0000000
--- a/xml/p10/node_pau_pb_dob23_dib23_int_err.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_DOB23_DIB23_INT_ERR" reg_type="SCOM">
-    <register name="PB_DOB23_DIB23_INT_ERR">
-        <instance reg_inst="0" addr="0x1001182A" />
-        <instance reg_inst="1" addr="0x1101182A" />
-        <instance reg_inst="2" addr="0x1201182A" />
-        <instance reg_inst="3" addr="0x1301182A" />
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB23_DIB23_INT_ERR"/>
-    </rule>
-    <rule attn_type="RE" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB23_DIB23_INT_ERR"/>
-    </rule>
-    <rule attn_type="SPA" node_inst="0:3">
-        <expr type="reg" value1="PB_DOB23_DIB23_INT_ERR"/>
-    </rule>
-    <bit pos="0">dob23_rtag_pbiterr</bit>
-    <bit pos="1">dob23_rtag_perr</bit>
-    <bit pos="2">dob23_misc_perr</bit>
-    <bit pos="3">dob23_f0vc0_evenperr</bit>
-    <bit pos="4">dob23_f0vc0_oddperr</bit>
-    <bit pos="5">dob23_f0vc1_evenperr</bit>
-    <bit pos="6">dob23_f0vc1_oddperr</bit>
-    <bit pos="7">dob23_f1vc0_evenperr</bit>
-    <bit pos="8">dob23_f1vc0_oddperr</bit>
-    <bit pos="9">dob23_f1vc1_evenperr</bit>
-    <bit pos="10">dob23_f1vc1_oddperr</bit>
-    <bit pos="11">dob23_f0_underflow</bit>
-    <bit pos="12">dob23_f0_overflow</bit>
-    <bit pos="13">dob23_f1_underflow</bit>
-    <bit pos="14">dob23_f1_overflow</bit>
-    <bit pos="15">dob23_vc0_underflow</bit>
-    <bit pos="16">dob23_vc0_overflow</bit>
-    <bit pos="17">dob23_vc1_underflow</bit>
-    <bit pos="18">dob23_vc1_overflow</bit>
-    <bit pos="19">dob23_f0vc0_underflow</bit>
-    <bit pos="20">dob23_f0vc0_overflow</bit>
-    <bit pos="21">dob23_f0vc1_underflow</bit>
-    <bit pos="22">dob23_f0vc1_overflow</bit>
-    <bit pos="23">dob23_f1vc0_underflow</bit>
-    <bit pos="24">dob23_f1vc0_overflow</bit>
-    <bit pos="25">dob23_f1vc1_underflow</bit>
-    <bit pos="26">dob23_f1vc1_overflow</bit>
-    <bit pos="27">dob23_vc0_prefetch_overflow</bit>
-    <bit pos="28">dob23_vc1_prefetch_overflow</bit>
-    <bit pos="29">dib23_evn0_underflow</bit>
-    <bit pos="30">dib23_evn0_overflow</bit>
-    <bit pos="31">dib23_evn1_underflow</bit>
-    <bit pos="32">dib23_evn1_overflow</bit>
-    <bit pos="33">dib23_rtag_pbiterr</bit>
-    <bit pos="34">dib23_rtag_perr</bit>
-    <bit pos="35">dib23_misc_perr</bit>
-    <bit pos="36">dib23_odd0_underflow</bit>
-    <bit pos="37">dib23_odd0_overflow</bit>
-    <bit pos="38">dib23_odd1_underflow</bit>
-    <bit pos="39">dib23_odd1_overflow</bit>
-    <bit pos="40">dib23_rtag_underflow</bit>
-    <bit pos="41">dib23_rtag_overflow</bit>
-    <bit pos="42">dib23_data_underflow</bit>
-    <bit pos="43">dib23_data_overflow</bit>
-    <bit pos="44">dib23_vc0_underflow</bit>
-    <bit pos="45">dib23_vc0_overflow</bit>
-    <bit pos="46">dib23_vc1_underflow</bit>
-    <bit pos="47">dib23_vc1_overflow</bit>
-    <bit pos="48">dib23_f0vc0_over_underflow</bit>
-    <bit pos="49">dib23_f0vc1_over_underflow</bit>
-    <bit pos="50">dib23_f1vc0_over_underflow</bit>
-    <bit pos="51">dib23_f1vc1_over_underflow</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_pb_fm0123_err.xml b/xml/p10/node_pau_pb_fm0123_err.xml
deleted file mode 100644
index 7381c73..0000000
--- a/xml/p10/node_pau_pb_fm0123_err.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_FM0123_ERR" reg_type="SCOM">
-    <register name="PB_FM0123_ERR">
-        <instance reg_inst="0" addr="0x10011827" />
-        <instance reg_inst="1" addr="0x11011827" />
-        <instance reg_inst="2" addr="0x12011827" />
-        <instance reg_inst="3" addr="0x13011827" />
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="reg" value1="PB_FM0123_ERR"/>
-    </rule>
-    <rule attn_type="RE" node_inst="0:3">
-        <expr type="reg" value1="PB_FM0123_ERR"/>
-    </rule>
-    <rule attn_type="SPA" node_inst="0:3">
-        <expr type="reg" value1="PB_FM0123_ERR"/>
-    </rule>
-    <bit pos="0">fmr0_control_error</bit>
-    <bit pos="1">fmr0_addr_perr</bit>
-    <bit pos="2">fmr0_cc0_crediterr</bit>
-    <bit pos="3">fmr0_cc1_crediterr</bit>
-    <bit pos="4">fmr0_cc2_crediterr</bit>
-    <bit pos="5">fmr0_cc3_crediterr</bit>
-    <bit pos="6">fmr0_dat_hi_perr</bit>
-    <bit pos="7">fmr0_dat_lo_perr</bit>
-    <bit pos="8">fmr0_frame_crediterr</bit>
-    <bit pos="9">fmr0_internal_err</bit>
-    <bit pos="10">fmr0_prsp_ptyerr</bit>
-    <bit pos="11">fmr0_ttag_perr</bit>
-    <bit pos="12">fmr0_vc0_crediterr</bit>
-    <bit pos="13">fmr0_vc1_crediterr</bit>
-    <bit pos="14">fmr0_rtag_ptyerr</bit>
-    <bit pos="15">fmr0_rtag_misc_pty</bit>
-    <bit pos="16">fmr1_control_error</bit>
-    <bit pos="17">fmr1_addr_perr</bit>
-    <bit pos="18">fmr1_cc0_crediterr</bit>
-    <bit pos="19">fmr1_cc1_crediterr</bit>
-    <bit pos="20">fmr1_cc2_crediterr</bit>
-    <bit pos="21">fmr1_cc3_crediterr</bit>
-    <bit pos="22">fmr1_dat_hi_perr</bit>
-    <bit pos="23">fmr1_dat_lo_perr</bit>
-    <bit pos="24">fmr1_frame_crediterr</bit>
-    <bit pos="25">fmr1_internal_err</bit>
-    <bit pos="26">fmr1_prsp_ptyerr</bit>
-    <bit pos="27">fmr1_ttag_perr</bit>
-    <bit pos="28">fmr1_vc0_crediterr</bit>
-    <bit pos="29">fmr1_vc1_crediterr</bit>
-    <bit pos="30">fmr1_rtag_ptyerr</bit>
-    <bit pos="31">fmr1_rtag_misc_pty</bit>
-    <bit pos="32">fmr2_control_error</bit>
-    <bit pos="33">fmr2_addr_perr</bit>
-    <bit pos="34">fmr2_cc0_crediterr</bit>
-    <bit pos="35">fmr2_cc1_crediterr</bit>
-    <bit pos="36">fmr2_cc2_crediterr</bit>
-    <bit pos="37">fmr2_cc3_crediterr</bit>
-    <bit pos="38">fmr2_dat_hi_perr</bit>
-    <bit pos="39">fmr2_dat_lo_perr</bit>
-    <bit pos="40">fmr2_frame_crediterr</bit>
-    <bit pos="41">fmr2_internal_err</bit>
-    <bit pos="42">fmr2_prsp_ptyerr</bit>
-    <bit pos="43">fmr2_ttag_perr</bit>
-    <bit pos="44">fmr2_vc0_crediterr</bit>
-    <bit pos="45">fmr2_vc1_crediterr</bit>
-    <bit pos="46">fmr2_rtag_ptyerr</bit>
-    <bit pos="47">fmr2_rtag_misc_pty</bit>
-    <bit pos="48">fmr3_control_error</bit>
-    <bit pos="49">fmr3_addr_perr</bit>
-    <bit pos="50">fmr3_cc0_crediterr</bit>
-    <bit pos="51">fmr3_cc1_crediterr</bit>
-    <bit pos="52">fmr3_cc2_crediterr</bit>
-    <bit pos="53">fmr3_cc3_crediterr</bit>
-    <bit pos="54">fmr3_dat_hi_perr</bit>
-    <bit pos="55">fmr3_dat_lo_perr</bit>
-    <bit pos="56">fmr3_frame_crediterr</bit>
-    <bit pos="57">fmr3_internal_err</bit>
-    <bit pos="58">fmr3_prsp_ptyerr</bit>
-    <bit pos="59">fmr3_ttag_perr</bit>
-    <bit pos="60">fmr3_vc0_crediterr</bit>
-    <bit pos="61">fmr3_vc1_crediterr</bit>
-    <bit pos="62">fmr3_rtag_ptyerr</bit>
-    <bit pos="63">fmr3_rtag_misc_pty</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_phy_fir.xml b/xml/p10/node_pau_phy_fir.xml
deleted file mode 100644
index b88151f..0000000
--- a/xml/p10/node_pau_phy_fir.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="PAU_PHY_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PAU_PHY_FIR">
-        <instance addr="0x10012C00" reg_inst="0"/>
-        <instance addr="0x11012C00" reg_inst="1"/>
-        <instance addr="0x12012C00" reg_inst="2"/>
-        <instance addr="0x13012C00" reg_inst="3"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="1">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="2">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="3">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="4">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="5">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="6">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="7">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="8">FIR Register - A TX ZCAL state machine parity or mode register parity error has occurred.</bit>
-    <bit pos="9">FIR Register - A PPE internal error has occurred.</bit>
-    <bit pos="10">FIR Register - A PPE external error has occurred.</bit>
-    <bit pos="11">FIR Register - A PPE Halt due to Watchdog or Interrupt has occurred.</bit>
-    <bit pos="12">FIR Register - A PPE Halt due to Debug has occurred.</bit>
-    <bit pos="13">FIR Register - PPE Halted.</bit>
-    <bit pos="14">FIR Register - A PPE Watchdog Timeout has occurred.</bit>
-    <bit pos="15">FIR Register - A PPE Array Scrub was missed.</bit>
-    <bit pos="16">FIR Register - A PPE Array uncorrectable error has occurred.</bit>
-    <bit pos="17">FIR Register - A PPE Array correctable error has occurred.</bit>
-    <bit pos="18">FIR Register - A PPE Code Recal Abort has occurred.</bit>
-    <bit pos="19">FIR Register - A PPE Code Fatal Error has occurred.</bit>
-    <bit pos="20">FIR Register - A PPE Code Warning has occurred.</bit>
-    <bit pos="21">FIR Register - A PPE Code DFT Error has occurred.</bit>
-    <bit pos="22">FIR Register - A PPE Code Recal Not Run has occurred.</bit>
-    <bit pos="23">FIR Register - A PPE Code Thread Locked has occurred.</bit>
-    <bit pos="24">FIR Register - A PPE Code FIR 6 has occurred.</bit>
-    <bit pos="25">FIR Register - A PPE Code FIR 7 has occurred.</bit>
-    <bit pos="26">FIR Register- A SCOM FSM or FIR register parity error has occurred.</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_phy_fir_p10_10.xml b/xml/p10/node_pau_phy_fir_p10_10.xml
deleted file mode 100644
index 7993d08..0000000
--- a/xml/p10/node_pau_phy_fir_p10_10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="PAU_PHY_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PAU_PHY_FIR">
-        <instance addr="0x10012C00" reg_inst="0"/>
-        <instance addr="0x11012C00" reg_inst="1"/>
-        <instance addr="0x12012C00" reg_inst="2"/>
-        <instance addr="0x13012C00" reg_inst="3"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="1">FIR Register - A RX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="2">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="3">FIR Register - A RX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="4">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO0).</bit>
-    <bit pos="5">FIR Register - A TX state machine parity or mode register parity error has occurred (IOO1).</bit>
-    <bit pos="6">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI0).</bit>
-    <bit pos="7">FIR Register - A TX state machine parity or mode register parity error has occurred (OMI1).</bit>
-    <bit pos="8">FIR Register - A TX ZCAL state machine parity or mode register parity error has occurred.</bit>
-    <bit pos="9">FIR Register - A PPE internal error has occurred.</bit>
-    <bit pos="10">FIR Register - A PPE external error has occurred.</bit>
-    <bit pos="11">FIR Register - A PPE Halt due to Watchdog or Interrupt has occurred.</bit>
-    <bit pos="12">FIR Register - A PPE Halt due to Debug has occurred.</bit>
-    <bit pos="13">FIR Register - PPE Halted.</bit>
-    <bit pos="14">FIR Register - A PPE Watchdog Timeout has occurred.</bit>
-    <bit pos="15">FIR Register - A PPE Array Scrub was missed.</bit>
-    <bit pos="16">FIR Register - A PPE Array uncorrectable error has occurred.</bit>
-    <bit pos="17">FIR Register - A PPE Array correctable error has occurred.</bit>
-    <bit pos="18">FIR Register - A PPE Code Recal Abort has occurred.</bit>
-    <bit pos="19">FIR Register - A PPE Code Fatal Error has occurred.</bit>
-    <bit pos="20">FIR Register - A PPE Code Warning has occurred.</bit>
-    <bit pos="21">FIR Register - A PPE Code DFT Error has occurred.</bit>
-    <bit pos="22">FIR Register - A PPE Code Recal Not Run has occurred.</bit>
-    <bit pos="23">FIR Register - A PPE Code Thread Locked has occurred.</bit>
-    <bit pos="24">FIR Register - A PPE Code FIR 6 has occurred.</bit>
-    <bit pos="25">FIR Register - A PPE Code FIR 7 has occurred.</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_ptl_fir.xml b/xml/p10/node_pau_ptl_fir.xml
deleted file mode 100644
index d6cb342..0000000
--- a/xml/p10/node_pau_ptl_fir.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PAU_PTL_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PAU_PTL_FIR">
-        <instance addr="0x10011800" reg_inst="0"/>
-        <instance addr="0x11011800" reg_inst="1"/>
-        <instance addr="0x12011800" reg_inst="2"/>
-        <instance addr="0x13011800" reg_inst="3"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_TL_LINK_SYN_01">
-        <instance reg_inst="0" addr="0x10011812" />
-        <instance reg_inst="1" addr="0x11011812" />
-        <instance reg_inst="2" addr="0x12011812" />
-        <instance reg_inst="3" addr="0x13011812" />
-    </register>
-    <register name="PB_TL_LINK_SYN_23">
-        <instance reg_inst="0" addr="0x10011813" />
-        <instance reg_inst="1" addr="0x11011813" />
-        <instance reg_inst="2" addr="0x12011813" />
-        <instance reg_inst="3" addr="0x13011813" />
-    </register>
-    <register name="PB_EN_DOB_ECC_ERR">
-        <instance reg_inst="0" addr="0x10011818" />
-        <instance reg_inst="1" addr="0x11011818" />
-        <instance reg_inst="2" addr="0x12011818" />
-        <instance reg_inst="3" addr="0x13011818" />
-    </register>
-    <register name="PB_MISC_CFG">
-        <instance reg_inst="0" addr="0x10011825" />
-        <instance reg_inst="1" addr="0x11011825" />
-        <instance reg_inst="2" addr="0x12011825" />
-        <instance reg_inst="3" addr="0x13011825" />
-    </register>
-    <capture_group node_inst="0:3">
-        <capture_register reg_name="PB_TL_LINK_SYN_01" reg_inst="0:3" />
-        <capture_register reg_name="PB_TL_LINK_SYN_23" reg_inst="0:3" />
-        <capture_register reg_name="PB_EN_DOB_ECC_ERR" reg_inst="0:3" />
-        <capture_register reg_name="PB_MISC_CFG"       reg_inst="0:3" />
-    </capture_group>
-    <bit pos="0">fmr00 trained. Even PTL, even half.</bit>
-    <bit pos="1">fmr01 trained. Even PTL, odd half.</bit>
-    <bit pos="2">fmr02 trained. Odd PTL, even half.</bit>
-    <bit pos="3">fmr03 trained. Odd PTL, odd half.</bit>
-    <bit pos="4">dob01 ue</bit>
-    <bit pos="5">dob01 ce</bit>
-    <bit pos="6">dob01 sue</bit>
-    <bit pos="7" child_node="PB_DOB01_DIB01_INT_ERR" node_inst="0:3">data outbound switch internal error - even PTL.</bit>
-    <bit pos="8">dob23 ue</bit>
-    <bit pos="9">dob23 ce</bit>
-    <bit pos="10">dob23 sue</bit>
-    <bit pos="11" child_node="PB_DOB23_DIB23_INT_ERR" node_inst="0:3">data outbound switch internal error - odd PTL.</bit>
-    <bit pos="12" child_node="PB_FM0123_ERR" node_inst="0:3">Even PTL, even framer internal error</bit>
-    <bit pos="13">Even PTL, outbound switch cmd/presp/cresp internal error</bit>
-    <bit pos="14" child_node="PB_FM0123_ERR" node_inst="0:3">Even PTL, odd framer internal error</bit>
-    <bit pos="15" child_node="PB_FM0123_ERR" node_inst="0:3">Odd PTL, even framer internal error</bit>
-    <bit pos="16">Odd PTL, outbound switch cmd/presp/cresp internal error</bit>
-    <bit pos="17" child_node="PB_FM0123_ERR" node_inst="0:3">Odd PTL, odd framer internal error</bit>
-    <bit pos="18" child_node="PB_PR0123_ERR" node_inst="0:3">Even PTL, even parser internal error</bit>
-    <bit pos="19" child_node="PB_PR0123_ERR" node_inst="0:3">Even PTL, odd parser internal error</bit>
-    <bit pos="20" child_node="PB_PR0123_ERR" node_inst="0:3">Odd PTL, even parser internal error</bit>
-    <bit pos="21" child_node="PB_PR0123_ERR" node_inst="0:3">Odd PTL, odd parser internal error</bit>
-    <bit pos="22">Even PTL, even link down</bit>
-    <bit pos="23">Even PTL, odd link down</bit>
-    <bit pos="24">Odd PTL, even link down</bit>
-    <bit pos="25">Odd PTL, odd link down</bit>
-    <bit pos="26" child_node="PB_DOB01_DIB01_INT_ERR" node_inst="0:3">Even PTL data inbound switch internal error</bit>
-    <bit pos="27" child_node="PB_DOB23_DIB23_INT_ERR" node_inst="0:3">Odd PTL data inbound switch internal error</bit>
-    <bit pos="28">mailbox 00 special attention</bit>
-    <bit pos="29">mailbox 01 special attention</bit>
-    <bit pos="30">mailbox 10 special attention</bit>
-    <bit pos="31">mailbox 11 special attention</bit>
-    <bit pos="32">mailbox 20 special attention</bit>
-    <bit pos="33">mailbox 21 special attention</bit>
-    <bit pos="34">mailbox 30 special attention</bit>
-    <bit pos="35">mailbox 31 special attention</bit>
-    <bit pos="36">ptl0 spare</bit>
-    <bit pos="37">ptl1 spare</bit>
-    <bit pos="38">ptl2 spare</bit>
-    <bit pos="39">ptl3 spare</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_ext_fir.xml b/xml/p10/node_pb_ext_fir.xml
deleted file mode 100644
index 2e4aad4..0000000
--- a/xml/p10/node_pb_ext_fir.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_EXT_FIR" reg_type="SCOM">
-    <local_fir config="" name="PB_EXT_FIR">
-        <instance addr="0x030113AE" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-    </local_fir>
-    <bit pos="0">pb_x0_fir_err</bit>
-    <bit pos="1">pb_x1_fir_err</bit>
-    <bit pos="2">pb_x2_fir_err</bit>
-    <bit pos="3">pb_x3_fir_err</bit>
-    <bit pos="4">pb_x4_fir_err</bit>
-    <bit pos="5">pb_x5_fir_err</bit>
-    <bit pos="6">pb_x6_fir_err</bit>
-    <bit pos="7">pb_x7_fir_err</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_en1.xml b/xml/p10/node_pb_station_fir_en1.xml
deleted file mode 100644
index dacd25d..0000000
--- a/xml/p10/node_pb_station_fir_en1.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_EN1" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_EN1">
-        <instance addr="0x03011200" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_EN1">
-        <instance addr="0x0301120A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_EN1" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_en2.xml b/xml/p10/node_pb_station_fir_en2.xml
deleted file mode 100644
index c1aa972..0000000
--- a/xml/p10/node_pb_station_fir_en2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_EN2" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_EN2">
-        <instance addr="0x03011240" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_EN2">
-        <instance addr="0x0301124A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_EN1" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_en3.xml b/xml/p10/node_pb_station_fir_en3.xml
deleted file mode 100644
index 81f879f..0000000
--- a/xml/p10/node_pb_station_fir_en3.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_EN3" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_EN3">
-        <instance addr="0x03011280" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_EN3">
-        <instance addr="0x0301128A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_EN1" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_en4.xml b/xml/p10/node_pb_station_fir_en4.xml
deleted file mode 100644
index 023b4b0..0000000
--- a/xml/p10/node_pb_station_fir_en4.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_EN4" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_EN4">
-        <instance addr="0x030112C0" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_EN4">
-        <instance addr="0x030112CA" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_EN1" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_eq.xml b/xml/p10/node_pb_station_fir_eq.xml
deleted file mode 100644
index b5879b7..0000000
--- a/xml/p10/node_pb_station_fir_eq.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_EQ" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_EQ">
-        <instance addr="0x03011000" reg_inst="0"/>
-        <instance addr="0x03011040" reg_inst="1"/>
-        <instance addr="0x03011080" reg_inst="2"/>
-        <instance addr="0x030110C0" reg_inst="3"/>
-        <instance addr="0x03011100" reg_inst="4"/>
-        <instance addr="0x03011140" reg_inst="5"/>
-        <instance addr="0x03011180" reg_inst="6"/>
-        <instance addr="0x030111C0" reg_inst="7"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_EQ">
-        <instance addr="0x0301100A" reg_inst="0"/>
-        <instance addr="0x0301104A" reg_inst="1"/>
-        <instance addr="0x0301108A" reg_inst="2"/>
-        <instance addr="0x030110CA" reg_inst="3"/>
-        <instance addr="0x0301110A" reg_inst="4"/>
-        <instance addr="0x0301114A" reg_inst="5"/>
-        <instance addr="0x0301118A" reg_inst="6"/>
-        <instance addr="0x030111CA" reg_inst="7"/>
-    </register>
-    <capture_group node_inst="0:7">
-        <capture_register reg_inst="0:7" reg_name="PB_STATION_MODE_EQ" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_es1.xml b/xml/p10/node_pb_station_fir_es1.xml
deleted file mode 100644
index ead1f5c..0000000
--- a/xml/p10/node_pb_station_fir_es1.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_ES1" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_ES1">
-        <instance addr="0x03011300" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_ES1">
-        <instance addr="0x0301130A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_ES1" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_es2.xml b/xml/p10/node_pb_station_fir_es2.xml
deleted file mode 100644
index 0c74dab..0000000
--- a/xml/p10/node_pb_station_fir_es2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_ES2" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_ES2">
-        <instance addr="0x03011340" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_ES2">
-        <instance addr="0x0301134A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_ES2" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_es3.xml b/xml/p10/node_pb_station_fir_es3.xml
deleted file mode 100644
index f18d18f..0000000
--- a/xml/p10/node_pb_station_fir_es3.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="PB_STATION_FIR_ES3" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_ES3">
-        <instance addr="0x03011380" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_ES3">
-        <instance addr="0x0301138A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_ES3" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">inactive_link_error</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">active_link_error</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_es3_p10_10.xml b/xml/p10/node_pb_station_fir_es3_p10_10.xml
deleted file mode 100644
index 0f48aa7..0000000
--- a/xml/p10/node_pb_station_fir_es3_p10_10.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="PB_STATION_FIR_ES3" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_ES3">
-        <instance addr="0x03011380" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_ES3">
-        <instance addr="0x0301138A" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_ES3" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pb_station_fir_es4.xml b/xml/p10/node_pb_station_fir_es4.xml
deleted file mode 100644
index 81072af..0000000
--- a/xml/p10/node_pb_station_fir_es4.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PB_STATION_FIR_ES4" reg_type="SCOM">
-    <local_fir config="" name="PB_STATION_FIR_ES4">
-        <instance addr="0x030113C0" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="SPA" config="10"/>
-    </local_fir>
-    <register name="PB_STATION_MODE_ES4">
-        <instance addr="0x030113CA" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PB_STATION_MODE_ES4" />
-    </capture_group>
-    <bit pos="0">protocol_error</bit>
-    <bit pos="1">overflow_error</bit>
-    <bit pos="2">hw_parity_error</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">coherency_error</bit>
-    <bit pos="5">cresp_addr_error</bit>
-    <bit pos="6">cresp_error</bit>
-    <bit pos="7">hang_recovery_limit_error</bit>
-    <bit pos="8">spare</bit>
-    <bit pos="9">hang_recovery_gte_level1</bit>
-    <bit pos="10">force_mp_ipl</bit>
-    <bit pos="11">pb_cmd_snooper_error</bit>
-    <bit pos="12">data_overflow_error</bit>
-    <bit pos="13">data_protocol_error</bit>
-    <bit pos="14">data_route_error</bit>
-    <bit pos="15">fir_compab_trigger</bit>
-    <bit pos="16">link0_protocol_error</bit>
-    <bit pos="17">link0_overflow_error</bit>
-    <bit pos="18">link0_hw_parity_error</bit>
-    <bit pos="19">link1_protocol_error</bit>
-    <bit pos="20">link1_overflow_error</bit>
-    <bit pos="21">link1_hw_parity_error</bit>
-</attn_node>
diff --git a/xml/p10/node_pbaf_fir.xml b/xml/p10/node_pbaf_fir.xml
deleted file mode 100644
index 159fe5f..0000000
--- a/xml/p10/node_pbaf_fir.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PBAF_FIR" reg_type="SCOM">
-    <local_fir config="" name="PBAF_FIR">
-        <instance addr="0x03011DC0" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="PBA_ERR_RPT0">
-        <instance addr="0x03011DCC" reg_inst="0"/>
-    </register>
-    <register name="PBA_ERR_RPT1">
-        <instance addr="0x03011DCD" reg_inst="0"/>
-    </register>
-    <register name="PBA_ERR_RPT2">
-        <instance addr="0x03011DCE" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PBA_ERR_RPT0" />
-        <capture_register reg_inst="0" reg_name="PBA_ERR_RPT1" />
-        <capture_register reg_inst="0" reg_name="PBA_ERR_RPT2" />
-    </capture_group>
-    <bit pos="0">PB CRESP Addr Error Received for Forwarded Read Request</bit>
-    <bit pos="1">PB Read Data Timeout for Forwarded Request</bit>
-    <bit pos="2">PB Read Data SUE Error for Forwarded Request</bit>
-    <bit pos="3">PB Read Data UE Error for Forwarded Request</bit>
-    <bit pos="4">PB Read Data CE Error for Forwarded Request</bit>
-    <bit pos="5">PB Unexpected CRESP</bit>
-    <bit pos="6">PB Unexpected Data</bit>
-    <bit pos="7">PB Tag parity Error Detected</bit>
-    <bit pos="8">PB CRESP Addr Error Received for Forwarded Write Request</bit>
-    <bit pos="9">PB Invalid CRESP</bit>
-    <bit pos="10">PB CRESP ACK Dead response received for Forwarded Read request</bit>
-    <bit pos="11">PB OPERATIONAL Timeout detected</bit>
-    <bit pos="12">BCUE PowerBus Link Dead</bit>
-    <bit pos="13">PB CRESP Addr Error Received for BCUE Write Request</bit>
-    <bit pos="14">BCDE PowerBus Link Dead</bit>
-    <bit pos="15">PB CRESP Addr Error Received for BCDE Read Request</bit>
-    <bit pos="16">PB Read Data Timeout for BCDE Request</bit>
-    <bit pos="17">PB Read Data SUE Error for BCDE Request</bit>
-    <bit pos="18">PB Read Data UE Error for BCDE Request</bit>
-    <bit pos="19">PB Read Data CE Error for BCDE Request</bit>
-    <bit pos="20">Internal Logic Error</bit>
-    <bit pos="21">Byte count is less than full cache line</bit>
-    <bit pos="22">PBAXRCV Low data before High Data</bit>
-    <bit pos="23">PBAXRCV Low data timeout</bit>
-    <bit pos="24">PBAXRCV Reservation data timeout</bit>
-    <bit pos="25">Illegal PBAX Flow</bit>
-    <bit pos="26">PBAXSND engine retry threshold reached sending Phase 1</bit>
-    <bit pos="27">PBAXSND engine retry threshold reached sending Phase 2</bit>
-    <bit pos="28">PBAXSND Reservation Timeout</bit>
-    <bit pos="29">PB CRESP ACK Dead response received</bit>
-    <bit pos="30">PBAXIRCV Low data before High Data</bit>
-    <bit pos="31">PBAXIRCV Low data timeout</bit>
-    <bit pos="32">PBAXIRCV Reservation data timeout</bit>
-    <bit pos="33">Illegal PBAX Flow</bit>
-    <bit pos="34">PBAXISND engine retry threshold reached sending Phase 1</bit>
-    <bit pos="35">PBAXISND engine retry threshold reached sending Phase 2</bit>
-    <bit pos="36">PBAXISND Reservation Timeout</bit>
-    <bit pos="37">spare</bit>
-    <bit pos="38">spare</bit>
-    <bit pos="39">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_pbao_fir.xml b/xml/p10/node_pbao_fir.xml
deleted file mode 100644
index e2468e5..0000000
--- a/xml/p10/node_pbao_fir.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PBAO_FIR" reg_type="SCOM">
-    <local_fir config="" name="PBAO_FIR">
-        <instance addr="0x01010CC0" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <register name="PBAO_ERR_RPT_1">
-        <instance addr="0x01010CCD" reg_inst="0"/>
-    </register>
-    <register name="PBAO_ERR_RPT_2">
-        <instance addr="0x01010CCE" reg_inst="0"/>
-    </register>
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="PBAO_ERR_RPT_1" />
-        <capture_register reg_inst="0" reg_name="PBAO_ERR_RPT_2" />
-    </capture_group>
-    <bit pos="0">OCI Address Parity Error Det</bit>
-    <bit pos="1">PBA OCI Slave Initialization Error</bit>
-    <bit pos="2">OCI Write Data Parity Error Detected</bit>
-    <bit pos="3">spare</bit>
-    <bit pos="4">BCUE Setup Error</bit>
-    <bit pos="5">BCUE Read Data Parity Error OR MRDERR Asserted</bit>
-    <bit pos="6">BCDE Setup Error</bit>
-    <bit pos="7">BCDE Write Data error indicated by OCI Slave</bit>
-    <bit pos="8">Internal Logic Error</bit>
-    <bit pos="9">Illegal access to OCI Register</bit>
-    <bit pos="10">Push Write Error</bit>
-    <bit pos="11">Push Write Error</bit>
-    <bit pos="12">Illegal PBAX Flow</bit>
-    <bit pos="13">Illegal PBAX Flow</bit>
-    <bit pos="14">PBAXSND Reservation Error</bit>
-    <bit pos="15">PBAXISND Reservation Error</bit>
-    <bit pos="16">htm fifo interface fequency variation error</bit>
-    <bit pos="17">Invalide PB topology translate table entry</bit>
-    <bit pos="18">spare</bit>
-    <bit pos="19">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_pci_etu_fir.xml b/xml/p10/node_pci_etu_fir.xml
deleted file mode 100644
index 2a49a08..0000000
--- a/xml/p10/node_pci_etu_fir.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PCI_ETU_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PCI_ETU_FIR">
-        <instance addr="0x08010908" reg_inst="0"/>
-        <instance addr="0x08010948" reg_inst="1"/>
-        <instance addr="0x08010988" reg_inst="2"/>
-        <instance addr="0x09010908" reg_inst="3"/>
-        <instance addr="0x09010948" reg_inst="4"/>
-        <instance addr="0x09010988" reg_inst="5"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <bit pos="0">AIB_COMMAND_INVALID</bit>
-    <bit pos="1">AIB_ADDRESS_INVALID</bit>
-    <bit pos="2">AIB_ACCESS_ERROR</bit>
-    <bit pos="3">PAPR_OUTBOUND_INJECT_ERROR</bit>
-    <bit pos="4">AIB_FATAL_CLASS_ERROR</bit>
-    <bit pos="5">AIB_INF_CLASS_ERROR</bit>
-    <bit pos="6">spare</bit>
-    <bit pos="7">PE_STOP_STATE_SIGNALED</bit>
-    <bit pos="8">OUT_COMMON_ARRAY_FATAL_ERROR</bit>
-    <bit pos="9">OUT_COMMON_LATCH_FATAL_ERROR</bit>
-    <bit pos="10">OUT_COMMON_LOGIC_FATAL_ERROR</bit>
-    <bit pos="11">BLIF_OUT_INTERFACE_PARITY_ERROR</bit>
-    <bit pos="12">CFG_WRITE_CA_OR_UR_RESPONSE</bit>
-    <bit pos="13">MMIO_REQUEST_TIMEOUT</bit>
-    <bit pos="14">OUT_RRB_SOURCED_ERROR</bit>
-    <bit pos="15">CFG_LOGIC_SIGNALED_ERROR</bit>
-    <bit pos="16">RSB_REG_REQUEST_ADDRESS_ERROR</bit>
-    <bit pos="17">RSB_FDA_FATAL_ERROR</bit>
-    <bit pos="18">RSB_FDA_INF_ERROR</bit>
-    <bit pos="19">RSB_FDB_FATAL_ERROR</bit>
-    <bit pos="20">RSB_FDB_INF_ERROR</bit>
-    <bit pos="21">RSB_ERR_FATAL_ERROR</bit>
-    <bit pos="22">RSB_ERR_INF_ERROR</bit>
-    <bit pos="23">RSB_DBG_FATAL_ERROR</bit>
-    <bit pos="24">RSB_DBG_INF_ERROR</bit>
-    <bit pos="25">PCIE_REQUEST_ACCESS_ERROR</bit>
-    <bit pos="26">RSB_BUS_LOGIC_ERROR</bit>
-    <bit pos="27">RSB_UVI_FATAL_ERROR</bit>
-    <bit pos="28">RSB_UVI_INF_ERROR</bit>
-    <bit pos="29">SCOM_FATAL_ERROR</bit>
-    <bit pos="30">SCOM_INF_ERROR</bit>
-    <bit pos="31">PCIE_MACRO_ERROR_ACTIVE_STATUS</bit>
-    <bit pos="32">ARB_IODA_FATAL_ERROR</bit>
-    <bit pos="33">ARB_MSI_PE_MATCH_ERROR</bit>
-    <bit pos="34">ARB_MSI_ADDRESS_ERROR</bit>
-    <bit pos="35">ARB_TVT_ERROR</bit>
-    <bit pos="36">ARB_RCVD_FATAL_ERROR_MSG</bit>
-    <bit pos="37">ARB_RCVD_NONFATAL_ERROR_MSG</bit>
-    <bit pos="38">ARB_RCVD_CORRECTIBLE_ERROR_MSG</bit>
-    <bit pos="39">PAPR_INBOUND_INJECT_ERROR</bit>
-    <bit pos="40">ARB_COMMON_FATAL_ERROR</bit>
-    <bit pos="41">ARB_TABLE_BAR_DISABLED_ERROR</bit>
-    <bit pos="42">ARB_BLIF_COMPLETION_ERROR</bit>
-    <bit pos="43">ARB_PCT_TIMEOUT_ERROR</bit>
-    <bit pos="44">ARB_ECC_CORRECTABLE_ERROR</bit>
-    <bit pos="45">ARB_ECC_UNCORRECTABLE_ERROR</bit>
-    <bit pos="46">ARB_TLP_POISON_SIGNALED</bit>
-    <bit pos="47">ARB_RTT_PENUM_INVALID_ERROR</bit>
-    <bit pos="48">MRG_COMMON_FATAL_ERROR</bit>
-    <bit pos="49">MRG_TABLE_BAR_DISABLED_ERROR</bit>
-    <bit pos="50">MRG_ECC_CORRECTABLE_ERROR</bit>
-    <bit pos="51">MRG_ECC_UNCORRECTABLE_ERROR</bit>
-    <bit pos="52">MRG_AIB2_TX_TIMEOUT_ERROR</bit>
-    <bit pos="53">MRG_MRT_ERROR</bit>
-    <bit pos="54">spare</bit>
-    <bit pos="55">spare</bit>
-    <bit pos="56">TCE_IODA_PAGE_ACCESS_ERROR</bit>
-    <bit pos="57">TCE_REQUEST_TIMEOUT_ERROR</bit>
-    <bit pos="58">TCE_UNEXPECTED_RESPONSE_ERROR</bit>
-    <bit pos="59">TCE_COMMON_FATAL_ERROR</bit>
-    <bit pos="60">TCE_ECC_CORRECTABLE_ERROR</bit>
-    <bit pos="61">TCE_ECC_UNCORRECTABLE_ERROR</bit>
-    <bit pos="62">spare</bit>
-    <bit pos="63">FIR_INTERNAL_PARITY_ERROR</bit>
-</attn_node>
diff --git a/xml/p10/node_pci_fir.xml b/xml/p10/node_pci_fir.xml
deleted file mode 100644
index 826c6ac..0000000
--- a/xml/p10/node_pci_fir.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PCI_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PCI_FIR">
-        <instance addr="0x08010840" reg_inst="0"/>
-        <instance addr="0x08010880" reg_inst="1"/>
-        <instance addr="0x080108C0" reg_inst="2"/>
-        <instance addr="0x09010840" reg_inst="3"/>
-        <instance addr="0x09010880" reg_inst="4"/>
-        <instance addr="0x090108C0" reg_inst="5"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-
-    <register name="PBAIB_CERR_RPT_REG">
-        <instance reg_inst="0" addr="0x0801084B" />
-        <instance reg_inst="1" addr="0x0801088B" />
-        <instance reg_inst="2" addr="0x080108CB" />
-        <instance reg_inst="3" addr="0x0901084B" />
-        <instance reg_inst="4" addr="0x0901088B" />
-        <instance reg_inst="5" addr="0x090108CB" />
-    </register>
-
-    <capture_group node_inst="0:5">
-        <capture_register reg_name="PBAIB_CERR_RPT_REG" reg_inst="0:5" />
-    </capture_group>
-
-    <bit pos="0">register parity error</bit>
-    <bit pos="1">hardware error</bit>
-    <bit pos="2">AIB interface error</bit>
-    <bit pos="3">ETU reset error</bit>
-    <bit pos="4">PEC SCOM error</bit>
-    <bit pos="5">spare</bit>
-</attn_node>
diff --git a/xml/p10/node_pci_iop_fir.xml b/xml/p10/node_pci_iop_fir.xml
deleted file mode 100644
index 035f31c..0000000
--- a/xml/p10/node_pci_iop_fir.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PCI_IOP_FIR" reg_type="SCOM">
-    <local_fir config="" name="PCI_IOP_FIR">
-        <instance addr="0x08011100" reg_inst="0"/>
-        <instance addr="0x08011500" reg_inst="1"/>
-        <instance addr="0x09011100" reg_inst="2"/>
-        <instance addr="0x09011500" reg_inst="3"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">Correctable error in PH0 arrays</bit>
-    <bit pos="1">Uncorrectable error in PH0 arrays</bit>
-    <bit pos="2">Correctable error in PH1 arrays</bit>
-    <bit pos="3">Uncorrectable error in PH1 arrays</bit>
-    <bit pos="4">Correctable error from SCOM in WRAP0</bit>
-    <bit pos="5">Uncorrectable error from SCOM in WRAP0</bit>
-    <bit pos="6">Correctable error from SCOM in WRAP1</bit>
-    <bit pos="7">Uncorrectable error from SCOM in WRAP1</bit>
-    <bit pos="8">Correctable error from SCRUB in WRAP0</bit>
-    <bit pos="9">Uncorrectable error from SCRUB in WRAP0</bit>
-    <bit pos="10">Correctable error from SCRUB in WRAP1</bit>
-    <bit pos="11">Uncorrectable error from SCRUB in WRAP1</bit>
-</attn_node>
diff --git a/xml/p10/node_pci_local_fir.xml b/xml/p10/node_pci_local_fir.xml
deleted file mode 100644
index 9ad29de..0000000
--- a/xml/p10/node_pci_local_fir.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PCI_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="PCI_LOCAL_FIR">
-        <instance addr="0x08040100" reg_inst="0"/>
-        <instance addr="0x09040100" reg_inst="1"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">unused</bit>
-    <bit pos="57">unused</bit>
-    <bit pos="58">unused</bit>
-    <bit pos="59">unused</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_pci_nest_fir.xml b/xml/p10/node_pci_nest_fir.xml
deleted file mode 100644
index 8fe18bb..0000000
--- a/xml/p10/node_pci_nest_fir.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PCI_NEST_FIR" reg_type="SCOM">
-    <local_fir config="W" name="PCI_NEST_FIR">
-        <instance addr="0x03011840" reg_inst="0"/>
-        <instance addr="0x03011880" reg_inst="1"/>
-        <instance addr="0x030118C0" reg_inst="2"/>
-        <instance addr="0x02011840" reg_inst="3"/>
-        <instance addr="0x02011880" reg_inst="4"/>
-        <instance addr="0x020118C0" reg_inst="5"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-
-    <register name="PCI_NFIR_ERR_RPT0">
-        <instance reg_inst="0" addr="0x0301184A" />
-        <instance reg_inst="1" addr="0x0301188A" />
-        <instance reg_inst="2" addr="0x030118CA" />
-        <instance reg_inst="3" addr="0x0201184A" />
-        <instance reg_inst="4" addr="0x0201188A" />
-        <instance reg_inst="5" addr="0x020118CA" />
-    </register>
-
-    <register name="PCI_NFIR_ERR_RPT1">
-        <instance reg_inst="0" addr="0x0301184B" />
-        <instance reg_inst="1" addr="0x0301188B" />
-        <instance reg_inst="2" addr="0x030118CB" />
-        <instance reg_inst="3" addr="0x0201184B" />
-        <instance reg_inst="4" addr="0x0201188B" />
-        <instance reg_inst="5" addr="0x020118CB" />
-    </register>
-
-    <capture_group node_inst="0:5">
-        <capture_register reg_name="PCI_NFIR_ERR_RPT0" reg_inst="0:5" />
-        <capture_register reg_name="PCI_NFIR_ERR_RPT1" reg_inst="0:5" />
-    </capture_group>
-
-    <bit pos="0">BAR Parity Error</bit>
-    <bit pos="1">Non-BAR Parity Error</bit>
-    <bit pos="2">Power Bus to PEC CE</bit>
-    <bit pos="3">Power Bus to PEC UE</bit>
-    <bit pos="4">Power Bus to PEC SUE</bit>
-    <bit pos="5">Array CE</bit>
-    <bit pos="6">Array UE</bit>
-    <bit pos="7">Array SUE</bit>
-    <bit pos="8">Register Array Parity Error</bit>
-    <bit pos="9">Power Bus Interface Parity Error</bit>
-    <bit pos="10">Power Bus Data Hang</bit>
-    <bit pos="11">Power Bus Hang Error</bit>
-    <bit pos="12">RD ARE Error</bit>
-    <bit pos="13">Non-Rd ARE Error</bit>
-    <bit pos="14">PCI Hang Error</bit>
-    <bit pos="15">PCI Clock Error</bit>
-    <bit pos="16">AIB Fence</bit>
-    <bit pos="17">Hardware Error</bit>
-    <bit pos="18">Unsolicited Power Bus Data</bit>
-    <bit pos="19">Unexpected Combined Response</bit>
-    <bit pos="20">Invalid Combined Response</bit>
-    <bit pos="21">Power Bus Unsupported Size</bit>
-    <bit pos="22">Power Bus Unsupported Command</bit>
-    <bit pos="23">reserved</bit>
-    <bit pos="24">reserved</bit>
-    <bit pos="25">reserved</bit>
-    <bit pos="26">Software Defined</bit>
-    <bit pos="27">PEC SCOM Engine Error</bit>
-</attn_node>
diff --git a/xml/p10/node_pll_unlock.xml b/xml/p10/node_pll_unlock.xml
deleted file mode 100644
index ae690f7..0000000
--- a/xml/p10/node_pll_unlock.xml
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="PLL_UNLOCK" reg_type="SCOM">
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="ROOT_CTRL0"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL3"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL4"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL5"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL6"         reg_inst= "0" />
-        <capture_register reg_name="RCS_SENSE_1"        reg_inst= "0" />
-        <capture_register reg_name="RCS_SENSE_2"        reg_inst= "0" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "1" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "2" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "3" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "8" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "9" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="12" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="13" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="14" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="15" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="16" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="17" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="18" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="19" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="24" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="25" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="26" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="27" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="28" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="29" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="30" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="31" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="32" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="33" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="34" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="35" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="36" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="37" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="38" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="39" />
-        <capture_register reg_name="BC_OR_PCBSLV_ERROR" reg_inst= "0" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "1" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "2" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "3" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "8" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "9" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="12" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="13" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="14" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="15" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="16" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="17" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="18" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="19" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="24" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="25" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="26" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="27" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="28" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="29" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="30" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="31" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="32" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="33" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="34" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="35" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="36" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="37" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="38" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="39" />
-    </capture_group>
-
-    <rule attn_type="CS" node_inst="0">
-        <expr type="or">
-            <!-- PLL summary for clock 0 -->
-            <expr type="and">
-                <!-- Check for primary clock 0 (RCS_SENSE_1[12]) -->
-                <expr type="lshift" value1="12">
-                    <expr type="reg" value1="RCS_SENSE_1" />
-                </expr>
-                <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                <expr type="or">
-                    <expr type="lshift" value1="24">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="25">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="26">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="27">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="28">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="29">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="30">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="31">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                </expr>
-                <!-- The summary has been shifted to the left most bit. -->
-                <expr type="int" value1="0x8000000000000000"/>
-            </expr>
-            <!-- PLL summary for clock 1 -->
-            <expr type="rshift" value1="1">
-                <expr type="and">
-                    <!-- Check for primary clock 1 (RCS_SENSE_1[13]) -->
-                    <expr type="lshift" value1="13">
-                        <expr type="reg" value1="RCS_SENSE_1" />
-                    </expr>
-                    <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                    <expr type="or">
-                        <expr type="lshift" value1="24">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="25">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="26">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="27">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="28">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="29">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="30">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="31">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                    </expr>
-                    <!-- The summary has been shifted to the left most bit. -->
-                    <expr type="int" value1="0x8000000000000000"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <expr type="or">
-            <!-- PLL summary for clock 0 -->
-            <expr type="and">
-                <!-- Check for primary clock 0 (RCS_SENSE_1[12]) -->
-                <expr type="lshift" value1="12">
-                    <expr type="reg" value1="RCS_SENSE_1" />
-                </expr>
-                <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                <expr type="or">
-                    <expr type="lshift" value1="24">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="25">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="26">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="27">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="28">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="29">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="30">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="31">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                </expr>
-                <!-- The summary has been shifted to the left most bit. -->
-                <expr type="int" value1="0x8000000000000000"/>
-            </expr>
-            <!-- PLL summary for clock 1 -->
-            <expr type="rshift" value1="1">
-                <expr type="and">
-                    <!-- Check for primary clock 1 (RCS_SENSE_1[13]) -->
-                    <expr type="lshift" value1="13">
-                        <expr type="reg" value1="RCS_SENSE_1" />
-                    </expr>
-                    <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                    <expr type="or">
-                        <expr type="lshift" value1="24">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="25">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="26">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="27">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="28">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="29">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="30">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="31">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                    </expr>
-                    <!-- The summary has been shifted to the left most bit. -->
-                    <expr type="int" value1="0x8000000000000000"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="SPA" node_inst="0">
-        <expr type="or">
-            <!-- PLL summary for clock 0 -->
-            <expr type="and">
-                <!-- Check for primary clock 0 (RCS_SENSE_1[12]) -->
-                <expr type="lshift" value1="12">
-                    <expr type="reg" value1="RCS_SENSE_1" />
-                </expr>
-                <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                <expr type="or">
-                    <expr type="lshift" value1="24">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="25">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="26">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="27">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="28">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="29">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="30">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="31">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                </expr>
-                <!-- The summary has been shifted to the left most bit. -->
-                <expr type="int" value1="0x8000000000000000"/>
-            </expr>
-            <!-- PLL summary for clock 1 -->
-            <expr type="rshift" value1="1">
-                <expr type="and">
-                    <!-- Check for primary clock 1 (RCS_SENSE_1[13]) -->
-                    <expr type="lshift" value1="13">
-                        <expr type="reg" value1="RCS_SENSE_1" />
-                    </expr>
-                    <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                    <expr type="or">
-                        <expr type="lshift" value1="24">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="25">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="26">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="27">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="28">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="29">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="30">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="31">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                    </expr>
-                    <!-- The summary has been shifted to the left most bit. -->
-                    <expr type="int" value1="0x8000000000000000"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="UCS" node_inst="0">
-        <expr type="or">
-            <!-- PLL summary for clock 0 -->
-            <expr type="and">
-                <!-- Check for primary clock 0 (RCS_SENSE_1[12]) -->
-                <expr type="lshift" value1="12">
-                    <expr type="reg" value1="RCS_SENSE_1" />
-                </expr>
-                <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                <expr type="or">
-                    <expr type="lshift" value1="24">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="25">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="26">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="27">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="28">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="29">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="30">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="31">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                </expr>
-                <!-- The summary has been shifted to the left most bit. -->
-                <expr type="int" value1="0x8000000000000000"/>
-            </expr>
-            <!-- PLL summary for clock 1 -->
-            <expr type="rshift" value1="1">
-                <expr type="and">
-                    <!-- Check for primary clock 1 (RCS_SENSE_1[13]) -->
-                    <expr type="lshift" value1="13">
-                        <expr type="reg" value1="RCS_SENSE_1" />
-                    </expr>
-                    <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                    <expr type="or">
-                        <expr type="lshift" value1="24">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="25">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="26">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="27">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="28">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="29">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="30">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="31">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                    </expr>
-                    <!-- The summary has been shifted to the left most bit. -->
-                    <expr type="int" value1="0x8000000000000000"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="HA" node_inst="0">
-        <expr type="or">
-            <!-- PLL summary for clock 0 -->
-            <expr type="and">
-                <!-- Check for primary clock 0 (RCS_SENSE_1[12]) -->
-                <expr type="lshift" value1="12">
-                    <expr type="reg" value1="RCS_SENSE_1" />
-                </expr>
-                <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                <expr type="or">
-                    <expr type="lshift" value1="24">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="25">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="26">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="27">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="28">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="29">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="30">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                    <expr type="lshift" value1="31">
-                        <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                    </expr>
-                </expr>
-                <!-- The summary has been shifted to the left most bit. -->
-                <expr type="int" value1="0x8000000000000000"/>
-            </expr>
-            <!-- PLL summary for clock 1 -->
-            <expr type="rshift" value1="1">
-                <expr type="and">
-                    <!-- Check for primary clock 1 (RCS_SENSE_1[13]) -->
-                    <expr type="lshift" value1="13">
-                        <expr type="reg" value1="RCS_SENSE_1" />
-                    </expr>
-                    <!-- Summary of BC_OR_PCBSLV_ERROR[24:31] -->
-                    <expr type="or">
-                        <expr type="lshift" value1="24">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="25">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="26">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="27">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="28">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="29">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="30">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                        <expr type="lshift" value1="31">
-                            <expr type="reg" value1="BC_OR_PCBSLV_ERROR" />
-                        </expr>
-                    </expr>
-                    <!-- The summary has been shifted to the left most bit. -->
-                    <expr type="int" value1="0x8000000000000000"/>
-                </expr>
-            </expr>
-        </expr>
-    </rule>
-
-    <bit pos="0">PLL unlock on clk A</bit>
-    <bit pos="1">PLL unlock on clk B</bit>
-
-</attn_node>
diff --git a/xml/p10/node_psihb_fir.xml b/xml/p10/node_psihb_fir.xml
deleted file mode 100644
index e4edc34..0000000
--- a/xml/p10/node_psihb_fir.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="PSIHB_FIR" reg_type="SCOM">
-    <local_fir config="" name="PSIHB_FIR">
-        <instance addr="0x03011D00" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <bit pos="0">CE from PowerBus data</bit>
-    <bit pos="1">UE from PowerBus data</bit>
-    <bit pos="2">SUE from PowerBus data</bit>
-    <bit pos="3">Interrupt Condition present in PSIHB</bit>
-    <bit pos="4">Interrupt from FSP is being processed</bit>
-    <bit pos="5">CE from PSILL data</bit>
-    <bit pos="6">UE from PSILL data</bit>
-    <bit pos="7">Error bit set, ignores the interrupt mask</bit>
-    <bit pos="8">Invalid TType Hit on PHB or FSP bar</bit>
-    <bit pos="9">Invalid CResp returned to command issued by PSIHB</bit>
-    <bit pos="10">PowerBus time out waiting for data grant</bit>
-    <bit pos="11">PB parity error</bit>
-    <bit pos="12">FSP tried access to trusted space</bit>
-    <bit pos="13">Unexpected PB CRESP or DATA</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">reserved</bit>
-    <bit pos="21">PSI global error bit 0</bit>
-    <bit pos="22">PSI global error bit 1</bit>
-    <bit pos="23">Upstream error</bit>
-    <bit pos="24">spare</bit>
-    <bit pos="25">spare</bit>
-    <bit pos="26">spare</bit>
-    <bit pos="27">fir parity Error</bit>
-</attn_node>
diff --git a/xml/p10/node_psihb_fir_p10_10.xml b/xml/p10/node_psihb_fir_p10_10.xml
deleted file mode 100644
index 5a7216b..0000000
--- a/xml/p10/node_psihb_fir_p10_10.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="PSIHB_FIR" reg_type="SCOM">
-    <local_fir config="" name="PSIHB_FIR">
-        <instance addr="0x03011D00" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-    </local_fir>
-    <bit pos="0">CE from PowerBus data</bit>
-    <bit pos="1">UE from PowerBus data</bit>
-    <bit pos="2">SUE from PowerBus data</bit>
-    <bit pos="3">Interrupt Condition present in PSIHB</bit>
-    <bit pos="4">Interrupt from FSP is being processed</bit>
-    <bit pos="5">CE from PSILL data</bit>
-    <bit pos="6">UE from PSILL data</bit>
-    <bit pos="7">Error bit set, ignores the interrupt mask</bit>
-    <bit pos="8">Invalid TType Hit on PHB or FSP bar</bit>
-    <bit pos="9">Invalid CResp returned to command issued by PSIHB</bit>
-    <bit pos="10">PowerBus time out waiting for data grant</bit>
-    <bit pos="11">PB parity error</bit>
-    <bit pos="12">FSP tried access to trusted space</bit>
-    <bit pos="13">Unexpected PB CRESP or DATA</bit>
-    <bit pos="14">Interrupt register change while interrupt still pending</bit>
-    <bit pos="15">PSI Interrupt address Error</bit>
-    <bit pos="16">OCC Interrupt address Error</bit>
-    <bit pos="17">FSI Interrupt address Error</bit>
-    <bit pos="18">LPC Interrupt address Error</bit>
-    <bit pos="19">LOCAL ERROR Interrupt address Error</bit>
-    <bit pos="20">HOST ERROR Interrupt address Error</bit>
-    <bit pos="21">PSI global error bit 0</bit>
-    <bit pos="22">PSI global error bit 1</bit>
-    <bit pos="23">Upstream error</bit>
-    <bit pos="24">spare</bit>
-    <bit pos="25">spare</bit>
-    <bit pos="26">spare</bit>
-    <bit pos="27">fir parity Error</bit>
-</attn_node>
diff --git a/xml/p10/node_rcs_osc_error.xml b/xml/p10/node_rcs_osc_error.xml
deleted file mode 100644
index 059d9df..0000000
--- a/xml/p10/node_rcs_osc_error.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="RCS_OSC_ERROR" reg_type="SCOM">
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="ROOT_CTRL0"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL3"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL4"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL5"         reg_inst= "0" />
-        <capture_register reg_name="ROOT_CTRL6"         reg_inst= "0" />
-        <capture_register reg_name="RCS_SENSE_1"        reg_inst= "0" />
-        <capture_register reg_name="RCS_SENSE_2"        reg_inst= "0" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "1" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "2" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "3" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "8" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst= "9" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="12" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="13" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="14" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="15" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="16" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="17" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="18" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="19" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="24" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="25" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="26" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="27" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="28" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="29" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="30" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="31" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="32" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="33" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="34" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="35" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="36" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="37" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="38" />
-        <capture_register reg_name="PCBSLV_CONFIG"      reg_inst="39" />
-        <capture_register reg_name="BC_OR_PCBSLV_ERROR" reg_inst= "0" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "1" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "2" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "3" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "8" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst= "9" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="12" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="13" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="14" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="15" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="16" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="17" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="18" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="19" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="24" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="25" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="26" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="27" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="28" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="29" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="30" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="31" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="32" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="33" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="34" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="35" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="36" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="37" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="38" />
-        <capture_register reg_name="PCBSLV_ERROR"       reg_inst="39" />
-    </capture_group>
-
-</attn_node>
diff --git a/xml/p10/node_tod_error.xml b/xml/p10/node_tod_error.xml
deleted file mode 100644
index c4713c8..0000000
--- a/xml/p10/node_tod_error.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="TOD_ERROR" reg_type="SCOM">
-
-    <rule attn_type="CS" node_inst="0">
-        <!-- TOD_ERROR & ~TOD_ERROR_MASK & ~TOD_ERROR_ROUTING -->
-        <expr type="and">
-            <expr type="reg" value1="TOD_ERROR" />
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_MASK" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_ROUTING" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <!-- TOD_ERROR & ~TOD_ERROR_MASK & ~TOD_ERROR_ROUTING -->
-        <expr type="and">
-            <expr type="reg" value1="TOD_ERROR" />
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_MASK" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_ROUTING" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="UCS" node_inst="0">
-        <!-- TOD_ERROR & ~TOD_ERROR_MASK & ~TOD_ERROR_ROUTING -->
-        <expr type="and">
-            <expr type="reg" value1="TOD_ERROR" />
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_MASK" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_ROUTING" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="SPA" node_inst="0">
-        <!-- TOD_ERROR & ~TOD_ERROR_MASK & ~TOD_ERROR_ROUTING -->
-        <expr type="and">
-            <expr type="reg" value1="TOD_ERROR" />
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_MASK" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_ROUTING" />
-            </expr>
-        </expr>
-    </rule>
-
-    <rule attn_type="HA" node_inst="0">
-        <!-- TOD_ERROR & ~TOD_ERROR_MASK & ~TOD_ERROR_ROUTING -->
-        <expr type="and">
-            <expr type="reg" value1="TOD_ERROR" />
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_MASK" />
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="TOD_ERROR_ROUTING" />
-            </expr>
-        </expr>
-    </rule>
-
-    <bit pos="0">M_PATH_CONTROL_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="1">M_PATH_0_PARITY_ERROR</bit>
-    <bit pos="2">M_PATH_1_PARITY_ERROR</bit>
-    <bit pos="3">PCRP0_DATA_PARITY_ERROR</bit>
-    <bit pos="4">PCRP1_DATA_PARITY_ERROR</bit>
-    <bit pos="5">SCRP0_DATA_PARITY_ERROR</bit>
-    <bit pos="6">SCRP1_DATA_PARITY_ERROR</bit>
-    <bit pos="7">SPCR_DATA_PARITY_ERROR</bit>
-    <bit pos="8">IPCR_DATA_PARITY_ERROR</bit>
-    <bit pos="9">PSMSCR_DATA_PARITY_ERROR</bit>
-    <bit pos="10">S_PATH_0_PARITY_ERROr</bit>
-    <bit pos="11">REG_0X08_DATA_PARITY_ERROR</bit>
-    <bit pos="12">M_PATH_STATUS_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="13">S_PATH_STATUS_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="14">M_PATH_0_STEP_CHECK_ERROR</bit>
-    <bit pos="15">M_PATH_1_STEP_CHECK_ERROR</bit>
-    <bit pos="16">S_PATH_0_STEP_CHECK_ERROR</bit>
-    <bit pos="17">I_PATH_STEP_CHECK_ERROR</bit>
-    <bit pos="18">PSS HAMMING DISTANCE</bit>
-    <bit pos="19">MISC_RESET_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="20">S_PATH_0_PARITY_ERROR</bit>
-    <bit pos="21">S_PATH_1_STEP_CHECK_ERROR</bit>
-    <bit pos="22">I_PATH_DELAY_STEP_CHECK_PARITY_ERROR</bit>
-    <bit pos="23">REG_0X0C DATA_PARITY ERROR</bit>
-    <bit pos="24">REG_0X11_0X12_0X13_0X14_0X15_0X16_DATA_PARITY_ERROR</bit>
-    <bit pos="25">REG_0X17_0X18_0X21_0X22_DATA_PARITY_ERROR</bit>
-    <bit pos="26">REG_0X1D_0X1E_0X1F_DATA_PARITY_ERROR</bit>
-    <bit pos="27">TIMER_VALUE_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="28">LOW_ORDER_STEP_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="29">FSM_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="30">RX_TTYPE_CONTROL_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="31">REG_0X30_0X31_0X32_0X33_DATA_PARITY_ERROR</bit>
-    <bit pos="32">CHIP_CONTROL_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="33">I_PATH_SYNC_CHECK_ERROR</bit>
-    <bit pos="34">I_PATH_FSM_STATE_PARITY_ERROR</bit>
-    <bit pos="35">I_PATH_TIME_REG_PARITY_ERROR</bit>
-    <bit pos="36">I_PATH_TIME_REG_OVERFLOW</bit>
-    <bit pos="37">WOF_LOW_ORDER_STEP_COUNTER_PARITY_ERROR</bit>
-    <bit pos="38:43">RX_TTYPE_1</bit>
-    <bit pos="44">PIB_SLAVE_ADDR_INVALID_ERROR</bit>
-    <bit pos="45">PIB_SLAVE_WRITE_INVALID_ERROR</bit>
-    <bit pos="46">PIB_SLAVE_READ_INVALID_ERROR</bit>
-    <bit pos="47">PIB_SLAVE_ADDR_PARITY_ERROR</bit>
-    <bit pos="48">PIB_SLAVE_DATA_PARITY_ERROR</bit>
-    <bit pos="49">TTYPE_CONTROL_REG_DATA_PARITY_ERROR</bit>
-    <bit pos="50:52">PIB_MASTER_RSP_INFO_ERROR</bit>
-    <bit pos="53">RX_TTYPE_INVALID_ERROR</bit>
-    <bit pos="54">RX_TTYPE_4_DATA_PARITY_ERROR</bit>
-    <bit pos="55">PIB_MASTER_REQUEST_ERROR</bit>
-    <bit pos="56">PIB_RESET_DURING_PIB_ACCESS_ERROR</bit>
-    <bit pos="57">EXTERNAL_XSTOP_ERROR</bit>
-    <bit pos="58:63">SPARE_ERROR</bit>
-</attn_node>
diff --git a/xml/p10/node_tp_local_fir.xml b/xml/p10/node_tp_local_fir.xml
deleted file mode 100644
index a3e0709..0000000
--- a/xml/p10/node_tp_local_fir.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="TP_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="TP_LOCAL_FIR">
-        <instance addr="0x01040100" reg_inst="0"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-
-    <register name="ROOT_CTRL0">
-        <instance reg_inst="0" addr="0x00050010" />
-    </register>
-
-    <register name="ROOT_CTRL3">
-        <instance reg_inst="0" addr="0x00050013" />
-    </register>
-
-    <register name="ROOT_CTRL4">
-        <instance reg_inst="0" addr="0x00050014" />
-    </register>
-
-    <register name="ROOT_CTRL5">
-        <instance reg_inst="0" addr="0x00050015" />
-    </register>
-
-    <register name="ROOT_CTRL6">
-        <instance reg_inst="0" addr="0x00050016" />
-    </register>
-
-    <register name="RCS_SENSE_1">
-        <instance reg_inst="0" addr="0x0005001D" />
-    </register>
-
-    <register name="RCS_SENSE_2">
-        <instance reg_inst="0" addr="0x0005001E" />
-    </register>
-
-    <register name="BC_OR_PCBSLV_ERROR">
-        <instance reg_inst="0" addr="0x470F001F" />
-    </register>
-
-    <register name="PCBSLV_CONFIG">
-        <!-- One per chiplet -->
-        <instance reg_inst= "1" addr="0x010F001E" />
-        <instance reg_inst= "2" addr="0x020F001E" />
-        <instance reg_inst= "3" addr="0x030F001E" />
-        <instance reg_inst= "8" addr="0x080F001E" />
-        <instance reg_inst= "9" addr="0x090F001E" />
-        <instance reg_inst="12" addr="0x0C0F001E" />
-        <instance reg_inst="13" addr="0x0D0F001E" />
-        <instance reg_inst="14" addr="0x0E0F001E" />
-        <instance reg_inst="15" addr="0x0F0F001E" />
-        <instance reg_inst="16" addr="0x100F001E" />
-        <instance reg_inst="17" addr="0x110F001E" />
-        <instance reg_inst="18" addr="0x120F001E" />
-        <instance reg_inst="19" addr="0x130F001E" />
-        <instance reg_inst="24" addr="0x180F001E" />
-        <instance reg_inst="25" addr="0x190F001E" />
-        <instance reg_inst="26" addr="0x1A0F001E" />
-        <instance reg_inst="27" addr="0x1B0F001E" />
-        <instance reg_inst="28" addr="0x1C0F001E" />
-        <instance reg_inst="29" addr="0x1D0F001E" />
-        <instance reg_inst="30" addr="0x1E0F001E" />
-        <instance reg_inst="31" addr="0x1F0F001E" />
-        <instance reg_inst="32" addr="0x200F001E" />
-        <instance reg_inst="33" addr="0x210F001E" />
-        <instance reg_inst="34" addr="0x220F001E" />
-        <instance reg_inst="35" addr="0x230F001E" />
-        <instance reg_inst="36" addr="0x240F001E" />
-        <instance reg_inst="37" addr="0x250F001E" />
-        <instance reg_inst="38" addr="0x260F001E" />
-        <instance reg_inst="39" addr="0x270F001E" />
-    </register>
-
-    <register name="PCBSLV_ERROR">
-        <!-- One per chiplet -->
-        <instance reg_inst= "1" addr="0x010F001F" />
-        <instance reg_inst= "2" addr="0x020F001F" />
-        <instance reg_inst= "3" addr="0x030F001F" />
-        <instance reg_inst= "8" addr="0x080F001F" />
-        <instance reg_inst= "9" addr="0x090F001F" />
-        <instance reg_inst="12" addr="0x0C0F001F" />
-        <instance reg_inst="13" addr="0x0D0F001F" />
-        <instance reg_inst="14" addr="0x0E0F001F" />
-        <instance reg_inst="15" addr="0x0F0F001F" />
-        <instance reg_inst="16" addr="0x100F001F" />
-        <instance reg_inst="17" addr="0x110F001F" />
-        <instance reg_inst="18" addr="0x120F001F" />
-        <instance reg_inst="19" addr="0x130F001F" />
-        <instance reg_inst="24" addr="0x180F001F" />
-        <instance reg_inst="25" addr="0x190F001F" />
-        <instance reg_inst="26" addr="0x1A0F001F" />
-        <instance reg_inst="27" addr="0x1B0F001F" />
-        <instance reg_inst="28" addr="0x1C0F001F" />
-        <instance reg_inst="29" addr="0x1D0F001F" />
-        <instance reg_inst="30" addr="0x1E0F001F" />
-        <instance reg_inst="31" addr="0x1F0F001F" />
-        <instance reg_inst="32" addr="0x200F001F" />
-        <instance reg_inst="33" addr="0x210F001F" />
-        <instance reg_inst="34" addr="0x220F001F" />
-        <instance reg_inst="35" addr="0x230F001F" />
-        <instance reg_inst="36" addr="0x240F001F" />
-        <instance reg_inst="37" addr="0x250F001F" />
-        <instance reg_inst="38" addr="0x260F001F" />
-        <instance reg_inst="39" addr="0x270F001F" />
-    </register>
-
-    <register name="TOD_M_PATH_CTRL">
-        <instance reg_inst="0" addr="0x00040000" />
-    </register>
-
-    <register name="TOD_PRI_PORT_0_CTRL">
-        <instance reg_inst="0" addr="0x00040001" />
-    </register>
-
-    <register name="TOD_PRI_PORT_1_CTRL">
-        <instance reg_inst="0" addr="0x00040002" />
-    </register>
-
-    <register name="TOD_SEC_PORT_0_CTRL">
-        <instance reg_inst="0" addr="0x00040003" />
-    </register>
-
-    <register name="TOD_SEC_PORT_1_CTRL">
-        <instance reg_inst="0" addr="0x00040004" />
-    </register>
-
-    <register name="TOD_S_PATH_CTRL">
-        <instance reg_inst="0" addr="0x00040005" />
-    </register>
-
-    <register name="TOD_I_PATH_CTRL">
-        <instance reg_inst="0" addr="0x00040006" />
-    </register>
-
-    <register name="TOD_PSS_MSS_CTRL">
-        <instance reg_inst="0" addr="0x00040007" />
-    </register>
-
-    <register name="TOD_PSS_MSS_STATUS">
-        <instance reg_inst="0" addr="0x00040008" />
-    </register>
-
-    <register name="TOD_M_PATH_STATUS">
-        <instance reg_inst="0" addr="0x00040009" />
-    </register>
-
-    <register name="TOD_S_PATH_STATUS">
-        <instance reg_inst="0" addr="0x0004000A" />
-    </register>
-
-    <register name="TOD_M_PATH_0_STEP_STEER">
-        <instance reg_inst="0" addr="0x0004000E" />
-    </register>
-
-    <register name="TOD_M_PATH_1_STEP_STEER">
-        <instance reg_inst="0" addr="0x0004000F" />
-    </register>
-
-    <register name="TOD_CHIP_CTRL">
-        <instance reg_inst="0" addr="0x00040010" />
-    </register>
-
-    <register name="TOD_TRACE_DATA_1">
-        <instance reg_inst="0" addr="0x0004001D" />
-    </register>
-
-    <register name="TOD_TRACE_DATA_2">
-        <instance reg_inst="0" addr="0x0004001E" />
-    </register>
-
-    <register name="TOD_TRACE_DATA_3">
-        <instance reg_inst="0" addr="0x0004001F" />
-    </register>
-
-    <register name="TOD_FSM">
-        <instance reg_inst="0" addr="0x00040024" />
-    </register>
-
-    <register name="TOD_TX_TTYPE_CTRL">
-        <instance reg_inst="0" addr="0x00040027" />
-    </register>
-
-    <register name="TOD_RX_TTYPE_CTRL">
-        <instance reg_inst="0" addr="0x00040029" />
-    </register>
-
-    <register name="TOD_ERROR">
-        <instance reg_inst="0" addr="0x00040030" />
-    </register>
-
-    <register name="TOD_ERROR_MASK">
-        <instance reg_inst="0" addr="0x00040032" />
-    </register>
-
-    <register name="TOD_ERROR_ROUTING">
-        <instance reg_inst="0" addr="0x00040033" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_inst="0" reg_name="TOD_M_PATH_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_PRI_PORT_0_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_PRI_PORT_1_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_SEC_PORT_0_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_SEC_PORT_1_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_S_PATH_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_I_PATH_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_PSS_MSS_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_PSS_MSS_STATUS" />
-        <capture_register reg_inst="0" reg_name="TOD_M_PATH_STATUS" />
-        <capture_register reg_inst="0" reg_name="TOD_S_PATH_STATUS" />
-        <capture_register reg_inst="0" reg_name="TOD_M_PATH_0_STEP_STEER" />
-        <capture_register reg_inst="0" reg_name="TOD_M_PATH_1_STEP_STEER" />
-        <capture_register reg_inst="0" reg_name="TOD_CHIP_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_TRACE_DATA_1" />
-        <capture_register reg_inst="0" reg_name="TOD_TRACE_DATA_2" />
-        <capture_register reg_inst="0" reg_name="TOD_TRACE_DATA_3" />
-        <capture_register reg_inst="0" reg_name="TOD_FSM" />
-        <capture_register reg_inst="0" reg_name="TOD_TX_TTYPE_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_RX_TTYPE_CTRL" />
-        <capture_register reg_inst="0" reg_name="TOD_ERROR" />
-        <capture_register reg_inst="0" reg_name="TOD_ERROR_MASK" />
-        <capture_register reg_inst="0" reg_name="TOD_ERROR_ROUTING" />
-    </capture_group>
-
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - internal error</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">ITR - FMU error</bit>
-    <bit pos="22">ITR - PCB error</bit>
-    <bit pos="23">PCB Master - timeout</bit>
-    <bit pos="24">I2CM - Parity errors</bit>
-    <bit pos="25" child_node="TOD_ERROR">TOD - any error</bit>
-    <bit pos="26">TOD - access error PIB</bit>
-    <bit pos="27">TOD - Error reported from PHYP</bit>
-    <bit pos="28" child_node="PLL_UNLOCK">PCB slave error</bit>
-    <bit pos="29">SBE - PPE int hardware error</bit>
-    <bit pos="30">SBE - PPE ext hardware error</bit>
-    <bit pos="31">SBE - PPE code error</bit>
-    <bit pos="32">SBE - PPE debug code breakpoint</bit>
-    <bit pos="33">SBE - PPE in halted state</bit>
-    <bit pos="34">SBE - PPE watchdog timeout</bit>
-    <bit pos="35">SBE - unused</bit>
-    <bit pos="36">SBE - unused</bit>
-    <bit pos="37">SBE - PPE triggers DBG</bit>
-    <bit pos="38">OTP - SCOM access errors and single ecc correctable</bit>
-    <bit pos="39">TPIO External Trigger</bit>
-    <bit pos="40">PCB Master - Multicast group member count underrun (MC misconfig)</bit>
-    <bit pos="41">PCB Master - Parity ERR</bit>
-    <bit pos="42" child_node="RCS_OSC_ERROR">RCS OSC error on clk A</bit>
-    <bit pos="43" child_node="RCS_OSC_ERROR">RCS OSC error on clk B</bit>
-    <bit pos="44">RCS - Up/down counter A unlock</bit>
-    <bit pos="45">RCS - Up/down counter B unlock</bit>
-    <bit pos="46">PIBMEM</bit>
-    <bit pos="47">PIBMEM</bit>
-    <bit pos="48">OTP - ECC UE or CE count overflow</bit>
-    <bit pos="49">Nest DPLL: DCO empty</bit>
-    <bit pos="50">Nest DPLL: DCO full</bit>
-    <bit pos="51">Nest DPLL: internal error</bit>
-    <bit pos="52">PAU DPLL: DCO empty</bit>
-    <bit pos="53">PAU DPLL: DCO full</bit>
-    <bit pos="54">PAU DPLL: internal error</bit>
-    <bit pos="55">SPI Master 0 Err</bit>
-    <bit pos="56">SPI Master 1 Err</bit>
-    <bit pos="57">SPI Master 2 Err</bit>
-    <bit pos="58">SPI Master 3 Err</bit>
-    <bit pos="59">SPI Master 4 Err</bit>
-    <bit pos="60">unused</bit>
-    <bit pos="61">unused</bit>
-    <bit pos="62">unused</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_vas_fir.xml b/xml/p10/node_vas_fir.xml
deleted file mode 100644
index ce1311e..0000000
--- a/xml/p10/node_vas_fir.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="VAS_FIR" reg_type="SCOM">
-    <local_fir config="W" name="VAS_FIR">
-        <instance addr="0x02011400" reg_inst="0"/>
-        <action attn_type="CS" config="00"/>
-        <action attn_type="RE" config="01"/>
-        <action attn_type="UCS" config="11"/>
-    </local_fir>
-    <bit pos="0">Hardware error detected in Egress logic</bit>
-    <bit pos="1">Hardware error detected in Ingress logic</bit>
-    <bit pos="2">Hardware error detected in CQ logic</bit>
-    <bit pos="3">Hardware error detected in WC logic</bit>
-    <bit pos="4">Hardware error detected in RG logic</bit>
-    <bit pos="5">PowerBus parity error detected on CQ logic interface</bit>
-    <bit pos="6">CQ logic detected PowerBus address error on CRESP from a read operation</bit>
-    <bit pos="7">CQ logic detected PowerBus address error on CRESP from a write operation</bit>
-    <bit pos="8">Correctable ECC error detected in Egress logic</bit>
-    <bit pos="9">Correctable ECC error detected in Ingress logic</bit>
-    <bit pos="10">Correctable ECC error detected in CQ logic</bit>
-    <bit pos="11">Correctable ECC error detected in WC logic</bit>
-    <bit pos="12">Correctable ECC error detected in RG logic</bit>
-    <bit pos="13">ECC Correctable Error detected on CQ outbound PowerBus interface</bit>
-    <bit pos="14">ECC Uncorrectable Error detected on CQ outbound PowerBus interface</bit>
-    <bit pos="15">PowerBus state machine hang detected in CQ logic</bit>
-    <bit pos="16">Uncorrectable ECC error detected in Egress logic</bit>
-    <bit pos="17">Uncorrectable ECC error detected in Ingress logic</bit>
-    <bit pos="18">Uncorrectable ECC error detected in CQ logic</bit>
-    <bit pos="19">Uncorrectable ECC error detected in WC logic</bit>
-    <bit pos="20">Uncorrectable ECC error detected in RG logic</bit>
-    <bit pos="21">Parity error detected in Ingress logic</bit>
-    <bit pos="22">Software cast error detected in Ingress logic</bit>
-    <bit pos="23">reserved</bit>
-    <bit pos="24">ECC sue error detected in Egress logic</bit>
-    <bit pos="25">ECC sue error detected in Ingress logic</bit>
-    <bit pos="26">ECC sue error detected in CQ logic</bit>
-    <bit pos="27">ECC sue error detected in WC logic</bit>
-    <bit pos="28">ECC sue error detected in RG logic</bit>
-    <bit pos="29">PowerBus link error detected on read operation in CQ logic</bit>
-    <bit pos="30">PowerBus link error detected on write operation in CQ logic</bit>
-    <bit pos="31">PowerBus link abort operation received in CQ logic</bit>
-    <bit pos="32">Address error detected on hypervisor MMIO read</bit>
-    <bit pos="33">Address error detected on OS MMIO read</bit>
-    <bit pos="34">Address error detected on hypervisor MMIO write</bit>
-    <bit pos="35">Address error detected on OS MMIO write</bit>
-    <bit pos="36">non-8-Byte MMIO detected by hypervisor</bit>
-    <bit pos="37">non-8-Byte MMIO detected by user or OS</bit>
-    <bit pos="38">reserved</bit>
-    <bit pos="39">reserved</bit>
-    <bit pos="40">reserved</bit>
-    <bit pos="41">reserved</bit>
-    <bit pos="42">ASB_Notify sent but not claimed and interrupts were disabled in window context</bit>
-    <bit pos="43">reserved</bit>
-    <bit pos="44">VAS rejected a PB paste command</bit>
-    <bit pos="45">VAS hung waiting for data from PowerBus</bit>
-    <bit pos="46">Incoming PowerBus parity error</bit>
-    <bit pos="47">HW error from SCOM Satellite 1</bit>
-    <bit pos="48">NX Local Checkstop</bit>
-    <bit pos="49">SCOM MMIO address offset error</bit>
-    <bit pos="50">TopoID Error Bit</bit>
-    <bit pos="51">spare</bit>
-</attn_node>
diff --git a/xml/parse_chip_data_xml b/xml/parse_chip_data_xml
deleted file mode 100755
index 8108ff1..0000000
--- a/xml/parse_chip_data_xml
+++ /dev/null
@@ -1,1304 +0,0 @@
-#!/usr/bin/env perl
-
-use warnings;
-use strict;
-
-use Data::Dumper;
-use Getopt::Long qw(:config no_ignore_case);
-use File::Path qw(make_path);
-use XML::Simple qw(:strict);
-use JSON;
-
-# Pull in from the lib directory
-use FindBin qw($RealBin);
-use FindBin qw($RealScript);
-use lib "$RealBin/lib";
-
-use BitRange;
-
-#-------------------------------------------------------------------------------
-# Global Variables
-#-------------------------------------------------------------------------------
-
-# Supported file versions and their values.
-my $FILE_VERSION =
-{
-    VER_01 => 0x01,
-};
-
-# This is a map of all currently supported models/ECs and their IDs.
-my $SUPPORTED_MODEL_EC =
-{
-    EXPLORER_11 => { id => 0x60D20011, type => "ocmb", desc => "Explorer 1.1" },
-    EXPLORER_20 => { id => 0x60D20020, type => "ocmb", desc => "Explorer 2.0" },
-    P10_10      => { id => 0x20DA0010, type => "proc", desc => "P10 1.0" },
-    P10_20      => { id => 0x20DA0020, type => "proc", desc => "P10 2.0" },
-};
-
-# All models/ECs that may exist in the XML, but no longer needs to be built.
-# This is useful for build optimization and also help prevent build breaks when
-# the XML still exists, but not needed anymore.
-my $DEPRECATED_MODEL_EC = [];
-
-# Supported register types and their values.
-my $REGISTER_TYPE =
-{
-    SCOM   => { id => 0x01, addr_size => 4, reg_size => 8 },
-    IDSCOM => { id => 0x02, addr_size => 8, reg_size => 8 },
-};
-
-# Supported attention types and their values.
-my $ATTN_TYPE =
-{
-    CS  => [ 1, 'checkstop'         ], # System checkstop hardware attention
-    UCS => [ 2, 'unit checkstop'    ], # Unit checkstop hardware attention
-    RE  => [ 3, 'recoverable'       ], # Recoverable hardware attention
-    SPA => [ 4, 'special attention' ], # event requiring action by the SP FW
-    HA  => [ 5, 'host attention'    ], # event requiring action by the host FW
-};
-
-#-------------------------------------------------------------------------------
-# Help function
-#-------------------------------------------------------------------------------
-
-sub help()
-{
-    print <<EOF;
-Usage: $RealScript -h
-       $RealScript -i <input_dir> -o <output_dir>
-
-Generates specified data files from the input Chip Data XML.
-
-General options:
-
- -h, --help     Prints this menu.
- -i, --input    Directory containing the Chip Data XML files.
- -o, --output   Directory that will contain the data files.
-
-Data file options (must specify at least one):
-
- --cdb          Generates Chip Data Binary files.
- --json         Generates PEL Parser Data JSON files.
-
-EOF
-
-    exit;
-}
-
-#-------------------------------------------------------------------------------
-# Input
-#-------------------------------------------------------------------------------
-
-help() unless @ARGV; # print help if no arguments
-
-# Get options
-my ( $help, $src_dir, $dest_dir, $gen_cdb, $gen_json );
-help() unless GetOptions(
-    'h|help'     => \$help,
-    'i|input=s'  => \$src_dir,
-    'o|output=s' => \$dest_dir,
-    'cdb'        => \$gen_cdb,
-    'json'       => \$gen_json,
-);
-
-help() if @ARGV; # print usage if there are extra arguments
-
-# -h,--help
-help() if ( $help );
-
-# -i,--input
-die "ERROR> Option -i required." unless ( defined $src_dir );
-die "ERROR> '$src_dir' is not a directory" unless ( -d $src_dir );
-
-# -o,--output
-die "ERROR> Option -o required." unless ( defined $dest_dir );
-make_path( $dest_dir, {error => \my $err} );
-if ( @{$err} )
-{
-    my ( $file, $message ) = %{shift @{$err}};
-    die "ERROR> $message: $file\n";
-}
-
-# --cdb, --json
-unless ( $gen_cdb or $gen_json )
-{
-    die "ERROR> Must specify at least one data file option.";
-}
-
-#-------------------------------------------------------------------------------
-# Prototypes
-#-------------------------------------------------------------------------------
-
-sub importXML($);
-sub normalizeXML($);
-sub buildDataFiles($$);
-
-#-------------------------------------------------------------------------------
-# Main
-#-------------------------------------------------------------------------------
-
-# Validate and import the XML.
-my $chip_data_xml = importXML( $src_dir );
-
-# There are some fields in the XML that are shorthand and need to be expanded
-# before building the binary files.
-my $normalized_data = normalizeXML( $chip_data_xml );
-
-# The XML should now be in a format to start building the binary files.
-buildDataFiles( $dest_dir, $normalized_data );
-
-#-------------------------------------------------------------------------------
-# Helper functions
-#-------------------------------------------------------------------------------
-
-sub FAIL($) { die( "ERROR> " . shift @_ ); }
-
-#-------------------------------------------------------------------------------
-# Import functions
-#-------------------------------------------------------------------------------
-
-# For each supported XML file in the given directory:
-#   - Ensures the XML is well-formed.
-#   - Ensures the XML validates against the schema.
-#   - Imports the XML into Perl data structures.
-sub importXML($)
-{
-    my ( $dir ) = @_;
-
-    my $data = {};
-
-    # Get a list of all the XML files.
-    opendir DIR, $dir or die "Couldn't open dir '$dir': $!";
-    my @files = grep { /^.+\.xml$/ } readdir DIR;
-    closedir DIR;
-
-    # Iterate each supported file type.
-    for my $type ( "chip", "node" )
-    {
-        for my $file ( grep { /^$type\_.+\.xml$/ } @files )
-        {
-            my $path = "$dir/$file";
-
-            # Ensure the XML is well-formed and validates against the schema.
-            my $schema = "$RealBin/schema/$type.xsd";
-            my $out = `xmllint --noout --schema $schema $path 2>&1`;
-            die "$out\nRAS XML validation failed on $file" if ( 0 != $? );
-
-            # Import the XML.
-            my $xml = XMLin( $path, KeyAttr => {}, ForceArray => 1 );
-
-            # Add the file path to the XML for error output.
-            $xml->{path} = $path;
-
-            # Push each file's data to a list for each file type.
-            push @{$data->{$type}}, $xml;
-        }
-    }
-
-    return $data;
-}
-
-#-------------------------------------------------------------------------------
-# Normalize functions
-#-------------------------------------------------------------------------------
-
-# Takes a string of models/ECs separated by ',' and returns a list of supported
-# models/ECs. See $SUPPORTED_MODEL_EC and $DEPRECATED_MODEL_EC.
-sub __expandModelEc($)
-{
-    my ( $str ) = @_;
-
-    my @list = split(/,/, $str);
-
-    # Remove any deprecated models/ECs.
-    for my $d ( @{$DEPRECATED_MODEL_EC} )
-    {
-        @list = grep { $d ne $_ } @list;
-    }
-
-    # Validate the remaining models/ECs.
-    for my $m ( @list )
-    {
-        unless ( defined $SUPPORTED_MODEL_EC->{$m} )
-        {
-            FAIL("Unsupported model/EC: $m");
-        }
-    }
-
-    return @list;
-}
-
-#-------------------------------------------------------------------------------
-
-sub __getInstRange($)
-{
-    my ( $insts ) = @_;
-
-    my $list = [];
-    for ( @{$insts} ) { push @{$list}, $_->{reg_inst}; }
-
-    @{$list} = sort {$a <=> $b} @{$list}; # Sort the list just in case.
-
-    return BitRange::compress($list);
-}
-
-sub __getReg($$$$)
-{
-    my ( $inst_in, $reg_type, $name, $addr_mod ) = @_;
-
-    my $inst_out = [];
-    for ( @{$inst_in} )
-    {
-        my $addr = "";
-        if ( "SCOM" eq $reg_type )
-        {
-            $addr = sprintf( "0x%08x", hex($_->{addr}) + $addr_mod );
-        }
-        elsif ( "IDSCOM" eq $reg_type )
-        {
-            # TODO: Need a portable way of handling 64-bit numbers.
-            FAIL("IDSCOM address currently not supported");
-        }
-        else
-        {
-            FAIL("Unsupported register type for node: $name");
-        }
-
-        push @{$inst_out}, { reg_inst => $_->{reg_inst}, addr => $addr };
-    }
-
-    return { name => $name, instance => $inst_out };
-}
-
-sub __getExpr($$)
-{
-    my ( $name, $config ) = @_;
-
-    # Get the register expression.
-    my $expr = { type => 'reg', value1 => $name };
-
-    if ( '0' eq $config )
-    {
-        # Take the NOT of the register expression.
-        $expr = { type => 'not', expr => [ $expr ] };
-    }
-
-    return $expr;
-}
-
-sub __getAct($$$$)
-{
-    my ( $fir, $range, $type, $config ) = @_;
-
-    FAIL("Invalid action config: $config") unless ( $config =~ /^[01]{2,3}$/ );
-
-    my @c = split( //, $config );
-
-    my $e = [];
-    push( @{$e}, __getExpr("${fir}",      '1'     ) );
-    push( @{$e}, __getExpr("${fir}_MASK", '0'     ) );
-    push( @{$e}, __getExpr("${fir}_ACT0", shift @c) );
-    push( @{$e}, __getExpr("${fir}_ACT1", shift @c) );
-    push( @{$e}, __getExpr("${fir}_ACT2", shift @c) ) if ( 0 < scalar @c );
-
-    return { node_inst => $range, attn_type => $type,
-             expr => [ { type => 'and', expr => $e } ] };
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeLocalFir($)
-{
-    my ( $node ) = @_;
-
-    return unless ( defined $node->{local_fir} );
-
-    # Note that the isolator will implicitly add all register referenced by the
-    # rules to the capture group. To reduce redundancy and overall file size, we
-    # won't add these registers to the capture group.
-
-    $node->{register}      = [] unless ( defined $node->{register}      );
-    $node->{rule}          = [] unless ( defined $node->{rule}          );
-
-    for my $l ( @{$node->{local_fir}} )
-    {
-        my $n = $l->{name};
-        my $i = $l->{instance};
-        my $t = $node->{reg_type};
-
-        my $inst_range = __getInstRange($i);
-
-        my $r = [];
-        push @{$r}, __getReg($i, $t, "${n}",      0);
-        push @{$r}, __getReg($i, $t, "${n}_MASK", 3);
-        push @{$r}, __getReg($i, $t, "${n}_ACT0", 6);
-        push @{$r}, __getReg($i, $t, "${n}_ACT1", 7);
-        push @{$r}, __getReg($i, $t, "${n}_WOF",  8) if ($l->{config} =~ /W/);
-        push @{$r}, __getReg($i, $t, "${n}_ACT2", 9) if ($l->{config} =~ /2/);
-
-        push @{$node->{register}}, @{$r};
-
-        for ( @{$l->{action}} )
-        {
-            push @{$node->{rule}},
-                 __getAct( $n, $inst_range, $_->{attn_type}, $_->{config} );
-        }
-    }
-
-    delete $node->{local_fir};
-}
-
-#-------------------------------------------------------------------------------
-
-# This is not very efficient, especially for large data structures. It is
-# recommended to use Data::Compare, but that is not available on the pool
-# machines.
-sub __dirtyCompare($$)
-{
-    local $Data::Dumper::Terse    = 1;
-    local $Data::Dumper::Indent   = 0;
-    local $Data::Dumper::Sortkeys = 1;
-    my ( $a, $b ) = ( Dumper(shift), Dumper(shift) );
-    return $a eq $b;
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeRegister($$)
-{
-    my ( $node, $regs ) = @_;
-
-    return unless ( defined $node->{register} );
-
-    # All of the registers will be put in the master register list for the chip.
-    for my $r ( @{$node->{register}} )
-    {
-        # Set the default access if needed.
-        $r->{access} = 'RW' unless ( defined $r->{access} );
-
-        # Each register will keep track of its type.
-        $r->{reg_type} = $node->{reg_type};
-
-        for my $model_ec ( __expandModelEc($node->{model_ec}) )
-        {
-            if ( defined $regs->{$model_ec}->{$r->{name}} )
-            {
-                # This register already exists so check the contents for
-                # accuracy
-                unless ( __dirtyCompare($r, $regs->{$model_ec}->{$r->{name}}) )
-                {
-                    FAIL("Duplicate register: $r->{name}");
-                }
-            }
-            else
-            {
-                # Add this node's register to the master register list.
-                $regs->{$model_ec}->{$r->{name}} = $r;
-            }
-        }
-    }
-
-    # Clean up this node's register data.
-    delete $node->{register};
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeCaptureGroup($$)
-{
-    my ( $node, $insts_data ) = @_;
-
-    # Capture groups are optional (although recommended).
-    return unless ( defined $node->{capture_group} );
-
-    for my $c ( @{$node->{capture_group}} )
-    {
-        # There must be at least one capture_register.
-        unless ( defined $c->{capture_register} and
-                 0 < scalar @{$c->{capture_register}} )
-        {
-            FAIL("<capture_group> for node $node->{name} does not contain at " .
-                 "least one <capture_register>" );
-        }
-
-        my @node_insts = BitRange::expand($c->{node_inst});
-
-        for my $r ( @{$c->{capture_register}} )
-        {
-            # node_inst and reg_inst must be the same size.
-            my @reg_insts = BitRange::expand($r->{reg_inst});
-            unless ( scalar @node_insts == scalar @reg_insts )
-            {
-                FAIL("capture_group/\@node_inst and capture_register/" .
-                     "\@reg_inst list sized not equal for node $node->{name}");
-            }
-
-            # Expand the capture groups so there is one per node instance.
-            for ( 0 .. (scalar @node_insts - 1) )
-            {
-                my ( $ni, $ri ) = ( $node_insts[$_], $reg_insts[$_] );
-                push @{$insts_data->{$ni}->{capture_group}},
-                     { reg_name => $r->{reg_name}, reg_inst => $ri };
-            }
-        }
-    }
-
-    # Clean up this node's capture group data.
-    delete $node->{capture_group};
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeExpr($$$$); # Called recursively
-
-sub __normalizeExpr($$$$)
-{
-    my ( $in, $ni, $idx, $size ) = @_;
-
-    my ( $t, $e, $v1, $v2 ) = ( $in->{type}, $in->{expr},
-                                $in->{value1}, $in->{value2} );
-
-    my $out = { type => $t };
-
-    if ( "and" eq $t or "or" eq $t )
-    {
-        if ( defined $v1 or defined $v2 or
-             not defined $e or not (0 < scalar @{$e}) )
-        {
-            FAIL("Invalid parameters for and/or expression");
-        }
-
-        # Iterate each sub expression.
-        push @{$out->{expr}}, __normalizeExpr($_, $ni, $idx, $size) for (@{$e});
-    }
-    elsif ( "not" eq $t )
-    {
-        if ( defined $v1 or defined $v2 or
-             not defined $e or not (1 == scalar @{$e}) )
-        {
-            FAIL("Invalid parameters for not expression");
-        }
-
-        # Iterate each sub expression.
-        push @{$out->{expr}}, __normalizeExpr($_, $ni, $idx, $size) for (@{$e});
-    }
-    elsif ( "lshift" eq $t or "rshift" eq $t )
-    {
-        if ( not defined $v1 or defined $v2 or
-             not defined $e or not (1 == scalar @{$e}) )
-        {
-            FAIL("Invalid parameters for lshift/rshift expression");
-        }
-
-        # Copy value1.
-        $out->{value1} = $v1;
-
-        # Iterate each sub expression.
-        push @{$out->{expr}}, __normalizeExpr($_, $ni, $idx, $size) for (@{$e});
-    }
-    elsif ( "reg" eq $t )
-    {
-        if ( not defined $v1 or defined $e )
-        {
-            FAIL("Invalid parameters for reg expression");
-        }
-
-        # Copy value1.
-        $out->{value1} = $v1;
-
-        # value2 is optional in the XML, update the value to the node or
-        # register instance.
-        if ( defined $v2 )
-        {
-            my @reg_insts = BitRange::expand($v2);
-            unless ( $size == scalar @reg_insts )
-            {
-                FAIL("reg expression value2:$v2 list not the same ".
-                     "size as containing node's rule instances:$size");
-            }
-
-            $out->{value2} = $reg_insts[$idx];
-        }
-        else
-        {
-            # The register instance is the same as the node instance.
-            $out->{value2} = $ni;
-        }
-    }
-    elsif ( "int" eq $t )
-    {
-        if ( not defined $v1 or defined $v2 or defined $e )
-        {
-            FAIL("Invalid parameters for int expression");
-        }
-
-        # Copy value1.
-        $out->{value1} = $v1;
-    }
-    else
-    {
-        FAIL("Unsupported expression type: $t");
-    }
-
-    return $out;
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeRule($$)
-{
-    my ( $node, $insts_data ) = @_;
-
-    # There should be only one rule per attention type and node instance for
-    # this node.
-    my $rule_dups = {};
-
-    for my $r ( @{$node->{rule}} )
-    {
-        # There should be exactly one parent expression.
-        unless ( 1 == scalar @{$r->{expr}} )
-        {
-            FAIL("Multiple parent expressions for rule: $node->{name} " .
-                 "$r->{attn_type}");
-        }
-        my $expr = $r->{expr}->[0];
-
-        my @node_insts = BitRange::expand($r->{node_inst});
-        my $sz_insts = scalar @node_insts;
-
-        # Expand the expression for each node instance.
-        for my $idx ( 0 .. ($sz_insts - 1) )
-        {
-            my $ni = $node_insts[$idx];
-
-            # Check for duplicates.
-            if ( defined $rule_dups->{$r->{attn_type}}->{$ni} )
-            {
-                FAIL("Duplicate rule: $node->{name} $r->{attn_type} $ni");
-            }
-            else
-            {
-                $rule_dups->{$r->{attn_type}}->{$ni} = 1;
-            }
-
-            # Add the rule for this expression.
-            push @{$insts_data->{$ni}->{rule}},
-                 { attn_type => $r->{attn_type},
-                   expr      => __normalizeExpr($expr, $ni, $idx, $sz_insts) };
-        }
-    }
-
-    # Clean up this node's rule data.
-    delete $node->{rule};
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeBit($$$)
-{
-    my ( $node, $sigs, $insts_data ) = @_;
-
-    my @node_insts = sort {$a <=> $b} keys %{$insts_data};
-    my $sz_insts = scalar @node_insts;
-
-    # There should be only one child node per node instance bit position.
-    my $child_dups = {};
-
-    for my $b ( sort {$a->{pos} cmp $b->{pos}} @{$node->{bit}} )
-    {
-        my @child_insts = ();
-
-        # Ensure child_node and node_inst are set properly.
-        if ( defined $b->{child_node} )
-        {
-            # Ensure each bit has a default node_inst attribute if needed.
-            $b->{node_inst} = "0" unless ( defined $b->{node_inst} );
-
-            # Get all of the instances for this child node.
-            @child_insts = BitRange::expand($b->{node_inst});
-
-            # Both inst list must be equal in size.
-            unless ( $sz_insts == scalar @child_insts )
-            {
-                FAIL("node_inst attribute list size for node:$node->{name} " .
-                     "bit:$b->{pos} does not match node instances " .
-                     "represented by the <rule> element");
-            }
-        }
-        elsif ( defined $b->{node_inst} )
-        {
-            FAIL("node_inst attribute exists for node:$node->{name} " .
-                 "bit:$b->{pos} with no child_node attribute");
-        }
-
-        # Get the signatures for each node, instance, and bit position.
-        for my $p ( BitRange::expand($b->{pos}) )
-        {
-            for my $i ( 0 .. ($sz_insts-1) )
-            {
-                my ( $n, $ni ) = ( $node->{name}, $node_insts[$i] );
-
-                # This is to cover a bug in the figtree information where there
-                # currently is no comment for some bits.
-                $b->{content} = "" unless ( defined $b->{content} );
-
-                for my $model_ec ( __expandModelEc($node->{model_ec}) )
-                {
-                    # Check if this signature already exists.
-                    if ( defined $sigs->{$model_ec}->{$n}->{$ni}->{$p} and
-                        $b->{content} ne $sigs->{$model_ec}->{$n}->{$ni}->{$p} )
-                    {
-                        FAIL("Duplicate signature for $n $ni $p");
-                    }
-
-                    # Get the signatures for each node, instance, and bit
-                    # position.
-                    $sigs->{$model_ec}->{$n}->{$ni}->{$p} = $b->{content};
-                }
-
-                # Move onto the next instance unless a child node exists.
-                next unless ( defined $b->{child_node} );
-
-                my $pi = $child_insts[$i];
-
-                my $child = { pos        => $p,
-                              child_node => $b->{child_node},
-                              node_inst  => $pi };
-
-                # Ensure this child node doesn't already exist.
-                if ( defined $child_dups->{$ni}->{$p} and
-                     not __dirtyCompare($child, $child_dups->{$ni}->{$p}) )
-                {
-                    FAIL("Duplicate child_node for $n $ni $p");
-                }
-
-                # Add this child node.
-                push @{$insts_data->{$ni}->{bit}}, $child;
-            }
-        }
-    }
-
-    # Clean up this node's bit data.
-    delete $node->{bit};
-}
-
-#-------------------------------------------------------------------------------
-
-sub __normalizeNode($$$)
-{
-    my ( $node, $regs, $sigs ) = @_;
-
-    # Ensure a valid register type.
-    unless ( grep { /^$node->{reg_type}$/ } keys %{$REGISTER_TYPE} )
-    {
-        FAIL( "Unsupported register type: $node->{reg_type}" );
-    }
-
-    my $insts_data = {}; # Collect data for each instance of this node.
-
-    # First, expand the <local_fir> data if it exists.
-    __normalizeLocalFir($node);
-
-    # All registers will be put in a master register list for the chip.
-    __normalizeRegister($node, $regs);
-
-    # Split the capture group information per node instance.
-    __normalizeCaptureGroup($node, $insts_data);
-
-    my $is_rule = (defined $node->{rule} and 0 < scalar @{$node->{rule}}) ? 1 : 0;
-    my $is_bit  = (defined $node->{bit}  and 0 < scalar @{$node->{bit}})  ? 1 : 0;
-
-    # If a rule is defined, a bit must be defined as well. It is possible for
-    # neither to be defined (FFDC-only node).
-    if ( $is_rule and $is_bit )
-    {
-        # Split the rule information per node instance. The sorted instance list
-        # will be used as indexes for the node_inst attribute of the <bit>
-        # elements.
-        __normalizeRule($node, $insts_data);
-
-        # Finally, collect the signature details and split the bit information
-        # per node instance.
-        __normalizeBit($node, $sigs, $insts_data);
-    }
-    elsif ( $is_rule or $is_bit )
-    {
-        # One is defined and the other is not. This is an error.
-        FAIL("Node $node->{name} has a bit or rule defined and the other is not.");
-    }
-
-    # Now that we have all of the node data, collapse the instance data into
-    # a list. Note that sort order doesn't matter. Only used for consistency.
-    for ( sort keys %{$insts_data} )
-    {
-        $insts_data->{$_}->{node_inst} = $_;
-        push @{$node->{instance}}, $insts_data->{$_};
-    }
-}
-
-#-------------------------------------------------------------------------------
-
-sub normalizeXML($)
-{
-    my ( $xml ) = @_;
-
-    my $data = {};
-
-    # Iterate each chip file.
-    for my $chip ( @{$xml->{chip}} )
-    {
-        # Iterate each model/EC.
-        for my $model_ec ( __expandModelEc($chip->{model_ec}) )
-        {
-            # Ensure there is not a duplicate definition for a model/EC.
-            if ( $data->{$model_ec}->{chip} )
-            {
-                FAIL("Duplicate data for model/EC $model_ec in:\n" .
-                     "    $data->{$model_ec}->{chip}->{path}\n" .
-                     "    $chip->{path}");
-            }
-
-            # Add this chip to the data.
-            $data->{$model_ec}->{attn_tree} = $chip->{attn_tree};
-        }
-    }
-
-    # Extract the data for each node.
-    my ( $regs, $sigs, $node_dups ) = ( {}, {}, {} );
-    for my $node ( sort { $a->{name} cmp $b->{name} } @{$xml->{node}} )
-    {
-        # A node may be defined for more than one model/EC.
-        for my $model_ec ( __expandModelEc($node->{model_ec}) )
-        {
-            # A node can only be defined once per model/EC.
-            if ( defined $node_dups->{$model_ec}->{$node->{name}} )
-            {
-                FAIL( "Duplicate node defined for $model_ec -> $node->{name} ");
-            }
-            else
-            {
-                $node_dups->{$model_ec}->{$node->{name}} = 1;
-            }
-
-            # Initialize the master list of registers and signatures of this
-            # model/EC, if necessary.
-
-            $regs->{$model_ec} = {} unless ( defined $regs->{$model_ec} );
-            $sigs->{$model_ec} = {} unless ( defined $sigs->{$model_ec} );
-        }
-
-        # The same node content will be used for each model/EC characterized by
-        # this node. There is some normalization that needs to happen because of
-        # shorthand elements, like <local_fir>, and some error checking. This
-        # only needs to be done once per node, not per model/EC.
-        __normalizeNode( $node, $regs, $sigs );
-
-        # Push the node data for each model/EC.
-        for my $model_ec ( __expandModelEc($node->{model_ec}) )
-        {
-            push @{$data->{$model_ec}->{node}}, $node;
-        }
-    }
-
-    # Sort and collapse the master register list.
-    for my $m ( keys %{$regs} )
-    {
-        for my $n ( sort keys %{$regs->{$m}} )
-        {
-            push @{$data->{$m}->{register}}, $regs->{$m}->{$n};
-        }
-    }
-
-    # Collapse the signature lists.
-    for my $m ( keys %{$sigs} )
-    {
-        for my $n ( sort keys %{$sigs->{$m}} )
-        {
-            for my $i ( sort {$a <=> $b} keys %{$sigs->{$m}->{$n}} )
-            {
-                for my $b ( sort {$a <=> $b} keys %{$sigs->{$m}->{$n}->{$i}} )
-                {
-                    push @{$data->{$m}->{signature}},
-                         { name => $n, inst => $i, bit => $b,
-                           desc => $sigs->{$m}->{$n}->{$i}->{$b} };
-                }
-            }
-        }
-    }
-
-    return $data;
-}
-
-#-------------------------------------------------------------------------------
-# Output functions
-#-------------------------------------------------------------------------------
-
-# The $num passed into this function can be a numeric of string. All values are
-# converted to a hex string and then into the binary format. This helps avoid
-# portability issues with endianess. Requirements:
-#  - Hex strings must start with '0x'.
-#  - For portability, 64-bit numbers must be passed as a hex string.
-sub __bin($$$)
-{
-    my ( $fh, $bytes, $num ) = @_;
-
-    # $bytes must be a positive integer.
-    die "Invalid bytes: $bytes" unless ( 0 < $bytes );
-
-    my $str = ''; # Default invalid string
-
-    my $char = $bytes * 2; # Number of characters in the string.
-
-    # Check if $num is a hex string.
-    if ( $num =~ /^0[x|X](.*)/ )
-    {
-        $str = $1; # strip the '0x'
-    }
-    # Check if $num is string or numeric decimal integer (32-bit max).
-    elsif ( $num =~ /^[0-9]+$/ and $bytes <= 4 )
-    {
-        $str = sprintf("%0${char}x", $num); # Convert to hex string
-    }
-
-    # Check for a hex number with the valid size.
-    unless ( $str =~ /^[0-9a-fA-F]{$char}$/ )
-    {
-        die "Invalid number: $num (size: $bytes)";
-    }
-
-    # Print the binary string.
-    print $fh pack( "H$char", $str );
-}
-
-#-------------------------------------------------------------------------------
-
-sub __hash($$)
-{
-    my $bytes = shift;
-    my @str   = unpack("C*", shift); # returns an array of ascii values
-
-    # Currently only supporting 1, 2, 3, and 4 byte hashes.
-    unless ( 1 <= $bytes and $bytes <= 4 )
-    {
-        FAIL("Unsupported hash size: $bytes");
-    }
-
-    # Add padding to the end of the character array so that the size is
-    # divisible by $bytes.
-    push @str, 0 until ( 0 == scalar(@str) % $bytes );
-
-    # This hash is a simple "n*s[0] + (n-1)*s[1] + ... + s[n-1]" algorithm,
-    # where s[i] is a $bytes size chunk of the input string.
-
-    my ( $sumA, $sumB ) = ( 0, 0 );
-    while ( my @chunk = splice @str, 0, $bytes )
-    {
-        # Combine the chunk array into a single value.
-        my $val = 0; for ( @chunk ) { $val <<= 8; $val |= $_; }
-
-        # Apply the simple hash.
-        $sumA += $val;
-        $sumB += $sumA;
-    }
-
-    # Mask off everything except the target number of bytes.
-    $sumB &= 0xffffffff >> ((4 - $bytes) * 8);
-
-    return $sumB;
-}
-
-#-------------------------------------------------------------------------------
-
-sub __printRegisters($$)
-{
-    my ( $fh, $data ) = @_;
-
-    my $num_regs = scalar @{$data};
-    FAIL("No registers defined") unless ( 0 < $num_regs );
-
-    # Register list metadata
-    __bin($fh, 1, $_) for ( unpack("C*", "REGS") );
-    __bin($fh, 3, $num_regs);
-
-    my $reg_ids = {}; # for hash duplicate checking
-
-    for my $r ( @{$data} )
-    {
-        # Get the hash of the register name and check for duplicates.
-        my $id = __hash(3, $r->{name});
-        if ( defined $reg_ids->{$id} )
-        {
-            FAIL("Duplicate register ID hash " . sprintf('0x%08x', $id) .
-                 " for $r->{name} and $reg_ids->{$id}");
-        }
-        else
-        {
-            $reg_ids->{$id} = $r->{name};
-        }
-
-        # Get the attribute flags.
-        my $flags = 0x00;
-        $flags |= 0x80 if ( $r->{access} =~ /R/ );
-        $flags |= 0x40 if ( $r->{access} =~ /W/ );
-
-        # Get the number of address instances.
-        my $num_inst = scalar @{$r->{instance}};
-        unless ( 0 < $num_inst )
-        {
-            FAIL("No register instances defined for $r->{name}");
-        }
-
-        # Register metadata
-        __bin($fh, 3, $id      );
-        __bin($fh, 1, $REGISTER_TYPE->{$r->{reg_type}}->{id});
-        __bin($fh, 1, $flags   );
-        __bin($fh, 1, $num_inst);
-
-        for my $i ( @{$r->{instance}} )
-        {
-            my $s = $REGISTER_TYPE->{$r->{reg_type}}->{addr_size};
-
-            # Register Instance metadata
-            __bin($fh,  1, $i->{reg_inst});
-            __bin($fh, $s, $i->{addr}    );
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-
-sub __printExpr($$$);
-
-sub __printExpr($$$)
-{
-    my ( $fh, $size, $expr ) = @_;
-
-    my ( $t, $e, $v1, $v2 ) = ( $expr->{type}, $expr->{expr},
-                                $expr->{value1}, $expr->{value2} );
-
-    if ( "reg" eq $t )
-    {
-        __bin($fh, 1, 0x01);            # expression type for "reg"
-        __bin($fh, 3, __hash(3,$v1));   # register id
-        __bin($fh, 1, $v2);             # register instance
-    }
-    elsif ( "int" eq $t )
-    {
-        __bin($fh,     1, 0x02);    # expression type for "int"
-        __bin($fh, $size, $v1);     # integer value
-    }
-    elsif ( "and" eq $t )
-    {
-        __bin($fh, 1, 0x10);                        # expression type for "and"
-        __bin($fh, 1, scalar @{$e});                # number of sub-expressions
-        __printExpr($fh, $size, $_) for ( @{$e} );  # add each sub-expression
-    }
-    elsif ( "or" eq $t )
-    {
-        __bin($fh, 1, 0x11);                        # expression type for "or"
-        __bin($fh, 1, scalar @{$e});                # number of sub-expressions
-        __printExpr($fh, $size, $_) for ( @{$e} );  # add each sub-expression
-    }
-    elsif ( "not" eq $t )
-    {
-        __bin($fh, 1, 0x12);                # expression type for "not"
-        __printExpr($fh, $size, $e->[0]);   # add only sub-expression
-    }
-    elsif ( "lshift" eq $t )
-    {
-        __bin($fh, 1, 0x13);                # expression type for "lshift"
-        __bin($fh, 1, $v1);                 # shift amount
-        __printExpr($fh, $size, $e->[0]);   # add only sub-expression
-    }
-    elsif ( "rshift" eq $t )
-    {
-        __bin($fh, 1, 0x14);                # expression type for "rshift"
-        __bin($fh, 1, $v1);                 # shift amount
-        __printExpr($fh, $size, $e->[0]);   # add only sub-expression
-    }
-}
-
-#-------------------------------------------------------------------------------
-
-sub __printNodes($$)
-{
-    my ( $fh, $data ) = @_;
-
-    my $num_nodes = scalar @{$data};
-    FAIL("No nodes defined") unless ( 0 < $num_nodes );
-
-    # Isolation Node list metadata
-    __bin($fh, 1, $_) for ( unpack("C*", "NODE") );
-    __bin($fh, 2, $num_nodes);
-
-    my $node_ids = {}; # for hash duplicate checking
-
-    for my $n ( @{$data} )
-    {
-        # Get the hash of the node name and check for duplicates.
-        my $id = __hash(2, $n->{name});
-        if ( defined $node_ids->{$id} )
-        {
-            FAIL("Duplicate node ID hash " . sprintf('0x%08x', $id) .
-                 " for $n->{name} and $node_ids->{$id}");
-        }
-        else
-        {
-            $node_ids->{$id} = $n->{name};
-        }
-
-        my $num_insts = scalar @{$n->{instance}};
-        unless ( 0 < $num_insts )
-        {
-            FAIL("No nodes instances defined for $n->{name}");
-        }
-
-        my $reg_type = $REGISTER_TYPE->{$n->{reg_type}}->{id};
-        my $reg_size = $REGISTER_TYPE->{$n->{reg_type}}->{reg_size};
-
-        # Register metadata
-        __bin($fh, 2, $id);
-        __bin($fh, 1, $reg_type);
-        __bin($fh, 1, $num_insts);
-
-        for my $i ( @{$n->{instance}} )
-        {
-            # Capture groups are optional.
-            my $num_cap_regs = (defined $i->{capture_group})
-                                    ? scalar @{$i->{capture_group}} : 0;
-
-            # Rules may not exist for this node.
-            my $num_rules = (defined $i->{rule}) ? scalar @{$i->{rule}} : 0;
-
-            # Child nodes may not exist for this node.
-            my $num_bit = (defined $i->{bit}) ? scalar @{$i->{bit}} : 0;
-
-            # Register instance metadata
-            __bin($fh, 1, $i->{node_inst});
-            __bin($fh, 1, $num_cap_regs  );
-            __bin($fh, 1, $num_rules     );
-            __bin($fh, 1, $num_bit       );
-
-            if ( 0 < $num_cap_regs )
-            {
-                for my $cg ( @{$i->{capture_group}} )
-                {
-                    # Register capture register metadata
-                    __bin($fh, 3, __hash(3, $cg->{reg_name}));
-                    __bin($fh, 1, $cg->{reg_inst}           );
-                }
-            }
-
-            if ( 0 < $num_rules )
-            {
-                for my $r ( @{$i->{rule}} )
-                {
-                    # Register rule metadata
-                    __bin($fh, 1, $ATTN_TYPE->{$r->{attn_type}}->[0]);
-                    __printExpr($fh, $reg_size, $r->{expr});
-                }
-            }
-
-            if ( 0 < $num_bit )
-            {
-                for my $b ( @{$i->{bit}} )
-                {
-                    # Register child node metadata
-                    __bin($fh, 1, $b->{pos}                  );
-                    __bin($fh, 2, __hash(2, $b->{child_node}));
-                    __bin($fh, 1, $b->{node_inst}            );
-                }
-            }
-        }
-    }
-}
-
-#-------------------------------------------------------------------------------
-
-sub __printAttnTree($$)
-{
-    my ( $fh, $data ) = @_;
-
-    my $num_root_nodes = scalar @{$data};
-    FAIL("No root nodes defined") unless ( 0 < $num_root_nodes );
-
-    # Root Node list metadata
-    __bin($fh, 1, $_) for ( unpack("C*", "ROOT") );
-    __bin($fh, 1, $num_root_nodes);
-
-    for my $r ( @{$data} )
-    {
-        # Root Node metadata
-        __bin($fh, 1, $ATTN_TYPE->{$r->{attn_type}}->[0]);
-        __bin($fh, 2, __hash(2, $r->{root_node})        );
-        __bin($fh, 1, $r->{node_inst}                   );
-    }
-}
-
-#-------------------------------------------------------------------------------
-
-sub __printParserData($$$$)
-{
-    my ( $fh, $model_ec, $sig_list, $reg_list) = @_;
-
-    # IMPORTANT: All hash keys with hex values must be lowercase.
-
-    my $attns = {};
-    my $regs  = {};
-    my $sigs  = {};
-
-    # Get the chip info.
-    my $info = $SUPPORTED_MODEL_EC->{$model_ec};
-    $info->{'id'} = sprintf('%08x', $info->{'id'});
-
-    # Get the list of attention types.
-    while ( my ($k, $v) = each %{$ATTN_TYPE} )
-    {
-        $attns->{$v->[0]} = $v->[1];
-    }
-
-    # Get the signature data.
-    for my $s ( @{$sig_list} )
-    {
-        # Format is:
-        #   { id : [ name, { bit : desc, ... } ], ... }
-
-        # The ID is a 2-byte hash of the node name (lowercase).
-        my $id = sprintf('%04x', __hash(2, $s->{name}));
-
-        if ( exists($sigs->{$id}) )
-        {
-            # Check for hash collisions.
-            if ($sigs->{$id}->[0] ne $s->{name} )
-            {
-                FAIL("Node hash collision for $id: $sigs->{$id}->[0] " .
-                     "and $s->{name}");
-            }
-        }
-        else
-        {
-            # Initialize this node.
-            $sigs->{$id} = [ $s->{name}, {} ];
-        }
-
-        # Check for signature collisions.
-        if ( exists($sigs->{$id}->[1]->{$s->{bit}}) )
-        {
-            # Check for signature collisions.
-            if ( $sigs->{$id}->[1]->{$s->{bit}} ne $s->{desc} )
-            {
-                FAIL("Multiple signatures for $s->{name} bit $s->{bit}:\n" .
-                     "  $sigs->{$id}->[1]->{$s->{bit}}\n" .
-                     "  $s->{desc}");
-            }
-        }
-        else
-        {
-            # Set the signature for this bit.
-            $sigs->{$id}->[1]->{$s->{bit}} = $s->{desc};
-        }
-    }
-
-    # Get the register data.
-    for my $r ( @{$reg_list} )
-    {
-        # Format is:
-        #   { id : [ name, { inst : addr, ... } ], ... }
-
-        # The ID is a 3-byte hash of the register name (lowercase).
-        my $id = sprintf('%06x', __hash(3, $r->{name}));
-
-        if ( exists($regs->{$id}) )
-        {
-            # Check for hash collisions.
-            if ( $regs->{$id}->[0] ne $r->{name} )
-            {
-                FAIL("Register hash collision for $id: " .
-                     "$regs->{$id}->[0] and $r->{name}");
-            }
-        }
-        else
-        {
-            # Initialize this register.
-            $regs->{$id} = [ $r->{name}, {} ];
-        }
-
-        # Add the address for each instance of the register (shouldn't have to
-        # worry about duplicates).
-        for ( @{$r->{instance}} )
-        {
-            $regs->{$id}->[1]->{$_->{reg_inst}} = $_->{addr};
-        }
-    }
-
-    my $data =
-    {
-        'model_ec'   => $info,
-        'attn_types' => $attns,
-        'registers'  => $regs,
-        'signatures' => $sigs,
-    };
-
-    print $fh to_json( $data, {utf8 => 1, pretty => 1, canonical => 1} );
-}
-
-#-------------------------------------------------------------------------------
-
-sub buildDataFiles($$)
-{
-    my ( $dir, $data ) = @_;
-
-    while ( my ($model_ec, $chip) = each %{$data} )
-    {
-        unless ( defined $chip->{register} )
-        {
-            FAIL("Chip $model_ec does not contain registers");
-        }
-        unless ( defined $chip->{node} )
-        {
-            FAIL("Chip $model_ec does not contain nodes");
-        }
-        unless ( defined $chip->{attn_tree} )
-        {
-            FAIL("Chip $model_ec does not contain attn_tree information");
-        }
-        unless ( defined $chip->{signature} )
-        {
-            FAIL("Chip $model_ec does not contain signatures");
-        }
-
-        # Chip Data Binary files ###############################################
-
-        if ( $gen_cdb )
-        {
-            my $bin_file = "$dir/chip_data_" . lc $model_ec . ".cdb";
-            open my $bin_fh, '>', $bin_file or die "Cannot open $bin_file: $!";
-            binmode $bin_fh; # writes a binary file
-
-            # Chip Data File metadata
-            __bin($bin_fh, 1, $_) for ( unpack("C*", "CHIPDATA") );
-            __bin($bin_fh, 4, $SUPPORTED_MODEL_EC->{$model_ec}->{id});
-            __bin($bin_fh, 1, $FILE_VERSION->{VER_01}               );
-
-            __printRegisters( $bin_fh, $chip->{register}  );
-            __printNodes(     $bin_fh, $chip->{node}      );
-            __printAttnTree(  $bin_fh, $chip->{attn_tree} );
-
-            close $bin_fh;
-        }
-
-        # eBMC PEL parsing JSON ################################################
-
-        if ( $gen_json )
-        {
-            my $file = "$dir/pel_parser_data_" . lc $model_ec . ".json";
-            open my $fh, '>', $file or die "Cannot open $file: $!";
-
-            __printParserData( $fh, $model_ec, $chip->{signature},
-                               $chip->{register} );
-
-            close $fh;
-        }
-    }
-}
-
diff --git a/xml/schema/chip.xsd b/xml/schema/chip.xsd
deleted file mode 100644
index 5842651..0000000
--- a/xml/schema/chip.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="unqualified">
-
-<!-- Root element: chip -->
-<xsd:element name="chip">
-    <xsd:complexType>
-        <xsd:sequence>
-            <xsd:element name="attn_tree" type="attn_tree"
-                         minOccurs="1" maxOccurs="255"/>
-        </xsd:sequence>
-        <xsd:attribute name="name"     type="name_type"     use="required"/>
-        <xsd:attribute name="model_ec" type="model_ec_type" use="required"/>
-    </xsd:complexType>
-</xsd:element>
-
-<!-- Element: chip/attn_tree -->
-<xsd:complexType name="attn_tree">
-    <xsd:attribute name="attn_type" type="attn_type_enum" use="required"/>
-    <xsd:attribute name="root_node" type="name_type"      use="required"/>
-    <xsd:attribute name="node_inst" type="inst_type"      use="required"/>
-</xsd:complexType>
-
-<!-- Names must be alphanumeric or underscores, no spaces or other symbols
-     allowed. -->
-<xsd:simpleType name="name_type">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[a-zA-Z0-9_]+"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- A comma separated list of names (see name_type for name definition). -->
-<xsd:simpleType name="model_ec_type">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[a-zA-Z0-9_]+(,[a-zA-Z0-9_]+)*"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Instance values are integers from 0-255. -->
-<xsd:simpleType name="inst_type">
-    <xsd:restriction base="xsd:integer">
-        <xsd:minInclusive value="0"/>
-        <xsd:maxInclusive value="255"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Attention type enum. -->
-<xsd:simpleType name="attn_type_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="CS"/>
-        <xsd:enumeration value="RE"/>
-        <xsd:enumeration value="UCS"/>
-        <xsd:enumeration value="SPA"/>
-        <xsd:enumeration value="HA"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/xml/schema/node.xsd b/xml/schema/node.xsd
deleted file mode 100644
index 2bbe4ec..0000000
--- a/xml/schema/node.xsd
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="unqualified">
-
-<!-- Root element: attn_node -->
-<xsd:element name="attn_node">
-    <xsd:complexType>
-
-        <xsd:sequence>
-            <!-- Note that local_fir will eventually generate register,
-                 capture_group, and rule, which is why those are optional in
-                 the schema, but are still required in the binary files. -->
-            <xsd:element name="local_fir" type="local_fir" minOccurs="0"
-                         maxOccurs="255"/>
-            <xsd:element name="register"  type="register"  minOccurs="0"
-                         maxOccurs="255"/>
-            <xsd:element name="capture_group" type="capture_group" minOccurs="0"
-                         maxOccurs="255"/>
-            <xsd:element name="rule" type="rule" minOccurs="0" maxOccurs="255"/>
-            <xsd:element name="bit"  type="bit"  minOccurs="0" maxOccurs="255"/>
-        </xsd:sequence>
-
-        <xsd:attribute name="name"     type="name_type"     use="required"/>
-        <xsd:attribute name="model_ec" type="model_ec_type" use="required"/>
-        <xsd:attribute name="reg_type" type="reg_type_enum" use="required"/>
-
-    </xsd:complexType>
-</xsd:element>
-
-<!-- Element: chip/register -->
-<xsd:complexType name="register">
-
-    <xsd:sequence>
-        <xsd:element name="instance" type="instance" minOccurs="1"
-                     maxOccurs="255"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="name"   type="name_type"   use="required"/>
-    <xsd:attribute name="access" type="access_enum" use="optional"/>
-
-</xsd:complexType>
-
-<!-- Element: chip/register/instance -->
-<!-- Element: chip/local_fir/instance -->
-<xsd:complexType name="instance">
-    <xsd:attribute name="reg_inst" type="inst_type" use="required"/>
-    <xsd:attribute name="addr"     type="addr_type" use="required"/>
-</xsd:complexType>
-
-<!-- Element: chip/capture_group -->
-<xsd:complexType name="capture_group">
-
-    <xsd:sequence>
-        <xsd:element name="capture_register" type="capture_register"
-                     minOccurs="1" maxOccurs="255"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="node_inst" type="int_range" use="required"/>
-
-</xsd:complexType>
-
-<!-- Element: chip/capture_group/capture_register -->
-<xsd:complexType name="capture_register">
-    <xsd:attribute name="reg_name" type="name_type" use="required"/>
-    <xsd:attribute name="reg_inst" type="int_range" use="required"/>
-</xsd:complexType>
-
-<!-- Element: chip/rule -->
-<xsd:complexType name="rule">
-
-    <xsd:sequence>
-        <xsd:element name="expr" type="expr" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="attn_type" type="attn_type_enum" use="required"/>
-    <xsd:attribute name="node_inst" type="int_range"      use="required"/>
-
-</xsd:complexType>
-
-<!-- Element: chip/rule/expr -->
-<!-- Element: chip/rule/expr/expr... -->
-<xsd:complexType name="expr">
-
-    <xsd:sequence>
-        <xsd:element name="expr" type="expr" minOccurs="0" maxOccurs="255"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="type"   type="expr_type_enum" use="required"/>
-    <xsd:attribute name="value1"                       use="optional"/>
-    <xsd:attribute name="value2"                       use="optional"/>
-
-</xsd:complexType>
-
-<!-- Element: chip/bit -->
-<xsd:complexType name="bit">
-    <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-            <xsd:attribute name="pos"        type="int_range"  use="required"/>
-            <xsd:attribute name="child_node" type="name_type"  use="optional"/>
-            <xsd:attribute name="node_inst"  type="int_range"  use="optional"/>
-        </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<!-- Element: chip/local_fir -->
-<xsd:complexType name="local_fir">
-
-    <xsd:sequence>
-        <xsd:element name="instance" type="instance" minOccurs="1"
-                     maxOccurs="255"/>
-        <xsd:element name="action" type="action" minOccurs="1"
-                     maxOccurs="255"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="name"   type="name_type"             use="required"/>
-    <xsd:attribute name="config" type="local_fir_config_enum" use="required"/>
-
-</xsd:complexType>
-
-<!-- Element: chip/local_fir/action -->
-<xsd:complexType name="action">
-
-    <xsd:attribute name="attn_type" type="attn_type_enum"     use="required"/>
-    <xsd:attribute name="config"    type="action_config_enum" use="required"/>
-
-</xsd:complexType>
-
-<!-- Names must be alphanumeric or underscores, no spaces or other symbols
-     allowed. -->
-<xsd:simpleType name="name_type">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[a-zA-Z0-9_]+"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- A comma separated list of names (see name_type for name definition). -->
-<xsd:simpleType name="model_ec_type">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[a-zA-Z0-9_]+(,[a-zA-Z0-9_]+)*"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Instance values are integers from 0-255. -->
-<xsd:simpleType name="inst_type">
-    <xsd:restriction base="xsd:integer">
-        <xsd:minInclusive value="0"/>
-        <xsd:maxInclusive value="255"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Instance values are integers from 0-255. -->
-<xsd:simpleType name="int_range">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[0-9]+([,:][0-9]+)*"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Instance values are integers from 0-255. -->
-<xsd:simpleType name="addr_type">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="0x([0-9a-fA-F]{8}|[0-9a-fA-F]{16})"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Attention type enum. -->
-<xsd:simpleType name="attn_type_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="CS"/>
-        <xsd:enumeration value="RE"/>
-        <xsd:enumeration value="UCS"/>
-        <xsd:enumeration value="SPA"/>
-        <xsd:enumeration value="HA"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Attention type enum. -->
-<xsd:simpleType name="reg_type_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="SCOM"/>
-        <xsd:enumeration value="IDSCOM"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Attention type enum. -->
-<xsd:simpleType name="access_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="RO"/>
-        <xsd:enumeration value="WO"/>
-        <xsd:enumeration value="RW"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Expression type enum. -->
-<xsd:simpleType name="expr_type_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="reg"/>
-        <xsd:enumeration value="int"/>
-        <xsd:enumeration value="and"/>
-        <xsd:enumeration value="or"/>
-        <xsd:enumeration value="not"/>
-        <xsd:enumeration value="lshift"/>
-        <xsd:enumeration value="rshift"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Local FIR config. -->
-<xsd:simpleType name="local_fir_config_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:enumeration value=""/>
-        <xsd:enumeration value="W"/>
-        <xsd:enumeration value="2"/>
-        <xsd:enumeration value="W2"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- Local FIR action config. -->
-<xsd:simpleType name="action_config_enum">
-    <xsd:restriction base="xsd:string">
-        <xsd:pattern value="[0-1]{2,3}"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/xml/setup.py b/xml/setup.py
deleted file mode 100644
index 74e91c9..0000000
--- a/xml/setup.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import os
-import subprocess
-
-from setuptools import setup
-from setuptools.command.build_py import build_py
-
-# Typically in files like this we'd use find_packages() to traverse directories
-# for any static packages. However, we are trying to add data to a package that
-# will actually exist in another repository. Therefore, we have to explicitly
-# list out the package name, directory, and data information.
-
-# We are building data for the following module:
-package_name = "pel.hwdiags"
-
-# Since we are not using find_packages() we have to provide a package directory,
-# but in this case nothing exists because there are no static package
-# directories. Therefore, we will just use the empty string.
-package_dir = ""
-
-# Split the package data directory into its components.
-data_dir_components = [*package_name.split("."), "data"]
-
-# It is important to note that '/' must be used as the path separator, even on
-# Windows. Setuptools will automatically convert the slashes where appropriate.
-package_data_glob = "/".join(data_dir_components)
-
-
-# This is a custom build class that is used to dynamically build the data files.
-class my_build_py(build_py):
-    def run(self):
-        if not self.dry_run:  # honor --dry-run flag
-            # Make sure the build directory for the data exists.
-            # Yes, os.path.join() is necessary in this case, which is different
-            # that what is stated above regarding package_data_glob.
-            data_dir = os.path.join(self.build_lib, *data_dir_components)
-            self.mkpath(data_dir)
-
-            # Generate the PEL parser data JSON from the Chip Data XML.
-            # TODO: The current tool to build the PEL parser JSON files is a
-            #       perl script. Eventually, it will be converted to a python
-            #       module.
-            # TODO: The list of data file directories will need to be
-            #       configurable via the package config in the bitbake recipes.
-            for chip in ("p10", "explorer"):
-                subprocess.run(
-                    [
-                        "./parse_chip_data_xml",
-                        "--json",
-                        "-i",
-                        chip,
-                        "-o",
-                        data_dir,
-                    ],
-                    check=True,
-                )
-
-        # Call the superclass run() to ensure everything else builds.
-        super().run()
-
-
-setup(
-    name="openpower-hw-diags-pel-parser-data",
-    version=os.getenv("PELTOOL_VERSION", "1.0"),
-    classifiers=["License :: OSI Approved :: Apache Software License"],
-    cmdclass={"build_py": my_build_py},  # register custom build class
-    packages=[package_name],
-    package_dir={package_name: package_dir},
-    package_data={package_name: [package_data_glob]},
-)
diff --git a/xml/xml_list.sh b/xml/xml_list.sh
deleted file mode 100755
index ca598cc..0000000
--- a/xml/xml_list.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Verify input.
-if [ ! -d "$1" ]; then
-    echo "Invalid directory: $1" 1>&2
-    exit 1
-fi
-
-# Simply list out all of the XML files in the given directory.
-for i in "$1"/*.xml; do
-    if [ -f "$i" ]; then
-        echo "$i"
-    fi
-done
-