Update VPO xml with mem targets, adjust DJVPD, update DIMM pos attr

Change-Id: Ie1e805d8a6e6e4e418c98b103965b76b8532e852
RTC: 156221
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26402
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

4 files changed, 637 insertions, 80 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 385ff79e2..f9a223ff0 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -215,6 +215,7 @@ fsp.tar_CONTENTS = \
     $(if $(FAKEPNOR), src/build/buildpnor/pnorLayoutFake.xml, ) \
     $(if $(FAKEPNOR), img/vbu_NIMBUS_targeting.bin, ) \
     $(if $(FAKEPNOR), img/vpo_sysmvpd.dat, ) \
+    $(if $(FAKEPNOR), img/vpo_djvpd.dat, ) \
     img/simics_NIMBUS_targeting.bin \
     obj/genfiles/fapiattrs.xml \
     obj/genfiles/hb_plat_attr_srvc.H \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 19239b29e..1696aefbe 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -90,6 +90,7 @@ SECUREBOOT_SIGNED_CONTAINER = secureboot_signed_container
 SIGN_PREFIX_PARAMS=-flag 0x80000000 -hka ${DEV_KEY_DIR}/hw_key_a -hkb ${DEV_KEY_DIR}/hw_key_b -hkc ${DEV_KEY_DIR}/hw_key_c -skp ${DEV_KEY_DIR}/sw_key_a
 SIGN_BUILD_PARAMS=-skp ${DEV_KEY_DIR}/sw_key_a
 VPO_FAKE_MVPD = vpo_sysmvpd.dat
+VPO_FAKE_DJVPD = vpo_djvpd.dat
 
 ALL_HB_IMAGES = ${BASE_IMAGES} \
                 ${BASE_W_HEADER_IMAGE} \
@@ -146,6 +147,10 @@ cp_hbfiles: .SPECTARG
 	ecc --inject ${EXT_HEADER_IMAGE} --output ${EXT_ECC_HEADER_IMAGE} --p8
 	dd if=${EXT_IMAGE} of=${EXT_PAD_IMAGE} ibs=4k count=1280 conv=sync
 	ecc --inject ${EXT_PAD_IMAGE} --output ${EXT_ECC_IMAGE} --p8
+        .if(${FAKEPNOR} != "")
+	dd if=${EXT_IMAGE} of=${EXT_FAKE_IMAGE} ibs=5120k conv=sync
+        .endif
+
 
 	# Test signed container, SIGNING_DIR set by env variable
 	.if(${SECUREBOOT} && ${SIGNING_DIR})
@@ -175,7 +180,7 @@ cp_hbfiles: .SPECTARG
 	dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${TEMP_IMAGE}
 	ecc --inject ${TEMP_IMAGE} --output ${DJVPD_ECC_IMAGE} --p8
         .if(${FAKEPNOR} != "")
-	dd if=/dev/zero bs=32K count=1 | tr "\000" "\377" > ${DJVPD_IMAGE}
+	dd if=${${VPO_FAKE_DJVPD}:P} bs=32K count=1 > ${DJVPD_IMAGE}
         .endif
 	# MVPD partition
 	dd if=/dev/zero bs=512K count=1 | tr "\000" "\377" > ${TEMP_IMAGE}
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index cfce2f29f..948d76685 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -115,9 +115,17 @@
         <default>0x000603FC00000000</default>
     </attribute>
     <attribute>
+        <id>TPM_REQUIRED</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
         <id>ISTEP_MODE</id>
         <default>0x1</default>
     </attribute>
+    <attribute>
+        <id>PROC_EPS_TABLE_TYPE</id>
+        <default>EPS_TYPE_LE</default>
+    </attribute>
 </targetInstance>
 
 <!-- System node 0 -->
@@ -146,6 +154,19 @@
         <id>ORDINAL_ID</id>
         <default>0</default>
     </attribute>
