Switch fakepnor over to VBU XML file, default to istep

Change-Id: I5fef5732c2f658438733eb8278854a08f093b85f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22494
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

5 files changed, 55 insertions, 19 deletions

diff --git a/src/build/buildpnor/pnorLayoutFake.xml b/src/build/buildpnor/pnorLayoutFake.xml
index 3f58fba96..2bbd56cc9 100644
--- a/src/build/buildpnor/pnorLayoutFake.xml
+++ b/src/build/buildpnor/pnorLayoutFake.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -77,42 +77,59 @@ Layout Description
     </metadata>
     <section>
         <!-- NOTE: smaller than official layout  for fake-PNOR  -->
-        <description>Module VPD (256K) -only supports 4 processors</description>
+        <description>Module VPD (128K) -only supports 2 processors</description>
         <eyeCatch>MVPD</eyeCatch>
         <physicalOffset>0x2000</physicalOffset>
-        <physicalRegionSize>0x40000</physicalRegionSize>
+        <physicalRegionSize>0x20000</physicalRegionSize>
         <side>sideless</side>
     </section>
     <section>
         <!-- NOTE: smaller than official layout  for fake-PNOR  -->
-        <description>DIMM JEDEC (128K) -only supports 4 processors</description>
+        <description>DIMM JEDEC (32K) supports 2 * 16 *512 bytes</description>
         <eyeCatch>DJVPD</eyeCatch>
-        <physicalOffset>0x42000</physicalOffset>
-        <physicalRegionSize>0x20000</physicalRegionSize>
+        <physicalOffset>0x22000</physicalOffset>
+        <physicalRegionSize>0x8000</physicalRegionSize>
         <side>sideless</side>
     </section>
     <section>
         <!-- NOTE: smaller than official layout  for fake-PNOR  -->
-        <description>Hostboot Extended image (3MB)</description>
-        <eyeCatch>HBI</eyeCatch>
-        <physicalOffset>0x62000</physicalOffset>
-        <physicalRegionSize>0x500000</physicalRegionSize>
+        <description>Board/Centaur VPD (64K) - 1 board</description>
+        <eyeCatch>CVPD</eyeCatch>
+        <physicalOffset>0x2A000</physicalOffset>
+        <physicalRegionSize>0x10000</physicalRegionSize>
         <side>sideless</side>
     </section>
     <section>
         <!-- NOTE: smaller than official layout  for fake-PNOR  -->
         <description>Hostboot Error Logs (64K)</description>
         <eyeCatch>HBEL</eyeCatch>
-        <physicalOffset>0x562000</physicalOffset>
+        <physicalOffset>0x3A000</physicalOffset>
         <physicalRegionSize>0x10000</physicalRegionSize>
         <side>sideless</side>
     </section>
     <section>
         <!-- NOTE: smaller than official layout  for fake-PNOR  -->
+        <description>WINK (512K) </description>
+        <eyeCatch>WINK</eyeCatch>
+        <physicalOffset>0x4A000</physicalOffset>
+        <physicalRegionSize>0x80000</physicalRegionSize>
+        <sha512Version/>
+        <side>sideless</side>
+    </section>
+    <section>
+        <!-- NOTE: smaller than official layout  for fake-PNOR  -->
         <description>Attribute Data (128k)</description>
         <eyeCatch>HBD</eyeCatch>
-        <physicalOffset>0x572000</physicalOffset>
+        <physicalOffset>0xCA000</physicalOffset>
         <physicalRegionSize>0x20000</physicalRegionSize>
         <side>sideless</side>
     </section>
+    <section>
+        <!-- NOTE: smaller than official layout  for fake-PNOR  -->
+        <description>Hostboot Extended image (3MB)</description>
+        <eyeCatch>HBI</eyeCatch>
+        <physicalOffset>0xEA000</physicalOffset>
+        <physicalRegionSize>0x500000</physicalRegionSize>
+        <side>sideless</side>
+    </section>
 </pnor>
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 8bf53fc70..385ff79e2 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -40,7 +40,7 @@ ROOTPATH = ../../..
 #
 
 # Content targets.
-VALID_TARGETS = fsp tools openpower
+VALID_TARGETS = fsp tools openpower vpo
 
 #
 # Files which are to be directly copied into content targets.
@@ -104,7 +104,6 @@ COPY_RENAME_FILES = \
     img/hostboot.bin:img/hbicore$(UNDERSCORE_TEST).bin:fsp,openpower \
     img/hostboot_extended.bin:img/hbicore$(UNDERSCORE_TEST)_extended.bin:fsp,openpower \
     img/hostboot_runtime.bin:img/hbirt$(UNDERSCORE_TEST).bin:fsp,openpower \
-    vbu_NIMBUS.pnor:img/vbu$(UNDERSCORE_TEST)_NIMBUS.pnor:vpo \
     hbicore.syms:img/hbicore$(UNDERSCORE_TEST).syms:tools,vpo,openpower \
     hbicore.list.bz2:img/hbicore$(UNDERSCORE_TEST).list.bz2:tools,vpo,openpower \
     hbicore.bin.modinfo:img/hbicore$(UNDERSCORE_TEST).bin.modinfo:tools,vpo,openpower \
@@ -168,6 +167,8 @@ simics.tar_CONTENTS = \
     src/build/simics/startup.simics \
     src/build/simics/standalone.simics \
     src/build/simics/combined.simics \
+    src/build/simics/run_as_vpo.simics \
+    src/build/simics/fake_mem.simics \
     src/build/simics/ipmi_bt_responder.py \
     src/build/simics/hb-simdebug.py \
     src/build/debug/hb-dump-debug \
