7 files changed, 3 insertions, 1505 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 67b778abb..bb4e89b65 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -133,6 +133,8 @@ foreach my $i (@{$SystemAttrs->{'required-policy-settings'}})
                        "0x2580",
                        "FREQ_PB",
                        $freqPB,
+                       "NEST_FREQ_MHZ",
+                       $freqPB,
                        "FREQ_PCIE",
                        $freqPCIE,
                        "FREQ_X",
@@ -1730,19 +1732,11 @@ sub generate_proc
     }
 
     #default to murano (s1_) values and change later if for venice (p8_)
-    my $ab_bndy_pll     = 536;
-    my $pb_bndy_dmipll  = 1234;
     my $ex_func_l3      = 48826;
-    my $perv_bndy_pll   = 861;
-    my $pci_bndy_pll    = 565;
 
     if($CHIPNAME eq "venice")
     {
-        $ab_bndy_pll     = 536;
-        $pb_bndy_dmipll  = 1848;
         $ex_func_l3      = 49020;
-        $perv_bndy_pll   = 855;
-        $pci_bndy_pll    = 565;
     }
 
     #MURANO=DCM installed, VENICE=SCM
@@ -1796,25 +1790,9 @@ sub generate_proc
 
     <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
     <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>$ab_bndy_pll</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>$pb_bndy_dmipll</default>
-    </attribute>
-    <attribute>
     <id>PROC_EX_FUNC_L3_LENGTH</id>
         <default>$ex_func_l3</default>
     </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>$perv_bndy_pll</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>$pci_bndy_pll</default>
-    </attribute>
     <attribute><id>PROC_DCM_INSTALLED</id>
         <default>$dcm_installed</default>
     </attribute>";
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 3ac8e50bc..cb8115b60 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -9330,363 +9330,6 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
-<!-- 
-#ENV=HW
-#PU_NEST_FREQ = 2000
-#PU_PCIE_REF_CLOCK = 100
-#PU_REF_CLOCK = 133
-#PU_XBUS_FREQ = 4000
--->
-<attribute>
-    <id>PROC_PERV_BNDY_PLL_DATA</id>
-    <description>Ring image for perv_bndy_pll ring containing filter plls and xb_pll,nest_pll
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20,
-                 0x00, 0xA0, 0x00, 0x60, 0x01, 0x20, 0x51, 0xBB,
-                 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-                 0x20, 0x00, 0xA0, 0x00, 0x60, 0x01, 0x20, 0x51,
-                 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x20, 0x00, 0x24, 0x00, 0x70, 0x00, 0xC0,
-                 0x52, 0xC5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x80, 0x00, 0x98, 0x01, 0xC0,
-                 0x03, 0x01, 0x4B, 0x17, 0x40, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>128</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PERV_BNDY_PLL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-#ENV=HW
-#PU_DMI_FREQ = 4000
--->
-<attribute>
-    <id>PROC_PB_BNDY_DMIPLL_DATA</id>
-    <description>Ring image for pb_bndy_dmipll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x3F,0x44,0x11,0x00,0x00,0x00,0x7E,0x88,0x22,0x00,
-                 0x00,0x00,0xFD,0x10,0x44,0x00,0x00,0x01,0xFA,0x20,
-                 0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x40,0x00,0x48,0x00,0xE0,0x01,0x80,0xA5,0x8B,0x20,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                 0x00
-            </default>
-        </uint8_t>
-        <array>231</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PB_BNDY_DMIPLL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PB_BNDY_DMIPLL_FOR_DCCAL_DATA</id>
-    <description>Ring image for pb_bndy_dmipll ring for DC cal
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>192</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PB_BNDY_DMIPLL_FOR_DCCAL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-#ENV=HW
-#PU_ABUS_FREQ = 3200
--->
-<attribute>
-    <id>PROC_AB_BNDY_PLL_DATA</id>
-    <description>Ring image for ab_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x44,
-                0x11,0x00,0x00,0x00,0x7E,0x88,0x22,0x00,0x00,0x00,
-                0xFD,0x10,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x10,0x00,0x12,0x00,0x38,0x00,0x60,0x2B,
-                0xA2,0xE8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_AB_BNDY_PLL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_AB_BNDY_PLL_FOR_DCCAL_DATA</id>
-    <description>Ring image for ab_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_AB_BNDY_PLL_FOR_DCCAL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-#ENV=HW
-#PU_PCIE_FREQ = 1000
--->
-<attribute>
-    <id>PROC_PCI_BNDY_PLL_DATA</id>
-    <description>Ring image for pci_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xAA,
-                 0xC3, 0xC0, 0x14, 0x00, 0x00, 0x00, 0x52,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00
-	    </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <persistency>volatile</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PCI_BNDY_PLL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-    <description>Length of data in ring image for perv_bndy_pll ring containing filter plls and xb_pll,nest_pll
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PERV_BNDY_PLL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-    <description>Length of data in ring image for pb_bndy_dmipll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_AB_BNDY_PLL_LENGTH</id>
-    <description>Length of data in ring image for ab_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_AB_BNDY_PLL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-    <description>Length of data in ring image for pci_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PCI_BNDY_PLL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PERV_BNDY_PLL_FLUSH</id>
-    <description>Ring flush image for perv_bndy_pll ring containing filter plls and xb_pll,nest_pll
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>128</array>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PERV_BNDY_PLL_FLUSH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PB_BNDY_DMIPLL_FLUSH</id>
-    <description>Ring flush image for pb_bndy_dmipll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>192</array>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PB_BNDY_DMIPLL_FLUSH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_AB_BNDY_PLL_FLUSH</id>
-    <description>Ring flush image for ab_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_AB_BNDY_PLL_FLUSH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>PROC_PCI_BNDY_PLL_FLUSH</id>
-    <description>Ring flush image for pci_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>0</default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <persistency>non-volatile</persistency>
-    <readable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_PROC_PCI_BNDY_PLL_FLUSH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
 <attribute>
     <id>PROC_PERV_BNDY_PLL_CHIPLET_ID</id>
     <description>Chiplet ID for ring image for perv_bndy_pll ring containing filter plls and xb_pll,nest_pll
