Skip to content

Commit

Permalink
Get Final HDAT Size from PAYLOAD's SPIRA section
Browse files Browse the repository at this point in the history 
This commit retrieves the amount of space the PAYLOAD has reserved
for the HDAT content in its SPIRA section.  It then uses this size
when copying the HDAT from the temporary location (where the FSP
put it with DMAs-via-TCEs) to its final location.

Change-Id: I430a78a1655db85f448b3f5c30e6a83f5be4b1f6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58261
Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.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: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@mabaiocchi @dcrowell77
mabaiocchi authored and dcrowell77 committed May 8, 2018
1 parent d44dfb6 commit 3d3d39d
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 22 deletions.
1 change: 1 addition & 0 deletions src/include/usr/isteps/istep_reasoncodes.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ namespace ISTEP
RC_FAILED_WRITE_SPR = ISTEP_COMP_ID | 0x37,
RC_FAILED_TO_BOOT_SBE = ISTEP_COMP_ID | 0x38,
RC_REDISCOVERED_TARGETS = ISTEP_COMP_ID | 0x39,
RC_HDAT_SIZE_CHECK_FAILED = ISTEP_COMP_ID | 0x3A,
};

};
Expand Down
5 changes: 4 additions & 1 deletion src/include/usr/runtime/runtime.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,11 @@ errlHndl_t openUntrustedSpCommArea(uint64_t i_commbase);
*
* @param[in] payloadBase_va - Virtual Address pointing to start of PAYLOAD
* @param[out] o_hdat_offset - Offset of HDAT Location from start of PAYLOAD
* @param[out] o_hdat_size - Size of HDAT Location reserved by PAYLOAD
*/
void findHdatLocation(uint64_t payloadBase_va, uint64_t& o_hdat_offset);
void findHdatLocation(uint64_t payloadBase_va,
uint64_t& o_hdat_offset,
size_t& o_hdat_size);

}

Expand Down
53 changes: 43 additions & 10 deletions src/usr/isteps/istep21/call_host_runtime_setup.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@ errlHndl_t verifyAndMovePayload(void)
payload_tmp_virt_addr,
payload_size);

// Convert the move payloadBase_va to after secure header for PHYP
uint64_t payloadBase_va = reinterpret_cast<uint64_t>(payloadBase_virt_addr);
payloadBase_va += (is_phyp ? PAGESIZE : 0 );

// Move HDAT into its proper place after it was temporarily put into
// HDAT_TMP_ADDR-relative-to-HRMOR (HDAT_TMP_SIZE) by the FSP via TCEs
Expand All @@ -395,14 +398,43 @@ errlHndl_t verifyAndMovePayload(void)
break;
}

// Determine location of HDAT from NACA section of PAYLOAD
// Determine location and size of HDAT from NACA section of PAYLOAD
uint64_t hdat_cpy_offset = 0;
size_t hdat_cpy_size = 0;

// Convert the move payloadBase_va to after secure header for PHYP
uint64_t payloadBase_va = reinterpret_cast<uint64_t>(payloadBase_virt_addr);
payloadBase_va += (is_phyp ? PAGESIZE : 0 );
RUNTIME::findHdatLocation(payloadBase_va, hdat_cpy_offset, hdat_cpy_size);


// Check that the size PAYLOAD allocated for HDAT is less than
// temporary HDAT space
if ( hdat_cpy_size > HDAT_TMP_SIZE)
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,ERR_MRK
"verifyAndMovePayload(): PAYLOAD's allocated HDAT size 0x%X "
"Exceeds Maximum Temporary HDAT Size 0x%X",
hdat_cpy_size, HDAT_TMP_SIZE);

RUNTIME::findHdatLocation(payloadBase_va, hdat_cpy_offset);
/*@
* @errortype
* @reasoncode RC_HDAT_SIZE_CHECK_FAILED
* @severity ERRL_SEV_UNRECOVERABLE
* @moduleid MOD_VERIFY_AND_MOVE_PAYLOAD
* @userdata1 Allocated HDAT size from PAYLOAD
* @userdata2 Temporary HDAT size
* @devdesc PAYLOAD allocated more HDAT space than temporary
* space that Hostboot uses
* @custdesc A problem occurred during the IPL
* of the system.
*/
l_err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
MOD_VERIFY_AND_MOVE_PAYLOAD,
RC_HDAT_SIZE_CHECK_FAILED,
hdat_cpy_size,
HDAT_TMP_SIZE,
true /*Add HB SW Callout*/);
l_err ->collectTrace("ISTEPS_TRACE",256);
break;
}

// PHYP images require adding 1 PAGESIZE since our virtual address starts
// at the secure header of PAYLOAD before PAYLOAD_BASE
Expand All @@ -412,13 +444,13 @@ errlHndl_t verifyAndMovePayload(void)
}

TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"verifyAndMovePayload(): hdat_copy_offset = 0x%X",
hdat_cpy_offset);
"verifyAndMovePayload(): hdat_copy_offset = 0x%X and size=0x%X",
hdat_cpy_offset, hdat_cpy_size);

hdat_final_virt_addr = mm_block_map(
reinterpret_cast<void*>(payloadBase +
hdat_cpy_offset),
HDAT_TMP_SIZE);
hdat_cpy_size);

// Check for nullptr being returned
if (hdat_final_virt_addr == nullptr)
Expand All @@ -436,11 +468,12 @@ errlHndl_t verifyAndMovePayload(void)
"verifyAndMovePayload(): Copy HDAT from 0x%.16llX (va="
"0x%llX) to HDAT_FINAL = 0x%.16llX (va=0x%llX), size=0x%llX",
hdat_tmp_phys_addr, hdat_tmp_virt_addr,
payloadBase+hdat_cpy_offset, hdat_final_virt_addr, HDAT_TMP_SIZE);
payloadBase+hdat_cpy_offset, hdat_final_virt_addr,
hdat_cpy_size);

memcpy(hdat_final_virt_addr,
hdat_tmp_virt_addr,
HDAT_TMP_SIZE);
hdat_cpy_size);

} while(0);

Expand Down
28 changes: 17 additions & 11 deletions src/usr/runtime/hdatservice.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1800,9 +1800,10 @@ errlHndl_t clear_host_data_section(const RUNTIME::SectionId i_section)
}


void findHdatLocation(const uint64_t i_payloadBase_va, uint64_t& o_hdat_offset)
void findHdatLocation(const uint64_t i_payloadBase_va,
uint64_t& o_hdat_offset,
size_t& o_hdat_size)
{

TRACFCOMP( g_trac_runtime, ENTER_MRK"findHdatLocation> i_payloadBase_va = 0x%.16llX", i_payloadBase_va);

do {
Expand All @@ -1814,22 +1815,27 @@ void findHdatLocation(const uint64_t i_payloadBase_va, uint64_t& o_hdat_offset)
(HDAT_NACA_OFFSET + i_payloadBase_va);
TRACFCOMP( g_trac_runtime, "findHdatLocation> NACA=0x%.X->0x%p", HDAT_NACA_OFFSET, naca );

// Find SpiraH information in NACA
const hdatSpira_t* spiraH = reinterpret_cast<const hdatSpira_t*>
// Find SpiraH information in NACA
const hdatSpira_t* spiraH = reinterpret_cast<const hdatSpira_t*>
(naca->spiraH + i_payloadBase_va);
TRACFCOMP( g_trac_runtime, "findHdatLocation> SPIRA-H=0x%X->0x%p", naca->spiraH, spiraH );
TRACFCOMP( g_trac_runtime, "findHdatLocation> SPIRA-H=0x%X->0x%p", naca->spiraH, spiraH );

// SPIRA-S is at the beginning of the Host Data Area Tuple of SpiraH
const hdat5Tuple_t* tuple = reinterpret_cast<const hdat5Tuple_t*>
(&(spiraH->hdatDataArea[SPIRAH_HOST_DATA_AREAS]));
TRACFCOMP( g_trac_runtime, "findHdatLocation> SPIRA-S tuple at 0x%p, tuple->hdatAbsAddr=0x%X", tuple, tuple->hdatAbsAddr );
// SPIRA-S is at the beginning of the Host Data Area Tuple of SpiraH
const hdat5Tuple_t* tuple = reinterpret_cast<const hdat5Tuple_t*>
(&(spiraH->hdatDataArea[SPIRAH_HOST_DATA_AREAS]));
TRACFCOMP( g_trac_runtime, "findHdatLocation> SPIRA-S tuple at 0x%p: "
"hdatAbsAddr=0x%X, hdatAllocCnt=0x%X, hdatAllocSize=0x%X",
tuple, tuple->hdatAbsAddr, tuple->hdatAllocCnt,
tuple->hdatAllocSize );

o_hdat_offset = tuple->hdatAbsAddr;
o_hdat_size = tuple->hdatAllocCnt * tuple->hdatAllocSize;

} while (0);

TRACFCOMP( g_trac_runtime, EXIT_MRK"findHdatLocation> o_hdat_offset = 0x%X", o_hdat_offset);

TRACFCOMP( g_trac_runtime, EXIT_MRK"findHdatLocation> "
"o_hdat_offset = 0x%X, o_hdat_size=0x%X",
o_hdat_offset, o_hdat_size);
}


Expand Down

0 comments on commit 3d3d39d

Please sign in to comment.