diff options
14 files changed, 149 insertions, 120 deletions
diff --git a/src/include/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.H b/src/include/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.H index e9b6974ad..669a4c518 100755 --- a/src/include/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.H +++ b/src/include/usr/hwpf/hwp/winkle_ring_accessors/getL3DeltaDataAttr.H @@ -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.H,v 1.1 2013/12/10 02:11:07 mjjones Exp $ +// $Id: getL3DeltaDataAttr.H,v 1.2 2014/03/20 16:24:43 whs Exp $ /** * @file getL3DeltaDataAttr.H * @@ -36,7 +36,7 @@ // function pointer typedef definition for HWP call support typedef fapi::ReturnCode (*getL3DeltaDataAttr_FP_t) - (const fapi::Target &, uint32_t (&)[DELTA_DATA_SIZE]); + (const fapi::Target &, uint32_t (&)[DELTA_DATA_SIZE], uint32_t &); extern "C" @@ -46,12 +46,14 @@ extern "C" * * @param i_fapiTarget - cpu target * @param o_data - out: L3 delta data data. + * @param o_ringLength - out: Length of decompressed data * * @return fapi::ReturnCode - FAPI_RC_SUCCESS if success, * relevant error code for failure. */ 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)); } diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H index 4d9a8462e..d9d021304 100644 --- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H +++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H @@ -669,6 +669,16 @@ fapi::ReturnCode fapiPlatGetL3DDAttr(const fapi::Target * i_pProcTarget, uint32_t (&o_data)[DELTA_DATA_SIZE]); /** * @brief This function is called by the FAPI_ATTR_GET macro when getting the + * ATTR_PROC_EX_FUNC_L3_LENGTH attribute. It should not be called + * directly. + * + * @param[in] i_pProcTarget Processor Chip Target pointer + * @param[out] o_ringLength length of decompressed ring + */ +fapi::ReturnCode fapiPlatGetL3Length(const fapi::Target * i_pProcTarget, + uint32_t (&o_ringLength)); +/** + * @brief This function is called by the FAPI_ATTR_GET macro when getting the * ATTR_PCI_OSCSWITCH_CONFIG attribute. It should not be called * directly. * @@ -1735,11 +1745,14 @@ fapi::ReturnCode fapiPlatGetPciOscswitchConfig (PTARGET, VAL, fapi::SET_L4_BANK_DELETE_MODE) //------------------------------------------------------------------------------ -// MACRO to support L3 DELTA DATA Ring Attribute +// MACROS to support L3 DELTA DATA Ring Attributes //------------------------------------------------------------------------------ #define ATTR_PROC_EX_FUNC_L3_DELTA_DATA_GETMACRO(ID, PTARGET, VAL) \ fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \ fapi::platAttrSvc::fapiPlatGetL3DDAttr(PTARGET, VAL) +#define ATTR_PROC_EX_FUNC_L3_LENGTH_GETMACRO(ID, PTARGET, VAL) \ + fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \ + fapi::platAttrSvc::fapiPlatGetL3Length(PTARGET, VAL) //------------------------------------------------------------------------------ // MACRO to support pci osc switch config diff --git a/src/usr/hwpf/fapi/fapiCreateL3DeltaVals.pl b/src/usr/hwpf/fapi/fapiCreateL3DeltaVals.pl index 4dca6f971..08093f8e7 100755 --- a/src/usr/hwpf/fapi/fapiCreateL3DeltaVals.pl +++ b/src/usr/hwpf/fapi/fapiCreateL3DeltaVals.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -21,8 +21,7 @@ # Origin: 30 # # IBM_PROLOG_END_TAG - -# $Id: fapiCreateL3DeltaVals.pl,v 1.2 2013/12/13 14:42:47 mjjones Exp $ +# $Id: fapiCreateL3DeltaVals.pl,v 1.3 2014/03/20 16:25:04 whs Exp $ # # Purpose: This perl script will parse HWP Attribute XML files # and add attribute information to a file called fapiL3DeltaDataAttr.H @@ -91,9 +90,11 @@ print OUTFILE "#define DELTA_DATA_SIZE 64\n"; # Create array structure for L3_DELTA_DATA attribute print OUTFILE "struct L3_DELTA_DATA_ATTR {\n"; +print OUTFILE " uint8_t l_ATTR_SELECT;\n"; print OUTFILE " uint8_t l_ATTR_CHIPTYPE;\n"; print OUTFILE " uint8_t l_ATTR_EC;\n"; -print OUTFILE " uint32_t l_ATTR_L3_DELTA_DATA [3][DELTA_DATA_SIZE];\n"; +print OUTFILE " uint32_t l_ATTR_BIT_LENGTH;\n"; +print OUTFILE " uint32_t l_ATTR_L3_DELTA_DATA[DELTA_DATA_SIZE];\n"; print OUTFILE "};\n"; print OUTFILE "\n"; print OUTFILE "\n" . "const L3_DELTA_DATA_ATTR L3_DELTA_DATA_array [] = {\n"; @@ -111,6 +112,8 @@ foreach $ringAttrFile (@fileList) my $count = 0; my $dataCount = 0; my $dataArrayString = ""; + my $selectVal = 0; + my $lengthVal = 0; # open the winkle ring attribute file open (FILE, "$ringAttrFile") or die "Couldn't open $ringAttrFile for input.\n"; @@ -139,7 +142,6 @@ foreach $ringAttrFile (@fileList) print OUTFILE " \@ec $ec\n"; print OUTFILE " \@version $revision\n"; print OUTFILE "*/\n"; - print OUTFILE "{\n"; while (<FILE>) { @@ -155,7 +157,12 @@ foreach $ringAttrFile (@fileList) # Store select value in array if ($_ =~ m"^#SELECT=(\d)") { - my $selectVal = $1; + $selectVal = $1; + } + if ($_ =~ m"^ATTR_PROC_EX_FUNC_L3_LENGTH u32\s+(\d+)\s+") + { + $lengthVal = $1; + if ($selectVal != ($count-1)) { die "$ProgName ERROR: Select value in file $ringAttrFile does not appear to be sequential. There may be a script problem or a corrupted ring attribute file.\n"; @@ -175,14 +182,12 @@ foreach $ringAttrFile (@fileList) { die "$ProgName ERROR: Chip type $chip not supported by this script. Either the ring attribute file is in error or support for the new chip type needs to be added.\n"; } - # If first set of data values - if ($selectVal == 0) - { - print OUTFILE " $chipEnum, \t// CHIP TYPE \n"; - print OUTFILE " 0x$ec, \t// EC LEVEL \n"; - print OUTFILE " {\n"; - } - print OUTFILE " { \t// ATTR_PROC_PBIEX_ASYNC_SEL = $1\n"; + print OUTFILE "{\n"; + print OUTFILE " $selectVal, \t// ATTR_PROC_PBIEX_ASYNC_SEL \n"; + print OUTFILE " $chipEnum, \t// CHIP TYPE \n"; + print OUTFILE " 0x$ec, \t// EC LEVEL \n"; + print OUTFILE " $lengthVal, \t// RING LENGTH \n"; + print OUTFILE " {\n"; } # Store values in array @@ -197,18 +202,16 @@ foreach $ringAttrFile (@fileList) # If this is the last entry in the array (delta data size = 64 if ($dataCount eq 64) { - print OUTFILE " $dataArrayString }, // ATTR_PROC_EX_FUNC_L3_DELTA_DATA \n"; + print OUTFILE " $dataArrayString\n"; + print OUTFILE " }, // ATTR_PROC_EX_FUNC_L3_DELTA_DATA\n"; + print OUTFILE "},\n"; $dataArrayString = ""; } } } } - # Close array - print OUTFILE " }, \n\n"; - close (FILE); - print OUTFILE "},\n"; } print OUTFILE "}; \n\n"; 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 diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index cc2ad3f7f..7567a7bd0 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -1454,7 +1454,18 @@ fapi::ReturnCode fapiPlatGetL3DDAttr(const fapi::Target * i_pProcTarget, uint32_t (&o_data)[DELTA_DATA_SIZE]) { fapi::ReturnCode l_rc; - FAPI_EXEC_HWP(l_rc, getL3DeltaDataAttr, *i_pProcTarget, o_data); + uint32_t l_ringLength=0; + FAPI_EXEC_HWP(l_rc, getL3DeltaDataAttr,*i_pProcTarget,o_data,l_ringLength); + return l_rc; +} + +//----------------------------------------------------------------------------- +fapi::ReturnCode fapiPlatGetL3Length(const fapi::Target * i_pProcTarget, + uint32_t (&o_ringLength)) +{ + fapi::ReturnCode l_rc; + uint32_t l_data [DELTA_DATA_SIZE] = {}; + FAPI_EXEC_HWP(l_rc, getL3DeltaDataAttr,*i_pProcTarget,l_data,o_ringLength); return l_rc; } diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 2085e2078..37dab3a34 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -1882,14 +1882,6 @@ sub generate_proc } } - #default to murano (s1_) values and change later if for venice (p8_) - my $ex_func_l3 = 48826; - - if($CHIPNAME eq "venice") - { - $ex_func_l3 = 49020; - } - #MURANO=DCM installed, VENICE=SCM my $dcm_installed = 0; if($CHIPNAME eq "murano") @@ -1943,12 +1935,6 @@ sub generate_proc <default>$fruid</default> </attribute> <attribute><id>VPD_REC_NUM</id><default>$vpdnum</default></attribute> - - <!-- workaround for SW196865 - see RTC:69918 for additional details --> - <attribute> - <id>PROC_EX_FUNC_L3_LENGTH</id> - <default>$ex_func_l3</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 8b501cfd2..4fe142cfe 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -10445,23 +10445,6 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript </hwpfToHbAttrMap> </attribute> -<attribute> - <id>PROC_EX_FUNC_L3_LENGTH</id> - <description>Length of ex_func_l3 ring in bits - creator: platform - firmware notes: - </description> - <simpleType> - <uint32_t></uint32_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_PROC_EX_FUNC_L3_LENGTH</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - <enumerationType> <id>PROC_PBIEX_ASYNC_SEL</id> <description>Enumeration indicating which _PBIEX_ASYNC_SEL should be use</description> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index b40734976..dd54feacc 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -514,7 +514,6 @@ <attribute><id>PROC_AB_BNDY_PLL_SCAN_SELECT</id></attribute> <attribute><id>PROC_PCI_BNDY_PLL_SCAN_SELECT</id></attribute> <attribute><id>PROC_PCIE_REFCLOCK_ENABLE</id></attribute> - <attribute><id>PROC_EX_FUNC_L3_LENGTH</id></attribute> <attribute><id>ECID</id></attribute> <attribute><id>PROC_HTM_BAR_SIZE</id></attribute> |