@@ -10848,590 +10491,6 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
 <!-- ===== End Attributes supporting erepair_thresholds.xml HWPF Attributes ===== -->
 
 <!-- Mem PLL attributes ===== -->
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=SIM
-# NOTE: This attribute default values are set for VPO (SIM)
-#       On real sytem, when sbe_centaur_init.C runs, it will set this attribute
-#       MEMB_TP_BNDY_PLL_DATA with data that matches the running frequencies.
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x70, 0x00,
-                0x80, 0x51, 0xA7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x1D, 0x96, 0x0C, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <writeable/>
-    <persistency>volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_FLUSH</id>
-    <description>Ring flush image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_FLUSH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=SIM
-#GEN_FLUSH=NO
-#DCCAL_MODE = 1
-# NOTE: This attribute default values are set for VPO (SIM)
-#       This attribute is not currently used yet.
-#       Follow the mechanism of setting MEMB_TP_BNDY_PLL_DATA above to
-#       set this attribute MEMB_TP_BNDY_PLL_FOR_DCCAL_DATA for real system.
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_FOR_DCCAL_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x70, 0x00,
-               0x80, 0x51, 0xA7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x40, 0x00, 0x80, 0x00, 0x00, 0x1D, 0x96, 0x0C, 0x00, 0xA0,
-               0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_FOR_DCCAL_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1066
-#MEMB_NEST_FREQ = 4000
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1066_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x24, 0x00, 0x70, 0x00,
-                0xC0, 0x52, 0xC4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x14, 0x96, 0x18, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1066_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1333
-#MEMB_NEST_FREQ = 4000
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1333_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x24, 0x00, 0x70, 0x00,
-                0xC0, 0x52, 0xC4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x19, 0x16, 0x14, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1333_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1600
-#MEMB_NEST_FREQ = 4000
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1600_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x24, 0x00, 0x70, 0x00,
-                0xC0, 0x52, 0xC4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x19, 0x16, 0x18, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1600_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1866
-#MEMB_NEST_FREQ = 4000
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1866_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x24, 0x00, 0x70, 0x00,
-                0xC0, 0x52, 0xC4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x1B, 0x56, 0x15, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1866_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1066
-#MEMB_NEST_FREQ = 4800
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1066_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00,
-                0x80, 0x51, 0xA4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x14, 0x96, 0x18, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1066_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1333
-#MEMB_NEST_FREQ = 4800
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1333_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00,
-                0x80, 0x51, 0xA4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x19, 0x16, 0x14, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1333_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1600
-#MEMB_NEST_FREQ = 4800
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1600_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00,
-                0x80, 0x51, 0xA4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x19, 0x16, 0x18, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1600_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<!--
-# $Id: centaur_10_pll_ring.attributes,v 1.6 2013/07/26 17:29:50 mfred Exp $
-#ENV=HW
-#GEN_FLUSH=NO
-#MEMB_MEM_FREQ = 1866
-#MEMB_NEST_FREQ = 4800
--->
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1866_DATA</id>
-    <description>Ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint8_t>
-            <default>
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0xFD, 0x10, 0x44, 0x00, 0x00, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00,
-                0x80, 0x51, 0xA4, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-                0x40, 0x00, 0x80, 0x00, 0x00, 0x1B, 0x56, 0x15, 0x00, 0xA0,
-                0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            </default>
-        </uint8_t>
-        <array>80</array>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1866_DATA</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_FOR_DCCAL_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_FOR_DCCAL_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1066_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1066_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1333_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1333_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1600_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1600_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4000_MEM1866_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4000_MEM1866_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1066_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1066_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1333_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1333_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1600_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1600_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
-    <id>MEMB_TP_BNDY_PLL_NEST4800_MEM1866_LENGTH</id>
-    <description>Length of data in ring image for Centaur tp_bndy_pll ring
-      creator: platform
-      firmware notes:
-    </description>
-    <simpleType>
-        <uint32_t>
-            <default>0x1BA</default>
-        </uint32_t>
-    </simpleType>
-    <readable/>
-    <persistency>non-volatile</persistency>
-    <hwpfToHbAttrMap>
-        <id>ATTR_MEMB_TP_BNDY_PLL_NEST4800_MEM1866_LENGTH</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
 <attribute>
     <id>MEMB_TP_BNDY_PLL_SCAN_SELECT</id>
     <description>Scan select for ring image for Centaur tp_bndy_pll ring
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 0bc8b5cd5..146f1eec0 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -304,27 +304,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE000000000</default>
@@ -1059,27 +1038,6 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -1819,27 +1777,6 @@
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
 
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE200000000</default>
@@ -2576,27 +2513,6 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index 0af784c87..c3e8dffa3 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -277,27 +277,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE000000000</default>
@@ -1398,27 +1377,6 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -2519,27 +2477,6 @@
         <default>2</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -3639,27 +3576,6 @@
         <default>3</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -4758,27 +4674,6 @@
         <default>4</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>4</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -5846,27 +5741,6 @@
         <default>5</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>5</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -6932,27 +6806,6 @@
         <default>6</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>6</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -8019,27 +7872,6 @@
         <default>7</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>7</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -16033,27 +15865,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE000000000</default>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 45bd2bac4..886af8837 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -456,21 +456,6 @@
     <attribute><id>PROC_PSI_UNTRUSTED_BAR0_SIZE</id></attribute>
     <attribute><id>PROC_PSI_UNTRUSTED_BAR1_BASE_ADDR</id></attribute>
     <attribute><id>PROC_PSI_UNTRUSTED_BAR1_SIZE</id></attribute>