+    <attribute>
+        <id>TPM_PRIMARY_INFO</id>
+        <default>
+             <field><id>tpmEnabled</id><value>1</value></field>
+             <field><id>i2cMasterPath</id>
+               <value>physical:sys-0/node-0/proc-0</value></field>
+             <field><id>port</id><value>0</value></field>
+             <field><id>devAddrLocality0</id><value>0xAE</value></field>
+             <field><id>devAddrLocality4</id><value>0xFF</value></field>
+             <field><id>engine</id><value>2</value></field>
+             <field><id>byteAddrOffset</id><value>0x01</value></field>
+        </default>
+    </attribute>
 </targetInstance>
 
 <!-- Nimbus n0p0 processor chip -->
@@ -256,6 +277,15 @@
     <attribute><id>XSCOM_BASE_ADDRESS</id>
         <default>0x000603FC00000000</default>
     </attribute>
+    <attribute>
+        <id>I2C_BUS_SPEED_ARRAY</id>
+        <default>
+            0, 0, 0,
+            0, 0, 0,
+            400, 0, 0,
+            0, 0, 0
+        </default>
+    </attribute>
 </targetInstance>
 
 <!-- Nimbus n0p0 EQ units -->
@@ -332,11 +362,11 @@
         <default>physical:sys-0/node-0/proc-0/perv-17</default>
     </attribute>
 <!--TODO RTC:144077  POUNDV ATTRs are temporarily set to 1 for testing
-    purposes if we have a way to do attr overrides during standalone simics
+	purposes if we have a way to do attr overrides during standalone simics
     then we can get rid of these poundv attributes for this EQ-->
     <attribute>
         <id>POUNDV_BUCKET_NUM</id>
-        <default>1</default>
+        <default>2</default>
     </attribute>
     <attribute>
         <id>POUNDV_BUCKET_NUM_OVERRIDE</id>
@@ -1634,11 +1664,78 @@
     </attribute>
 </targetInstance>
 
+<!-- Nimbus n0p0 MCBIST units -->
+<targetInstance>
+    <id>sys0node0proc0mcbist0</id>
+    <type>unit-mcbist-power9</type>
+    <attribute><id>HUID</id><default>0x00250000</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>pu.mcbist:k0:n0:s0:p00:c0</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/mcbist-0</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>PARENT_PERVASIVE</id>
+        <default>physical:sys-0/node-0/proc-0/perv-7</default>
+    </attribute>
+</targetInstance>
+
+<targetInstance>
+    <id>sys0node0proc0mcbist1</id>
+    <type>unit-mcbist-power9</type>
+    <attribute><id>HUID</id><default>0x00250001</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>pu.mcbist:k0:n0:s0:p00:c1</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/proc-0/mcbist-1</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
+        <id>PARENT_PERVASIVE</id>
+        <default>physical:sys-0/node-0/proc-0/perv-8</default>
+    </attribute>
+</targetInstance>
+
 <!-- nimbus n0p0 MCS units -->
 <targetInstance>
     <id>sys0node0proc0mcbist0mcs0</id>
-    <type>unit-mcs-nimbus</type>
-    <attribute><id>HUID</id><default>0x000B0100</default></attribute>
+    <type>unit-mcs-power9</type>
+    <attribute><id>HUID</id><default>0x000B0000</default></attribute>
     <attribute>
         <id>FAPI_NAME</id><default>pu.mcs:k0:n0:s0:p00:c0</default>
     </attribute>
@@ -1677,8 +1774,8 @@
 
 <targetInstance>
     <id>sys0node0proc0mcbist0mcs1</id>
-    <type>unit-mcs-nimbus</type>
-    <attribute><id>HUID</id><default>0x000B0101</default></attribute>
+    <type>unit-mcs-power9</type>
+    <attribute><id>HUID</id><default>0x000B0001</default></attribute>
     <attribute>
         <id>FAPI_NAME</id><default>pu.mcs:k0:n0:s0:p00:c1</default>
     </attribute>
@@ -1717,8 +1814,8 @@
 
 <targetInstance>
     <id>sys0node0proc0mcbist1mcs0</id>
