From 24c6ac779e4ad663fd997bee7a52a807f3e6beb3 Mon Sep 17 00:00:00 2001 From: Dean Sanner Date: Mon, 14 Apr 2014 12:51:31 -0500 Subject: Correct BAR calculation in Sapphire mode Change-Id: Ifdaea94a0253fd17a43133da0d064e97bfc09554 CQ: SW257095 Backport: release-fips810 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10492 Tested-by: Jenkins Server Reviewed-by: Andrew J. Geissler Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/plat/fapiPlatAttributeService.C | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/usr/hwpf/plat/fapiPlatAttributeService.C') diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index 25e2a50c1..6f4d40042 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -955,9 +955,9 @@ fapi::ReturnCode fapiPlatGetProcPcieBarBaseAddr ( { if(TARGETING::is_sapphire_load()) { - o_pcieBarBase[u][0] = SAPPHIRE_PCIE_BAR0_BASE | + o_pcieBarBase[u][0] = SAPPHIRE_PCIE_BAR0_BASE + (l_pciMem64[u] & PCIE_BAR0_OFFSET_MASK); - o_pcieBarBase[u][1] = SAPPHIRE_PCIE_BAR1_BASE | + o_pcieBarBase[u][1] = SAPPHIRE_PCIE_BAR1_BASE + (l_pciMem32[u] & PCIE_BAR1_OFFSET_MASK); } else @@ -968,7 +968,8 @@ fapi::ReturnCode fapiPlatGetProcPcieBarBaseAddr ( o_pcieBarBase[u][2] = l_phbRegs[u]; - FAPI_DBG( "fapiPlatGetProcPcieBarBaseAddr: Unit %d : %p %p %p", + FAPI_DBG( "fapiPlatGetProcPcieBarBaseAddr: Chip %x Unit %d : %p %p %p", + TARGETING::get_huid(l_pProcTarget), u, o_pcieBarBase[u][0], o_pcieBarBase[u][1], -- cgit v1.2.3