From 5825828fa7984e6d46dd47ef1835646303d2a593 Mon Sep 17 00:00:00 2001 From: Bill Hoffa Date: Wed, 14 Aug 2019 10:49:46 -0500 Subject: Fix MMIO Addressing and Attributes on Non-Master Proc - MMIOs to the MC/OMI space to a non-master proc were incorrectly using a base address pointing to proc0 - The OMI_INBAND_BAR_BASE_ADDR_OFFSET attribute MRW processing was incorrect for MC and OMI targets behind the 2nd proc Change-Id: Ife440541642463e11d4146157d568f8cd4440877 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82234 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Reviewed-by: Christian R Geddes Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Michael Baiocchi Reviewed-by: Daniel M Crowell --- src/usr/mmio/mmio.C | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/usr/mmio') diff --git a/src/usr/mmio/mmio.C b/src/usr/mmio/mmio.C index 4a5d714ab..7d85dee8f 100644 --- a/src/usr/mmio/mmio.C +++ b/src/usr/mmio/mmio.C @@ -108,8 +108,19 @@ errlHndl_t mmioSetup() auto l_omiBaseAddr = l_mcTarget->getAttr(); - // Apply the MMIO base offset so we get the real address - uint64_t l_realAddr = ( l_omiBaseAddr | MMIO_BASE ); + // Build up the full address with group/chip address considerations + auto l_procType = TARGETING::TYPE_PROC; + TARGETING::Target* l_parentChip = getParent(l_mcTarget, l_procType); + uint8_t l_groupId = + l_parentChip->getAttr(); + uint8_t l_chipId = + l_parentChip->getAttr(); + uint64_t l_realAddr = computeMemoryMapOffset( MMIO_BASE, + l_groupId, + l_chipId ); + + // Apply the MMIO base offset so we get the final address + l_realAddr += l_omiBaseAddr; // Map the device with a kernal call, each device, the MC, is 32 GB uint64_t l_virtAddr = reinterpret_cast -- cgit v1.2.3