diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2013-05-02 14:57:32 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-05-06 17:08:54 -0500 |
commit | 0b8a07b09265dd48c2881caca24e150a948272a0 (patch) | |
tree | b95f86a4746a3103f55bd29e5e384c64370e13bb | |
parent | 446e7630a44ccfcd2b72de1c2d1a0d2e2b59f555 (diff) | |
download | talos-hostboot-0b8a07b09265dd48c2881caca24e150a948272a0.tar.gz talos-hostboot-0b8a07b09265dd48c2881caca24e150a948272a0.zip |
Support for processor specific Ring Lengths in Hostboot
This is a quick fix for SW196865, several ring lengths
are different based on processor type, this change will
set the attributes for these lengths in the genHwsvMrwXml.pl
based on processor type.
Change-Id: I42f0e61d138eca5724e290ed81873dd5244f5809
RTC:70945
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4333
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
6 files changed, 462 insertions, 14 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index ce77f621c..56d1fbda6 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -1695,8 +1695,24 @@ 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; + } + print " -<!-- $SYSNAME n${node}p${proc} processor chip --> + <!-- $SYSNAME n${node}p${proc} processor chip --> <targetInstance> <id>sys${sys}node${node}proc${proc}</id> @@ -1727,7 +1743,29 @@ sub generate_proc <id>FABRIC_CHIP_ID</id> <default>$logid</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>$vpdnum</default></attribute>"; + <attribute><id>VPD_REC_NUM</id><default>$vpdnum</default></attribute> + + <!-- 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>"; if ($slave) { diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index bfb39029b..28f6118de 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -9441,9 +9441,7 @@ Measured in GB</description> firmware notes: </description> <simpleType> - <uint32_t> - <default>0x0000035d</default> - </uint32_t> + <uint32_t></uint32_t> </simpleType> <persistency>non-volatile</persistency> <readable/> @@ -9460,9 +9458,7 @@ Measured in GB</description> firmware notes: </description> <simpleType> - <uint32_t> - <default>0x4d2</default> - </uint32_t> + <uint32_t></uint32_t> </simpleType> <persistency>non-volatile</persistency> <readable/> @@ -9479,9 +9475,7 @@ Measured in GB</description> firmware notes: </description> <simpleType> - <uint32_t> - <default>0x00000218</default> - </uint32_t> + <uint32_t></uint32_t> </simpleType> <persistency>non-volatile</persistency> <readable/> @@ -9498,9 +9492,7 @@ Measured in GB</description> firmware notes: </description> <simpleType> - <uint32_t> - <default>0x235</default> - </uint32_t> + <uint32_t></uint32_t> </simpleType> <persistency>non-volatile</persistency> <readable/> diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml index c55653ff9..24978f4e4 100644 --- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml @@ -258,6 +258,28 @@ <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> </attribute> @@ -920,6 +942,28 @@ <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> </attribute> @@ -1589,6 +1633,29 @@ <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> </attribute> @@ -2256,6 +2323,28 @@ <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> </attribute> diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml index e85de8245..746b3c8c2 100644 --- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml @@ -234,6 +234,28 @@ <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> </attribute> @@ -1253,6 +1275,28 @@ <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> </attribute> @@ -2272,6 +2316,28 @@ <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> </attribute> @@ -3291,6 +3357,28 @@ <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> </attribute> @@ -4308,6 +4396,28 @@ <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> </attribute> @@ -5327,6 +5437,28 @@ <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> </attribute> @@ -6344,6 +6476,28 @@ <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> </attribute> @@ -7362,6 +7516,28 @@ <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> </attribute> @@ -14657,6 +14833,28 @@ <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> </attribute> diff --git a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml index e2829b7a8..e1b406ea2 100644 --- a/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_MURANO.system.xml @@ -206,6 +206,28 @@ <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> </attribute> @@ -718,6 +740,28 @@ <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> </attribute> @@ -1119,6 +1163,28 @@ <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> </attribute> @@ -1521,6 +1587,27 @@ <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 e630ea3ee..719d461ff 100644 --- a/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_VENICE.system.xml @@ -251,6 +251,28 @@ <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> </attribute> @@ -1352,6 +1374,28 @@ <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> </attribute> |