dump: Copy data type field from MDST table to MDRT table

In case of OPAL system MDST and MDDT contains entries from multiple sources (OPAL, kernel, etc,). Post MPIPL OPAL needs a way to differentiate between them. Hence copy type field from MDST table to MDRT table. Change-Id: I3f196cdc58e7376d7743188d0a6b76c99799b5ad Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57600 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: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Apr 21, 2018 · b90ed8f · b90ed8f
1 parent 9a3aa40
commit b90ed8f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/include/usr/dump/dumpif.H b/src/include/usr/dump/dumpif.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -101,7 +103,8 @@ namespace DUMP
     struct dumpEntry
     {
         uint64_t dataAddr;
-        uint32_t reserved;
+        uint16_t data_type;    // Used by payload
+        uint16_t reserved;
         uint32_t dataSize;
     } PACKED;
 

diff --git a/src/usr/dump/dumpCollect.C b/src/usr/dump/dumpCollect.C
@@ -508,6 +508,15 @@ errlHndl_t copySrcToDest(dumpEntry *srcTableEntry,
                 resultsTableEntry->destAddr =
                   VmmManager::FORCE_PHYS_ADDR|curDestTableAddr;
                 resultsTableEntry->dataSize = sizeToCopy;
+                // Size field in source/destination table is of 4 bytes.
+                // So result table size field will never cross 4 bytes.
+                // Hence use top 2 bytes to copy data_type from source
+                // table to result table (see HDAT spec for details).
+                if (TARGETING::is_sapphire_load())
+                {
+                    uint64_t data_type = srcTableEntry[curSourceIndex].data_type;
+                    resultsTableEntry->dataSize |= (data_type << 48);
+                }
                 resultsTableEntry++;
                 l_resultCount++;
                 curResultIndex++;