From 0b8a07b09265dd48c2881caca24e150a948272a0 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Thu, 2 May 2013 14:57:32 -0500 Subject: 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 Reviewed-by: A. Patrick Williams III --- src/usr/targeting/common/genHwsvMrwXml.pl | 42 ++++- .../targeting/common/xmltohb/attribute_types.xml | 16 +- .../common/xmltohb/simics_MURANO.system.xml | 89 +++++++++ .../common/xmltohb/simics_VENICE.system.xml | 198 +++++++++++++++++++++ .../targeting/common/xmltohb/vbu_MURANO.system.xml | 87 +++++++++ .../targeting/common/xmltohb/vbu_VENICE.system.xml | 44 +++++ 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 " - + sys${sys}node${node}proc${proc} @@ -1727,7 +1743,29 @@ sub generate_proc FABRIC_CHIP_ID $logid - VPD_REC_NUM$vpdnum"; + VPD_REC_NUM$vpdnum + + + + PROC_AB_BNDY_PLL_LENGTH + $ab_bndy_pll + + + PROC_PB_BNDY_DMIPLL_LENGTH + $pb_bndy_dmipll + + + PROC_EX_FUNC_L3_LENGTH + $ex_func_l3 + + + PROC_PERV_BNDY_PLL_LENGTH + $perv_bndy_pll + + + PROC_PCI_BNDY_PLL_LENGTH + $pci_bndy_pll + "; 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 firmware notes: - - 0x0000035d - + non-volatile @@ -9460,9 +9458,7 @@ Measured in GB firmware notes: - - 0x4d2 - + non-volatile @@ -9479,9 +9475,7 @@ Measured in GB firmware notes: - - 0x00000218 - + non-volatile @@ -9498,9 +9492,7 @@ Measured in GB firmware notes: - - 0x235 - + non-volatile 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 @@ 0 VPD_REC_NUM0 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE000000000 @@ -920,6 +942,28 @@ 1 VPD_REC_NUM1 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -1589,6 +1633,29 @@ 0 VPD_REC_NUM2 + + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE200000000 @@ -2256,6 +2323,28 @@ 1 VPD_REC_NUM3 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 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 @@ 0 VPD_REC_NUM0 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE000000000 @@ -1253,6 +1275,28 @@ 1 VPD_REC_NUM1 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -2272,6 +2316,28 @@ 2 VPD_REC_NUM2 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -3291,6 +3357,28 @@ 3 VPD_REC_NUM3 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -4308,6 +4396,28 @@ 4 VPD_REC_NUM4 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -5327,6 +5437,28 @@ 5 VPD_REC_NUM5 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -6344,6 +6476,28 @@ 6 VPD_REC_NUM6 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -7362,6 +7516,28 @@ 7 VPD_REC_NUM7 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 @@ -14657,6 +14833,28 @@ 0 VPD_REC_NUM0 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE000000000 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 @@ 0 VPD_REC_NUM0 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE000000000 @@ -718,6 +740,28 @@ 1 VPD_REC_NUM1 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE100000000 @@ -1119,6 +1163,28 @@ 0 VPD_REC_NUM2 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE200000000 @@ -1521,6 +1587,27 @@ 1 VPD_REC_NUM3 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1234 + + + PROC_EX_FUNC_L3_LENGTH + 48826 + + + PROC_PERV_BNDY_PLL_LENGTH + 861 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + FSP_BASE_ADDR 0x0003FFE300000000 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 @@ 0 VPD_REC_NUM0 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0003FFE000000000 @@ -1352,6 +1374,28 @@ 1 VPD_REC_NUM1 + + + PROC_AB_BNDY_PLL_LENGTH + 536 + + + PROC_PB_BNDY_DMIPLL_LENGTH + 1848 + + + PROC_EX_FUNC_L3_LENGTH + 49020 + + + PROC_PERV_BNDY_PLL_LENGTH + 855 + + + PROC_PCI_BNDY_PLL_LENGTH + 565 + + FSP_BASE_ADDR 0x0000000000000000 -- cgit v1.2.1