diff options
author | Thi Tran <thi@us.ibm.com> | 2014-11-13 12:47:31 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-01-16 10:10:54 -0600 |
commit | a59dccb2db8eabad2b756b9207e28a0e72aa7cbc (patch) | |
tree | de09149cbedd5e57fef42a21beab6a67f44eea4f /src/usr/targeting | |
parent | f2f75404fafd6d6e7e52a5b901665165ab61b625 (diff) | |
download | talos-hostboot-a59dccb2db8eabad2b756b9207e28a0e72aa7cbc.tar.gz talos-hostboot-a59dccb2db8eabad2b756b9207e28a0e72aa7cbc.zip |
P8+ VPO - HB supports to istep 7 for NVLINK test
Change-Id: I79ec79e1601ae51bf759b80a07c5b4cf2d97fc5c
RTC: 95236
Depends-On: I19823ac32a963d7072d21140b828c30ab326a19f
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14468
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
-rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml | 1236 | ||||
-rw-r--r-- | src/usr/targeting/targetservicestart.C | 5 |
2 files changed, 390 insertions, 851 deletions
diff --git a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml index c13506976..db96d3242 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NAPLES.system.xml @@ -241,7 +241,8 @@ <id>SP_FUNCTIONS</id> <default> <!-- VBU uses a checkpoint with the FSI initialized --> - <field><id>fsiSlaveInit</id><value>1</value></field> + <!-- Let HB initialize both Slave and Master FSI --> + <field><id>fsiSlaveInit</id><value>0</value></field> <field><id>mailboxEnabled</id><value>0</value></field> <field><id>fsiMasterInit</id><value>0</value></field> <field><id>hardwareChangeDetection</id><value>0</value></field> @@ -341,7 +342,6 @@ </targetInstance> <!-- Naples n0p0 processor chip --> - <targetInstance> <id>sys0node0proc0</id> <type>chip-processor-naples</type> @@ -390,19 +390,17 @@ <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80000000</default> </attribute> - <attribute> - <id>PHB_BASE_ADDRS</id> - <default> - 0x0003FFFE40000000,0x0003FFFE40100000, - 0x0003FFFE40200000,0x0003FFFE40300000 - </default> + <attribute><id>PHB_BASE_ADDRS</id> + <default> + 0x0003FFFE40000000,0x0003FFFE40100000, + 0x0003FFFE40200000,0x0003FFFE40300000 + </default> </attribute> - <attribute> - <id>PCI_BASE_ADDRS_64</id> - <default> - 0x0003D00000000000,0x0003D01000000000, - 0x0003D02000000000,0x0003D03000000000 - </default> + <attribute><id>PCI_BASE_ADDRS_64</id> + <default> + 0x0003D00000000000,0x0003D01000000000, + 0x0003D02000000000,0x0003D03000000000 + </default> </attribute> <attribute><id>PCI_BASE_ADDRS_32</id> <default> @@ -416,6 +414,12 @@ <attribute><id>IBSCOM_PROC_BASE_ADDR</id> <default>0x0003E00000000000</default> </attribute> + <attribute><id>MSS_INTERLEAVE_ENABLE</id> + <default>0xff</default> + </attribute> + <attribute><id>PROC_DCM_INSTALLED</id> + <default>0</default> + </attribute> <!-- PROC_PCIE_ attributes --> <attribute> @@ -493,7 +497,7 @@ <attribute> <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> <default> - 0x00000080,0x00000080 + 0x00000080, 0x00000080 </default> </attribute> <!-- End PROC_PCIE_ attributes --> @@ -506,194 +510,158 @@ </attribute> <attribute> <id>PROC_PCIE_IOP_SWAP</id> - <default>0</default> + <default>0,0</default> </attribute> <attribute> <id>PROC_PCIE_PHB_ACTIVE</id> <default>0xE0</default> </attribute> + <!-- PM_ attributes --> <attribute> - <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> - <default>0xFFFF,0x0000,0xFFFF,0x0000</default> - </attribute> -</targetInstance> - -<!-- Naples n0p0 EX units - Define only EX4 and EX5 for now to preserve AWAN memory --> -<targetInstance> - <id>sys0node0proc0ex4</id> - <type>unit-ex-naples</type> - <attribute><id>HUID</id><default>0x00060004</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-4</default> + <id>PM_UNDERVOLTING_FRQ_MINIMUM</id> + <default>0</default> </attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-4</default> + <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id> + <default>0</default> </attribute> <attribute> - <id>CHIP_UNIT</id> + <id>PM_SPIVID_PORT_ENABLE</id> <default>4</default> </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex5</id> - <type>unit-ex-naples</type> - <attribute><id>HUID</id><default>0x00060005</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-5</default> + <attribute> + <id>PM_APSS_CHIP_SELECT</id> + <default>0x00</default> </attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-5</default> + <id>PM_PBAX_NODEID</id> + <default>0</default> </attribute> <attribute> - <id>CHIP_UNIT</id> - <default>5</default> + <id>PM_PBAX_CHIPID</id> + <default>0</default> </attribute> -</targetInstance> - -<!-- Naples n0p0 core units --> - -<targetInstance> - <id>sys0node0proc0ex4core0</id> - <type>unit-core-naples</type> - <attribute><id>HUID</id><default>0x00070004</default></attribute> <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default> + <id>PM_PBAX_BRDCST_ID_VECTOR</id> + <default>0</default> </attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default> + <id>PM_SLEEP_ENTRY</id> + <default>0</default> </attribute> <attribute> - <id>CHIP_UNIT</id> - <default>4</default> + <id>PM_SLEEP_EXIT</id> + <default>0</default> </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0proc0ex5core0</id> - <type>unit-core-naples</type> - <attribute><id>HUID</id><default>0x00070005</default></attribute> <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default> + <id>PM_SLEEP_TYPE</id> + <default>0</default> </attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default> + <id>PM_WINKLE_ENTRY</id> + <default>0</default> </attribute> <attribute> - <id>CHIP_UNIT</id> - <default>5</default> + <id>PM_WINKLE_EXIT</id> + <default>0</default> </attribute> + <attribute> + <id>PM_WINKLE_TYPE</id> + <default>0</default> + </attribute> + <!-- End PM_ attributes --> </targetInstance> -<!-- Naples n0p0 MCS units --> -<!-- TODO: RTC 109249, check MCS units --> - +<!-- Naples n0p0 EX units: Define only EX3 for now to preserve AWAN memory (model n_2_b n1_e8014_n8_pC_c1000_cen2_cen018_unopt_1 --> <targetInstance> - <id>sys0node0proc0mcs4</id> - <type>unit-mcs-naples</type> - <attribute><id>HUID</id><default>0x000B0004</default></attribute> - <attribute> + <id>sys0node0proc0ex3</id> + <type>unit-ex-naples</type> + <attribute><id>HUID</id><default>0x00060003</default></attribute> + <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-4</default> + <default>physical:sys-0/node-0/proc-0/ex-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4</default> + <default>affinity:sys-0/node-0/proc-0/ex-3</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>4</default> - </attribute> - <attribute><id>IBSCOM_MCS_BASE_ADDR</id> - <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> - <default>0x0003E08000000000</default> - </attribute> - <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>0</default> + <default>3</default> </attribute> </targetInstance> +<!-- Set core for EX3 --> +<!-- Naples n0p0 core units --> + <targetInstance> - <id>sys0node0proc0mcs5</id> - <type>unit-mcs-naples</type> - <attribute><id>HUID</id><default>0x000B0005</default></attribute> + <id>sys0node0proc0ex3core0</id> + <type>unit-core-naples</type> + <attribute><id>HUID</id><default>0x00070003</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-5</default> + <default>physical:sys-0/node-0/proc-0/ex-3/core-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5</default> + <default>affinity:sys-0/node-0/proc-0/ex-3/core-0</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>5</default> - </attribute> - <attribute><id>IBSCOM_MCS_BASE_ADDR</id> - <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> - <default>0x0003E0A000000000</default> - </attribute> - <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>1</default> + <default>3</default> </attribute> </targetInstance> +<!-- Naples n0p0 MCS units --> +<!-- TODO: RTC 109249, check MCS units --> + <targetInstance> - <id>sys0node0proc0mcs6</id> + <id>sys0node0proc0mcs0</id> <type>unit-mcs-naples</type> - <attribute><id>HUID</id><default>0x000B0006</default></attribute> + <attribute><id>HUID</id><default>0x000B0000</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-6</default> + <default>physical:sys-0/node-0/proc-0/mcs-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-6</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>6</default> + <default>0</default> </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> - <default>0x0003E0C000000000</default> + <default>0x0003E00000000000</default> </attribute> <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>1</default> + <default>0</default> </attribute> </targetInstance> <targetInstance> - <id>sys0node0proc0mcs7</id> + <id>sys0node0proc0mcs1</id> <type>unit-mcs-naples</type> - <attribute><id>HUID</id><default>0x000B0007</default></attribute> + <attribute><id>HUID</id><default>0x000B0001</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-0/mcs-7</default> + <default>physical:sys-0/node-0/proc-0/mcs-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-7</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>7</default> + <default>1</default> </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> - <default>0x0003E0E000000000</default> + <default>0x0003E02000000000</default> </attribute> <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>1</default> + <default>0</default> </attribute> </targetInstance> @@ -735,7 +703,6 @@ </attribute> </targetInstance> -<!-- TODO: RTC 109249, check PCI --> <targetInstance> <id>sys0node0proc0pci2</id> <type>unit-pci-naples</type> @@ -754,7 +721,6 @@ </attribute> </targetInstance> - <!-- Naples n0p0 ABUS units --> <!-- TODO: RTC 109249, check ABUS --> @@ -890,9 +856,9 @@ </attribute> <attribute> <id>FRU_ID</id> - <default>0</default> + <default>1</default> </attribute> - <!-- FSI is connected via proc0:MFSI-0 --> + <!-- FSI is connected via proc0:MFSI-1 --> <attribute> <id>FSI_MASTER_CHIP</id> <default>physical:sys-0/node-0/proc-0</default> @@ -927,10 +893,10 @@ <attribute><id>VPD_REC_NUM</id><default>1</default></attribute> <attribute><id>FSP_BASE_ADDR</id> - <default>0x0003FFE100000000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>PSI_BRIDGE_BASE_ADDR</id> - <default>0x0003FFFE80100000</default> + <default>0x0000000000000000</default> </attribute> <attribute><id>INTP_BASE_ADDR</id> <default>0x0003FFFF80100000</default> @@ -953,39 +919,190 @@ 0x0003FF8300000000,0x0003FF8380000000 </default> </attribute> - <attribute><id>MEM_BASE</id> - <default>0x0000020000000000</default> - </attribute> - <attribute><id>MIRROR_BASE</id> - <default>0x0002020000000000</default> - </attribute> <attribute><id>RNG_BASE_ADDR</id> <default>0x0003FFFF40001000</default> </attribute> + <attribute><id>IBSCOM_PROC_BASE_ADDR</id> + <default>0x0003E10000000000</default> + </attribute> + <attribute><id>MSS_INTERLEAVE_ENABLE</id> + <default>0xff</default> + </attribute> + <attribute><id>PROC_DCM_INSTALLED</id> + <default>0</default> + </attribute> + + <!-- PROC_PCIE_ attributes --> + <attribute> + <id>PROC_PCIE_IOP_G2_PLL_CONTROL0</id> + <default> + 0x18F4,0x18F4 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_G3_PLL_CONTROL0</id> + <default> + 0x086C,0x086C + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_PCS_CONTROL0</id> + <default> + 0x3AE8,0x3AE8 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_PCS_CONTROL1</id> + <default> + 0x5CB9,0x5CB9 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_PLL_GLOBAL_CONTROL0</id> + <default> + 0x146,0x146 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_PLL_GLOBAL_CONTROL1</id> + <default> + 0x6D7,0x6D7 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_RX_PEAK</id> + <default> + 0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B,0xB1B + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_RX_SDL</id> + <default> + 0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A,0x294A + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_RX_VGA_CONTROL2</id> + <default> + 0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451,0x9451 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_TX_BWLOSS1</id> + <default> + 0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_TX_FIFO_OFFSET</id> + <default> + 0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294,0x4294 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_TX_RCVRDETCNTL</id> + <default> + 0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151,0x2151 + </default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_ZCAL_CONTROL</id> + <default> + 0x00000080, 0x00000080 + </default> + </attribute> + <!-- End PROC_PCIE_ attributes --> + + <!-- The default value of the following three attributes are written by --> + <!-- the FSP. They are included here because VBU/VPO uses faked PNOR. --> + <attribute> + <id>PROC_PCIE_IOP_CONFIG</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_PCIE_IOP_SWAP</id> + <default>0</default> + </attribute> + <attribute> + <id>PROC_PCIE_PHB_ACTIVE</id> + <default>0xE0</default> + </attribute> + <!-- PM_ attributes --> + <attribute> + <id>PM_UNDERVOLTING_FRQ_MINIMUM</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_UNDERVOLTING_FREQ_MAXIMUM</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_SPIVID_PORT_ENABLE</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_APSS_CHIP_SELECT</id> + <default>0xff</default> + </attribute> + <attribute> + <id>PM_PBAX_NODEID</id> + <default>0</default> + </attribute> <attribute> - <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> - <default>0xFFFF,0x0000,0xFFFF,0x0000</default> + <id>PM_PBAX_CHIPID</id> + <default>1</default> + </attribute> + <attribute> + <id>PM_PBAX_BRDCST_ID_VECTOR</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_SLEEP_ENTRY</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_SLEEP_EXIT</id> + <default>0</default> </attribute> + <attribute> + <id>PM_SLEEP_TYPE</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_WINKLE_ENTRY</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_WINKLE_EXIT</id> + <default>0</default> + </attribute> + <attribute> + <id>PM_WINKLE_TYPE</id> + <default>0</default> + </attribute> + <!-- End PM_ attributes --> </targetInstance> + +<!-- Naples n0p0 EX units: Define only EX3 & EX5 for now to preserve AWAN memory (model n_2_b n1_e8014_n8_pC_c1000_cen2_cen018_unopt_1) --> <!-- Naples n0p1 EX units Define only EX4 and EX5 for now to preserve AWAN memory --> <targetInstance> - <id>sys0node0proc1ex4</id> + <id>sys0node0proc1ex3</id> <type>unit-ex-naples</type> - <attribute><id>HUID</id><default>0x00060014</default></attribute> + <attribute><id>HUID</id><default>0x00060013</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/ex-4</default> + <default>physical:sys-0/node-0/proc-1/ex-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/ex-4</default> + <default>affinity:sys-0/node-0/proc-1/ex-3</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>4</default> + <default>3</default> </attribute> </targetInstance> @@ -1007,24 +1124,24 @@ </attribute> </targetInstance> - +<!-- Set core to ex3 --> <!-- Naples n0p1 core units --> <targetInstance> - <id>sys0node0proc1ex4core0</id> + <id>sys0node0proc1ex3core0</id> <type>unit-core-naples</type> - <attribute><id>HUID</id><default>0x00070014</default></attribute> + <attribute><id>HUID</id><default>0x00070013</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/proc-1/ex-4/core-0</default> + <default>physical:sys-0/node-0/proc-1/ex-3/core-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-1/ex-4/core-0</default> + <default>affinity:sys-0/node-0/proc-1/ex-3/core-0</default> </attribute> <attribute> <id>CHIP_UNIT</id> - <default>4</default> + <default>3</default> </attribute> </targetInstance> @@ -1390,10 +1507,6 @@ <attribute><id>RNG_BASE_ADDR</id> <default>0x0003FFFF40002000</default> </attribute> - <attribute> - <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> - <default>0xFFFF,0x0000,0xFFFF,0x0000</default> - </attribute> </targetInstance> <!-- Naples n2p0 EX units @@ -1819,10 +1932,6 @@ <attribute><id>RNG_BASE_ADDR</id> <default>0x0003FFFF40003000</default> </attribute> - <attribute> - <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id> - <default>0xFFFF,0x0000,0xFFFF,0x0000</default> - </attribute> </targetInstance> <!-- Naples n2p1 EX units @@ -2151,20 +2260,20 @@ </targetInstance> -<!-- Centaur n0p4 : start --> +<!-- Centaur n0p0 : start --> <targetInstance> - <id>sys0node0membuf4</id> + <id>sys0node0membuf0</id> <type>chip-membuf-centaur</type> - <attribute><id>HUID</id><default>0x00040004</default></attribute> - <attribute><id>POSITION</id><default>4</default></attribute> + <attribute><id>HUID</id><default>0x00040000</default></attribute> + <attribute><id>POSITION</id><default>0</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-4</default> + <default>physical:sys-0/node-0/membuf-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default> </attribute> <!-- FSI is connected via proc0:cMFSI-0 --> @@ -2192,40 +2301,41 @@ </default> </attribute> <attribute><id>VPD_REC_NUM</id><default>4</default></attribute> + <attribute><id>MSS_CACHE_ENABLE</id><default>1</default></attribute> <attribute><id>EI_BUS_TX_MSBSWAP</id> <default>0</default> </attribute> </targetInstance> -<!-- Centaur L4 affiliated with membuf4 --> +<!-- Centaur L4 affiliated with membuf0 --> <targetInstance> - <id>sys0node0membuf4l40</id> + <id>sys0node0membuf0l40</id> <type>unit-l4-centaur</type> - <attribute><id>HUID</id><default>0x000C0004</default></attribute> + <attribute><id>HUID</id><default>0x000C0000</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-4/l4-0</default> + <default>physical:sys-0/node-0/membuf-0/l4-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/l4-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/l4-0</default> </attribute> </targetInstance> -<!-- Centaur MBAs affiliated with membuf4 --> +<!-- Centaur MBAs affiliated with membuf0 --> <targetInstance> - <id>sys0node0membuf4mba0</id> + <id>sys0node0membuf0mba0</id> <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D0008</default></attribute> + <attribute><id>HUID</id><default>0x000D0000</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-4/mba-0</default> + <default>physical:sys-0/node-0/membuf-0/mba-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-0</default> </attribute> <attribute> <id>CHIP_UNIT</id> @@ -2234,16 +2344,16 @@ </targetInstance> <targetInstance> - <id>sys0node0membuf4mba1</id> + <id>sys0node0membuf0mba1</id> <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D0009</default></attribute> + <attribute><id>HUID</id><default>0x000D0001</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-4/mba-1</default> + <default>physical:sys-0/node-0/membuf-0/mba-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-1</default> </attribute> <attribute> <id>CHIP_UNIT</id> @@ -2251,22 +2361,22 @@ </attribute> </targetInstance> -<!-- Centaur n0p4 : end --> +<!-- Centaur n0p0 : end --> -<!-- Centaur n0p5 : start --> +<!-- Centaur n0p1 : start --> <targetInstance> - <id>sys0node0membuf5</id> + <id>sys0node0membuf1</id> <type>chip-membuf-centaur</type> - <attribute><id>HUID</id><default>0x00040005</default></attribute> - <attribute><id>POSITION</id><default>5</default></attribute> + <attribute><id>HUID</id><default>0x00040001</default></attribute> + <attribute><id>POSITION</id><default>1</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-5</default> + <default>physical:sys-0/node-0/membuf-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1</default> </attribute> <!-- FSI is connected via proc0:cMFSI-1 --> @@ -2293,144 +2403,42 @@ <field><id>reserved</id><value>0</value></field> </default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>5</default></attribute> - <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>1</default> - </attribute> -</targetInstance> - -<!-- Centaur L4 affiliated with membuf5 --> - -<targetInstance> - <id>sys0node0membuf5l40</id> - <type>unit-l4-centaur</type> - <attribute><id>HUID</id><default>0x000C0005</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-5/l4-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/l4-0</default> - </attribute> -</targetInstance> - -<!-- Centaur MBAs affiliated with membuf5 --> - -<targetInstance> - <id>sys0node0membuf5mba0</id> - <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D000A</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-5/mba-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-0</default> - </attribute> - <attribute> - <id>CHIP_UNIT</id> - <default>0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0membuf5mba1</id> - <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D000B</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-5/mba-1</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-1</default> - </attribute> - <attribute> - <id>CHIP_UNIT</id> - <default>1</default> - </attribute> -</targetInstance> - -<!-- Centaur n0p1 : end --> - -<!-- Centaur n2p20 : affiliated with n2p0->mcs-4 - start --> - -<targetInstance> - <id>sys0node0membuf20</id> - <type>chip-membuf-centaur</type> - <attribute><id>HUID</id><default>0x00040014</default></attribute> - <attribute><id>POSITION</id><default>20</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-20</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20</default> - </attribute> - - <!-- FSI is connected via proc2:cMFSI-0 --> - <attribute> - <id>FSI_MASTER_CHIP</id> - <default>physical:sys-0/node-0/proc-2</default> - </attribute> - <attribute> - <id>FSI_MASTER_TYPE</id> - <default>CMFSI</default> - </attribute> - <attribute> - <id>FSI_MASTER_PORT</id> - <default>0</default> - </attribute> - <attribute> - <id>FSI_SLAVE_CASCADE</id> - <default>0</default> - </attribute> - <attribute> - <id>FSI_OPTION_FLAGS</id> - <default> - <field><id>flipPort</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>20</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>4</default></attribute> + <attribute><id>MSS_CACHE_ENABLE</id><default>1</default></attribute> <attribute><id>EI_BUS_TX_MSBSWAP</id> <default>0</default> </attribute> </targetInstance> -<!-- Centaur L4 affiliated with n2p0->mcs-4/membuf-20/ --> +<!-- Centaur L4 affiliated with membuf1 --> <targetInstance> - <id>sys0node0membuf20l40</id> + <id>sys0node0membuf1l40</id> <type>unit-l4-centaur</type> - <attribute><id>HUID</id><default>0x000C0014</default></attribute> + <attribute><id>HUID</id><default>0x000C0001</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-20/l4-0</default> + <default>physical:sys-0/node-0/membuf-1/l4-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/l4-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/l4-0</default> </attribute> </targetInstance> -<!-- Centaur MBAs affiliated with n2p0->mcs-4->membuf-20-> --> +<!-- Centaur MBAs affiliated with membuf1 --> <targetInstance> - <id>sys0node0membuf20mba0</id> + <id>sys0node0membuf1mba0</id> <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D0028</default></attribute> + <attribute><id>HUID</id><default>0x000D0002</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-20/mba-0</default> + <default>physical:sys-0/node-0/membuf-1/mba-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-0</default> </attribute> <attribute> <id>CHIP_UNIT</id> @@ -2439,16 +2447,16 @@ </targetInstance> <targetInstance> - <id>sys0node0membuf20mba1</id> + <id>sys0node0membuf1mba1</id> <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D0029</default></attribute> + <attribute><id>HUID</id><default>0x000D0003</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-20/mba-1</default> + <default>physical:sys-0/node-0/membuf-1/mba-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-1</default> </attribute> <attribute> <id>CHIP_UNIT</id> @@ -2456,111 +2464,8 @@ </attribute> </targetInstance> -<!-- Centaur n2p20 : end --> - - -<!-- Centaur n2p21 : affiliated with n2p0->mcs-5 - start --> - -<targetInstance> - <id>sys0node0membuf21</id> - <type>chip-membuf-centaur</type> - <attribute><id>HUID</id><default>0x00040015</default></attribute> - <attribute><id>POSITION</id><default>21</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-21</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21</default> - </attribute> - - <!-- FSI is connected via proc2:cMFSI-1 --> - <attribute> - <id>FSI_MASTER_CHIP</id> - <default>physical:sys-0/node-0/proc-2</default> - </attribute> - <attribute> - <id>FSI_MASTER_TYPE</id> - <default>CMFSI</default> - </attribute> - <attribute> - <id>FSI_MASTER_PORT</id> - <default>1</default> - </attribute> - <attribute> - <id>FSI_SLAVE_CASCADE</id> - <default>0</default> - </attribute> - <attribute> - <id>FSI_OPTION_FLAGS</id> - <default> - <field><id>flipPort</id><value>0</value></field> - <field><id>reserved</id><value>0</value></field> - </default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>21</default></attribute> - <attribute><id>EI_BUS_TX_MSBSWAP</id> - <default>1</default> - </attribute> -</targetInstance> - -<!-- Centaur L4 affiliated with n2p0->mcs-5/membuf-21/ --> - -<targetInstance> - <id>sys0node0membuf21l40</id> - <type>unit-l4-centaur</type> - <attribute><id>HUID</id><default>0x000C0015</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-21/l4-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/l4-0</default> - </attribute> -</targetInstance> - -<!-- Centaur MBAs affiliated with n2p0->mcs-5->membuf-21-> --> - -<targetInstance> - <id>sys0node0membuf21mba0</id> - <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D002A</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-21/mba-0</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-0</default> - </attribute> - <attribute> - <id>CHIP_UNIT</id> - <default>0</default> - </attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0membuf21mba1</id> - <type>unit-mba-centaur</type> - <attribute><id>HUID</id><default>0x000D002B</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/membuf-21/mba-1</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-1</default> - </attribute> - <attribute> - <id>CHIP_UNIT</id> - <default>1</default> - </attribute> -</targetInstance> +<!-- Centaur n0p1 : end --> -<!-- Centaur n2p21 : end --> <!-- DIMMS id/physical is sys-0/node-0/dimm-[d] @@ -2569,19 +2474,19 @@ where i=[0-7] j=[0-7] k=[0-1] l=[0-1] m=[0-1] --> -<!-- DIMMS connected to sys-0/node-0/proc-0/mcs-4/membuf-4 --> +<!-- DIMMS connected to sys-0/node-0/proc-0/mcs-0/membuf-0 --> <targetInstance> - <id>sys0node0dimm32</id> + <id>sys0node0dimm0</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030020</default></attribute> + <attribute><id>HUID</id><default>0x00030000</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-32</default> + <default>physical:sys-0/node-0/dimm-0</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-0/dimm-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-0/dimm-0</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2591,206 +2496,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>32</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm33</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030021</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-33</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-0/dimm-1</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>33</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm34</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030022</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-34</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-0/dimm-2</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>34</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm35</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030023</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-35</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-0/dimm-3</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>35</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm36</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030024</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-36</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-1/dimm-0</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>36</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm37</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030025</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-37</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-1/dimm-1</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>37</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm38</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030026</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-38</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-1/dimm-2</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>38</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm39</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030027</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-39</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mba-1/dimm-3</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>39</default></attribute> -</targetInstance> - -<!-- DIMMS connected to sys-0/node-0/proc-0/mcs-5/membuf-5 --> - -<targetInstance> - <id>sys0node0dimm40</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030028</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-40</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-0/dimm-0</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>40</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>0</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm41</id> + <id>sys0node0dimm1</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x00030029</default></attribute> + <attribute><id>HUID</id><default>0x00030001</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-41</default> + <default>physical:sys-0/node-0/dimm-1</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-0/dimm-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-0/dimm-1</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2800,20 +2519,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>41</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>1</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm42</id> + <id>sys0node0dimm2</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002A</default></attribute> + <attribute><id>HUID</id><default>0x00030002</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-42</default> + <default>physical:sys-0/node-0/dimm-2</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-0/dimm-2</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-0/dimm-2</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2823,20 +2542,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>42</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>2</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm43</id> + <id>sys0node0dimm3</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002B</default></attribute> + <attribute><id>HUID</id><default>0x00030003</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-43</default> + <default>physical:sys-0/node-0/dimm-3</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-0/dimm-3</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-0/dimm-3</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2846,20 +2565,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>43</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>3</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm44</id> + <id>sys0node0dimm4</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002C</default></attribute> + <attribute><id>HUID</id><default>0x00030004</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-44</default> + <default>physical:sys-0/node-0/dimm-4</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-1/dimm-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-1/dimm-0</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2869,20 +2588,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>44</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>4</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm45</id> + <id>sys0node0dimm5</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002D</default></attribute> + <attribute><id>HUID</id><default>0x00030005</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-45</default> + <default>physical:sys-0/node-0/dimm-5</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-1/dimm-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-1/dimm-1</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2892,20 +2611,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>45</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>5</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm46</id> + <id>sys0node0dimm6</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002E</default></attribute> + <attribute><id>HUID</id><default>0x00030006</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-46</default> + <default>physical:sys-0/node-0/dimm-6</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-1/dimm-2</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-1/dimm-2</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2915,20 +2634,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>46</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>6</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm47</id> + <id>sys0node0dimm7</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x0003002F</default></attribute> + <attribute><id>HUID</id><default>0x00030007</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-47</default> + <default>physical:sys-0/node-0/dimm-7</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mba-1/dimm-3</default> + <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mba-1/dimm-3</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -2938,114 +2657,22 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>47</default></attribute> -</targetInstance> - -<!-- DIMMS connected to sys-0/node-0/proc-2/mcs-4/membuf-20 --> - -<targetInstance> - <id>sys0node0dimm160</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A0</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-160</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-0/dimm-0</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>32</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm161</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A1</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-161</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-0/dimm-1</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>33</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm162</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A2</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-162</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-0/dimm-2</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>34</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>7</default></attribute> </targetInstance> -<targetInstance> - <id>sys0node0dimm163</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A3</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-163</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-0/dimm-3</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>35</default></attribute> -</targetInstance> +<!-- DIMMS connected to sys-0/node-0/proc-0/mcs-1/membuf-1 --> <targetInstance> - <id>sys0node0dimm164</id> + <id>sys0node0dimm8</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A4</default></attribute> + <attribute><id>HUID</id><default>0x00030008</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-164</default> + <default>physical:sys-0/node-0/dimm-8</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-1/dimm-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-0/dimm-0</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3055,20 +2682,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>36</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>8</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm165</id> + <id>sys0node0dimm9</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A5</default></attribute> + <attribute><id>HUID</id><default>0x00030009</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-165</default> + <default>physical:sys-0/node-0/dimm-9</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-1/dimm-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-0/dimm-1</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3078,20 +2705,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>37</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>9</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm166</id> + <id>sys0node0dimm10</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A6</default></attribute> + <attribute><id>HUID</id><default>0x0003000A</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-166</default> + <default>physical:sys-0/node-0/dimm-10</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-1/dimm-2</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-0/dimm-2</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3101,20 +2728,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>38</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>10</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm1679</id> + <id>sys0node0dimm11</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A7</default></attribute> + <attribute><id>HUID</id><default>0x0003000B</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-167</default> + <default>physical:sys-0/node-0/dimm-11</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-20/mba-1/dimm-3</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-0/dimm-3</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3124,22 +2751,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>39</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>11</default></attribute> </targetInstance> -<!-- DIMMS connected to sys-0/node-0/proc-2/mcs-5/membuf-21 --> - <targetInstance> - <id>sys0node0dimm168</id> + <id>sys0node0dimm12</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A8</default></attribute> + <attribute><id>HUID</id><default>0x0003000C</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-168</default> + <default>physical:sys-0/node-0/dimm-12</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-0/dimm-0</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-1/dimm-0</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3149,20 +2774,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>40</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>12</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm169</id> + <id>sys0node0dimm13</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300A9</default></attribute> + <attribute><id>HUID</id><default>0x0003000D</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-169</default> + <default>physical:sys-0/node-0/dimm-13</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-0/dimm-1</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-1/dimm-1</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3172,20 +2797,20 @@ <id>MBA_PORT</id> <default>0</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>41</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>13</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm170</id> + <id>sys0node0dimm14</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AA</default></attribute> + <attribute><id>HUID</id><default>0x0003000E</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-170</default> + <default>physical:sys-0/node-0/dimm-14</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-0/dimm-2</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-1/dimm-2</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3195,20 +2820,20 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>42</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>14</default></attribute> </targetInstance> <targetInstance> - <id>sys0node0dimm171</id> + <id>sys0node0dimm15</id> <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AB</default></attribute> + <attribute><id>HUID</id><default>0x0003000F</default></attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-171</default> + <default>physical:sys-0/node-0/dimm-15</default> </attribute> <attribute> <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-0/dimm-3</default> + <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-1/mba-1/dimm-3</default> </attribute> <attribute> <id>MBA_DIMM</id> @@ -3218,99 +2843,8 @@ <id>MBA_PORT</id> <default>1</default> </attribute> - <attribute><id>VPD_REC_NUM</id><default>43</default></attribute> + <attribute><id>VPD_REC_NUM</id><default>15</default></attribute> </targetInstance> -<targetInstance> - <id>sys0node0dimm172</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AC</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-172</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-1/dimm-0</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>44</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm173</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AD</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-173</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-1/dimm-1</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>0</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>45</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm174</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AE</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-174</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-1/dimm-2</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>0</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>46</default></attribute> -</targetInstance> - -<targetInstance> - <id>sys0node0dimm175</id> - <type>lcard-dimm-cdimm</type> - <attribute><id>HUID</id><default>0x000300AF</default></attribute> - <attribute> - <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/dimm-175</default> - </attribute> - <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-21/mba-1/dimm-3</default> - </attribute> - <attribute> - <id>MBA_DIMM</id> - <default>1</default> - </attribute> - <attribute> - <id>MBA_PORT</id> - <default>1</default> - </attribute> - <attribute><id>VPD_REC_NUM</id><default>47</default></attribute> -</targetInstance> </attributes> diff --git a/src/usr/targeting/targetservicestart.C b/src/usr/targeting/targetservicestart.C index d3446b4c3..4252ca32b 100644 --- a/src/usr/targeting/targetservicestart.C +++ b/src/usr/targeting/targetservicestart.C @@ -53,6 +53,8 @@ #include <errl/errlentry.H> #include <errl/errlmanager.H> #include <devicefw/userif.H> +#include <config.h> + //****************************************************************************** // targetService @@ -117,8 +119,11 @@ static void initTargeting(errlHndl_t& io_pError) l_pTopLevel->getAttrAsString<ATTR_MODEL>()); } +// No error module loaded in VPO to save load time +#ifndef CONFIG_VPO_COMPILE // call ErrlManager function - tell him that TARG is ready! ERRORLOG::ErrlManager::errlResourceReady(ERRORLOG::TARG); +#endif } TARG_EXIT(); |