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/targeting/common/processMrw.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/usr/targeting') diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl index 24759589c..9840a5213 100755 --- a/src/usr/targeting/common/processMrw.pl +++ b/src/usr/targeting/common/processMrw.pl @@ -1662,9 +1662,9 @@ sub processMcbist ## sub processMc { - # TODO, work needs to be done for OMI_INBAND_BAR_BASE_ADDR_OFFSET - # Will be added in a later commit along with the other BARs - # RTC:210315 + # NOTE: OMI_INBAND_BAR_BASE_ADDR_OFFSET will be set for the MC + # targets via a specific child OMI Target. View the + # processOmi function for further details. my $targetObj = shift; my $target = shift; @@ -1765,7 +1765,7 @@ sub processOmi $value = "physical:sys-0/node-0/proc-$proc_num/" . $omi_map{$num}; $targetObj->setAttribute($target, "OMIC_PARENT", $value); - my $omi = Math::BigInt->new($targetObj->getAttribute($target,"FAPI_POS")); + my $omi = Math::BigInt->new($targetObj->getAttribute($target,"CHIP_UNIT")); # Base omi bar offset # We use this base address in simics_AXONE.system.xml and want our # addresses to match the ones in that xml -- cgit v1.2.3