From e5dfc3ab0ec51ee63205c7064b7b4a4c4b8ba46f Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Mon, 18 Jun 2018 23:05:31 -0500 Subject: Allow SPDX override as part of FW load Memory VPD contents have changed since the cards have been built so we need to provide a method to override the data as part of a FW build. We have done the same thing previously for the MEMD record on the Nimbus machines so will use the same design here for SPDX. As part of this change, the previous MEMD support was refactored to be completely generic so a single code path can be used for any arbitrary record. Change-Id: I5af5e965429c881be3de0d18c82b1d7918ac9c22 CQ: SW430659 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61190 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Michael Baiocchi Reviewed-by: Nicholas E. Bofferding Reviewed-by: William G. Hoffa Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60980 --- src/include/usr/util/utilrsvdmem.H | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/include/usr/util') diff --git a/src/include/usr/util/utilrsvdmem.H b/src/include/usr/util/utilrsvdmem.H index ed4d0e4f5..d93819b7b 100644 --- a/src/include/usr/util/utilrsvdmem.H +++ b/src/include/usr/util/utilrsvdmem.H @@ -35,23 +35,33 @@ namespace Util typedef uint64_t hbrt_mem_label_t; // Ascii label "VPD " in hex - constexpr hbrt_mem_label_t HBRT_MEM_LABEL_VPD = 0x5650442020202020; + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_VPD = 0x5650442020202020; // Ascii label "ATTR " in hex - constexpr hbrt_mem_label_t HBRT_MEM_LABEL_ATTR = 0x4154545220202020; + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_ATTR = 0x4154545220202020; // Ascii label "ATTROVER" in hex - constexpr hbrt_mem_label_t HBRT_MEM_LABEL_ATTROVER = 0x415454524F564552; + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_ATTROVER = 0x415454524F564552; // Ascii label "PADDING " in hex - constexpr hbrt_mem_label_t HBRT_MEM_LABEL_PADDING = 0x50414444494E4720; + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_PADDING = 0x50414444494E4720; // Ascii label "HYPCOMM " in hex - constexpr hbrt_mem_label_t HBRT_MEM_LABEL_HYPCOMM = 0x485950434f4d4d20; + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_HYPCOMM = 0x485950434f4d4d20; // Ascii label "TRACEBUF" in hex constexpr hbrt_mem_label_t HBRT_MEM_LABEL_TRACEBUF = 0x5452414345425546; + // Note : may be several sections of the format 'VPD_xxxx' if support + // other overrides in the future + // Ascii label "VPD_" in hex + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_VPD_XXXX = 0x5650445F00000000; + // Mask off specific VPD label + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_VPD_MASK = 0x00000000FFFFFFFF; + // Ascii label "VPD_MEMD in hex + constexpr hbrt_mem_label_t HBRT_MEM_LABEL_VPD_MEMD = 0x5650445F4D454D44; + + /** @brief A 32 byte table of contents entry */ struct hbrtTableOfContentsEntry_t { -- cgit v1.2.3