diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2013-08-05 09:20:20 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-08-07 16:48:28 -0500 |
| commit | 4f00fd5fef1cd375f85516c8fbc3855f0dd93b5a (patch) | |
| tree | 97eae2c986b122deefce06b8762a2295675976c2 /src/usr/hwpf/plat | |
| parent | 75ecf4cb9842739b4f495c0cf3f330f03cd348dd (diff) | |
| download | blackbird-hostboot-4f00fd5fef1cd375f85516c8fbc3855f0dd93b5a.tar.gz blackbird-hostboot-4f00fd5fef1cd375f85516c8fbc3855f0dd93b5a.zip | |
Do not enable PCI/PHB BARs when starting PHYP
Change-Id: Ie01a1a2966a2ed6e7ca0a14ec9a4ab54f779c7e3
CQ: SW213092
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5697
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/plat')
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatAttributeService.C | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index c3ab3567a..71fefb5a8 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -1041,14 +1041,30 @@ fapi::ReturnCode fapiPlatGetProcPcieBarEnable ( } else { + // In PHYP mode, we need to leave the PCI BARs disabled + bool phyp_mode = false; + if( TARGETING::is_phyp_load() ) + { + phyp_mode = true; + } + // BAR # 0 are the PCIE unit #'s // BAR # 1 is reserved, should be DISabled (per Joe McGill) // BAR # 2 are the PHB REGS for( uint8_t u=0; u<3; u++ ) { - o_pcieBarEnable[u][0] = l_isEnabled ; - o_pcieBarEnable[u][1] = PROC_BARS_DISABLE ; - o_pcieBarEnable[u][2] = l_isEnabled ; + if( phyp_mode ) + { + o_pcieBarEnable[u][0] = PROC_BARS_DISABLE ; + o_pcieBarEnable[u][1] = PROC_BARS_DISABLE ; + o_pcieBarEnable[u][2] = PROC_BARS_DISABLE ; + } + else + { + o_pcieBarEnable[u][0] = l_isEnabled ; + o_pcieBarEnable[u][1] = PROC_BARS_DISABLE ; + o_pcieBarEnable[u][2] = l_isEnabled ; + } FAPI_DBG( "fapiPlatGetProcPcieBarEnable: Unit %d : %p %p %p", u, |
