From 76571f381d074c99f44d3ff94d4607cc09eef1be Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Wed, 12 Feb 2020 22:32:55 +0530 Subject: MPIPL: Copy all SBE data to hypervisor memory This patch fixes couple of regressions introduced by commit d99b1ed. - Setting wrong offset size. As per HDAT spec internal data structure array size should be 0x10. - Remove double increment of procNum Fixes: d99b1ed (Add SBE Arch dump area for both OPAL & PHYP) Change-Id: I8a3737c1375b74fb488136a3aefa3a4420cf1b6c CC: Dean Sanner Signed-off-by: Vasant Hegde Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/91580 Reviewed-by: MURULIDHAR NATARAJU Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M Crowell --- src/usr/dump/dumpCollect.C | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/usr/dump/dumpCollect.C b/src/usr/dump/dumpCollect.C index 970231213..b85bcd28b 100644 --- a/src/usr/dump/dumpCollect.C +++ b/src/usr/dump/dumpCollect.C @@ -421,7 +421,6 @@ errlHndl_t copyArchitectedRegs(void) uint64_t procSrcAddr = (reinterpret_cast(vMapSrcAddrBase)+ procNum * VMM_ARCH_REG_DATA_PER_PROC_SIZE); TRACDCOMP(g_trac_dump, "SBE Proc[%d] [%p]", procNum, procSrcAddr); - procNum++; sbeArchRegDumpProcHdr_t *sbeProcHdr = reinterpret_cast(procSrcAddr); @@ -503,7 +502,7 @@ errlHndl_t copyArchitectedRegs(void) hostHdr->pir = sbeTdHdr->pir; hostHdr->coreState = sbeTdHdr->coreState; hostHdr->iv_regArrayHdr.hdatOffset = - sizeof(hostArchRegDataHdr); + sizeof(HDAT::hdatHDIFDataArray_t); hostHdr->iv_regArrayHdr.hdatArrayCnt = regCount; hostHdr->iv_regArrayHdr.hdatAllocSize = sizeof(hostArchRegDataEntry); -- cgit v1.2.1