@@ -212,6 +213,8 @@ fsp.tar_CONTENTS = \
     src/build/buildpnor/buildpnor.pl \
     src/build/buildpnor/defaultPnorLayout.xml \
     $(if $(FAKEPNOR), src/build/buildpnor/pnorLayoutFake.xml, ) \
+    $(if $(FAKEPNOR), img/vbu_NIMBUS_targeting.bin, ) \
+    $(if $(FAKEPNOR), img/vpo_sysmvpd.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 8bd7b4900..7773c1254 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -89,6 +89,8 @@ SECUREBOOT_SIGNED_CONTAINER = secureboot_signed_container
 # DEV_KEY_DIR set by env variable
 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
+
 ALL_HB_IMAGES = ${BASE_IMAGES} \
                 ${BASE_W_HEADER_IMAGE} \
                 ${BASE_ECC_IMAGE} ${EXT_ECC_IMAGE} \
@@ -173,13 +175,13 @@ 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=128K count=1 | tr "\000" "\377" > ${DJVPD_IMAGE}
+	dd if=/dev/zero bs=32K count=1 | tr "\000" "\377" > ${DJVPD_IMAGE}
         .endif
 	# MVPD partition
 	dd if=/dev/zero bs=512K count=1 | tr "\000" "\377" > ${TEMP_IMAGE}
 	ecc --inject ${TEMP_IMAGE} --output ${MVPD_ECC_IMAGE} --p8
         .if(${FAKEPNOR} != "")
-	dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${MVPD_IMAGE}
+	dd if=${${VPO_FAKE_MVPD}:P} bs=128K count=1 > ${MVPD_IMAGE}
         .endif
 	# CVPD partition
 	dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${TEMP_IMAGE}
@@ -268,8 +270,9 @@ HOSTBOOT_FAKEPNOR_SECTIONS = HBI=${EXT_FAKE_IMAGE},HBEL=${HBEL_IMAGE},MVPD=${MVP
 HBFW_OBJPATH = ${.PATH:M*obj*}
 ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
 NIMBUS_TARG_IMG = simics_NIMBUS_targeting.bin
+NIMBUS_VPO_TARG_IMG = vbu_NIMBUS_targeting.bin
 NIMBUS_TARG_IMG_ECC = simics_NIMBUS_targeting.bin.ecc
-NIMBUS_TARG_IMG_FAKE = simics_NIMBUS_targeting.bin.fake
+NIMBUS_TARG_IMG_FAKE = vbu_NIMBUS_targeting.bin.fake
 NIMBUS_SLW_IMG = ${ENGD_OBJPATH:Fp9n.hw_ref_image.hdr.bin}
 NIMBUS_LOCAL_SLW_IMG = p9n.hw_ref_image.hdr.bin
 NIMBUS_LOCAL_SLW_IMG_ECC = p9n.hw_ref_image.hdr.bin.ecc
@@ -286,7 +289,7 @@ inject_ecc: build_sbe_partitions
 	dd if=${${NIMBUS_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${NIMBUS_TARG_IMG_ECC} --p8; \
 	#for NIMBUS fake pnor skip version header
-	dd if=${${NIMBUS_TARG_IMG}:P} of=${NIMBUS_TARG_IMG_FAKE} ibs=4k count=32 skip=1 conv=sync; \
+	dd if=${${NIMBUS_VPO_TARG_IMG}:P} of=${NIMBUS_TARG_IMG_FAKE} ibs=4k count=32 skip=1 conv=sync; \
 	# SBE partition
 	dd if=${${NIMBUS_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \
 	ecc --inject ${TEMP_IMG} --output ${NIMBUS_SBE_IMG_ECC} --p8; \
@@ -299,7 +302,7 @@ inject_ecc: build_sbe_partitions
 	rm ${TEMP_IMG}
 
 NIMBUS_SECT = HBD=${NIMBUS_TARG_IMG_ECC},SBE=${NIMBUS_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${NIMBUS_LOCAL_SLW_IMG_ECC}
-FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE}
+FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE},WINK=${NIMBUS_LOCAL_SLW_IMG}
 
 # To build fake PNOR, set FAKEPNOR to filename of file to build,
 #    ie, 'export FAKEPNOR=fake8m.pnor'
diff --git a/src/build/simics/fake_mem.simics b/src/build/simics/fake_mem.simics
new file mode 100644
index 000000000..b9ffc27b0
--- /dev/null
+++ b/src/build/simics/fake_mem.simics
@@ -0,0 +1,5 @@
+#Fake out memory map of 32GB in Simics
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000000 0x0
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000010 0x800000000 -b  size=8
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000020 0x1
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000030 0x1
diff --git a/src/build/simics/run_as_vpo.simics b/src/build/simics/run_as_vpo.simics
new file mode 100644
index 000000000..4236ad453
--- /dev/null
+++ b/src/build/simics/run_as_vpo.simics
@@ -0,0 +1,8 @@
+system_cmp0.phys_mem.del-map p9Proc0.l3_cache_ram
+($hb_cpu)->hrmor=0x00000000
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000000 0x0
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000010 0x800000000 -b  size=8
+p9Proc0.p9_mem_map.host_xscom_device_mm.write 0x050000020 0x1
+system_cmp0.phys_mem.load-file ../obj/ppc/hbfw/img/fake6m.pnor 0x00400000
+system_cmp0.phys_mem.load-file ../obj/ppc/hbfw/img/hostboot.bin 0x00000000
+system_cmp0.phys_mem.del-map p9Proc0.lpcm