-    <type>unit-mcs-nimbus</type>
-    <attribute><id>HUID</id><default>0x000B0102</default></attribute>
+    <type>unit-mcs-power9</type>
+    <attribute><id>HUID</id><default>0x000B0002</default></attribute>
     <attribute>
         <id>FAPI_NAME</id><default>pu.mcs:k0:n0:s0:p00:c2</default>
     </attribute>
@@ -1757,8 +1854,8 @@
 
 <targetInstance>
     <id>sys0node0proc0mcbist1mcs1</id>
-    <type>unit-mcs-nimbus</type>
-    <attribute><id>HUID</id><default>0x000B0103</default></attribute>
+    <type>unit-mcs-power9</type>
+    <attribute><id>HUID</id><default>0x000B0003</default></attribute>
     <attribute>
         <id>FAPI_NAME</id><default>pu.mcs:k0:n0:s0:p00:c3</default>
     </attribute>
@@ -2063,73 +2160,6 @@
     </attribute>
 </targetInstance>
 
-<!-- Nimbus n0p0 MCBIST units -->
-<targetInstance>
-    <id>sys0node0proc0mcbist0</id>
-    <type>unit-mcbist-nimbus</type>
-    <attribute><id>HUID</id><default>0x00250000</default></attribute>
-    <attribute>
-        <id>FAPI_NAME</id><default>pu.mcbist:k0:n0:s0:p00:c0</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcbist-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcbist-0</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_POS</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-7</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0mcbist1</id>
-    <type>unit-mcbist-nimbus</type>
-    <attribute><id>HUID</id><default>0x00250001</default></attribute>
-    <attribute>
-        <id>FAPI_NAME</id><default>pu.mcbist:k0:n0:s0:p00:c1</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcbist-1</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcbist-1</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_POS</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>CHIP_UNIT</id>
-        <default>1</default>
-    </attribute>
-    <attribute>
-        <id>PARENT_PERVASIVE</id>
-        <default>physical:sys-0/node-0/proc-0/perv-8</default>
-    </attribute>
-</targetInstance>
-
 <!-- Nimbus n0p0 PEC units -->
 <targetInstance>
     <id>sys0node0proc0pec0</id>
@@ -4040,7 +4070,7 @@
     </attribute>
     <attribute>
         <id>PEER_TARGET</id>
-        <default>physical:sys-0/node-0/proc-3/xbus-1</default>
+        <default>physical:sys-0/node-0/proc-1/xbus-1</default>
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
@@ -4077,7 +4107,7 @@
     </attribute>
     <attribute>
         <id>PEER_TARGET</id>
-        <default>physical:sys-0/node-0/proc-2/xbus-1</default>
+        <default>physical:sys-0/node-0/proc-1/xbus-1</default>
     </attribute>
     <attribute>
         <id>PARENT_PERVASIVE</id>
@@ -4242,4 +4272,524 @@
     </attribute>
 </targetInstance>
 
