diff options
author | Dean Sanner <dsanner@us.ibm.com> | 2017-07-21 07:47:54 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-24 11:17:16 -0400 |
commit | 07440fe370a0d58a806375ff0f78995f1c8828a2 (patch) | |
tree | ccfa50a2d81514b9b8bbe6df03e3c4fda70ce8b7 | |
parent | a45815d6ca469e5abd4e47338d38a6678c9bd331 (diff) | |
download | talos-hostboot-07440fe370a0d58a806375ff0f78995f1c8828a2.tar.gz talos-hostboot-07440fe370a0d58a806375ff0f78995f1c8828a2.zip |
Enable VPD population for Cumulus Simulation
Change-Id: I45bd9b557ad21c64728531e88ab029b8bfdeb54d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43432
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: SWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>
Reviewed-by: Sakethan R. Kotta <sakkotta@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 5 | ||||
-rwxr-xr-x | src/build/mkrules/dist.targets.mk | 1 | ||||
-rwxr-xr-x | src/build/simics/hb-pnor-vpd-preload.pl | 19 | ||||
-rwxr-xr-x | src/build/simics/hb-pnor-vpd-preload.py | 7 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml | 687 | ||||
-rw-r--r-- | src/usr/vpd/makefile | 1 |
6 files changed, 134 insertions, 586 deletions
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 90c2aab35..76b8c0aed 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -39,3 +39,8 @@ cd $sb/sbei/sbfw/ mk -a && mk install_all cd - +#changes needed for Cumulus +echo "Applying SIMICS workaround to support Cumulus" +sbex -t 1031560 +cd $sb/simu +mk -a diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk index 4b5dc3b25..170612fd4 100755 --- a/src/build/mkrules/dist.targets.mk +++ b/src/build/mkrules/dist.targets.mk @@ -230,6 +230,7 @@ simics.tar_CONTENTS = \ img/procmvpd.dat \ img/procmvpd_ven.dat \ img/procmvpd_p9n.dat \ + img/procmvpd_p9c.dat \ img/cvpd.dat \ img/dvpd.dat \ obj/genfiles/attrInfo.csv \ diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl index 70fc244a7..72717fa94 100755 --- a/src/build/simics/hb-pnor-vpd-preload.pl +++ b/src/build/simics/hb-pnor-vpd-preload.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2016 +# Contributors Listed Below - COPYRIGHT 2012,2017 # [+] International Business Machines Corp. # # @@ -57,6 +57,7 @@ my $emptyMemVPD; my $mvpdFile = "procmvpd.dat"; my $mvpdFile_ven = "procmvpd_ven.dat"; my $mvpdFile_p9n = "procmvpd_p9n.dat"; +my $mvpdFile_p9c = "procmvpd_p9c.dat"; my $cvpdFile = "cvpd.dat"; my $dvpdFile = "dvpd.dat"; my $memVpdFile = $cvpdFile; @@ -302,6 +303,10 @@ sub createMVPDData { $sourceFile = "$dataPath/$mvpdFile_p9n"; } + elsif( $procChipType eq "p9c") + { + $sourceFile = "$dataPath/$mvpdFile_p9c"; + } else { $sourceFile = "$dataPath/$mvpdFile"; @@ -503,7 +508,7 @@ sub getMemoryConfig #use pre-defined Centaur Plugging order for( my $mcs = 0; $mcs < $MAX_MCS; $mcs++ ) { - debugMsg( "Mcs: $mcs" ); + debugMsg( "Mcs: $mcs CentPerProc: $numCentPerProc" ); if( $machine eq "MURANO" || $machine eq "NO_SP") { # Plugging order is: @@ -551,6 +556,16 @@ sub getMemoryConfig } } } + elsif( $machine eq "CUMULUS" ) + { + # Plugging order is: + # Processor 0 - 3 + # MCS 0 - 3 (1 Centaur/MCS) + if(($mcs % $MAX_MCS) >= 0 && ($mcs % $MAX_MCS) < 4) + { + $mcsArray[$mcs] = 1; + } + } elsif( $procChipType eq "p9n") { #There are no centaurs within a NIMBUS machine, but need to set diff --git a/src/build/simics/hb-pnor-vpd-preload.py b/src/build/simics/hb-pnor-vpd-preload.py index 49d97e2a2..1c2ce6a0d 100755 --- a/src/build/simics/hb-pnor-vpd-preload.py +++ b/src/build/simics/hb-pnor-vpd-preload.py @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2016 +# Contributors Listed Below - COPYRIGHT 2012,2017 # [+] International Business Machines Corp. # # @@ -32,10 +32,11 @@ import shlex toolLoc = os.environ.get("HB_TOOLPATH"); thisSys = os.environ.get("HB_MACHINE").upper(); numProcs = os.environ.get( "NUM_PROCS"); +dimmsPerProc = os.environ.get( "DIMMS_PER_PROC"); numCentaurPerProcParm = ""; numCentaurPerProc = "0"; -if os.environ.has_key( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys ): - numCentaurPerProc=os.environ.get( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys ); +if (thisSys == "CUMULUS"): + numCentaurPerProc=str(int(dimmsPerProc)/2); numCentaurPerProcParm=" --numCentPerProc " + numCentaurPerProc; pass procChipTypeParm = ""; diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml index c42851ab4..e7d79e6a5 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml @@ -125,7 +125,7 @@ <attribute> <id>ASYNC_NEST_FREQ_MHZ</id> - <default>2400</default> + <default>0xFFFF</default> </attribute> <attribute> @@ -5572,6 +5572,10 @@ <id>TYPE</id> <default>MEMBUF</default> </attribute> + <attribute> + <id>VPD_REC_NUM</id> + <default>0</default> + </attribute> </targetInstance> <targetInstance> @@ -5653,91 +5657,27 @@ <targetInstance> <id>sys0node0dimm0</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030000</default></attribute> + <attribute><id>POSITION</id><default>0</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-0/dimm-0</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p00</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>0</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030000</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p00</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-0</default> </attribute> <attribute> - <id>POSITION</id> + <id>ORDINAL_ID</id> <default>0</default> </attribute> <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-0/dimm-0</default> </attribute> - <attribute> - <id>RESOURCE_IS_CRITICAL</id> + <id>FAPI_POS</id> <default>0</default> </attribute> - - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x34</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-0</value></field> - <field><id>port</id><value>0</value></field> - </default> - </attribute> - <attribute> - <id>TYPE</id> - <default>DIMM</default> - </attribute> <attribute> <id>VPD_REC_NUM</id> <default>0</default> @@ -5746,96 +5686,33 @@ <targetInstance> <id>sys0node0dimm1</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030001</default></attribute> + <attribute><id>POSITION</id><default>1</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-0/dimm-1</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p01</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>1</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030001</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p01</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-1</default> </attribute> <attribute> - <id>POSITION</id> + <id>ORDINAL_ID</id> <default>1</default> </attribute> <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> - <default>0</default> - </attribute> - - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x36</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-0</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-0/dimm-1</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>1</default> </attribute> <attribute> <id>VPD_REC_NUM</id> <default>1</default> </attribute> -</targetInstance> + </targetInstance> + <targetInstance> <id>sys0node0membuf0mba1</id> <type>unit-mba-centaur</type> @@ -5856,90 +5733,26 @@ <targetInstance> <id>sys0node0dimm2</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030002</default></attribute> + <attribute><id>POSITION</id><default>2</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-1/dimm-0</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p02</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>2</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030002</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p02</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-2</default> </attribute> <attribute> - <id>POSITION</id> + <id>ORDINAL_ID</id> <default>2</default> </attribute> <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> - <default>0</default> - </attribute> - - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x38</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-0</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-1/dimm-0</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>2</default> </attribute> <attribute> <id>VPD_REC_NUM</id> @@ -5949,96 +5762,32 @@ <targetInstance> <id>sys0node0dimm3</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030003</default></attribute> + <attribute><id>POSITION</id><default>3</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-1/dimm-1</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p03</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>3</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030003</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p03</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-3</default> </attribute> <attribute> - <id>POSITION</id> - <default>6</default> - </attribute> - <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> + <id>ORDINAL_ID</id> <default>0</default> </attribute> - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x3A</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-0</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-0/mba-1/dimm-1</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>3</default> </attribute> <attribute> <id>VPD_REC_NUM</id> - <default>6</default> + <default>3</default> </attribute> -</targetInstance> + </targetInstance> <targetInstance> <id>sys0node0membuf1</id> @@ -6164,7 +5913,10 @@ <id>TYPE</id> <default>MEMBUF</default> </attribute> - + <attribute> + <id>VPD_REC_NUM</id> + <default>1</default> + </attribute> </targetInstance> <targetInstance> <id>sys0node0membuf1l40</id> @@ -6245,90 +5997,26 @@ <targetInstance> <id>sys0node0dimm4</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030004</default></attribute> + <attribute><id>POSITION</id><default>4</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-0/dimm-0</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p04</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>4</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030004</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p04</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-4</default> </attribute> <attribute> - <id>POSITION</id> + <id>ORDINAL_ID</id> <default>4</default> </attribute> <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> - <default>0</default> - </attribute> - - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x34</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-1</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-0/dimm-0</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>4</default> </attribute> <attribute> <id>VPD_REC_NUM</id> @@ -6338,90 +6026,26 @@ <targetInstance> <id>sys0node0dimm5</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030005</default></attribute> + <attribute><id>POSITION</id><default>5</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-0/membuf-1/mba-0/dimm-5</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p05</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>5</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030005</default> - </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p05</default> </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-5</default> </attribute> <attribute> - <id>POSITION</id> - <default>5</default> - </attribute> - <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> + <id>ORDINAL_ID</id> <default>0</default> </attribute> - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x36</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-1</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-0/dimm-1</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>5</default> </attribute> <attribute> <id>VPD_REC_NUM</id> @@ -6448,183 +6072,55 @@ <targetInstance> <id>sys0node0dimm6</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030006</default></attribute> + <attribute><id>POSITION</id><default>6</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-1/dimm-0</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p06</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>6</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030006</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p06</default> </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> - </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-6</default> </attribute> <attribute> - <id>POSITION</id> + <id>ORDINAL_ID</id> <default>6</default> </attribute> <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> - <default>0</default> - </attribute> - - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x38</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-1</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-1/dimm-0</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>6</default> </attribute> <attribute> <id>VPD_REC_NUM</id> - <default>4</default> + <default>6</default> </attribute> </targetInstance> <targetInstance> <id>sys0node0dimm7</id> <type>lcard-dimm-jedec</type> + <attribute><id>HUID</id><default>0x00030007</default></attribute> + <attribute><id>POSITION</id><default>7</default></attribute> <attribute> - <id>AFFINITY_PATH</id> - <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-1/dimm-1</default> - </attribute> - - <attribute> - <id>CDM_DOMAIN</id> - <default>DIMM</default> - </attribute> - - <attribute> - <id>CLASS</id> - <default>CARD</default> - </attribute> - <attribute> - <id>DECONFIG_GARDABLE</id> - <default>1</default> - </attribute> - - - <attribute> - <id>FAPI_NAME</id> - <default>dimm:k0:n0:s0:p07</default> - </attribute> - <attribute> - <id>FAPI_POS</id> - <default>7</default> - </attribute> - - - <attribute> - <id>HUID</id> - <default>0x00030007</default> + <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p07</default> </attribute> - - <attribute> - <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> - <default>0x00000003</default> - </attribute> - - - - - - - - - <attribute> <id>PHYS_PATH</id> <default>physical:sys-0/node-0/dimm-7</default> </attribute> <attribute> - <id>POSITION</id> - <default>7</default> - </attribute> - <attribute> - <id>PRIMARY_CAPABILITIES</id> - <default> - <field><id>reserved</id><value/></field> - <field><id>supportsFsiScom</id><value/></field> - <field><id>supportsInbandScom</id><value/></field> - <field><id>supportsXscom</id><value/></field> - </default> - </attribute> - - <attribute> - <id>RESOURCE_IS_CRITICAL</id> + <id>ORDINAL_ID</id> <default>0</default> </attribute> - - <attribute> - <id>TEMP_SENSOR_I2C_CONFIG</id> - <default> - <field><id>devAddr</id><value>0x3A</value></field> - <field><id>engine</id><value>6</value></field> - <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/membuf-1</value></field> - <field><id>port</id><value>0</value></field> - </default> + <id>AFFINITY_PATH</id> + <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/dmi-1/membuf-1/mba-1/dimm-1</default> </attribute> <attribute> - <id>TYPE</id> - <default>DIMM</default> + <id>FAPI_POS</id> + <default>7</default> </attribute> <attribute> <id>VPD_REC_NUM</id> @@ -8844,6 +8340,35 @@ </targetInstance> <targetInstance> + <id>sys0node0proc0nx0</id> + <type>unit-nx-power9</type> + <attribute><id>HUID</id><default>0x001E0000</default></attribute> + <attribute> + <id>FAPI_NAME</id><default>NA</default> + </attribute> + <attribute> + <id>PHYS_PATH</id> + <default>physical:sys-0/node-0/proc-0/nx-0</default> + </attribute> + <attribute> + <id>AFFINITY_PATH</id> + <default>physical:sys-0/node-0/proc-0/nx-0</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>0xFFFFFFFF</default> + </attribute> + <attribute> + <id>ORDINAL_ID</id> + <default>0</default> + </attribute> + <attribute> + <id>CHIP_UNIT</id> + <default>0</default> + </attribute> +</targetInstance> + +<targetInstance> <id>sys0node0proc0pec0</id> <type>unit-pec-power9</type> <attribute> diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile index 962acaa2c..2031b1d4a 100644 --- a/src/usr/vpd/makefile +++ b/src/usr/vpd/makefile @@ -49,6 +49,7 @@ BINARY_FILES += $(IMGDIR)/vpo_djvpd.dat:eb4dce98f19ebfe77243be1c56d3d0eaa1889d90 # on 1/3/2017 # Modified PG record to have proper XBUS data and only the first 4 cores BINARY_FILES += $(IMGDIR)/procmvpd_p9n.dat:ca32d9418a7ff3781a2989b230c2f915e20d47af +BINARY_FILES += $(IMGDIR)/procmvpd_p9c.dat:423208204c2f0e759610f4f39243362fd4b6d103 #Update to Centaur DD2.0 for CCIN 31E8 |