From 2ba85f05bb0468204d7d0dddda32e9313be4a8a1 Mon Sep 17 00:00:00 2001 From: Murulidhar Nataraju Date: Thu, 20 Feb 2020 09:53:40 -0600 Subject: [PATCH] MPIPL:Fix the condition for copyArchitectedRegs() SBE collects architected register data for below combination of systems.Hence Copy architected register data from Reserved Memory to hypervisor memory. 1) FSP - OPAL 2) BMC - OPAL 3) BMC - PHYP Change-Id: If5bd1fc0e541fd4722742aa24c25fdb8c3c10554 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/92049 Reviewed-by: VASANT HEGDE Tested-by: Jenkins Server Reviewed-by: Daniel M Crowell Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: William G Hoffa --- .../isteps/istep14/call_host_mpipl_service.C | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/usr/isteps/istep14/call_host_mpipl_service.C b/src/usr/isteps/istep14/call_host_mpipl_service.C index bab3ace6273..766aa85b886 100644 --- a/src/usr/isteps/istep14/call_host_mpipl_service.C +++ b/src/usr/isteps/istep14/call_host_mpipl_service.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2019 */ +/* Contributors Listed Below - COPYRIGHT 2015,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -157,10 +157,18 @@ void* call_host_mpipl_service (void *io_pArgs) do { - // In OPAL based system SBE collects architected register - // data. Copy architected register data from Reserved Memory - // to hypervisor memory. - if( TARGETING::is_sapphire_load() ) + //SBE collects architected register data for below combination + //of systems.Hence Copy architected register data from Reserved + //Memory to hypervisor memory. + // + //1) FSP - OPAL + //2) BMC - OPAL + //3) BMC - PHYP + + + //Copy Architected register data if sys is **NOT** (FSP + PHYP) + //combination. + if( !(is_phyp_load() && INITSERVICE::spBaseServicesEnabled()) ) { l_err = DUMP::copyArchitectedRegs(); if (l_err)