diff options
| author | Nick Bofferding <bofferdn@us.ibm.com> | 2017-06-20 14:22:38 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-22 09:20:28 -0400 |
| commit | ccb74685e3205a1f74e4a2264f27775144600d2c (patch) | |
| tree | 1c05f71a8cded2d600ba83621fd8827e32452069 /src/usr/targeting/attrrp.C | |
| parent | 68ff2b9ea18728f467d8945023e62b7b4f645087 (diff) | |
| download | talos-hostboot-ccb74685e3205a1f74e4a2264f27775144600d2c.tar.gz talos-hostboot-ccb74685e3205a1f74e4a2264f27775144600d2c.zip | |
Fix secure PNOR provider deadlock
- Direct extended/targeting image unprotected payload access to PNOR range
Change-Id: Id81b3bcc8c3ef4317e68e111847d6c9d3ede7ac4
CQ: SW392719
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42156
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@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: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/attrrp.C')
| -rwxr-xr-x | src/usr/targeting/attrrp.C | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/usr/targeting/attrrp.C b/src/usr/targeting/attrrp.C index 28ffe8133..da1efdb15 100755 --- a/src/usr/targeting/attrrp.C +++ b/src/usr/targeting/attrrp.C @@ -442,6 +442,17 @@ namespace TARGETING iv_sections[i].pnorAddress = l_pnorSectionInfo.vaddr + l_section->sectionOffset; + #ifdef CONFIG_SECUREBOOT + // RW targeting section is part of the unprotected payload + // so use the normal PNOR virtual address space + if( l_pnorSectionInfo.secure + && iv_sections[i].type == SECTION_TYPE_PNOR_RW) + { + iv_sections[i].pnorAddress -= + (VMM_VADDR_SPNOR_DELTA + VMM_VADDR_SPNOR_DELTA); + } + #endif + if(iv_isMpipl) { //For MPIPL we are reading from real memory, |
