diff options
| author | Thi Tran <thi@us.ibm.com> | 2014-04-09 08:21:26 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-04-11 12:39:36 -0500 |
| commit | e60490a0487b9517643c6c79a988d10e56592cf1 (patch) | |
| tree | d40d2343dd59f16c19ba09bdc5dca93def0245db /src/usr/targeting | |
| parent | 8536337d4b1978fc5b4593356124d701d46fd3e5 (diff) | |
| download | talos-hostboot-e60490a0487b9517643c6c79a988d10e56592cf1.tar.gz talos-hostboot-e60490a0487b9517643c6c79a988d10e56592cf1.zip | |
Undo workaround for PROC_PCIE_IOP_ZCAL_CONTROL attribute
Change-Id: Iec1bda28c850b2b66c2b1694d68a2c70802c74df
RTC: 94725
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10279
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
5 files changed, 17 insertions, 19 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 744dc5f01..1665f43f2 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -307,10 +307,8 @@ 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", - 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}]; + $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/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index e1f58666f..a3b63503e 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -554,7 +554,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -1413,7 +1413,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -2263,7 +2263,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -3113,7 +3113,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index 1d5bdc99f..08c682928 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -521,7 +521,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -1732,7 +1732,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -2943,7 +2943,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -4154,7 +4154,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -5364,7 +5364,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -6543,7 +6543,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -7720,7 +7720,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -8897,7 +8897,7 @@ po<!-- IBM_PROLOG_BEGIN_TAG -- <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml index 0056a2735..b5ce746ff 100644 --- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml @@ -495,7 +495,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080,0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> diff --git a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml index a22d1e7ce..31245033b 100644 --- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml @@ -500,7 +500,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -1601,7 +1601,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x000,0x000 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> |
