Skip to content

Commit

Permalink
ZZ Gen4 WOFDATA
Browse files Browse the repository at this point in the history 
To support SuperWOF we will have a separate set of tables for
ZZ Gen4.  This results in generating new binary blobs and
choosing a unique lid.

Change-Id: I9cb0c8b2b0cea8fa78c922a266800464ba1f6616
CMVC-Prereq: 1101542
RTC: 250374
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/92681
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
Reviewed-by: ARAVIND T. NAIR <aravindnair@in.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
  • Loading branch information
@dcrowell77
dcrowell77 authored and Nicholas E Bofferding committed Mar 11, 2020
1 parent d88e41a commit dced790
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/build/mkrules/hbfw/img/makefile
View file
Expand Up @@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2012,2019
# Contributors Listed Below - COPYRIGHT 2012,2020
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -385,6 +385,7 @@ AXONE_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid
ZZ_WOFDATA_IMG = ${ENGD_WOFPATH:Fzz_wof_data.bin}
ZEPPELIN_WOFDATA_IMG = ${ENGD_WOFPATH:Fzeppelin_wof_data.bin}
FLEETWOOD_WOFDATA_IMG = ${ENGD_WOFPATH:Ffleetwood_wof_data.bin}
ZZGEN4_WOFDATA_IMG = ${ENGD_WOFPATH:Fzzgen4_wof_data.bin}
ZZ_MEMD_IMG = ${ENGD_MEMDPATH:Fzz_memd_output.dat}
ZEPPELIN_MEMD_IMG = ${ENGD_MEMDPATH:Fzeppelin_memd_output.dat}
FLEETWOOD_MEMD_IMG = ${ENGD_MEMDPATH:Ffleetwood_memd_output.dat}
Expand Down Expand Up @@ -453,7 +454,7 @@ ZZ2UGEN4_HBD_FINAL_IMG = ZZ-2U-GEN4.HBD.bin
GEN_ZEPPELIN_BIN_FILES = ZEPPELIN:WOFDATA=${${ZEPPELIN_WOFDATA_IMG}:P},MEMD=${${ZEPPELIN_MEMD_IMG}:P},HBD=${${ZEPPELIN_HBD_IMG}:P}
GEN_FLEETWOOD_BIN_FILES = FLEETWOOD:WOFDATA=${${FLEETWOOD_WOFDATA_IMG}:P},MEMD=${${FLEETWOOD_MEMD_IMG}:P},${FLEETWOOD_HBD_IMGS}
GEN_ZZ2U_BIN_FILES = ZZ-2U:WOFDATA=${${ZZ_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P},HBD=${${ZZ2U_HBD_IMG}:P}
GEN_ZZGEN4_BIN_FILES = ZZ-GEN4:WOFDATA=${${ZZ_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P},HBD=${${ZZGEN4_HBD_IMG}:P}
GEN_ZZGEN4_BIN_FILES = ZZ-GEN4:WOFDATA=${${ZZGEN4_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P},HBD=${${ZZGEN4_HBD_IMG}:P}
GEN_ZZ2UGEN4_BIN_FILES = ZZ-2U-GEN4:WOFDATA=${${ZZ_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P},HBD=${${ZZ2UGEN4_HBD_IMG}:P}

SYSTEM_SPECIFIC_PARAMS = --install-all --emit-eccless ${TARGET_TEST:b--test} ${CONFIG_SECUREBOOT:b--secureboot} \
Expand Down
4 changes: 3 additions & 1 deletion src/include/usr/util/utillidmgr.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* Contributors Listed Below - COPYRIGHT 2013,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -55,6 +55,8 @@ enum LidId
// TODO RTC 172767 Make utillidmgr LIDID structure attribute driven
WOF_LIDID = 0x81e00440,
WOF_CONTAINER_LIDID = 0x80d00015,
WOF_GEN4_LIDID = 0x81e00443,
WOF_GEN4_CONTAINER_LIDID = 0x80d001d,
// Hcode Reference Image LIDs
NIMBUS_HCODE_LIDID = 0x81e00602,
CUMULUS_HCODE_LIDID = 0x81e00603,
Expand Down
1 change: 0 additions & 1 deletion src/usr/targeting/common/xmltohb/attribute_types.xml
View file
Expand Up @@ -8747,7 +8747,6 @@
</description>
<simpleType>
<uint32_t>
<!-- @todo-RTC:172776-Get rid of default value that points to ZZ -->
<default>0x81E00440</default>
</uint32_t>
</simpleType>
Expand Down
6 changes: 5 additions & 1 deletion src/usr/util/runtime/utillidmgr_rt.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* Contributors Listed Below - COPYRIGHT 2013,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -361,6 +361,8 @@ const uint32_t * UtilLidMgr::getLidList(size_t * o_num)
Util::OCC_CONTAINER_LIDID,
Util::WOF_LIDID,
Util::WOF_CONTAINER_LIDID,
Util::WOF_GEN4_LIDID,
Util::WOF_GEN4_CONTAINER_LIDID,
Util::NIMBUS_HCODE_LIDID,
Util::CUMULUS_HCODE_LIDID,
Util::HCODE_CONTAINER_LIDID,
Expand All @@ -379,6 +381,8 @@ bool UtilLidMgr::lidInHbResvMem(const uint32_t i_lidId) const
i_lidId == Util::OCC_CONTAINER_LIDID ||
i_lidId == Util::WOF_LIDID ||
i_lidId == Util::WOF_CONTAINER_LIDID ||
i_lidId == Util::WOF_GEN4_LIDID ||
i_lidId == Util::WOF_GEN4_CONTAINER_LIDID ||
i_lidId == Util::NIMBUS_HCODE_LIDID ||
i_lidId == Util::CUMULUS_HCODE_LIDID ||
i_lidId == Util::HCODE_CONTAINER_LIDID ||
Expand Down
4 changes: 3 additions & 1 deletion src/usr/util/utillidpnor.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* Contributors Listed Below - COPYRIGHT 2014,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -53,6 +53,8 @@ static const PnorLidsMap PnorToLidsMap =
{ PNOR::WOFDATA, LidAndContainerLid(WOF_LIDID, WOF_CONTAINER_LIDID)},
{ PNOR::HCODE, LidAndContainerLid(NIMBUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)},
{ PNOR::RINGOVD, LidAndContainerLid(HWREFIMG_RINGOVD_LIDID,INVALID_LIDID)},
// Note - This list does not include data that is used on non-OPAL
// systems, e.g. CUMULUS_HCODE, WOF_GEN4
};

LidAndContainerLid getPnorSecLidIds(const PNOR::SectionId i_sec)
Expand Down

0 comments on commit dced790

Please sign in to comment.