diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-06-08 13:29:15 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-28 16:01:35 -0400 |
| commit | b29154df590cec5b8fd11d5fd228332c95c8f915 (patch) | |
| tree | cd42b6e43fda058ba502a1209c87d643132ea738 /src/kernel | |
| parent | ab2b3a0f07219b0a3c51b7215bb4b1b4f42deb08 (diff) | |
| download | talos-hostboot-b29154df590cec5b8fd11d5fd228332c95c8f915.tar.gz talos-hostboot-b29154df590cec5b8fd11d5fd228332c95c8f915.zip | |
Remove Hacks / Workarounds put in by commits 41463 and 41574
Remove hacks to set LPC and XSCOM MMIO BAR default values in Bootloader and in
data passed to Hostboot (defect SW391259).
Change-Id: I3df6accadda8a5c461d969ed38e7970bc37291c9
CQ: SW391539
CMVC-Prereq: 1026637
Depends-on: I55ca10034d7adf3e766edb4d0071f649c7c90446
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41556
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/bltohbdatamgr.C | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/bltohbdatamgr.C b/src/kernel/bltohbdatamgr.C index 1bc076628..1fa211381 100644 --- a/src/kernel/bltohbdatamgr.C +++ b/src/kernel/bltohbdatamgr.C @@ -145,7 +145,9 @@ printk("Version=%lX\n",i_data.version); } // Ensure Bootloader to HB structure has the MMIO members - if( iv_data.version >= Bootloader::BLTOHB_MMIOBARS ) + // NOTE: BLTOHB_MMIOBARS version may not be sufficient to ensure that BARs + // were set correctly, instead use BLTOHB_SECURE_OVERRIDES version. + if( iv_data.version >= Bootloader::BLTOHB_SECURE_OVERRIDES ) { printk("lpc=%lX, xscom=%lX\n", i_data.lpcBAR, i_data.xscomBAR ); kassert(i_data.lpcBAR>0); @@ -161,10 +163,8 @@ printk("lpc=%lX, xscom=%lX\n", i_data.lpcBAR, i_data.xscomBAR ); } - //@fixme-RTC:149250-Remove this hack - iv_data.lpcBAR = MMIO_GROUP0_CHIP0_LPC_BASE_ADDR; - iv_data.xscomBAR = MMIO_GROUP0_CHIP0_XSCOM_BASE_ADDR; - printk( "Use default LPC/XSCOM\n" ); +printk("lpc=%lX, xscom=%lX, iv_data=%p\n", iv_data.lpcBAR, iv_data.xscomBAR, + static_cast<void *>(&iv_data) ); // Size of data that needs to be preserved and pinned. |