+<!-- DIMMS
+     id/physical is sys-0/node-0/dimm-[d]
+            where d=[0-31]
+     affinity    is sys-0/node-0/proc-0/mcs-[j]/mca-[k]/dimm-[m]
+            where j=[0-3] k=[0-7] m=[0-31]
+-->
+
+<!-- DIMM n0:p1 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-0/mca-0/dimm-0</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>0</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>1</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p0 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-0/mca-0/dimm-1</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>1</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>0</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p3 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>2</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-0/mca-1/dimm-2</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>2</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>3</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p2 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>3</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-0/mca-1/dimm-3</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>3</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>2</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p4 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>4</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-1/mca-0/dimm-4</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>4</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>4</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p5 -->
+
+<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>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>ORDINAL_ID</id>
+        <default>5</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-1/mca-0/dimm-5</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>5</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>5</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p7 -->
+
+<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>FAPI_NAME</id><default>dimm:k0:n0:s0:p06</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-6</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>6</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-1/mca-1/dimm-6</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>6</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>7</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p6 -->
+
+<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>FAPI_NAME</id><default>dimm:k0:n0:s0:p07</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-7</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>7</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-0/mcs-1/mca-1/dimm-7</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>7</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>6</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p8 -->
+
+<targetInstance>
+    <id>sys0node0dimm8</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x00030008</default></attribute>
+    <attribute><id>POSITION</id><default>8</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p08</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-8</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>8</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-0/mca-0/dimm-8</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>8</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>8</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p9 -->
+
+<targetInstance>
+    <id>sys0node0dimm9</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x00030009</default></attribute>
+    <attribute><id>POSITION</id><default>9</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p09</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-9</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>9</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-0/mca-0/dimm-9</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>9</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>9</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p10 -->
+
+<targetInstance>
+    <id>sys0node0dimm10</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000A</default></attribute>
+    <attribute><id>POSITION</id><default>10</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p10</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-10</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-0/mca-1/dimm-10</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>10</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>10</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p11 -->
+
+<targetInstance>
+    <id>sys0node0dimm11</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000B</default></attribute>
+    <attribute><id>POSITION</id><default>11</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p11</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-11</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-0/mca-1/dimm-11</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>11</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>11</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p12 -->
+
+<targetInstance>
+    <id>sys0node0dimm12</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000C</default></attribute>
+    <attribute><id>POSITION</id><default>12</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p12</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-12</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>12</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-1/mca-0/dimm-12</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>12</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>12</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p13 -->
+
+<targetInstance>
+    <id>sys0node0dimm13</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000D</default></attribute>
+    <attribute><id>POSITION</id><default>13</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p13</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-13</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>13</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-1/mca-0/dimm-13</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>13</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>13</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p15 -->
+
+<targetInstance>
+    <id>sys0node0dimm14</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000E</default></attribute>
+    <attribute><id>POSITION</id><default>14</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p14</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-14</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>14</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-1/mca-1/dimm-14</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>14</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>15</default>
+    </attribute>
+</targetInstance>
+
+<!-- DIMM n0:p14 -->
+
+<targetInstance>
+    <id>sys0node0dimm15</id>
+    <type>lcard-dimm-jedec</type>
+    <attribute><id>HUID</id><default>0x0003000F</default></attribute>
+    <attribute><id>POSITION</id><default>15</default></attribute>
+    <attribute>
+        <id>FAPI_NAME</id><default>dimm:k0:n0:s0:p15</default>
+    </attribute>
+    <attribute>
+        <id>PHYS_PATH</id>
+        <default>physical:sys-0/node-0/dimm-15</default>
+    </attribute>
+    <attribute>
+        <id>ORDINAL_ID</id>
+        <default>15</default>
+    </attribute>
+    <attribute>
+        <id>AFFINITY_PATH</id>
+        <default>affinity:sys-0/node-0/proc-0/mcbist-1/mcs-1/mca-1/dimm-15</default>
+    </attribute>
+    <attribute>
+        <id>FAPI_POS</id>
+        <default>15</default>
+    </attribute>
+    <attribute>
+        <id>VPD_REC_NUM</id>
+        <default>14</default>
+    </attribute>
+</targetInstance>
+
+
 </attributes>
diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile
index 3a34df282..00be98825 100644
--- a/src/usr/vpd/makefile
+++ b/src/usr/vpd/makefile
@@ -43,6 +43,7 @@ BINARY_FILES += $(IMGDIR)/procmvpd.dat:65759fa4aebd2e3b42b25309504a3007b3b51036
 BINARY_FILES += $(IMGDIR)/procmvpd_ven.dat:dd8507bec946283260f82af212ed32feaeb3363a
 BINARY_FILES += $(IMGDIR)/procmvpd_p9n.dat:eb8d6b178c16415da16c8edcd9b61bbd61129e3a
 BINARY_FILES += $(IMGDIR)/vpo_sysmvpd.dat:b3b907c2e80b68ffe96e924b9cb0db6735fe4532
+BINARY_FILES += $(IMGDIR)/vpo_djvpd.dat:cb2c6de3ad46cdd53605d156e22c4bda8d637a42
 
 
 #Update to Centaur DD2.0 for CCIN 31E8