diff options
author | Thi Tran <thi@us.ibm.com> | 2014-01-08 08:07:11 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-01-08 11:59:45 -0600 |
commit | ca2e1f088903168fcf7ef766ce9201681105081e (patch) | |
tree | 2347c70b59a3043af51d16ee9301b8740d48ea71 /src | |
parent | f3e453363fa9e92146a4bf578c8aab9f44af3933 (diff) | |
download | talos-hostboot-ca2e1f088903168fcf7ef766ce9201681105081e.tar.gz talos-hostboot-ca2e1f088903168fcf7ef766ce9201681105081e.zip |
INITPROC: Hostboot SW239813 FIR_STATUS_REG_ZCAL_B_ERR_STATUS
Change-Id: I467998d836518bee40aad32223d9e625e7f41912
CQ:SW239813
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7943
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
5 files changed, 474 insertions, 7 deletions
diff --git a/src/usr/hwpf/hwp/initfiles/p8.pe.phase1.scom.initfile b/src/usr/hwpf/hwp/initfiles/p8.pe.phase1.scom.initfile index 69aaa2a49..f6d1baaa6 100644 --- a/src/usr/hwpf/hwp/initfiles/p8.pe.phase1.scom.initfile +++ b/src/usr/hwpf/hwp/initfiles/p8.pe.phase1.scom.initfile @@ -1,4 +1,4 @@ -#-- $Id: p8.pe.phase1.scom.initfile,v 1.5 2013/11/22 17:24:47 ricmata Exp $ +#-- $Id: p8.pe.phase1.scom.initfile,v 1.6 2013/12/13 02:28:52 ricmata Exp $ #------------------------------------------------------------------------------- #-- #-- (C) Copyright International Business Machines Corp. 2011 @@ -760,6 +760,198 @@ scom 0x800003F70901143F { 48:63, ATTR_PROC_PCIE_IOP_RX_SDL[0][15]; } +#-- TX GEN1 Coefficient Override Register (A0) +scom 0x800004100901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][0]; +} + +#-- TX GEN1 Coefficient Override Register (A1) +scom 0x800004500901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][1]; +} + +#-- TX GEN1 Coefficient Override Register (A2) +scom 0x800004900901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][2]; +} + +#-- TX GEN1 Coefficient Override Register (A3) +scom 0x800004D00901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][3]; +} + +#-- TX GEN1 Coefficient Override Register (A4) +scom 0x800005100901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][4]; +} + +#-- TX GEN1 Coefficient Override Register (A5) +scom 0x800005500901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][5]; +} + +#-- TX GEN1 Coefficient Override Register (A6) +scom 0x800005900901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][6]; +} + +#-- TX GEN1 Coefficient Override Register (A7) +scom 0x800005D00901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][7]; +} + +#-- TX GEN1 Coefficient Override Register (B0) +scom 0x800006100901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][8]; +} + +#-- TX GEN1 Coefficient Override Register (B1) +scom 0x800006500901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][9]; +} + +#-- TX GEN1 Coefficient Override Register (B2) +scom 0x800006900901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][10]; +} + +#-- TX GEN1 Coefficient Override Register (B3) +scom 0x800006D00901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][11]; +} + +#-- TX GEN1 Coefficient Override Register (B4) +scom 0x800007100901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][12]; +} + +#-- TX GEN1 Coefficient Override Register (B5) +scom 0x800007500901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][13]; +} + +#-- TX GEN1 Coefficient Override Register (B6) +scom 0x800007900901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][14]; +} + +#-- TX GEN1 Coefficient Override Register (B7) +scom 0x800007D00901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[0][15]; +} + +#-- TX GEN2 Coefficient Override Register (A0) +scom 0x800004110901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][0]; +} + +#-- TX GEN2 Coefficient Override Register (A1) +scom 0x800004510901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][1]; +} + +#-- TX GEN2 Coefficient Override Register (A2) +scom 0x800004910901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][2]; +} + +#-- TX GEN2 Coefficient Override Register (A3) +scom 0x800004D10901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][3]; +} + +#-- TX GEN2 Coefficient Override Register (A4) +scom 0x800005110901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][4]; +} + +#-- TX GEN2 Coefficient Override Register (A5) +scom 0x800005510901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][5]; +} + +#-- TX GEN2 Coefficient Override Register (A6) +scom 0x800005910901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][6]; +} + +#-- TX GEN2 Coefficient Override Register (A7) +scom 0x800005D10901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][7]; +} + +#-- TX GEN2 Coefficient Override Register (B0) +scom 0x800006110901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][8]; +} + +#-- TX GEN2 Coefficient Override Register (B1) +scom 0x800006510901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][9]; +} + +#-- TX GEN2 Coefficient Override Register (B2) +scom 0x800006910901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][10]; +} + +#-- TX GEN2 Coefficient Override Register (B3) +scom 0x800006D10901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][11]; +} + +#-- TX GEN1 Coefficient Override Register (B4) +scom 0x800007110901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][12]; +} + +#-- TX GEN2 Coefficient Override Register (B5) +scom 0x800007510901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][13]; +} + +#-- TX GEN2 Coefficient Override Register (B6) +scom 0x800007910901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][14]; +} + +#-- TX GEN2 Coefficient Override Register (B7) +scom 0x800007D10901143F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[0][15]; +} + #-- RX Phase Rotator Flywheel Control Register (A0) scom 0x8000002F0901143F { bits, scom_data; @@ -1791,6 +1983,198 @@ scom 0x800003F70901187F { 48:63, ATTR_PROC_PCIE_IOP_RX_SDL[1][15], (lane32); } +#-- TX GEN1 Coefficient Override Register (A0) +scom 0x800004100901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][0]; +} + +#-- TX GEN1 Coefficient Override Register (A1) +scom 0x800004500901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][1]; +} + +#-- TX GEN1 Coefficient Override Register (A2) +scom 0x800004900901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][2]; +} + +#-- TX GEN1 Coefficient Override Register (A3) +scom 0x800004D00901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][3]; +} + +#-- TX GEN1 Coefficient Override Register (A4) +scom 0x800005100901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][4]; +} + +#-- TX GEN1 Coefficient Override Register (A5) +scom 0x800005500901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][5]; +} + +#-- TX GEN1 Coefficient Override Register (A6) +scom 0x800005900901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][6]; +} + +#-- TX GEN1 Coefficient Override Register (A7) +scom 0x800005D00901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][7]; +} + +#-- TX GEN1 Coefficient Override Register (B0) +scom 0x800006100901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][8], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B1) +scom 0x800006500901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][9], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B2) +scom 0x800006900901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][10], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B3) +scom 0x800006D00901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][11], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B4) +scom 0x800007100901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][12], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B5) +scom 0x800007500901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][13], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B6) +scom 0x800007900901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][14], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B7) +scom 0x800007D00901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN1[1][15], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (A0) +scom 0x800004110901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][0]; +} + +#-- TX GEN2 Coefficient Override Register (A1) +scom 0x800004510901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][1]; +} + +#-- TX GEN2 Coefficient Override Register (A2) +scom 0x800004910901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][2]; +} + +#-- TX GEN2 Coefficient Override Register (A3) +scom 0x800004D10901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][3]; +} + +#-- TX GEN2 Coefficient Override Register (A4) +scom 0x800005110901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][4]; +} + +#-- TX GEN2 Coefficient Override Register (A5) +scom 0x800005510901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][5]; +} + +#-- TX GEN2 Coefficient Override Register (A6) +scom 0x800005910901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][6]; +} + +#-- TX GEN2 Coefficient Override Register (A7) +scom 0x800005D10901187F { + bits, scom_data; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][7]; +} + +#-- TX GEN2 Coefficient Override Register (B0) +scom 0x800006110901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][8], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B1) +scom 0x800006510901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][9], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B2) +scom 0x800006910901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][10], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B3) +scom 0x800006D10901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][11], (lane32); +} + +#-- TX GEN1 Coefficient Override Register (B4) +scom 0x800007110901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][12], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B5) +scom 0x800007510901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][13], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B6) +scom 0x800007910901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][14], (lane32); +} + +#-- TX GEN2 Coefficient Override Register (B7) +scom 0x800007D10901187F { + bits, scom_data, expr; + 48:63, ATTR_PROC_PCIE_IOP_TX_FFE_GEN2[1][15], (lane32); +} + #-- RX Phase Rotator Flywheel Control Register (A0) scom 0x8000002F0901187F { bits, scom_data; diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml index ec9f8332b..013defb11 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml +++ b/src/usr/hwpf/hwp/nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml @@ -5,7 +5,7 @@ <!-- --> <!-- IBM CONFIDENTIAL --> <!-- --> -<!-- COPYRIGHT International Business Machines Corp. 2012,2013 --> +<!-- COPYRIGHT International Business Machines Corp. 2012,2014 --> <!-- --> <!-- p1 --> <!-- --> @@ -20,7 +20,7 @@ <!-- Origin: 30 --> <!-- --> <!-- IBM_PROLOG_END_TAG --> -<!-- $Id: proc_pcie_scominit_attributes.xml,v 1.5 2013/09/23 15:21:15 jmcgill Exp $ --> +<!-- $Id: proc_pcie_scominit_attributes.xml,v 1.6 2013/12/09 21:52:08 jmcgill Exp $ --> <!-- proc_pcie_scominit_attributes.xml --> <attributes> <!-- ********************************************************************* --> @@ -285,6 +285,38 @@ </attribute> <!-- ********************************************************************* --> <attribute> + <id>ATTR_PROC_PCIE_IOP_TX_FFE_GEN1</id> + <targetType>TARGET_TYPE_PROC_CHIP</targetType> + <description> + creator: platform (MRW) + consumer: proc_pcie_scominit + notes: + PCIe TX FFE (Gen1) + First array index: IOP number (0:1) + Second array index: Lane number (0:15) + </description> + <valueType>uint32</valueType> + <array>2,16</array> + <platInit/> + </attribute> + <!-- ********************************************************************* --> + <attribute> + <id>ATTR_PROC_PCIE_IOP_TX_FFE_GEN2</id> + <targetType>TARGET_TYPE_PROC_CHIP</targetType> + <description> + creator: platform (MRW) + consumer: proc_pcie_scominit + notes: + PCIe TX FFE (Gen2) + First array index: IOP number (0:1) + Second array index: Lane number (0:15) + </description> + <valueType>uint32</valueType> + <array>2,16</array> + <platInit/> + </attribute> + <!-- ********************************************************************* --> + <attribute> <id>ATTR_PROC_PCIE_IOP_ZCAL_CONTROL</id> <targetType>TARGET_TYPE_PROC_CHIP</targetType> <description> diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 2a67dc1cc..1b7768eef 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -285,8 +285,10 @@ foreach my $i (@{$ProcPcie->{'processor-settings'}}) $i->{proc_pcie_iop_tx_rcvrdetcntl_iop0}, $i->{proc_pcie_iop_tx_rcvrdetcntl_iop1}, "PROC_PCIE_IOP_ZCAL_CONTROL", - $i->{proc_pcie_iop_zcal_control_iop0}, - $i->{proc_pcie_iop_zcal_control_iop1}]; + 0x00000080, 0x00000080]; +# TODO RTC 94725 - Restore PROC_PCIE_IOP_ZCAL_CONTROL when MRW values are updated. +# $i->{proc_pcie_iop_zcal_control_iop0}, +# $i->{proc_pcie_iop_zcal_control_iop1}]; } my @SortedPcie = sort byNodePos @procPcie; diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 7fb5cbcc3..14e2cf95e 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -5,7 +5,7 @@ <!-- --> <!-- IBM CONFIDENTIAL --> <!-- --> -<!-- COPYRIGHT International Business Machines Corp. 2011,2013 --> +<!-- COPYRIGHT International Business Machines Corp. 2011,2014 --> <!-- --> <!-- p1 --> <!-- --> @@ -12774,4 +12774,48 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript </hwpfToHbAttrMap> </attribute> +<attribute> + <id>PROC_PCIE_IOP_TX_FFE_GEN1</id> + <description> + creator: platform (MRW) + consumer: proc_pcie_scominit + notes: + PCIe TX FFE (Gen1) + First array index: IOP number (0:1) + Second array index: Lane number (0:15) + </description> + <simpleType> + <uint32_t></uint32_t> + <array>2,16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_PROC_PCIE_IOP_TX_FFE_GEN1</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>PROC_PCIE_IOP_TX_FFE_GEN2</id> + <description> + creator: platform (MRW) + consumer: proc_pcie_scominit + notes: + PCIe TX FFE (Gen2) + First array index: IOP number (0:1) + Second array index: Lane number (0:15) + </description> + <simpleType> + <uint32_t></uint32_t> + <array>2,16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_PROC_PCIE_IOP_TX_FFE_GEN2</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 8d7595259..001c183f9 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -5,7 +5,7 @@ <!-- --> <!-- IBM CONFIDENTIAL --> <!-- --> -<!-- COPYRIGHT International Business Machines Corp. 2011,2013 --> +<!-- COPYRIGHT International Business Machines Corp. 2011,2014 --> <!-- --> <!-- p1 --> <!-- --> @@ -500,6 +500,11 @@ <attribute><id>PROC_BOOT_VOLTAGE_VID</id></attribute> <attribute><id>PROC_PBA_UNTRUSTED_BAR_BASE_ADDR</id></attribute> <attribute><id>PROC_PBA_UNTRUSTED_BAR_SIZE</id></attribute> + + <attribute><id>PROC_PCIE_IOP_TX_FFE_GEN1</id></attribute> + <attribute><id>PROC_PCIE_IOP_TX_FFE_GEN2</id></attribute> + + </targetType> <targetType> |