-    <!-- PROC_PLL_RING attributes -->
-    <attribute><id>PROC_PERV_BNDY_PLL_DATA</id></attribute>
-    <attribute><id>PROC_PB_BNDY_DMIPLL_DATA</id></attribute>
-    <attribute><id>PROC_PB_BNDY_DMIPLL_FOR_DCCAL_DATA</id></attribute>
-    <attribute><id>PROC_AB_BNDY_PLL_DATA</id></attribute>
-    <attribute><id>PROC_AB_BNDY_PLL_FOR_DCCAL_DATA</id></attribute>
-    <attribute><id>PROC_PCI_BNDY_PLL_DATA</id></attribute>
-    <attribute><id>PROC_PERV_BNDY_PLL_LENGTH</id></attribute>
-    <attribute><id>PROC_PB_BNDY_DMIPLL_LENGTH</id></attribute>
-    <attribute><id>PROC_AB_BNDY_PLL_LENGTH</id></attribute>
-    <attribute><id>PROC_PCI_BNDY_PLL_LENGTH</id></attribute>
-    <attribute><id>PROC_PERV_BNDY_PLL_FLUSH</id></attribute>
-    <attribute><id>PROC_PB_BNDY_DMIPLL_FLUSH</id></attribute>
-    <attribute><id>PROC_AB_BNDY_PLL_FLUSH</id></attribute>
-    <attribute><id>PROC_PCI_BNDY_PLL_FLUSH</id></attribute>
     <attribute><id>PROC_PERV_BNDY_PLL_CHIPLET_ID</id></attribute>
     <attribute><id>PROC_PB_BNDY_DMIPLL_CHIPLET_ID</id></attribute>
     <attribute><id>PROC_AB_BNDY_PLL_CHIPLET_ID</id></attribute>
