diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2018-03-21 14:05:20 +0530 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-04-21 12:05:37 -0400 |
| commit | a02dc537676283b4aa30bf9045530595e9af9648 (patch) | |
| tree | 079c45053840cc7a8cad3e34ae51252393eeaf2a | |
| parent | a434252bb4dce5a580669a0220c285c447a58188 (diff) | |
| download | talos-hostboot-a02dc537676283b4aa30bf9045530595e9af9648.tar.gz talos-hostboot-a02dc537676283b4aa30bf9045530595e9af9648.zip | |
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/55187
CI-Ready: RAJA DAS <rajadas2@in.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
CI-Ready: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/include/usr/dump/dumpif.H | 7 | ||||
| -rw-r--r-- | src/usr/dump/dumpCollect.C | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/include/usr/dump/dumpif.H b/src/include/usr/dump/dumpif.H index 352229ef3..21bdde05c 100644 --- 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 index 0f31602cf..602ca72be 100644 --- 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++; |
