PBIEX async boundary 'performance' mode settings not applied for Murano DD2.x

Replace the hardcoded by chip type PROC_EX_FUNC_L3_LENGTH with picking up
the length from winkle ring attribute files.
Update winkle ring attribute files from eKB to include length.
Fsp will need to be updated, but can be done indepedently. Need is for HB.

Change-Id: Ia310817e0e3acb16387c76f157382432eccaa69c
Backport: release-fips810
CQ: SW252753
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9766
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 95 insertions, 63 deletions

diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C b/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C
index d89743270..fe23204e3 100755
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013                   */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getL3DeltaDataAttr.C,v 1.4 2013/12/13 14:46:30 mjjones Exp $
+// $Id: getL3DeltaDataAttr.C,v 1.5 2014/03/20 16:24:48 whs Exp $
 /**
  *  @file getL3DeltaDataAttr.C
  *
@@ -51,12 +51,14 @@ extern "C"
 {
 
 fapi::ReturnCode getL3DeltaDataAttr( const fapi::Target  &i_fapiTarget,
-                                     uint32_t (&o_data)[DELTA_DATA_SIZE])
+                                     uint32_t (&o_data)[DELTA_DATA_SIZE],
+                                     uint32_t (&o_ringLength))
 {
      FAPI_INF("getL3DeltaDataAttr: entry" );
 
      // Initialize return values to 0x00
      memset(o_data, 0x00, sizeof(o_data));
+     o_ringLength = 0;
 
      // Define and initialize variables
 
@@ -150,7 +152,8 @@ fapi::ReturnCode getL3DeltaDataAttr( const fapi::Target  &i_fapiTarget,
          for (i = 0; ((i < (sizeof(L3_DELTA_DATA_array) / 
                             sizeof(L3_DELTA_DATA_ATTR))) &&
              ((L3_DELTA_DATA_array[i].l_ATTR_CHIPTYPE != l_chipType) ||
-               (L3_DELTA_DATA_array[i].l_ATTR_EC       != l_attrDdLevel))); i++)
+              (L3_DELTA_DATA_array[i].l_ATTR_EC       != l_attrDdLevel) ||
+              (L3_DELTA_DATA_array[i].l_ATTR_SELECT   != l_selection))); i++)
          { }
          // No match found
          if (i == (sizeof(L3_DELTA_DATA_array)/sizeof(L3_DELTA_DATA_ATTR)))
@@ -166,8 +169,9 @@ fapi::ReturnCode getL3DeltaDataAttr( const fapi::Target  &i_fapiTarget,
          }
 
          // Set return delta data attr value
-         memcpy(o_data, L3_DELTA_DATA_array[i].l_ATTR_L3_DELTA_DATA[l_selection],
+         memcpy(o_data,L3_DELTA_DATA_array[i].l_ATTR_L3_DELTA_DATA,
                 sizeof(o_data));
+         o_ringLength = L3_DELTA_DATA_array[i].l_ATTR_BIT_LENGTH;
 
      } while (0);
 
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes
index 7b348fb14..b604d10b3 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_10_winkle_ring.attributes
@@ -1,5 +1,4 @@
-# $Id: p8_10_winkle_ring.attributes,v 1.2 2013/06/19 14:01:21 jmcgill Exp $
-
+# $Id: p8_10_winkle_ring.attributes,v 1.3 2014/03/20 02:43:32 jmcgill Exp $
 #===============================================================================BEGIN Entry
 #
 #SELECT=0
@@ -25,6 +24,8 @@
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
@@ -116,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
@@ -201,6 +204,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49022
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14AA0004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14AE0040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14B00050
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes
index dae712779..46913a36b 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/p8_20_winkle_ring.attributes
@@ -1,4 +1,5 @@
-# $Id: createWinkleRingData,v 1.8 2013/08/28 18:15:47 jmcgill Exp n#===============================================================================BEGIN Entry
+# $Id: p8_20_winkle_ring.attributes,v 1.3 2014/03/20 02:46:32 jmcgill Exp $
+#===============================================================================BEGIN Entry
 #
 #SELECT=0
 #PU_EX_DPLL_FREQ = 4800
@@ -12,17 +13,19 @@
 #    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
 #    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
 #    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
+#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10000
+#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10000
+#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
+#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
+#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10010
+#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10010
 #    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
@@ -34,21 +37,21 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15760003
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x157700C0
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x15F200F0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168A0028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168B000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16ED0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16EE0085
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F7000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17DD0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17E90002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EC0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F40002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18000002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18030001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x18040020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0xFFFF0000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168A0048
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168B0012
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16EE0081
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16F60048
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F70012
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17DD0002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17E90002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17EC0001
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17ED0020
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17F40002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x18000002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18030001
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18040020
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0xFFFF0000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
@@ -114,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
@@ -186,25 +191,21 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #PU_EX_DPLL_FREQ = 1200
 #PU_NEST_FREQ = 2400
 #------------------------------------------------------------------------------- Ring String View
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.CMD1_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
 #    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
 #    EHP.EX.CRSP0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
 #    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:3) 0b1010
 #    EHP.EX.CRSP1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:3) 0b1010
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_C2I_SND_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b11000
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10100
-#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10100
+#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
+#    EHP.EX.DATA0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
+#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:4) 0b10110
+#    EHP.EX.DATA1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:4) 0b10110
 #    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD0_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49195
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00020
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30002
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C50002
@@ -213,24 +214,24 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[4] u32[64]  0x14D50020
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[5] u32[64]  0x14D80002
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[6] u32[64]  0x14DA0002
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[7] u32[64]  0x14DB0080
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x15760003
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x157700C0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x15F200F0
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x168A0028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x168B000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x16ED0004
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x16EE0085
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x16F60028
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x16F7000A
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x17DD0002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x17E90002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x17EC0001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0x17ED0020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x17F40002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x18000002
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x18030001
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x18040020
-ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0xFFFF0000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[8] u32[64]  0x168A0068
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[9] u32[64]  0x168B001A
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[10] u32[64]  0x16F60068
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[11] u32[64]  0x16F7001A
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[12] u32[64]  0x17DD0002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[13] u32[64]  0x17E90002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[14] u32[64]  0x17EC0001
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[15] u32[64]  0x17ED0020
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[16] u32[64]  0x17F40002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[17] u32[64]  0x18000002
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[18] u32[64]  0x18030001
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[19] u32[64]  0x18040020
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[20] u32[64]  0xFFFF0000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[21] u32[64]  0x00000000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[22] u32[64]  0x00000000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[23] u32[64]  0x00000000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[24] u32[64]  0x00000000
+ATTR_PROC_EX_FUNC_L3_DELTA_DATA[25] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[26] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[27] u32[64]  0x00000000
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[28] u32[64]  0x00000000
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes
index 4ef8a1f40..4af3ba016 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_10_winkle_ring.attributes
@@ -1,5 +1,4 @@
-# $Id: s1_10_winkle_ring.attributes,v 1.5 2013/06/19 14:04:04 jmcgill Exp $
-
+# $Id: s1_10_winkle_ring.attributes,v 1.6 2014/03/20 02:38:43 jmcgill Exp $
 #===============================================================================BEGIN Entry
 #
 #SELECT=0
@@ -25,6 +24,8 @@
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
@@ -116,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
@@ -201,6 +204,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes
index ab0d531ec..b80e6de98 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_13_winkle_ring.attributes
@@ -1,5 +1,4 @@
-# $Id: s1_13_winkle_ring.attributes,v 1.2 2013/06/19 14:07:22 jmcgill Exp $
-
+# $Id: s1_13_winkle_ring.attributes,v 1.3 2014/03/20 02:40:36 jmcgill Exp $
 #===============================================================================BEGIN Entry
 #
 #SELECT=0
@@ -25,6 +24,8 @@
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
@@ -116,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
@@ -201,6 +204,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  48826
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14920040
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14950004
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14970005
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes
index 29807a3c9..1ca618a7d 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_20_winkle_ring.attributes
@@ -1,4 +1,4 @@
-# $Id: s1_20_winkle_ring.attributes,v 1.2 2013/08/28 19:49:46 jmcgill Exp $
+# $Id: s1_20_winkle_ring.attributes,v 1.3 2014/03/20 02:41:15 jmcgill Exp $
 #===============================================================================BEGIN Entry
 #
 #SELECT=0
@@ -24,6 +24,8 @@
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
@@ -115,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
@@ -200,6 +204,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
diff --git a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes
index bc2ff66a2..0b9fad3be 100644
--- a/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes
+++ b/src/usr/hwpf/hwp/winkle_ring_accessors/s1_21_winkle_ring.attributes
@@ -1,4 +1,4 @@
-# $Id: s1_21_winkle_ring.attributes,v 1.2 2013/08/28 19:49:51 jmcgill Exp $
+# $Id: s1_21_winkle_ring.attributes,v 1.3 2014/03/20 02:41:48 jmcgill Exp $
 #===============================================================================BEGIN Entry
 #
 #SELECT=0
@@ -24,6 +24,8 @@
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
@@ -115,6 +117,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A
@@ -200,6 +204,8 @@ ATTR_PROC_EX_FUNC_L3_DELTA_DATA[63] u32[64]  0x00000000
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.PB_CFG_MODEQ.ESC.L2(0:5) 0b100100
 #    EHP.EX.RCMD1_I2C_RCV_CTL.SERIAL_MODEQ.SHIFT_DATAQ.ESC.L2(0:5) 0b100100
 #------------------------------------------------------------------------------- Attribute View
+
+ATTR_PROC_EX_FUNC_L3_LENGTH u32  49193
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[0] u32[64]  0x14C00080
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[1] u32[64]  0x14C30008
 ATTR_PROC_EX_FUNC_L3_DELTA_DATA[2] u32[64]  0x14C5000A