@@ -1176,28 +1161,7 @@
     <attribute><id>MSS_NWELL_MISPLACEMENT</id></attribute>
     <attribute><id>EI_BUS_TX_MSBSWAP</id></attribute>
     <attribute><id>MSS_FREQ_OVERRIDE</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_FLUSH</id></attribute>
     <attribute><id>MEMB_TP_BNDY_PLL_SCAN_SELECT</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_FOR_DCCAL_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_FOR_DCCAL_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1066_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1066_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1333_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1333_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1600_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1600_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1866_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4000_MEM1866_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1066_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1066_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1333_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1333_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1600_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1600_LENGTH</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1866_DATA</id></attribute>
-    <attribute><id>MEMB_TP_BNDY_PLL_NEST4800_MEM1866_LENGTH</id></attribute>
     <attribute><id>MSS_FREQ_BIAS_PERCENTAGE</id></attribute>
     <attribute><id>CDIMM_SENSOR_MAP_PRIMARY</id></attribute>
     <attribute><id>CDIMM_SENSOR_MAP_SECONDARY</id></attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
index d094c0fe6..fc67f7ed7 100644
--- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml
@@ -292,27 +292,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE000000000</default>
@@ -839,27 +818,6 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE100000000</default>
@@ -1275,27 +1233,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE200000000</default>
@@ -1712,27 +1649,7 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1234</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>48826</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>861</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
+
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE300000000</default>
     </attribute>
diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
index 5206f5a88..3c9fe4dfd 100644
--- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml
@@ -293,27 +293,6 @@
         <default>0</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0003FFE000000000</default>
@@ -477,65 +456,6 @@
         <id>PROC_PCIE_PHB_ACTIVE</id>
         <default>0xE0</default>
     </attribute>
-    <attribute>
-        <id>PROC_PCI_BNDY_PLL_DATA</id>
-        <default>
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-            0x02, 0xee, 0xc3, 0x20, 0x14, 0x00, 0x00, 0x00, 0x52, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        </default>
-    </attribute>
-    <attribute>
-        <id>PROC_AB_BNDY_PLL_DATA</id>
-        <default>
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x40, 0x2b,
-            0xa3, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        </default>
-    </attribute>
-    <attribute>
-        <id>PROC_PB_BNDY_DMIPLL_DATA</id>
-        <default>
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-            0x01, 0x00, 0x03, 0x00, 0x04, 0x02, 0x8d, 0x30, 0x80, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x01, 0x80,
-            0x02, 0x01, 0x46, 0x98, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00,
-        </default>
-    </attribute>
-    <attribute>
-        <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>0x738</default>
-    </attribute>
 </targetInstance>
 
 <!-- Venice n0p0 EX units -->
@@ -1444,27 +1364,6 @@
         <default>1</default>
     </attribute>
     <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
-    <!-- workaround for SW196865 - see  RTC:69918 for additional details -->
-    <attribute>
-      <id>PROC_AB_BNDY_PLL_LENGTH</id>
-        <default>536</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>1848</default>
-    </attribute>
-    <attribute>
-    <id>PROC_EX_FUNC_L3_LENGTH</id>
-        <default>49020</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PERV_BNDY_PLL_LENGTH</id>
-        <default>855</default>
-    </attribute>
-    <attribute>
-    <id>PROC_PCI_BNDY_PLL_LENGTH</id>
-        <default>565</default>
-    </attribute>
 
     <attribute><id>FSP_BASE_ADDR</id>
         <default>0x0000000000000000</default>
@@ -1628,52 +1527,6 @@
         <id>PROC_PCIE_PHB_ACTIVE</id>
         <default>0xE0</default>
     </attribute>
-    <attribute>
-        <id>PROC_AB_BNDY_PLL_DATA</id>
-        <default>
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x40, 0x2b,
-            0xa3, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        </default>
-    </attribute>
-    <attribute>
-        <id>PROC_PB_BNDY_DMIPLL_DATA</id>
-        <default>
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-            0x01, 0x00, 0x03, 0x00, 0x04, 0x02, 0x8d, 0x30, 0x80, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x01, 0x80,
-            0x02, 0x01, 0x46, 0x98, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00,
-        </default>
-    </attribute>
-    <attribute>
-        <id>PROC_PB_BNDY_DMIPLL_LENGTH</id>
-        <default>0x738</default>
-    </attribute>
 </targetInstance>
 
 <!-- Venice n0p1 EX units -->