diff options
Diffstat (limited to 'src')
27 files changed, 688 insertions, 926 deletions
diff --git a/src/HBconfig b/src/HBconfig new file mode 100644 index 000000000..6902e8a35 --- /dev/null +++ b/src/HBconfig @@ -0,0 +1,5 @@ +# HBconfig file for VPO_COMPILE option +config VPO_COMPILE + default n + help + Compile and build image for VPO environment diff --git a/src/build/buildpnor/pnorLayoutVpo.xml b/src/build/buildpnor/pnorLayoutVpo.xml index 15a3a94da..6b0aa2994 100644 --- a/src/build/buildpnor/pnorLayoutVpo.xml +++ b/src/build/buildpnor/pnorLayoutVpo.xml @@ -5,7 +5,9 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- COPYRIGHT International Business Machines Corp. 2012,2014 --> +<!-- Contributors Listed Below - COPYRIGHT 2012,2014 --> +<!-- [+] International Business Machines Corp. --> +<!-- --> <!-- --> <!-- Licensed under the Apache License, Version 2.0 (the "License"); --> <!-- you may not use this file except in compliance with the License. --> @@ -25,13 +27,14 @@ <imageSize>0x400000</imageSize> <blockSize>0x1000</blockSize> <partTableSize>0x1</partTableSize> + <sideAOffset>0x0</sideAOffset> + <sideBOffset>0x0</sideBOffset> </metadata> <section> <description>Table of Contents (2K)</description> <eyeCatch>part</eyeCatch> <physicalOffset>0</physicalOffset> <physicalRegionSize>0x1000</physicalRegionSize> - <ecc>no</ecc> <source>Generate</source> <sideless>no</sideless> </section> @@ -42,7 +45,6 @@ <physicalOffset>0x1000</physicalOffset> <physicalRegionSize>0x40000</physicalRegionSize> <actualRegionSize>0x40000</actualRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>yes</sideless> </section> @@ -53,7 +55,6 @@ <physicalOffset>0x41000</physicalOffset> <physicalRegionSize>0x20000</physicalRegionSize> <actualRegionSize>0x20000</actualRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>yes</sideless> </section> @@ -64,7 +65,6 @@ <physicalOffset>0x61000</physicalOffset> <physicalRegionSize>0x20000</physicalRegionSize> <actualRegionSize>0x20000</actualRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>yes</sideless> </section> @@ -74,7 +74,6 @@ <eyeCatch>HBI</eyeCatch> <physicalOffset>0x81000</physicalOffset> <physicalRegionSize>0x300000</physicalRegionSize> - <ecc>no</ecc> <source>File</source> <sideless>no</sideless> </section> @@ -85,7 +84,6 @@ <physicalOffset>0x381000</physicalOffset> <physicalRegionSize>0x31000</physicalRegionSize> <actualRegionSize>0x30000</actualRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>no</sideless> </section> @@ -96,7 +94,6 @@ <physicalOffset>0x3B2000</physicalOffset> <physicalRegionSize>0x10000</physicalRegionSize> <actualRegionSize>0x10000</actualRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>no</sideless> </section> @@ -106,7 +103,6 @@ <eyeCatch>HBD</eyeCatch> <physicalOffset>0x3C2000</physicalOffset> <physicalRegionSize>0x20000</physicalRegionSize> - <ecc>no</ecc> <source>File</source> <sideless>no</sideless> </section> @@ -115,7 +111,6 @@ <eyeCatch>GUARD</eyeCatch> <physicalOffset>0x3E2000</physicalOffset> <physicalRegionSize>0x4000</physicalRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>no</sideless> </section> @@ -125,7 +120,6 @@ <eyeCatch>SBEC</eyeCatch> <physicalOffset>0x3E6000</physicalOffset> <physicalRegionSize>0x10000</physicalRegionSize> - <ecc>no</ecc> <source>Blank</source> <sideless>no</sideless> </section> diff --git a/src/build/vpo/Setup_Env b/src/build/vpo/Setup_Env index cff25e1da..682f51a95 100644 --- a/src/build/vpo/Setup_Env +++ b/src/build/vpo/Setup_Env @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -48,6 +50,8 @@ # Version 1.5 10-09-2012 Added m_9_g/m_10_g/m_10_h models # # Version 1.6 01-03-2012 Updated for m_10_b, m_11_a +# Version 1.7 09-23-2014 Updated for n_1_a (Naples) +# ################################################################################ # Define useful pointers to automated tests/scripts @@ -74,7 +78,7 @@ AUTOVBU_HBVBUTOOLS_BASEDIR=/gsa/ausgsa/projects/h/hostboot/vbutools # Remove any previous test definitions for HostBoot values - force everything to default if not set # by Setup_MyEnv function or user specifed argument(s) -unset HB_IMGDIR HB_RELDIR HB_VBUTOOLS DEFAULT_LEVEL +#unset HB_IMGDIR HB_RELDIR HB_VBUTOOLS DEFAULT_LEVEL unset AWAN_CONFIG AWAN_SCRIPT AUTOVBU_ECMD_VER unset AUTOVBU_START AUTOVBU_ISTEP_START AUTOVBU_ISTEP_LIST AUTOVBU_ISTEP_CHKPT unset ISTEP_ROOT ISTEP_ROOT_JIM @@ -90,17 +94,18 @@ unset HB_VBUPNOR_ADDR HB_SYSMVPD_ADDR HB_SYSSPD_ADDR Setup_MyEnv() { # Default Sprint release - sprint=hb0107a_1250.810 + sprint=hb1107b_1445.820 # Initialize HostBoot environment/cronus/tools - note new naming convention - export AUTOVBU_CRONUS_SIM=dev + export AUTOVBU_CRONUS_SIM=rel - export ISTEP_ARCHIVE=archives/13.01.08 + export ISTEP_ARCHIVE=archives/14.12.01 + export VBU_PROCS_ROOT=/afs/awd.austin.ibm.com/projects/eclipz/lab/p8/compiled_procs/$ISTEP_ARCHIVE/procs export GLOBAL_DEBUG=8.VW.Vc.dG.F3.0I.E8.V - export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.20130110 + export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.20141101 # Select default model -- choose either VBU or VPO versions - export VPO_MODEL=m_11_a; unset VBU_MODEL; VBUVPO=VPO + export VPO_MODEL=n_2_b; unset VBU_MODEL; VBUVPO=VPO # Default AWAN request time - shorter periods get AWAN faster @@ -108,20 +113,18 @@ Setup_MyEnv() { # Default AWAN request server - export ASUBMIT_SERVER=asubmit1.pok.ibm.com + export ASUBMIT_SERVER=${ASUBMIT_SERVER-asubmit2.pok.ibm.com} # Default sprint test case settings export AUTOVBU_CORE=-cft export AUTOVBU_SIMCLOCKS=5000000 - export AUTOVBU_INITIAL_CHKPT=after_real_proc_sbe.chkpt + export AUTOVBU_INITIAL_CHKPT=mcguirej_14.10.05_real_after_istep_s5.chkpt export AUTOVBU_LOOPS=1200 export AUTOVBU_PRINTK_LINES=50 # Values used internally by automated tools - export AUTOVPO_ROOTDIR=/afs/apd/func/awanng/vpo/vpo1/mur - test "$MY_BSO_ID" = "" && echo "Warning: Set MY_BSO_ID to IBM intranet ID if BSO firewall required" return 0 @@ -234,11 +237,11 @@ Setup_MyDynamic() { # Set remaining HostBoot variables now that we have all user supplied settings - export HB_RELDIR=${HB_RELDIR-`echo $AUTOVBU_HBRELEASE_BASEDIR/*$sprint`} - if [ ! -d "$HB_RELDIR" ]; then - echo "Can not find Sprint Release directory: $HB_RELDIR" - return 1 - fi + export HB_RELDIR=${HB_RELDIR-`ls -1drt $AUTOVBU_HBRELEASE_BASEDIR/*820/tools|tail -1`} + if [ ! -d "$HB_RELDIR" ]; then + echo "Can not find Release directory: $HB_RELDIR" + return 1 + fi export HB_VBUTOOLS=${HB_VBUTOOLS-$AUTOVBU_HBVBUTOOLS_BASEDIR/$AUTOVBU_CRONUS_SIM} if [ ! -d "$HB_VBUTOOLS" ]; then @@ -257,6 +260,18 @@ Setup_MyDynamic() { # Dynamically determine if specifed model is for VPO or VBU if [ "$VPO_MODEL" != "" ]; then + case "$VPO_MODEL" + in + n*) + export AUTOVPO_ROOTDIR=/afs/apd/func/awanng/vpo/vpo1/nap + ;; + v*) + export AUTOVPO_ROOTDIR=/afs/apd/func/awanng/vpo/vpo1/ven + ;; + *) + export AUTOVPO_ROOTDIR=/afs/apd/func/awanng/vpo/vpo1/mur + ;; + esac if [ ! -d $AUTOVPO_ROOTDIR/$VPO_MODEL ]; then export VBU_MODEL=$VPO_MODEL; unset VPO_MODEL VBUVPO=VBU @@ -270,22 +285,18 @@ Setup_MyDynamic() { # Set other defaults based upon MODEL case "$VPO_MODEL$VBU_MODEL" in + n1_e8*|n_*_a|n_*_b) + export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1} + export AWAN_CONFIG=${AWAN_CONFIG-sp4b} + export AWAN_SCRIPT=run_script_sp4b_autovpo + ;; + s1_e8042_c0400_cen1_cen0*|m_10_b|s1_e8053_n8_p8_c0400_cen1_cen081_unopt_1|m_11_a) export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1} export AWAN_CONFIG=${AWAN_CONFIG-star8b} unset DEFAULT_LEVEL ;; - s1_e8052_nA_p8_c0400_cen1_cen081_unopt_1|s1_e8052_c0400_cen1_cen081_unopt_1|s1_e8050_c0400_cen1_cen081_unopt_1|s1_e8050_nA_p8_c0400_cen1_cen081_unopt_1|m_9_a|m_9_g|m_10_g) - export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1} - export AWAN_CONFIG=${AWAN_CONFIG-star12b} - unset DEFAULT_LEVEL - ;; - s1_e8052_nA_pC_c0400_cen1_cen081_unopt_1|s1_e8050_he_cen1_cen081_nA_pC_c0400_unopt_1|m_10_h) - export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1} - export AWAN_CONFIG=${AWAN_CONFIG-star24b} - unset DEFAULT_LEVEL - ;; *) export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1} export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b} @@ -408,7 +419,7 @@ Setup_MyTarget() { if [ -f "$MY_AWAN_HAVE" ]; then if [ ! -f "$MY_AWAN_TARGET" ]; then # Pause a while for target to initialize - for i in 0 1 2 3 4 5 + for i in `seq 1 10` do test -f "$MY_AWAN_TARGET" && break echo "Waiting for $MY_AWAN_TARGET" @@ -435,8 +446,8 @@ Setup_MyTarget() { if [ -f "$CRONUS_HOME/cnfgs/${my_target}_cnfg" ]; then # Update target cronus config file - setconfig HW_PROCEDURE_PATH $HB_VBUTOOLS -quiet - getconfig HW_PROCEDURE_PATH -quiet + getconfig HW_PROCEDURE_PATH -quiet | grep -s $HB_VBUTOOLS + test $? || setconfig HW_PROCEDURE_PATH $HB_VBUTOOLS setconfig GLOBAL_DEBUG $GLOBAL_DEBUG -quiet getconfig GLOBAL_DEBUG -quiet @@ -468,7 +479,45 @@ Setup_MyHBImage() { # Load initial checkpoint first set -x - siminit ${AUTOVBU_INITIAL_CHKPT-after_proc_sbe} -quiet || return 1 + siminit ${AUTOVBU_INITIAL_CHKPT-after_istep_s5} -quiet || return 1 + + # Guarantee 4K padding for L3 + dd if=$HB_IMGDIR/hbicore${use_test}.bin of=$PWD/hbicore.bin bs=4k conv=sync status=noxfer + + if [ "$MODEL_ROOT" == "/afs/apd/func/awanng/vpo/vpo1/mur" ]; then + dd if=$HB_IMGDIR/vbu_MURANO_mbx.pnor of=$PWD/vbu.pnor bs=4k conv=sync status=noxfer + else + dd if=$HB_IMGDIR/vbu_VENICE_mbx.pnor of=$PWD/vbu.pnor bs=4k conv=sync status=noxfer + fi + if [ -f ${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/sysmvpd.dat ]; then + dd if=${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/sysmvpd.dat of=$PWD/sysmvpd.dat bs=4k conv=sync status=noxfer + dd if=${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/syscvpd.dat of=$PWD/syscvpd.dat bs=4k conv=sync status=noxfer + dd if=${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/sysspd.dat of=$PWD/sysspd.dat bs=4k conv=sync status=noxfer + else + dd if=$JP/auto/VPD-13.02.19/sysmvpd.dat of=$PWD/sysmvpd.dat bs=4k conv=sync status=noxfer + dd if=$JP/auto/VPD-13.02.19/syscvpd.dat of=$PWD/syscvpd.dat bs=4k conv=sync status=noxfer + dd if=$JP/auto/VPD-13.02.19/sysspd.dat of=$PWD/sysspd.dat bs=4k conv=sync status=noxfer + fi + if [ -f ${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/procpore.dat ]; then + dd if=${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/procpore.dat of=$PWD/procpore.dat bs=4k conv=sync status=noxfer + else + dd if=$JP/auto/VPD-13.04.16/procpore.dat of=$PWD/procpore.dat bs=4k conv=sync status=noxfer + fi + if [ -f ${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/censbe.dat ]; then + dd if=${AUTOFSP_VPD_IMGDIR-$HB_IMGDIR}/censbe.dat of=$PWD/censbe.dat bs=4k conv=sync status=noxfer + fi + ls -l hbicore.bin vbu.pnor sysmvpd.dat syscvpd.dat sysspd.dat procpore.dat + + # Note: The loading addresses must match the PNOR layout in src/build/buildpnor/pnorLayoutVpo.xml + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/hbicore.bin -b -cft + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/vbu.pnor -o ${HB_VBUPNOR_ADDR-0x400000} -b -cft + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/sysmvpd.dat -o ${HB_SYSMVPD_ADDR-0x401000} -b -cft + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/sysspd.dat -o ${HB_SYSSPD_ADDR-0x441000} -b -cft + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/syscvpd.dat -o ${HB_SYSCVPD_ADDR-0x461000} -b -cft + /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/procpore.dat -o ${HB_PROCPORE_ADDR-0x781000} -b -cft + test -f $PWD/censbe.dat && /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/censbe.dat -o ${HB_CENSBE_ADDR-0x7E6000} -b -cft + rm -f hbicore.bin vbu.pnor sysmvpd.dat syscvpd.dat sysspd.dat procpore.dat censbe.dat + $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/hbicore${use_test}.bin -b ${AUTOVBU_CORE--cft} || return 1 $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/vbu${use_test}.pnor -o ${HB_VBUPNOR_ADDR-0x480000} -b ${AUTOVBU_CORE--cft} || return 1 if [ -f ${HB_IMGDIR}/sysmvpd.dat ]; then @@ -476,6 +525,20 @@ Setup_MyHBImage() { $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/sysspd.dat -o ${HB_SYSSPD_ADDR-0x4C1000} -b ${CORE--cft} || return 1 fi putscom pu.ex 10013284 FAC0FAC0FAC0FAC0 -p0 -call -quiet + # Workaround for power management PCB OFFLINE + for core in `ecmdquery chips -ep -dc -quiet | grep ex | sed -n -e 's/-k0 -n0 -s0 ...ex -p00 -c//p' | awk '{ printf "%x\n",$ARGV[0]; }'` + do + putscom pu 1${core}0F0105 0280000000000000 -all -quiet + done + + # Set PNOR mode to fake PNOR using Scratch 1 (This is no longer needed since we use a custom image that always use faked PNOR) + # putscom pu.ex 10013284 FAC0FAC0FAC0FAC0 -p0 -cft -quiet + # putscom pu.ex 10013285 0000000000000001 -p0 -cft -quiet + # putscom pu 050038 0000000000000000 -cft -quiet + # putscom pu 050039 0000000000000000 -cft -quiet + # putscom pu 05003a 0000000000000000 -cft -quiet + # putscom pu 05003b 0000000000000000 -cft -quiet + set +x fi @@ -526,19 +589,27 @@ Setup_MyDynamic || return 1 echo echo "Performing HostBoot setup/initialization for $VBUVPO model $VBU_MODEL$VPO_MODEL" echo -echo "Sprint Release directory: $HB_RELDIR" +echo "Release directory: $HB_RELDIR" echo "Using HB_IMGDIR: $HB_IMGDIR" echo "Using ecmdsetup version: $AUTOVBU_ECMD_VER" echo "Using Cronus version: $AUTOVBU_CRONUS_SIM" echo "Using HB_VBUTOOLS version: `basename $HB_VBUTOOLS`" echo "Using HB_TOOLS version: `basename $HB_TOOLS`" +if [ "`basename $HB_TOOLS`" == "vpo" ]; then + r=`dirname $HB_TOOLS` + echo "Using HB_TOOLS version: `basename $r`/vpo" + unset r +else + echo "Using HB_TOOLS version: `basename $HB_TOOLS`" +fi echo sleep 2 # Setup ecmd/cronusflex -ecmdsetup auto cro $AUTOVBU_ECMD_VER $AUTOVBU_CRONUS_SIM sim pok +unset LD_LIBRARY_PATH +ecmdsetup auto cro $AUTOVBU_ECMD_VER $AUTOVBU_CRONUS_SIM $AUTOVBU_CRONUS_COPYLOCAL sim pok # Get an AWAN if requested, or reuse an existing connection if found diff --git a/src/build/vpo/hb-istep b/src/build/vpo/hb-istep index f5547f180..3df083961 100755 --- a/src/build/vpo/hb-istep +++ b/src/build/vpo/hb-istep @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2011,2014 +# Contributors Listed Below - COPYRIGHT 2011,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -1033,7 +1035,7 @@ sub setMode( $ ) ( system( $clearcmd ) == 0 ) or die "$clearcmd failed, $? : $! \n"; - print "Use attributes to control SPLess mode" + print "Use attributes to control SPLess mode"; $expected = 1; } else diff --git a/src/build/vpo/vpo.config b/src/build/vpo/vpo.config new file mode 100755 index 000000000..63851db00 --- /dev/null +++ b/src/build/vpo/vpo.config @@ -0,0 +1,5 @@ +# Configuration for VPO compilation +set SFC_IS_FAKE +set BMC_DOES_SFC_INIT +unset SFC_IS_IBM_DPSS +set VPO_COMPILE diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H index d3c91e555..6ea16a920 100644 --- a/src/include/usr/isteps/istep09list.H +++ b/src/include/usr/isteps/istep09list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -49,6 +51,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/activate_powerbus/activate_powerbus.H" +#include <config.h> namespace INITSERVICE { @@ -58,6 +61,8 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, +// Reduce ext img for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(09,01,"proc_build_smp"), ACTIVATE_POWERBUS::call_proc_build_smp, @@ -68,14 +73,17 @@ namespace INITSERVICE ACTIVATE_POWERBUS::call_host_slave_sbe_update, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep09Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libactivate_powerbus.so), DEP_LIB(libdram_initialization.so), DEP_LIB(libsbe.so), DEP_LIB(libbuild_winkle_images.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H index aa48cc11b..cd40eea4f 100644 --- a/src/include/usr/isteps/istep10list.H +++ b/src/include/usr/isteps/istep10list.H @@ -71,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H" +#include <config.h> namespace INITSERVICE { @@ -81,6 +82,9 @@ const TaskInfo g_istep10[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended img size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(10,01,"host_prd_hwreconfig"), HWAS::host_prd_hwreconfig, @@ -151,10 +155,13 @@ const TaskInfo g_istep10[] = { HWAS::host_stub, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif + }; const DepModInfo g_istep10Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libsbe_centaur_init.so), DEP_LIB(libfapiporeve.so), DEP_LIB(libporeve.so), @@ -162,6 +169,7 @@ const DepModInfo g_istep10Dependancies = { DEP_LIB(libsbe.so), DEP_LIB(libproc_hwreconfig.so), DEP_LIB(libslave_sbe.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index 85a901b64..7006c83c2 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -69,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/dmi_training/dmi_training.H" +#include <config.h> namespace INITSERVICE { @@ -79,6 +82,9 @@ const TaskInfo g_istep11[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(11,01,"mss_getecid"), DMI_TRAINING::call_mss_getecid, @@ -144,13 +150,16 @@ const TaskInfo g_istep11[] = { DMI_TRAINING::call_cen_set_inband_addr, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep11Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdmi_training.so), DEP_LIB(libedi_ei_initialization.so), DEP_LIB(libnest_chiplets.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index 824016ac8..2e724f25c 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -69,6 +69,8 @@ const TaskInfo g_istep12[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, +// To reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(12,01,"host_collect_dimm_spd"), MC_CONFIG::call_host_collect_dimm_spd, @@ -94,11 +96,15 @@ const TaskInfo g_istep12[] = { MC_CONFIG::call_mss_attr_update, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep12Dependancies = { { +// To reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libmc_config.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index 842ac6c5e..e717a4a66 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -71,6 +71,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/dram_training/dram_training.H" +#include <config.h> namespace INITSERVICE { @@ -80,6 +81,9 @@ const TaskInfo g_istep13[] = { NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce extended image size for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(13,01,"host_disable_vddr"), DRAM_TRAINING::call_host_disable_vddr, @@ -140,12 +144,15 @@ const TaskInfo g_istep13[] = { DRAM_TRAINING::call_mss_dimm_power_test, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, +#endif }; const DepModInfo g_istep13Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdram_training.so), DEP_LIB(libdram_initialization.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H index 73c612c38..d4ebcd88f 100644 --- a/src/include/usr/isteps/istep14list.H +++ b/src/include/usr/isteps/istep14list.H @@ -58,6 +58,7 @@ #include <initservice/initsvcstructs.H> #include <initservice/initsvcreasoncodes.H> +#include <config.h> // include prototypes file #include "../../../usr/hwpf/hwp/dram_initialization/dram_initialization.H" @@ -70,6 +71,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// Reduce ext img for VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(14,01,"host_startprd_dram"), DRAM_INITIALIZATION::call_host_startprd_dram, @@ -115,14 +119,17 @@ namespace INITSERVICE DRAM_INITIALIZATION::call_host_mpipl_service, { START_FN, EXT_IMAGE, MPIPL_OP, true } }, +#endif }; const DepModInfo g_istep14Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libdram_initialization.so), DEP_LIB(libdram_training.so), DEP_LIB(libdump.so), DEP_LIB(libnest_chiplets.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H index d7774cad3..9c0bc2e86 100644 --- a/src/include/usr/isteps/istep15list.H +++ b/src/include/usr/isteps/istep15list.H @@ -49,6 +49,7 @@ // include prototypes file #include "../../../usr/hwpf/hwp/build_winkle_images/build_winkle_images.H" +#include <config.h> namespace INITSERVICE { @@ -58,6 +59,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(15,01,"host_build_winkle"), BUILD_WINKLE_IMAGES::call_host_build_winkle, @@ -73,13 +77,17 @@ namespace INITSERVICE BUILD_WINKLE_IMAGES::call_p8_poreslw_init, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true } }, +#endif + }; const DepModInfo g_istep15Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libocc.so), DEP_LIB(libbuild_winkle_images.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index 3a4129ec0..3ce23445b 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -45,6 +47,7 @@ #include <initservice/initsvcstructs.H> #include <initservice/initsvcreasoncodes.H> +#include <config.h> // include prototypes file #include "../../../usr/hwpf/hwp/tod_init/tod_init.H" @@ -118,6 +121,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(18,13,"proc_tod_setup"), TOD::call_tod_setup, @@ -128,11 +134,15 @@ namespace INITSERVICE TOD::call_tod_init, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } }, +#endif + }; const DepModInfo g_istep18Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libtod_init.so), +#endif NULL } }; diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index 52a8311dd..0d024d021 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -64,6 +64,9 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + +// To reduce extended image size for VPO, don't run these isteps in VPO +#ifndef CONFIG_VPO_COMPILE { ISTEPNAME(21,01,"host_runtime_setup"), START_PAYLOAD::call_host_runtime_setup, @@ -79,10 +82,13 @@ namespace INITSERVICE START_PAYLOAD::call_host_start_payload, { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false } }, +#endif + }; const DepModInfo g_istep21Dependancies = { { +#ifndef CONFIG_VPO_COMPILE DEP_LIB(libbuild_winkle_images.so), DEP_LIB(libstart_payload.so), DEP_LIB(libruntime.so), @@ -95,6 +101,7 @@ const DepModInfo g_istep21Dependancies = { DEP_LIB(libhtmgt.so), DEP_LIB(libmc_config.so), #endif +#endif NULL } }; diff --git a/src/makefile b/src/makefile index 46b0b3d65..aa8eda966 100644 --- a/src/makefile +++ b/src/makefile @@ -34,6 +34,8 @@ SUBDIRS += usr.d SUBDIRS += build.d SUBDIRS += runtime.d +# Reducing HB extended img size for VPO by disabling certain libs using +# CONFIG_VPO_COMPILE option IMGS += hbicore IMGS += hbicore_test IMGS += hbirt @@ -129,33 +131,33 @@ EXTENDED_MODULES += intr EXTENDED_MODULES += scan EXTENDED_MODULES += vpd EXTENDED_MODULES += dmi_training -EXTENDED_MODULES += fapiporeve +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,fapiporeve) EXTENDED_MODULES += poreve EXTENDED_MODULES += util EXTENDED_MODULES += tracedaemon -EXTENDED_MODULES += sbe_centaur_init -EXTENDED_MODULES += mc_config -EXTENDED_MODULES += dram_training -EXTENDED_MODULES += mdia +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,sbe_centaur_init) +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,mc_config) +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dram_training) +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,mdia) EXTENDED_MODULES += mbox EXTENDED_MODULES += prdf EXTENDED_MODULES += bus_training -EXTENDED_MODULES += activate_powerbus +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,activate_powerbus) EXTENDED_MODULES += build_winkle_images EXTENDED_MODULES += core_activate -EXTENDED_MODULES += dram_initialization +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dram_initialization) EXTENDED_MODULES += edi_ei_initialization EXTENDED_MODULES += establish_system_smp EXTENDED_MODULES += occ EXTENDED_MODULES += nest_chiplets -EXTENDED_MODULES += start_payload +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,start_payload) EXTENDED_MODULES += thread_activate EXTENDED_MODULES += slave_sbe EXTENDED_MODULES += attn -EXTENDED_MODULES += runtime +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,runtime) EXTENDED_MODULES += ibscom -EXTENDED_MODULES += dump -EXTENDED_MODULES += tod_init +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dump) +EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,tod_init) EXTENDED_MODULES += secureboot_ext EXTENDED_MODULES += devtree EXTENDED_MODULES += sbe @@ -192,14 +194,14 @@ TESTCASE_MODULES += testvpd TESTCASE_MODULES += testpore TESTCASE_MODULES += testutil TESTCASE_MODULES += testmbox -TESTCASE_MODULES += testmdia +TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia) TESTCASE_MODULES += testprdf TESTCASE_MODULES += testattn TESTCASE_MODULES += testscan -TESTCASE_MODULES += testruntime +TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testruntime) TESTCASE_MODULES += testibscom -TESTCASE_MODULES += testdump -TESTCASE_MODULES += testsecureboot +TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testdump) +TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testsecureboot) TESTCASE_MODULES += testfsiscom TESTCASE_MODULES += testrtloader TESTCASE_MODULES += testsbe diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C index d64a882c3..6eb63d5e0 100644 --- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C +++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C @@ -41,6 +41,7 @@ #include <diag/mdia/mdia.H> #include <diag/mdia/mdiamevent.H> +#include <config.h> using namespace TARGETING; @@ -57,9 +58,9 @@ namespace PlatServices bool isInMdiaMode() { bool o_isInMdiaMode = false; - +#ifndef CONFIG_VPO_COMPILE MDIA::waitingForMaintCmdEvents(o_isInMdiaMode); - +#endif return o_isInMdiaMode; } @@ -72,6 +73,8 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget, int32_t o_rc = SUCCESS; +#ifndef CONFIG_VPO_COMPILE + do { if ( !isInMdiaMode() ) break; // no-op @@ -108,6 +111,8 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget, getHuid(i_mbaTarget), i_eventType ); } +#endif + return o_rc; #undef PRDF_FUNC diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C index 32c8d81ac..7735e19b5 100644 --- a/src/usr/hwas/common/hwas.C +++ b/src/usr/hwas/common/hwas.C @@ -1100,6 +1100,18 @@ void invokePresentByAssoc() l_funcMCSTargetList.begin(), l_funcMCSTargetList.end()); +// If VPO, dump targets (MCS) for verification & debug purposes +#ifdef CONFIG_VPO_COMPILE + HWAS_INF("invokePresentByAssoc(): MCS targets:"); + for (TargetHandleList::const_iterator l_MCS_Itr = + l_funcMCSTargetList.begin(); + l_MCS_Itr != l_funcMCSTargetList.end(); + l_MCS_Itr++) + { + HWAS_INF(" MCS: HUID %.8x", TARGETING::get_huid(*l_MCS_Itr)); + } +#endif + // get the membufs TargetHandleList l_funcMembufTargetList; getAllChips(l_funcMembufTargetList, TYPE_MEMBUF, true ); @@ -1107,6 +1119,17 @@ void invokePresentByAssoc() l_funcMembufTargetList.begin(), l_funcMembufTargetList.end()); +// If VPO, dump targets (MEMBUF) for verification & debug purposes +#ifdef CONFIG_VPO_COMPILE + HWAS_INF("invokePresentByAssoc(): MEMBUF targets:"); + for (TargetHandleList::const_iterator l_MEMBUF_Itr = l_funcMembufTargetList.begin(); + l_MEMBUF_Itr != l_funcMembufTargetList.end(); + l_MEMBUF_Itr++) + { + HWAS_INF(" MEMBUF: HUID %.8x", TARGETING::get_huid(*l_MEMBUF_Itr)); + } +#endif + // get the dimms TargetHandleList l_funcDIMMTargetList; getAllLogicalCards(l_funcDIMMTargetList, TYPE_DIMM, true ); @@ -1114,6 +1137,18 @@ void invokePresentByAssoc() l_funcDIMMTargetList.begin(), l_funcDIMMTargetList.end()); + +// If VPO, dump targets (DIMM) for verification & debug purposes +#ifdef CONFIG_VPO_COMPILE + HWAS_INF("invokePresentByAssoc(): DIMM targets:"); + for (TargetHandleList::const_iterator l_DIMM_Itr = l_funcDIMMTargetList.begin(); + l_DIMM_Itr != l_funcDIMMTargetList.end(); + l_DIMM_Itr++) + { + HWAS_INF(" DIMM: HUID %.8x", TARGETING::get_huid(*l_DIMM_Itr)); + } +#endif + // Define vectors of TargetInfo structs to be used in presentByAssoc TargetInfoVector l_targInfo; TargetInfoVector l_targToDeconfig; diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C index 5f54ae9e0..a86dc56db 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C +++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C @@ -59,6 +59,7 @@ #include <devicefw/userif.H> #include <vpd/mvpdenums.H> +#include <config.h> // -- prototype includes -- // Add any customized routines that you don't want overwritten into @@ -427,6 +428,12 @@ errlHndl_t customizeChipRegions(TARGETING::Target* i_procTarget) l_chipRegionData[l_chipRegionIndex]<<PG_START_POS; } +// VPO uses fake VPD, the chip region to be enabled should be set to 0x0F80000000000000 +// Note: A new H file can be created to be a centralized place to define VPO constant like this one. +#ifdef CONFIG_VPO_COMPILE + l_chipRegionData[2] = 0x0F80000000000000; +#endif + TRACDBIN(ISTEPS_TRACE::g_trac_isteps_trace, "Binary dump of ATTR_CHIP_REGIONS_TO_ENABLE:", l_chipRegionData,sizeof(ATTR_CHIP_REGIONS_TO_ENABLE_type)); diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H index 9014ccbab..087d08c1a 100644 --- a/src/usr/initservice/extinitsvc/extinitsvctasks.H +++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H @@ -317,6 +317,8 @@ const TaskInfo g_exttaskinfolist[] = { } }, +// No mdia in VPO +#ifndef CONFIG_VPO_COMPILE /** * @brief MDIA code library */ @@ -328,6 +330,7 @@ const TaskInfo g_exttaskinfolist[] = { EXT_IMAGE, // Extended Module } }, +#endif /** * @brief PRDF code library diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index 828afe3cf..7095d9bd5 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -50,6 +50,7 @@ #include <hwas/common/hwasCallout.H> #include <fsi/fsiif.H> #include <arch/ppc.H> +#include <config.h> #define INTR_TRACE_NAME INTR_COMP_NAME @@ -98,6 +99,15 @@ uint64_t get_enabled_threads( void ) uint64_t en_threads = sys->getAttr<TARGETING::ATTR_ENABLED_THREADS>(); if( en_threads == 0 ) { + +// Set max thread for VPO, nanosleep() here takes too long in VPO environment +#ifdef CONFIG_VPO_COMPILE + en_threads = 0xFF00000000000000; + sys->setAttr<TARGETING::ATTR_ENABLED_THREADS>(en_threads); + TRACFCOMP( g_trac_intr, "Enabled Threads for VPO = %.16X", en_threads ); + return en_threads; +#endif + // Read the scratch reg that the SBE setup // Enabled threads are listed as a bitstring in bits 16:23 // A value of zero means the SBE hasn't set them up yet diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C index 1d1a3895d..ff3241d7d 100644 --- a/src/usr/mbox/mailboxsp.C +++ b/src/usr/mbox/mailboxsp.C @@ -194,11 +194,12 @@ errlHndl_t MailboxSp::_init() } // else leave iv_disabled as true; +#ifndef CONFIG_VPO_COMPILE // Start the the interprocessor communications message handler IPC::IpcSp::init(err); - // call ErrlManager function - tell him that MBOX is ready! ERRORLOG::ErrlManager::errlResourceReady(ERRORLOG::MBOX); +#endif return err; } diff --git a/src/usr/mbox/makefile b/src/usr/mbox/makefile index 4aeb1bdba..96d750804 100644 --- a/src/usr/mbox/makefile +++ b/src/usr/mbox/makefile @@ -5,7 +5,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2012,2014 +# Contributors Listed Below - COPYRIGHT 2012,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,7 +28,7 @@ MODULE = mbox OBJS += mboxdd.o OBJS += mailboxsp.o OBJS += mbox_dma_buffer.o -OBJS += ipcSp.o +OBJS += $(if $(CONFIG_VPO_COMPILE),,ipcSp.o) SUBDIRS += test.d diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index 81358661c..a8ad0fb7a 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -43,6 +43,7 @@ #include <kernel/console.H> #include <endian.h> #include <util/align.H> +#include <config.h> // Trace definition trace_desc_t* g_trac_pnor = NULL; @@ -277,8 +278,11 @@ void PnorRP::initDaemon() errlCommit(l_errhdl,PNOR_COMP_ID); } +// Not supporting PNOR error in VPO +#ifndef CONFIG_VPO_COMPILE // call ErrlManager function - tell him that PNOR is ready! ERRORLOG::ErrlManager::errlResourceReady(ERRORLOG::PNOR); +#endif TRACUCOMP(g_trac_pnor, "< PnorRP::initDaemon" ); } diff --git a/src/usr/pnor/sfc_fake.C b/src/usr/pnor/sfc_fake.C index 90cce7843..9071043a2 100644 --- a/src/usr/pnor/sfc_fake.C +++ b/src/usr/pnor/sfc_fake.C @@ -277,8 +277,8 @@ errlHndl_t SfcFake::sendSpiCmd( uint8_t i_opCode, return new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, PNOR::MOD_SFCFAKE_SENDSPICMD, PNOR::RC_UNSUPPORTED_OPERATION, - TWO_UINT32_TO_UINT64(i_opCode - i_addr), + TWO_UINT32_TO_UINT64(i_opCode, + i_address), 0, true /*Software error*/); } diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C index 98e026205..76b7eea13 100644 --- a/src/usr/secureboot/base/service.C +++ b/src/usr/secureboot/base/service.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -25,6 +27,7 @@ #include <sys/mm.h> #include <util/singleton.H> #include <secureboot/secure_reasoncodes.H> +#include <config.h> #include "settings.H" #include "header.H" @@ -38,6 +41,10 @@ namespace SECUREBOOT do { + +// Don't blind purge in VPO +#ifndef CONFIG_VPO_COMPILE + // Load original secureboot header. if (enabled()) { @@ -50,21 +57,21 @@ namespace SECUREBOOT { break; } - +#endif // Extend memory footprint into lower portion of cache. // This can only fail is someone has already called to extend // to post-secureboot state. Major coding bug, so just assert. assert(0 == mm_extend(MM_EXTEND_POST_SECUREBOOT)); - +// Disable SecureROM in VPO +#ifndef CONFIG_VPO_COMPILE // Initialize the Secure ROM l_errl = initializeSecureROM(); if (l_errl) { break; } - - +#endif } while(0); return l_errl; 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(); |
