summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVan Lee <vanlee@us.ibm.com>2012-10-24 11:45:07 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-10-24 16:32:59 -0500
commitae2fc47103833e91ec7385e1ca89407f04653111 (patch)
tree9f4ceb094b62772138680f6c4a5518ba2f902032
parent9604a1d673182c3edbc83518d795a32bec55b77d (diff)
downloadblackbird-hostboot-ae2fc47103833e91ec7385e1ca89407f04653111.tar.gz
blackbird-hostboot-ae2fc47103833e91ec7385e1ca89407f04653111.zip
Fix proc_setup_bars fails on large config (4 procs 4 centaurs)
Change-Id: I8203c863f26aeb3a0ea20964e4c4bef64802c4e8 RTC: 50426 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2118 Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com> Tested-by: Jenkins Server
Diffstat
-rw-r--r--src/build/citest/etc/bbuild2
-rw-r--r--src/usr/hwpf/hwp/dram_initialization/dram_initialization.C81
-rw-r--r--src/usr/hwpf/hwp/dram_initialization/makefile1
-rw-r--r--src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C118
-rw-r--r--src/usr/hwpf/hwp/fapiTestHwp.C2
-rwxr-xr-xsrc/usr/hwpf/hwp/initfiles/sample.initfile18
-rw-r--r--src/usr/hwpf/plat/fapiPlatAttributeService.C17
-rw-r--r--src/usr/hwpf/test/hwpftest.H22
-rw-r--r--src/usr/targeting/common/xmltohb/simics_MURANO.system.xml80
-rw-r--r--src/usr/targeting/xmltohb/TULETA.mrw.xml660
-rwxr-xr-xsrc/usr/targeting/xmltohb/genHwsvMrwXml.pl297
-rw-r--r--src/usr/xscom/test/xscomtest.H48
12 files changed, 558 insertions, 788 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 51992b432..4c672d1de 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips810/Builds/b1002a_1241.810
+/esw/fips810/Builds/b1019a_1243.810
diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
index b2af5d3a9..7f0cc87c0 100644
--- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
+++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
@@ -57,6 +57,7 @@
#include <fapiPlatHwpInvoker.H>
#include "dram_initialization.H"
+#include <pbusLinkSvc.H>
// Uncomment these files as they become available:
// #include "host_startPRD_dram/host_startPRD_dram.H"
@@ -80,6 +81,7 @@ namespace DRAM_INITIALIZATION
{
using namespace TARGETING;
+using namespace EDI_EI_INITIALIZATION;
using namespace fapi;
@@ -426,59 +428,76 @@ void* call_proc_setup_bars( void *io_pArgs )
// -----------------------------------------------------------------------
std::vector<proc_setup_bars_proc_chip> l_proc_chips;
- for ( size_t i = 0; i < l_cpuTargetList.size(); i++ )
+ TargetPairs_t l_abusLinks;
+ l_errl = PbusLinkSvc::getTheInstance().getPbusConnections(
+ l_abusLinks, TYPE_ABUS, false );
+
+ for ( size_t i = 0; i < l_cpuTargetList.size() && !l_errl; i++ )
{
// make a local copy of the target for ease of use
const TARGETING::Target* l_pCpuTarget = l_cpuTargetList[i];
- TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
- "proc_setup_bars: proc %d", i );
- // dump physical path to targets
- EntityPath l_path;
- l_path = l_pCpuTarget->getAttr<ATTR_PHYS_PATH>();
- l_path.dump();
-
// cast OUR type of target to a FAPI type of target.
- const fapi::Target l_fapi_pCpuTarget(
- TARGET_TYPE_MEMBUF_CHIP,
- reinterpret_cast<void *>
- (const_cast<TARGETING::Target*>
- (l_pCpuTarget)) );
- // @todo Create dummy aX targets
- const fapi::Target l_a0_chip;
- const fapi::Target l_a1_chip;
- const fapi::Target l_a2_chip;
-
+ const fapi::Target l_fapi_pCpuTarget( TARGET_TYPE_PROC_CHIP,
+ reinterpret_cast<void *> (const_cast<TARGETING::Target*>
+ (l_pCpuTarget)) );
proc_setup_bars_proc_chip l_proc_chip ;
- l_proc_chip.this_chip = l_fapi_pCpuTarget;
- l_proc_chip.a0_chip = l_a0_chip;
- l_proc_chip.a1_chip = l_a1_chip;
- l_proc_chip.a2_chip = l_a2_chip;
- l_proc_chip.process_f0 = true;
- l_proc_chip.process_f1 = true;
+ l_proc_chip.this_chip = l_fapi_pCpuTarget;
+ l_proc_chip.process_f0 = true;
+ l_proc_chip.process_f1 = true;
+
+ TARGETING::TargetHandleList l_abuses;
+ getChildChiplets( l_abuses, l_pCpuTarget, TYPE_ABUS );
+
+ for (size_t j = 0; j < l_abuses.size(); j++)
+ {
+ TARGETING::Target * l_target = l_abuses[j];
+ uint8_t l_srcID = l_target->getAttr<ATTR_CHIP_UNIT>();
+ TargetPairs_t::iterator l_itr = l_abusLinks.find(l_target);
+ if ( l_itr == l_abusLinks.end() )
+ {
+ continue;
+ }
+
+ const TARGETING::Target *l_pParent = NULL;
+ l_pParent = getParentChip(
+ (const_cast<TARGETING::Target*>(l_itr->second)));
+ fapi::Target l_fapiproc_parent( TARGET_TYPE_PROC_CHIP,
+ (void *)l_pParent );
+
+ switch (l_srcID)
+ {
+ case 0: l_proc_chip.a0_chip = l_fapiproc_parent; break;
+ case 1: l_proc_chip.a1_chip = l_fapiproc_parent; break;
+ case 2: l_proc_chip.a2_chip = l_fapiproc_parent; break;
+ default: break;
+ }
+ }
l_proc_chips.push_back( l_proc_chip );
+ } // endfor
+
+ if (!l_errl)
+ {
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "call proc_setup_bars");
+
// call the HWP with each fapi::Target
- FAPI_INVOKE_HWP( l_errl,
- proc_setup_bars,
- l_proc_chips,
- true );
+ FAPI_INVOKE_HWP( l_errl, proc_setup_bars, l_proc_chips, true );
if ( l_errl )
{
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"ERROR : proc_setup_bars" );
- // break out with error
- break;
}
else
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"SUCCESS : proc_setup-bars" );
}
- } // endfor
+ }
} // end if !l_errl
// @@@@@ END CUSTOM BLOCK: @@@@@
diff --git a/src/usr/hwpf/hwp/dram_initialization/makefile b/src/usr/hwpf/hwp/dram_initialization/makefile
index 57c44f0e3..3f0918a74 100644
--- a/src/usr/hwpf/hwp/dram_initialization/makefile
+++ b/src/usr/hwpf/hwp/dram_initialization/makefile
@@ -32,6 +32,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
## pointer to common HWP files
EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training
## NOTE: add the base istep dir here.
EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/dram_initialization
diff --git a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
index 8e3db1748..e3642c1cb 100644
--- a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
+++ b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
@@ -1,27 +1,26 @@
-/* IBM_PROLOG_BEGIN_TAG
- * This is an automatically generated prolog.
- *
- * $Source: src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C $
- *
- * IBM CONFIDENTIAL
- *
- * COPYRIGHT International Business Machines Corp. 2012
- *
- * p1
- *
- * Object Code Only (OCO) source materials
- * Licensed Internal Code Source Materials
- * IBM HostBoot Licensed Internal Code
- *
- * The source code for this program is not published or other-
- * wise divested of its trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- *
- * Origin: 30
- *
- * IBM_PROLOG_END_TAG
- */
-// $Id: proc_setup_bars.C,v 1.5 2012/07/23 17:47:05 jmcgill Exp $
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
+// $Id: proc_setup_bars.C,v 1.7 2012/10/09 15:31:38 jmcgill Exp $
// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_setup_bars.C,v $
//------------------------------------------------------------------------------
// *|
@@ -876,7 +875,7 @@ fapi::ReturnCode proc_setup_bars_nx_get_mmio_bar_attrs(
io_addr_range.size);
if (!rc.ok())
{
- FAPI_ERR("proc_setup_bars_fsp_get_bar_attrs: Error querying ATTR_PROC_NX_MMIO_BAR_SIZE");
+ FAPI_ERR("proc_setup_bars_nx_get_mmio_bar_attrs: Error querying ATTR_PROC_NX_MMIO_BAR_SIZE");
break;
}
@@ -1358,32 +1357,69 @@ fapi::ReturnCode proc_setup_bars_process_chips(
// mark function entry
FAPI_DBG("proc_setup_bars_process_chips: Start");
- // loop over all chips passed from platform to HWP
- std::vector<proc_setup_bars_proc_chip>::iterator iter;
- for (iter = i_proc_chips.begin();
- iter != i_proc_chips.end();
- iter++)
+ do
{
- // process platform provided data in chip argument,
- // query chip specific attributes
- proc_setup_bars_smp_chip smp_chip;
- rc = proc_setup_bars_process_chip(&(*iter),
- smp_chip);
+ // loop over all chips passed from platform to HWP
+ std::vector<proc_setup_bars_proc_chip>::iterator c_iter;
+ for (c_iter = i_proc_chips.begin();
+ c_iter != i_proc_chips.end();
+ c_iter++)
+ {
+ // process platform provided data in chip argument,
+ // query chip specific attributes
+ proc_setup_bars_smp_chip smp_chip;
+ rc = proc_setup_bars_process_chip(&(*c_iter),
+ smp_chip);
+ if (!rc.ok())
+ {
+ FAPI_ERR("proc_setup_bars_process_chips: Error from proc_setup_bars_process_chip");
+ break;
+ }
+
+ // insert chip into SMP data structure given node & chip ID
+ rc = proc_setup_bars_insert_chip(smp_chip,
+ io_smp);
+ if (!rc.ok())
+ {
+ FAPI_ERR("proc_setup_bars_process_chips: Error from proc_setup_bars_insert_chip");
+ break;
+ }
+ }
if (!rc.ok())
{
- FAPI_ERR("proc_setup_bars_process_chips: Error from proc_setup_bars_process_chip");
break;
}
- // insert chip into SMP data structure given node & chip ID
- rc = proc_setup_bars_insert_chip(smp_chip,
- io_smp);
+ // perform final power of two adjustment on node specific resources once
+ // all chips have been processed
+ std::map<proc_fab_smp_node_id, proc_setup_bars_smp_node>::iterator n_iter;
+ for (n_iter = io_smp.nodes.begin();
+ n_iter != io_smp.nodes.end();
+ n_iter++)
+ {
+ // update node address ranges (non-mirrored & mirrored)
+ FAPI_DBG("proc_setup_bars_process_chips: Node %d ranges after power of two alignment:",
+ n_iter->first);
+ // ensure range is power of 2 aligned
+ if (n_iter->second.non_mirrored_range.enabled &&
+ !n_iter->second.non_mirrored_range.is_power_of_2())
+ {
+ n_iter->second.non_mirrored_range.round_next_power_of_2();
+ }
+ n_iter->second.non_mirrored_range.print();
+
+ if (n_iter->second.mirrored_range.enabled &&
+ !n_iter->second.mirrored_range.is_power_of_2())
+ {
+ n_iter->second.mirrored_range.round_next_power_of_2();
+ }
+ n_iter->second.mirrored_range.print();
+ }
if (!rc.ok())
{
- FAPI_ERR("proc_setup_bars_process_chips: Error from proc_setup_bars_insert_chip");
break;
}
- }
+ } while(0);
// mark function exit
FAPI_DBG("proc_setup_bars_process_chips: End");
diff --git a/src/usr/hwpf/hwp/fapiTestHwp.C b/src/usr/hwpf/hwp/fapiTestHwp.C
index d7a0b273c..2d299b19b 100644
--- a/src/usr/hwpf/hwp/fapiTestHwp.C
+++ b/src/usr/hwpf/hwp/fapiTestHwp.C
@@ -73,7 +73,7 @@ fapi::ReturnCode hwpInitialTest(const std::vector<fapi::Target> & i_target)
do
{
// Use this SCOM register for testing
- const uint64_t l_addr = 0x13010002;
+ const uint64_t l_addr = 0x14010002;
ecmdDataBufferBase l_ScomData(64);
uint64_t l_originalScomData = 0;
diff --git a/src/usr/hwpf/hwp/initfiles/sample.initfile b/src/usr/hwpf/hwp/initfiles/sample.initfile
index 8bf99a087..32ffc7d08 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.initfile
+++ b/src/usr/hwpf/hwp/initfiles/sample.initfile
@@ -67,7 +67,7 @@ define MBA1 = TGT2;
#--******************************************************************************
#-- Basic SCOM
#--******************************************************************************
-scom 0x0000000013010002 {
+scom 0x0000000014010002 {
scom_data ;
0xAABBC00000000000 ;
}
@@ -76,7 +76,7 @@ scom 0x0000000013010002 {
#-- Basic SCOM with Expression and Attribute
#--******************************************************************************
-scom 0x0000000013030007 {
+scom 0x0000000014030007 {
scom_data, expr ;
0x00000CDE00000000, SYS.ATTR_SCRATCH_UINT8_1 == SYS.ATTR_SCRATCH_UINT8_2 ;
}
@@ -139,7 +139,7 @@ scom 0x000000000006800c {
#--******************************************************************************
#-- Basic SCOM with bits
#--******************************************************************************
-scom 0x0000000013013283 {
+scom 0x0000000014013283 {
bits , scom_data ;
0:11 , 0b001111001001 ;
12 , 0b1 ;
@@ -152,7 +152,7 @@ scom 0x0000000013013283 {
#-- Complext SCOM with Bit Support, define, and attributes
#--******************************************************************************
-scom 0x0000000013013284 {
+scom 0x0000000014013284 {
bits , scom_data, expr ;
0:11 , 0b001111001001, ANY ;
12 , 0b1, def_equal_test ;
@@ -165,7 +165,7 @@ scom 0x0000000013013284 {
#-- Complex SCOM with Bit Support, and logical operators
#--******************************************************************************
-scom 0x0000000013013285 {
+scom 0x0000000014013285 {
bits , scom_data, expr ;
12 , 0b1, def_equal_test && def_not_equal_test ;
12 , 0b0, def_equal_test || def_not_equal_test ;
@@ -183,7 +183,7 @@ scom 0x0000000013013285 {
#-- SCOM with 'ec' column - Use scratch for now since all attributes work
#--******************************************************************************
-scom 0x0000000013013286 {
+scom 0x0000000014013286 {
scom_data, SYS.ATTR_SCRATCH_UINT32_1, SYS.ATTR_SCRATCH_UINT32_2 ;
0x0000000000000192, != 0, >= ENUM_ATTR_SCRATCH_UINT64_ARRAY_2_VAL_B ;
}
@@ -191,7 +191,7 @@ scom 0x0000000013013286 {
#--******************************************************************************
#-- Basic SCOM with an array
#--******************************************************************************
-scom 0x0000000013013287 {
+scom 0x0000000014013287 {
scom_data, expr ;
0x0000000000000182, SYS.ATTR_SCRATCH_UINT8_ARRAY_1[2] == SYS.ATTR_SCRATCH_UINT8_1 ;
}
@@ -199,7 +199,7 @@ scom 0x0000000013013287 {
#--******************************************************************************
#-- SCOM with 'ec' & expr column - Use scratch for now since all attributes work
#--******************************************************************************
-scom 0x0000000013013288 {
+scom 0x0000000014013288 {
scom_data, SYS.ATTR_SCRATCH_UINT32_1, expr;
0x0000000000000192, 3, SYS.ATTR_SCRATCH_UINT8_ARRAY_2[1][2][3] == 0x00000000000000BE;
}
@@ -207,7 +207,7 @@ scom 0x0000000013013288 {
#--******************************************************************************
#-- Complex SCOM with Bit Support, associated attributes and logical operators
#--******************************************************************************
-scom 0x0000000013013289 {
+scom 0x0000000014013289 {
bits, scom_data, MBA1.ATTR_CHIP_UNIT_POS, expr;
23, 0b0, 1, MBA0.ATTR_CHIP_UNIT_POS == 1;
23, MBA1.ATTR_CHIP_UNIT_POS, 1, MBA0.ATTR_CHIP_UNIT_POS == 0;
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C
index c0c9aa296..22e325ce6 100644
--- a/src/usr/hwpf/plat/fapiPlatAttributeService.C
+++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C
@@ -1472,23 +1472,6 @@ fapi::ReturnCode fapiPlatGetProcPcieBarSize (
break;
}
- // Just support proc 0 , 1 for now.
- if ( l_procNum > 1 )
- {
- /*@
- * @errortype
- * @moduleid MOD_ATTR_PROC_PCIE_BAR_SIZE_GET
- * @reasoncode RC_ATTR_UNSUPPORTED_PROC_NUM
- * @devdesc Null FAPI Target passed to ATTR_GET
- */
- errlHndl_t l_pError = new ERRORLOG::ErrlEntry(
- ERRORLOG::ERRL_SEV_INFORMATIONAL,
- fapi::MOD_ATTR_PROC_PCIE_BAR_SIZE_GET,
- fapi::RC_ATTR_UNSUPPORTED_PROC_NUM );
- l_fapirc.setPlatError(reinterpret_cast<void *> (l_pError));
- break;
- }
-
// NOTE: supported BAR0/1 sizes are from 64KB-1PB
// NOTE: BAR1 is disabled, set to 0
// NOTE: only supported BAR2 size is 4KB
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index 88c25039f..07d00044d 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -297,22 +297,22 @@ public:
{0x000000000006800c, 0, (0x8000000000000000 >> 0x17) |
(0x0000000000000060ll << (64 - (24 + 8))) |
0x0000000000003000},
- {0x0000000013010002, 0, 0xAABBC00000000000},
- {0x0000000013030007, 0, 0x00000CDE00000000},
- {0x0000000013013283, 0, 0x3c90000000000000 |
+ {0x0000000014010002, 0, 0xAABBC00000000000},
+ {0x0000000014030007, 0, 0x00000CDE00000000},
+ {0x0000000014013283, 0, 0x3c90000000000000 |
(0x8000000000000000 >> 0x0c) |
(0x8000000000000000 >> 0x0d) |
(0x0306400412000000 >> 0x0e) |
0x000000000000000D},
- {0x0000000013013284, 0, 0x3c90000000000000},
- {0x0000000013013285, 0, (0x8000000000000000 >> 0x0f) |
+ {0x0000000014013284, 0, 0x3c90000000000000},
+ {0x0000000014013285, 0, (0x8000000000000000 >> 0x0f) |
(0x8000000000000000 >> 0x10) |
(0x8000000000000000 >> 0x13) |
(0x0306400412000000 >> 0x15) },
- {0x0000000013013286, 0, 0x0000000000000192},
- {0x0000000013013287, 0, 0x0000000000000182},
- {0x0000000013013288, 0, 0x0000000000000192},
- {0x0000000013013289, 0, (0x8000000000000000 >> 0x17) |
+ {0x0000000014013286, 0, 0x0000000000000192},
+ {0x0000000014013287, 0, 0x0000000000000182},
+ {0x0000000014013288, 0, 0x0000000000000192},
+ {0x0000000014013289, 0, (0x8000000000000000 >> 0x17) |
(0x4000000000000000 >> 0x18)}
};
@@ -643,8 +643,8 @@ public:
{0x000000000006002c, 0x0000000000000183},
{0x000000000006800b, 0},
{0x000000000006800c, 0x8000000000000000 >> 0x17},
- {0x0000000013010002, 0xAABBC00000000000},
- {0x0000000013030007, 0x00000CDE00000000},
+ {0x0000000014010002, 0xAABBC00000000000},
+ {0x0000000014030007, 0x00000CDE00000000},
};
// Get the master processor chip
diff --git a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
index 8263850bb..01ca06bde 100644
--- a/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_MURANO.system.xml
@@ -237,7 +237,7 @@
<id>sys0node0proc0ex4</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0004</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/ex-4</default>
</attribute>
@@ -255,7 +255,7 @@
<id>sys0node0proc0ex5</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0005</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/ex-5</default>
</attribute>
@@ -273,7 +273,7 @@
<id>sys0node0proc0ex6</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0006</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/ex-6</default>
</attribute>
@@ -291,7 +291,7 @@
<id>sys0node0proc0ex12</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A000C</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/ex-12</default>
</attribute>
@@ -309,7 +309,7 @@
<id>sys0node0proc0ex13</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A000D</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/ex-13</default>
</attribute>
@@ -587,7 +587,7 @@
<id>sys0node0proc0abus0</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160000</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/abus-0</default>
</attribute>
@@ -598,14 +598,14 @@
<attribute>
<id>CHIP_UNIT</id>
<default>0</default>
- </attribute>
+ </attribute>
</targetInstance>
<targetInstance>
<id>sys0node0proc0abus1</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160001</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/abus-1</default>
</attribute>
@@ -616,7 +616,7 @@
<attribute>
<id>CHIP_UNIT</id>
<default>1</default>
- </attribute>
+ </attribute>
<attribute>
<id>PEER_TARGET</id>
<default>physical:sys-0/node-0/proc-2/abus-1</default>
@@ -627,14 +627,14 @@
<id>sys0node0proc0abus2</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160002</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/abus-2</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/abus-2</default>
- </attribute>
+ </attribute>
<attribute>
<id>CHIP_UNIT</id>
<default>2</default>
@@ -651,7 +651,7 @@
<id>sys0node0proc0xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150001</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-0/xbus-1</default>
</attribute>
@@ -724,7 +724,7 @@
</attribute>
<attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0003FFF000000000</default>
+ <default>0x0003FFE100000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80100000</default>
@@ -761,7 +761,7 @@
<id>sys0node0proc1ex4</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0014</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/ex-4</default>
</attribute>
@@ -779,7 +779,7 @@
<id>sys0node0proc1ex5</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0015</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/ex-5</default>
</attribute>
@@ -797,7 +797,7 @@
<id>sys0node0proc1ex6</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A0016</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/ex-6</default>
</attribute>
@@ -815,7 +815,7 @@
<id>sys0node0proc1ex12</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A001C</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/ex-12</default>
</attribute>
@@ -833,7 +833,7 @@
<id>sys0node0proc1ex13</id>
<type>unit-ex-murano</type>
<attribute><id>HUID</id><default>0x000A001D</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/ex-13</default>
</attribute>
@@ -1112,7 +1112,7 @@
<id>sys0node0proc1abus0</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160003</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/abus-0</default>
</attribute>
@@ -1130,14 +1130,14 @@
<id>sys0node0proc1abus1</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160004</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/abus-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-1/abus-1</default>
- </attribute>
+ </attribute>
<attribute>
<id>CHIP_UNIT</id>
<default>1</default>
@@ -1152,7 +1152,7 @@
<id>sys0node0proc1abus2</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160005</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/abus-2</default>
</attribute>
@@ -1176,7 +1176,7 @@
<id>sys0node0proc1xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150005</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-1/xbus-1</default>
</attribute>
@@ -1241,15 +1241,15 @@
</attribute>
<attribute>
<id>FABRIC_NODE_ID</id>
- <default>0</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FABRIC_CHIP_ID</id>
- <default>2</default>
+ <default>0</default>
</attribute>
<attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0004000000000000</default>
+ <default>0x0003FFE200000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80200000</default>
@@ -1638,7 +1638,7 @@
<id>sys0node0proc2abus0</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160006</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-2/abus-0</default>
</attribute>
@@ -1656,14 +1656,14 @@
<id>sys0node0proc2abus1</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160007</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-2/abus-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-2/abus-1</default>
- </attribute>
+ </attribute>
<attribute>
<id>CHIP_UNIT</id>
<default>1</default>
@@ -1678,7 +1678,7 @@
<id>sys0node0proc2abus2</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160008</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-2/abus-2</default>
</attribute>
@@ -1702,14 +1702,14 @@
<id>sys0node0proc2xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150009</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-2/xbus-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-2/xbus-1</default>
- </attribute>
+ </attribute>
<attribute>
<id>CHIP_UNIT</id>
<default>1</default>
@@ -1767,15 +1767,15 @@
</attribute>
<attribute>
<id>FABRIC_NODE_ID</id>
- <default>0</default>
+ <default>1</default>
</attribute>
<attribute>
<id>FABRIC_CHIP_ID</id>
- <default>3</default>
+ <default>1</default>
</attribute>
<attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0004001000000000</default>
+ <default>0x0003FFE300000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80300000</default>
@@ -2163,14 +2163,14 @@
<id>sys0node0proc3abus0</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x00160009</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-3/abus-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-3/abus-0</default>
- </attribute>
+ </attribute>
<attribute>
<id>CHIP_UNIT</id>
<default>0</default>
@@ -2181,7 +2181,7 @@
<id>sys0node0proc3abus1</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x0016000A</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-3/abus-1</default>
</attribute>
@@ -2203,7 +2203,7 @@
<id>sys0node0proc3abus2</id>
<type>unit-abus-murano</type>
<attribute><id>HUID</id><default>0x0016000B</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-3/abus-2</default>
</attribute>
@@ -2227,7 +2227,7 @@
<id>sys0node0proc3xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x0015000D</default></attribute>
- <attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/proc-3/xbus-1</default>
</attribute>
diff --git a/src/usr/targeting/xmltohb/TULETA.mrw.xml b/src/usr/targeting/xmltohb/TULETA.mrw.xml
index ac10b9c28..0adf80f78 100644
--- a/src/usr/targeting/xmltohb/TULETA.mrw.xml
+++ b/src/usr/targeting/xmltohb/TULETA.mrw.xml
@@ -20,7 +20,7 @@
<!-- Origin: 30 -->
<!-- -->
<!-- IBM_PROLOG_END_TAG -->
-<!-- Source path = /esw/fips810/Builds/b0906a_1237.810/obj/ppc/mrw/xml/data -->
+<!-- Source path = /esw/fips810/Builds/b1019a_1243.810/obj/ppc/mrw/xml/data -->
<attributes>
<!-- TULETA System with new values-->
@@ -60,9 +60,43 @@
<id>FREQ_MEM_REFCLOCK</id>
<default>266</default>
</attribute>
+ <!-- TODO: The frequency attributes below will need to be obtained -->
+ <!-- from the MRW. RTC 51209 will implement this when MRW is ready -->
+ <!-- to supply the values of these attributes -->
<attribute>
<id>FREQ_CORE_FLOOR</id>
- <default>2500</default>
+ <default>0x2580</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_PB</id>
+ <default>0x960</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_X</id>
+ <default>0x12C0</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_A</id>
+ <default>0x1900</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_PCIE</id>
+ <default>0x3E8</default>
+ </attribute>
+ <!-- The default value of the following three attributes are written -->
+ <!-- by the HWP using them. The default values are not from MRW. They -->
+ <!-- are included here FYI. -->
+ <attribute>
+ <id>PROC_EPS_GB_DIRECTION</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>PROC_EPS_GB_PERCENTAGE</id>
+ <default>0x14</default>
+ </attribute>
+ <attribute>
+ <id>PROC_FABRIC_ASYNC_SAFE_MODE</id>
+ <default>0</default>
</attribute>
<attribute>
<id>SP_FUNCTIONS</id>
@@ -89,11 +123,11 @@
<attribute>
<id>MSS_MBA_ADDR_INTERLEAVE_BIT</id>
<default>24</default>
- </attribute>
+ </attribute>
<attribute>
<id>MSS_MBA_CACHELINE_INTERLEAVE_MODE</id>
<default>1</default>
- </attribute>
+ </attribute>
<attribute>
<id>MSS_PREFETCH_ENABLE</id>
<default>1</default>
@@ -649,28 +683,6 @@
<!-- TULETA n0p0 XBUS units -->
<targetInstance>
- <id>sys0node0proc0xbus0</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150000</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-0/xbus-0</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/xbus-0</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>PEER_TARGET</id>
- <default>physical:sys-0/node-0/proc-1/xbus-0</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
<id>sys0node0proc0xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150001</default></attribute>
@@ -686,41 +698,9 @@
<id>CHIP_UNIT</id>
<default>1</default>
</attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc0xbus2</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150002</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-0/xbus-2</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/xbus-2</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>2</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc0xbus3</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150003</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-0/xbus-3</default>
- </attribute>
<attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/xbus-3</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>3</default>
+ <id>PEER_TARGET</id>
+ <default>physical:sys-0/node-0/proc-1/xbus-1</default>
</attribute>
</targetInstance>
@@ -747,6 +727,15 @@
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-1</default>
</attribute>
+ <attribute>
+ <id>FABRIC_NODE_ID</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>FABRIC_CHIP_ID</id>
+ <default>1</default>
+ </attribute>
+ <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
<!-- FSI is connected via proc0:MFSI-0 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
@@ -768,17 +757,9 @@
<id>FSI_OPTION_FLAGS</id>
<default>0</default>
</attribute>
- <attribute>
- <id>FABRIC_NODE_ID</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>FABRIC_CHIP_ID</id>
- <default>1</default>
- </attribute>
- <attribute><id>VPD_REC_NUM</id><default>1</default></attribute>
+ <!-- Data from PHYP Memory Map -->
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0003FFF000000000</default>
+ <default>0x0003FFE100000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80100000</default>
@@ -807,6 +788,7 @@
<attribute><id>RNG_BASE_ADDR</id>
<default>0x0003FFFF40001000</default>
</attribute>
+ <!-- End PHYP Memory Map -->
</targetInstance>
@@ -1271,28 +1253,6 @@
<!-- TULETA n0p1 XBUS units -->
<targetInstance>
- <id>sys0node0proc1xbus0</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150004</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-1/xbus-0</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/xbus-0</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>PEER_TARGET</id>
- <default>physical:sys-0/node-0/proc-0/xbus-0</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
<id>sys0node0proc1xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150005</default></attribute>
@@ -1308,41 +1268,9 @@
<id>CHIP_UNIT</id>
<default>1</default>
</attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc1xbus2</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150006</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-1/xbus-2</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/xbus-2</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>2</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc1xbus3</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150007</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-1/xbus-3</default>
- </attribute>
<attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/xbus-3</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>3</default>
+ <id>PEER_TARGET</id>
+ <default>physical:sys-0/node-0/proc-0/xbus-1</default>
</attribute>
</targetInstance>
@@ -1369,6 +1297,15 @@
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-2</default>
</attribute>
+ <attribute>
+ <id>FABRIC_NODE_ID</id>
+ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>FABRIC_CHIP_ID</id>
+ <default>0</default>
+ </attribute>
+ <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
<!-- FSI is connected via proc0:MFSI-1 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
@@ -1390,17 +1327,9 @@
<id>FSI_OPTION_FLAGS</id>
<default>0</default>
</attribute>
- <attribute>
- <id>FABRIC_NODE_ID</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>FABRIC_CHIP_ID</id>
- <default>2</default>
- </attribute>
- <attribute><id>VPD_REC_NUM</id><default>2</default></attribute>
+ <!-- Data from PHYP Memory Map -->
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0004000000000000</default>
+ <default>0x0003FFE200000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80200000</default>
@@ -1429,6 +1358,7 @@
<attribute><id>RNG_BASE_ADDR</id>
<default>0x0003FFFF40002000</default>
</attribute>
+ <!-- End PHYP Memory Map -->
</targetInstance>
@@ -1893,28 +1823,6 @@
<!-- TULETA n0p2 XBUS units -->
<targetInstance>
- <id>sys0node0proc2xbus0</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x00150008</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-2/xbus-0</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/xbus-0</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>PEER_TARGET</id>
- <default>physical:sys-0/node-0/proc-3/xbus-0</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
<id>sys0node0proc2xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x00150009</default></attribute>
@@ -1930,41 +1838,9 @@
<id>CHIP_UNIT</id>
<default>1</default>
</attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc2xbus2</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x0015000A</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-2/xbus-2</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/xbus-2</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>2</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc2xbus3</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x0015000B</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-2/xbus-3</default>
- </attribute>
<attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/xbus-3</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>3</default>
+ <id>PEER_TARGET</id>
+ <default>physical:sys-0/node-0/proc-3/xbus-1</default>
</attribute>
</targetInstance>
@@ -1991,6 +1867,15 @@
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-3</default>
</attribute>
+ <attribute>
+ <id>FABRIC_NODE_ID</id>
+ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>FABRIC_CHIP_ID</id>
+ <default>1</default>
+ </attribute>
+ <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
<!-- FSI is connected via proc0:MFSI-2 -->
<attribute>
<id>FSI_MASTER_CHIP</id>
@@ -2012,17 +1897,9 @@
<id>FSI_OPTION_FLAGS</id>
<default>0</default>
</attribute>
- <attribute>
- <id>FABRIC_NODE_ID</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>FABRIC_CHIP_ID</id>
- <default>3</default>
- </attribute>
- <attribute><id>VPD_REC_NUM</id><default>3</default></attribute>
+ <!-- Data from PHYP Memory Map -->
<attribute><id>FSP_BASE_ADDR</id>
- <default>0x0004001000000000</default>
+ <default>0x0003FFE300000000</default>
</attribute>
<attribute><id>PSI_BRIDGE_BASE_ADDR</id>
<default>0x0003FFFE80300000</default>
@@ -2051,6 +1928,7 @@
<attribute><id>RNG_BASE_ADDR</id>
<default>0x0003FFFF40003000</default>
</attribute>
+ <!-- End PHYP Memory Map -->
</targetInstance>
@@ -2515,28 +2393,6 @@
<!-- TULETA n0p3 XBUS units -->
<targetInstance>
- <id>sys0node0proc3xbus0</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x0015000C</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-3/xbus-0</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/xbus-0</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>PEER_TARGET</id>
- <default>physical:sys-0/node-0/proc-2/xbus-0</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
<id>sys0node0proc3xbus1</id>
<type>unit-xbus-murano</type>
<attribute><id>HUID</id><default>0x0015000D</default></attribute>
@@ -2552,41 +2408,9 @@
<id>CHIP_UNIT</id>
<default>1</default>
</attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc3xbus2</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x0015000E</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-3/xbus-2</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/xbus-2</default>
- </attribute>
- <attribute>
- <id>CHIP_UNIT</id>
- <default>2</default>
- </attribute>
-</targetInstance>
-
-<targetInstance>
- <id>sys0node0proc3xbus3</id>
- <type>unit-xbus-murano</type>
- <attribute><id>HUID</id><default>0x0015000F</default></attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/proc-3/xbus-3</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/xbus-3</default>
- </attribute>
<attribute>
- <id>CHIP_UNIT</id>
- <default>3</default>
+ <id>PEER_TARGET</id>
+ <default>physical:sys-0/node-0/proc-2/xbus-1</default>
</attribute>
</targetInstance>
@@ -2659,38 +2483,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf4 -->
<targetInstance>
- <id>sys0node0membuf4mbs0mba1</id>
+ <id>sys0node0membuf4mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110009</default></attribute>
+ <attribute><id>HUID</id><default>0x00110008</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf4mbs0mba0</id>
+ <id>sys0node0membuf4mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110008</default></attribute>
+ <attribute><id>HUID</id><default>0x00110009</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -2765,38 +2589,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf5 -->
<targetInstance>
- <id>sys0node0membuf5mbs0mba1</id>
+ <id>sys0node0membuf5mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000B</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000A</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf5mbs0mba0</id>
+ <id>sys0node0membuf5mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000A</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000B</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -2871,38 +2695,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf6 -->
<targetInstance>
- <id>sys0node0membuf6mbs0mba1</id>
+ <id>sys0node0membuf6mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000D</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000C</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf6mbs0mba0</id>
+ <id>sys0node0membuf6mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000C</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000D</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-6/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-6/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -2977,38 +2801,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf7 -->
<targetInstance>
- <id>sys0node0membuf7mbs0mba1</id>
+ <id>sys0node0membuf7mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000F</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000E</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf7mbs0mba0</id>
+ <id>sys0node0membuf7mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011000E</default></attribute>
+ <attribute><id>HUID</id><default>0x0011000F</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-7/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-7/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3083,38 +2907,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf12 -->
<targetInstance>
- <id>sys0node0membuf12mbs0mba1</id>
+ <id>sys0node0membuf12mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110019</default></attribute>
+ <attribute><id>HUID</id><default>0x00110018</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf12mbs0mba0</id>
+ <id>sys0node0membuf12mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110018</default></attribute>
+ <attribute><id>HUID</id><default>0x00110019</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-12/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-12/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3189,38 +3013,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf13 -->
<targetInstance>
- <id>sys0node0membuf13mbs0mba1</id>
+ <id>sys0node0membuf13mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001B</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001A</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf13mbs0mba0</id>
+ <id>sys0node0membuf13mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001A</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001B</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-13/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-13/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3295,38 +3119,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf14 -->
<targetInstance>
- <id>sys0node0membuf14mbs0mba1</id>
+ <id>sys0node0membuf14mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001D</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001C</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf14mbs0mba0</id>
+ <id>sys0node0membuf14mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001C</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001D</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-14/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-14/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3401,38 +3225,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf15 -->
<targetInstance>
- <id>sys0node0membuf15mbs0mba1</id>
+ <id>sys0node0membuf15mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001F</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001E</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf15mbs0mba0</id>
+ <id>sys0node0membuf15mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011001E</default></attribute>
+ <attribute><id>HUID</id><default>0x0011001F</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-15/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-15/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3507,38 +3331,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf20 -->
<targetInstance>
- <id>sys0node0membuf20mbs0mba1</id>
+ <id>sys0node0membuf20mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110029</default></attribute>
+ <attribute><id>HUID</id><default>0x00110028</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf20mbs0mba0</id>
+ <id>sys0node0membuf20mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110028</default></attribute>
+ <attribute><id>HUID</id><default>0x00110029</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-20/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3613,38 +3437,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf21 -->
<targetInstance>
- <id>sys0node0membuf21mbs0mba1</id>
+ <id>sys0node0membuf21mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002B</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002A</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf21mbs0mba0</id>
+ <id>sys0node0membuf21mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002A</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002B</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-21/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3719,38 +3543,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf22 -->
<targetInstance>
- <id>sys0node0membuf22mbs0mba1</id>
+ <id>sys0node0membuf22mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002D</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002C</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf22mbs0mba0</id>
+ <id>sys0node0membuf22mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002C</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002D</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-22/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-22/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3825,38 +3649,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf23 -->
<targetInstance>
- <id>sys0node0membuf23mbs0mba1</id>
+ <id>sys0node0membuf23mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002F</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002E</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf23mbs0mba0</id>
+ <id>sys0node0membuf23mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011002E</default></attribute>
+ <attribute><id>HUID</id><default>0x0011002F</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-23/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-23/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -3931,38 +3755,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf28 -->
<targetInstance>
- <id>sys0node0membuf28mbs0mba1</id>
+ <id>sys0node0membuf28mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110039</default></attribute>
+ <attribute><id>HUID</id><default>0x00110038</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf28mbs0mba0</id>
+ <id>sys0node0membuf28mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x00110038</default></attribute>
+ <attribute><id>HUID</id><default>0x00110039</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-28/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-28/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -4037,38 +3861,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf29 -->
<targetInstance>
- <id>sys0node0membuf29mbs0mba1</id>
+ <id>sys0node0membuf29mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003B</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003A</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf29mbs0mba0</id>
+ <id>sys0node0membuf29mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003A</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003B</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-29/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-29/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -4143,38 +3967,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf30 -->
<targetInstance>
- <id>sys0node0membuf30mbs0mba1</id>
+ <id>sys0node0membuf30mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003D</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003C</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf30mbs0mba0</id>
+ <id>sys0node0membuf30mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003C</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003D</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-30/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-30/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
@@ -4249,38 +4073,38 @@
<!-- TULETA Centaur MBAs affiliated with membuf31 -->
<targetInstance>
- <id>sys0node0membuf31mbs0mba1</id>
+ <id>sys0node0membuf31mbs0mba0</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003F</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003E</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-1</default>
+ <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/mbs-0/mba-1</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/mbs-0/mba-0</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>1</default>
+ <default>0</default>
</attribute>
</targetInstance>
<targetInstance>
- <id>sys0node0membuf31mbs0mba0</id>
+ <id>sys0node0membuf31mbs0mba1</id>
<type>unit-mba-centaur</type>
- <attribute><id>HUID</id><default>0x0011003E</default></attribute>
+ <attribute><id>HUID</id><default>0x0011003F</default></attribute>
<attribute>
<id>PHYS_PATH</id>
- <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-0</default>
+ <default>physical:sys-0/node-0/membuf-31/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
- <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/mbs-0/mba-0</default>
+ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-31/mbs-0/mba-1</default>
</attribute>
<attribute>
<id>CHIP_UNIT</id>
- <default>0</default>
+ <default>1</default>
</attribute>
</targetInstance>
diff --git a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
index aa9e4263c..2f4fc30c9 100755
--- a/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
+++ b/src/usr/targeting/xmltohb/genHwsvMrwXml.pl
@@ -81,6 +81,22 @@ if ($outFile ne "")
my $SYSNAME = uc($sysname);
+open (FH, "<$mrwdir/${sysname}-chip-ids.xml") ||
+ die "ERROR: unable to open $mrwdir/${sysname}-chip-ids.xml\n";
+close (FH);
+
+my $chipIds = XMLin("$mrwdir/${sysname}-chip-ids.xml");
+
+use constant CHIP_ID_NODE => 0;
+use constant CHIP_ID_POS => 1;
+use constant CHIP_ID_PATH => 2;
+
+my @chipIDs;
+foreach my $i (@{$chipIds->{'chip-id'}})
+{
+ push @chipIDs, [ $i->{node}, $i->{position}, $i->{'instance-path'} ];
+}
+
open (FH, "<$mrwdir/${sysname}-power-busses.xml") ||
die "ERROR: unable to open $mrwdir/${sysname}-power-busses.xml\n";
close (FH);
@@ -420,9 +436,21 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++)
my $proc = $STargets[$i][POS_FIELD];
my $ipath = $STargets[$i][PATH_FIELD];
$proc_ordinal_id = $STargets[$i][ORDINAL_FIELD];
+ my $lognode;
+ my $logid;
+ for (my $j = 0; $j <= $#chipIDs; $j++)
+ {
+ if ($chipIDs[$j][CHIP_ID_PATH] eq $ipath)
+ {
+ $lognode = $chipIDs[$j][CHIP_ID_NODE];
+ $logid = $chipIDs[$j][CHIP_ID_POS];
+ last;
+ }
+ }
if ($proc eq $Mproc)
{
- generate_master_proc($proc, $ipath,$STargets[$i][ORDINAL_FIELD]);
+ generate_proc($proc, $ipath, $lognode, $logid,
+ $proc_ordinal_id, 1, 0, 0);
if ($build eq "fsp")
{
generate_occ($proc);
@@ -458,7 +486,8 @@ for (my $do_core = 0, my $i = 0; $i <= $#STargets; $i++)
last;
}
}
- generate_slave_proc($proc, $fsi, $ipath,$STargets[$i][ORDINAL_FIELD]);
+ generate_proc($proc, $ipath, $lognode, $logid,
+ $proc_ordinal_id, 0, 1, $fsi);
if ($build eq "fsp")
{
generate_occ($proc);
@@ -917,9 +946,43 @@ sub generate_sys
<id>FREQ_MEM_REFCLOCK</id>
<default>$mem_refclk</default>
</attribute>
+ <!-- TODO: The frequency attributes below will need to be obtained -->
+ <!-- from the MRW. RTC 51209 will implement this when MRW is ready -->
+ <!-- to supply the values of these attributes -->
<attribute>
<id>FREQ_CORE_FLOOR</id>
- <default>2500</default>
+ <default>0x2580</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_PB</id>
+ <default>0x960</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_X</id>
+ <default>0x12C0</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_A</id>
+ <default>0x1900</default>
+ </attribute>
+ <attribute>
+ <id>FREQ_PCIE</id>
+ <default>0x3E8</default>
+ </attribute>
+ <!-- The default value of the following three attributes are written -->
+ <!-- by the HWP using them. The default values are not from MRW. They -->
+ <!-- are included here FYI. -->
+ <attribute>
+ <id>PROC_EPS_GB_DIRECTION</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>PROC_EPS_GB_PERCENTAGE</id>
+ <default>0x14</default>
+ </attribute>
+ <attribute>
+ <id>PROC_FABRIC_ASYNC_SAFE_MODE</id>
+ <default>0</default>
</attribute>
<attribute>
<id>SP_FUNCTIONS</id>
@@ -946,11 +1009,11 @@ sub generate_sys
<attribute>
<id>MSS_MBA_ADDR_INTERLEAVE_BIT</id>
<default>24</default>
- </attribute>
+ </attribute>
<attribute>
<id>MSS_MBA_CACHELINE_INTERLEAVE_MODE</id>
<default>1</default>
- </attribute>
+ </attribute>
<attribute>
<id>MSS_PREFETCH_ENABLE</id>
<default>1</default>
@@ -1105,9 +1168,10 @@ sub generate_system_node
}
}
-sub generate_master_proc
+sub generate_proc
{
- my ($proc, $ipath, $ordinalId) = @_;
+ my ($proc, $ipath, $lognode, $logid, $ordinalId, $master, $slave, $fsi) = @_;
+ my $uidstr = sprintf("0x%02X07%04X",${node},${proc}+${node}*8);
my $scompath = $devpath->{chip}->{$ipath}->{'scom-path'};
my $scanpath = $devpath->{chip}->{$ipath}->{'scan-path'};
my $scomsize = length($scompath) + 1;
@@ -1119,7 +1183,6 @@ sub generate_master_proc
$mboxpath = $devpath->{chip}->{$ipath}->{'mailbox-path'};
$mboxsize = length($mboxpath) + 1;
}
- my $uidstr = sprintf("0x%02X07%04X",${node},${proc}+${node}*8);
print "
<!-- $SYSNAME n${node}p${proc} processor chip -->
@@ -1130,8 +1193,8 @@ sub generate_master_proc
<attribute><id>POSITION</id><default>${proc}</default></attribute>
<attribute><id>SCOM_SWITCHES</id>
<default>
- <field><id>useFsiScom</id><value>0</value></field>
- <field><id>useXscom</id><value>1</value></field>
+ <field><id>useFsiScom</id><value>$slave</value></field>
+ <field><id>useXscom</id><value>$master</value></field>
<field><id>useInbandScom</id><value>0</value></field>
<field><id>reserved</id><value>0</value></field>
</default>
@@ -1146,14 +1209,40 @@ sub generate_master_proc
</attribute>
<attribute>
<id>FABRIC_NODE_ID</id>
- <default>$node</default>
+ <default>$lognode</default>
</attribute>
<attribute>
<id>FABRIC_CHIP_ID</id>
- <default>$proc</default>
+ <default>$logid</default>
</attribute>
<attribute><id>VPD_REC_NUM</id><default>$proc</default></attribute>";
+ if ($slave)
+ {
+ print "
+ <!-- FSI is connected via proc${Mproc}:MFSI-$fsi -->
+ <attribute>
+ <id>FSI_MASTER_CHIP</id>
+ <default>physical:sys-$sys/node-$node/proc-$Mproc</default>
+ </attribute>
+ <attribute>
+ <id>FSI_MASTER_TYPE</id>
+ <default>MFSI</default>
+ </attribute>
+ <attribute>
+ <id>FSI_MASTER_PORT</id>
+ <default>$fsi</default>
+ </attribute>
+ <attribute>
+ <id>FSI_SLAVE_CASCADE</id>
+ <default>0</default>
+ </attribute>
+ <attribute>
+ <id>FSI_OPTION_FLAGS</id>
+ <default>0</default>
+ </attribute>";
+ }
+
if ($build eq "fsp")
{
print "
@@ -1194,7 +1283,7 @@ sub generate_master_proc
# Starts at 1024TB - 128GB, 4GB per proc
printf( " <attribute><id>FSP_BASE_ADDR</id>\n" );
printf( " <default>0x%016X</default>\n",
- 0x0003FFE000000000 + 0x1000000000*$proc );
+ 0x0003FFE000000000 + 0x100000000*$proc );
printf( " </attribute>\n" );
# Starts at 1024TB - 6GB, 1MB per link/proc
@@ -1429,183 +1518,6 @@ print"
</targetInstance>\n";
}
-sub generate_slave_proc
-{
- my ($proc, $fsi, $ipath, $ordinalId) = @_;
- my $uidstr = sprintf("0x%02X07%04X",${node},$proc+${node}*8);
- my $scompath = $devpath->{chip}->{$ipath}->{'scom-path'};
- my $scanpath = $devpath->{chip}->{$ipath}->{'scan-path'};
- my $scomsize = length($scompath) + 1;
- my $scansize = length($scanpath) + 1;
- my $mboxpath = "";
- my $mboxsize = 0;
- if (exists $devpath->{chip}->{$ipath}->{'mailbox-path'})
- {
- $mboxpath = $devpath->{chip}->{$ipath}->{'mailbox-path'};
- $mboxsize = length($mboxpath) + 1;
- }
- print "
-<!-- $SYSNAME n${node}p$proc processor chip -->
-
-<targetInstance>
- <id>sys${sys}node${node}proc$proc</id>
- <type>chip-processor-murano</type>
- <attribute><id>HUID</id><default>${uidstr}</default></attribute>
- <attribute><id>POSITION</id><default>$proc</default></attribute>
- <attribute><id>SCOM_SWITCHES</id>
- <default>
- <field><id>useFsiScom</id><value>1</value></field>
- <field><id>useXscom</id><value>0</value></field>
- <field><id>useInbandScom</id><value>0</value></field>
- <field><id>reserved</id><value>0</value></field>
- </default>
- </attribute>
- <attribute>
- <id>PHYS_PATH</id>
- <default>physical:sys-$sys/node-$node/proc-$proc</default>
- </attribute>
- <attribute>
- <id>AFFINITY_PATH</id>
- <default>affinity:sys-$sys/node-$node/proc-$proc</default>
- </attribute>
- <!-- FSI is connected via proc${Mproc}:MFSI-$fsi -->
- <attribute>
- <id>FSI_MASTER_CHIP</id>
- <default>physical:sys-$sys/node-$node/proc-$Mproc</default>
- </attribute>
- <attribute>
- <id>FSI_MASTER_TYPE</id>
- <default>MFSI</default>
- </attribute>
- <attribute>
- <id>FSI_MASTER_PORT</id>
- <default>$fsi</default>
- </attribute>
- <attribute>
- <id>FSI_SLAVE_CASCADE</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>FSI_OPTION_FLAGS</id>
- <default>0</default>
- </attribute>
- <attribute>
- <id>FABRIC_NODE_ID</id>
- <default>$node</default>
- </attribute>
- <attribute>
- <id>FABRIC_CHIP_ID</id>
- <default>$proc</default>
- </attribute>
- <attribute><id>VPD_REC_NUM</id><default>$proc</default></attribute>";
-
- if ($build eq "fsp")
- {
- print "
- <attribute>
- <id>ORDINAL_ID</id>
- <default>$ordinalId</default>
- </attribute>
- <attribute>
- <id>FSP_SCOM_DEVICE_PATH</id>
- <default>$scompath</default>
- <sizeInclNull>$scomsize</sizeInclNull>
- </attribute>
- <attribute>
- <id>FSP_SCAN_DEVICE_PATH</id>
- <default>$scanpath</default>
- <sizeInclNull>$scansize</sizeInclNull>
- </attribute>";
- }
-
- if (($mboxsize != 0) && ($build eq "fsp"))
- {
- print "
- <attribute>
- <id>FSP_MBOX_DEVICE_PATH</id>
- <default>$mboxpath</default>
- <sizeInclNull>$mboxsize</sizeInclNull>
- </attribute>";
- }
-
- # Data from PHYP Memory Map
-
- # Starts at 1024TB - 128GB, 4GB per proc
- printf( "\n" );
- printf( " <attribute><id>FSP_BASE_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0003FFE000000000 + 0x1000000000*$proc );
- printf( " </attribute>\n" );
-
- # Starts at 1024TB - 6GB, 1MB per link/proc
- printf( " <attribute><id>PSI_BRIDGE_BASE_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0003FFFE80000000 + 0x100000*$proc );
- printf( " </attribute>\n" );
-
- # Starts at 1024TB - 2GB, 1MB per proc
- printf( " <attribute><id>INTP_BASE_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0003FFFF80000000 + 0x100000*$proc );
- printf( " </attribute>\n" );
-
- # Starts at 1024TB - 7GB, 1MB per PHB (=4MB per proc)
- printf( " <attribute><id>PHB_BASE_ADDRS</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x0003FFFE40000000 + 0x400000*$proc + 0x100000*0,
- 0x0003FFFE40000000 + 0x400000*$proc + 0x100000*1 );
- printf( " 0x%016X,0x%016X\n",
- 0x0003FFFE40000000 + 0x400000*$proc + 0x100000*2,
- 0x0003FFFE40000000 + 0x400000*$proc + 0x100000*3 );
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- # Starts at 976TB, 64GB per PHB (=256GB per proc)
- printf( " <attribute><id>PCI_BASE_ADDRS</id>\n" );
- printf( " <default>\n" );
- printf( " 0x%016X,0x%016X,\n",
- 0x0003D00000000000 + 0x4000000000*$proc + 0x1000000000*0,
- 0x0003D00000000000 + 0x4000000000*$proc + 0x1000000000*1 );
- printf( " 0x%016X,0x%016X\n",
- 0x0003D00000000000 + 0x4000000000*$proc + 0x1000000000*2,
- 0x0003D00000000000 + 0x4000000000*$proc + 0x1000000000*3 );
- printf( " </default>\n" );
- printf( " </attribute>\n" );
-
- # Starts at 0, 2TB per proc
- printf( " <attribute><id>MEM_BASE</id>\n" );
- printf( " <default>0x%016X</default>\n", 0x20000000000*$proc );
- printf( " </attribute>\n" );
-
- # Starts at 512TB, 2TB per proc
- printf( " <attribute><id>MIRROR_BASE</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0002000000000000 + 0x20000000000*$proc );
- printf( " </attribute>\n" );
-
- # Starts at 1024TB - 3GB
- printf( " <attribute><id>RNG_BASE_ADDR</id>\n" );
- printf( " <default>0x%016X</default>\n",
- 0x0003FFFF40000000 + 0x1000*$proc );
- printf( " </attribute>\n" );
-
- # end PHYP Memory Map
-
-
- if ($build eq "fsp")
- {
- print "
- <attribute>
- <id>RID</id>
- <default>0x100$proc</default>
- </attribute>";
- }
-
- print "\n</targetInstance>\n";
-
-}
-
sub generate_ex
{
my ($proc, $ex, $ordinalId) = @_;
@@ -1971,11 +1883,6 @@ sub generate_mba
$proc =~ s/.*:p(.*):.*/$1/g;
$mcs =~ s/.*:.*:mcs(.*)/$1/g;
- if ($mba == 0)
- {
- print "\n<!-- $SYSNAME Centaur MBAs affiliated with membuf$ctaur -->\n";
- }
-
my $uidstr = sprintf("0x%02X11%04X",${node},$mba+$mcs*2+$proc*8*2+${node}*8*8*2);
print "
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index 187eeaf74..4901de611 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -1,25 +1,25 @@
-// IBM_PROLOG_BEGIN_TAG
-// This is an automatically generated prolog.
-//
-// $Source: src/usr/xscom/test/xscomtest.H $
-//
-// IBM CONFIDENTIAL
-//
-// COPYRIGHT International Business Machines Corp. 2011
-//
-// p1
-//
-// Object Code Only (OCO) source materials
-// Licensed Internal Code Source Materials
-// IBM HostBoot Licensed Internal Code
-//
-// The source code for this program is not published or other-
-// wise divested of its trade secrets, irrespective of what has
-// been deposited with the U.S. Copyright Office.
-//
-// Origin: 30
-//
-// IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/xscom/test/xscomtest.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#ifndef __XCOMTEST_H
#define __XCOMTEST_H
@@ -50,8 +50,8 @@ struct testXscomAddrData
const testXscomAddrData g_xscomAddrTable[] =
{
// Write data to be ORed with read value
- {0x13030007, 0x0000040000000000},
- {0x13010002, 0xC000000000000000},
+ {0x14030007, 0x0000040000000000},
+ {0x14010002, 0xC000000000000000},
};
const uint32_t g_xscomAddrTableSz =
sizeof(g_xscomAddrTable)/sizeof(testXscomAddrData);
OpenPOWER on IntegriCloud