From 7e2a874589b1714f395f27a55b69127c76312e01 Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Thu, 18 Apr 2019 15:00:08 -0500 Subject: Add FAPI_POS and account for 4 possible PMIC targets Forgot to add FAPI_POS with original PMIC target commit. New DIMMs will support 4 PMIC targets, so update simics_AXONE based on that information. Change-Id: I36b966ce7b57f0c1d7124893c5d487f34797b9d7 RTC: 206184 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76173 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Reviewed-by: Glenn Miles Reviewed-by: Daniel M. Crowell --- .../common/xmltohb/simics_AXONE.system.xml | 214 +++++++++++++-------- src/usr/targeting/xmltohb/fapi_utils.pl | 7 +- 2 files changed, 137 insertions(+), 84 deletions(-) (limited to 'src/usr/targeting') diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index 157582ce6..607a4662f 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -43,7 +43,7 @@ * Each OMI unit connects to 1 OCMB chip * Each OCMB unit contains 1 MEM_PORT unit * Each MEM_PORT unit connects to 2 DIMMS (Only 1 dimm per mem_port in this XML) - * Each OCMB chip and its DIMMS are powered by 2 PMIC units + * Each OCMB chip and its DIMMS are powered by up to 4 PMIC units * Each MC unit has 3 OMIC units (a total of 12 per chip) * Each OMIC unit contains 2 or 3 OMI Units (OMIC0/1/3/4 contain 3 and OMIC2/5 contain 2 for a total of 16 per chip) * OMI Units are special as they have two parents (OMIC + MCC (described above)) @@ -9612,6 +9612,10 @@ FAPI_NAME pmic:k0:n0:s0:p00 + + FAPI_POS + 0 + FAPI_I2C_CONTROL_INFO @@ -9652,6 +9656,10 @@ FAPI_NAME pmic:k0:n0:s0:p01 + + FAPI_POS + 1 + FAPI_I2C_CONTROL_INFO @@ -9678,11 +9686,11 @@ - sys0node0pmic2 + sys0node0pmic4 pmic HUID - 0x00360002 + 0x00360004 AFFINITY_PATH @@ -9690,7 +9698,11 @@ FAPI_NAME - pmic:k0:n0:s0:p02 + pmic:k0:n0:s0:p04 + + + FAPI_POS + 4 FAPI_I2C_CONTROL_INFO @@ -9705,11 +9717,11 @@ ORDINAL_ID - 2 + 4 PHYS_PATH - physical:sys-0/node-0/pmic-2 + physical:sys-0/node-0/pmic-4 REL_POS @@ -9718,11 +9730,11 @@ - sys0node0pmic3 + sys0node0pmic5 pmic HUID - 0x00360003 + 0x00360005 AFFINITY_PATH @@ -9730,7 +9742,11 @@ FAPI_NAME - pmic:k0:n0:s0:p03 + pmic:k0:n0:s0:p05 + + + FAPI_POS + 5 FAPI_I2C_CONTROL_INFO @@ -9745,11 +9761,11 @@ ORDINAL_ID - 3 + 5 PHYS_PATH - physical:sys-0/node-0/pmic-3 + physical:sys-0/node-0/pmic-5 REL_POS @@ -9758,11 +9774,11 @@ - sys0node0pmic4 + sys0node0pmic8 pmic HUID - 0x00360004 + 0x00360008 AFFINITY_PATH @@ -9770,7 +9786,11 @@ FAPI_NAME - pmic:k0:n0:s0:p04 + pmic:k0:n0:s0:p08 + + + FAPI_POS + 8 FAPI_I2C_CONTROL_INFO @@ -9785,11 +9805,11 @@ ORDINAL_ID - 4 + 8 PHYS_PATH - physical:sys-0/node-0/pmic-4 + physical:sys-0/node-0/pmic-8 REL_POS @@ -9798,11 +9818,11 @@ - sys0node0pmic5 + sys0node0pmic9 pmic HUID - 0x00360005 + 0x00360009 AFFINITY_PATH @@ -9810,7 +9830,11 @@ FAPI_NAME - pmic:k0:n0:s0:p05 + pmic:k0:n0:s0:p09 + + + FAPI_POS + 9 FAPI_I2C_CONTROL_INFO @@ -9825,11 +9849,11 @@ ORDINAL_ID - 5 + 9 PHYS_PATH - physical:sys-0/node-0/pmic-5 + physical:sys-0/node-0/pmic-9 REL_POS @@ -9838,11 +9862,11 @@ - sys0node0pmic6 + sys0node0pmic12 pmic HUID - 0x00360006 + 0x0036000C AFFINITY_PATH @@ -9850,7 +9874,11 @@ FAPI_NAME - pmic:k0:n0:s0:p06 + pmic:k0:n0:s0:p12 + + + FAPI_POS + 12 FAPI_I2C_CONTROL_INFO @@ -9865,11 +9893,11 @@ ORDINAL_ID - 6 + 12 PHYS_PATH - physical:sys-0/node-0/pmic-6 + physical:sys-0/node-0/pmic-12 REL_POS @@ -9878,11 +9906,11 @@ - sys0node0pmic7 + sys0node0pmic13 pmic HUID - 0x00360007 + 0x0036000D AFFINITY_PATH @@ -9890,7 +9918,11 @@ FAPI_NAME - pmic:k0:n0:s0:p07 + pmic:k0:n0:s0:p13 + + + FAPI_POS + 13 FAPI_I2C_CONTROL_INFO @@ -9905,11 +9937,11 @@ ORDINAL_ID - 7 + 13 PHYS_PATH - physical:sys-0/node-0/pmic-7 + physical:sys-0/node-0/pmic-13 REL_POS @@ -9918,11 +9950,11 @@ - sys0node0pmic8 + sys0node0pmic16 pmic HUID - 0x00360008 + 0x00360010 AFFINITY_PATH @@ -9930,7 +9962,7 @@ FAPI_NAME - pmic:k0:n0:s0:p08 + pmic:k0:n0:s0:p16 FAPI_I2C_CONTROL_INFO @@ -9945,11 +9977,11 @@ ORDINAL_ID - 8 + 16 PHYS_PATH - physical:sys-0/node-0/pmic-8 + physical:sys-0/node-0/pmic-16 REL_POS @@ -9958,11 +9990,11 @@ - sys0node0pmic9 + sys0node0pmic17 pmic HUID - 0x00360009 + 0x00360011 AFFINITY_PATH @@ -9970,7 +10002,11 @@ FAPI_NAME - pmic:k0:n0:s0:p09 + pmic:k0:n0:s0:p17 + + + FAPI_POS + 17 FAPI_I2C_CONTROL_INFO @@ -9985,11 +10021,11 @@ ORDINAL_ID - 9 + 17 PHYS_PATH - physical:sys-0/node-0/pmic-9 + physical:sys-0/node-0/pmic-17 REL_POS @@ -9998,11 +10034,11 @@ - sys0node0pmic10 + sys0node0pmic20 pmic HUID - 0x0036000A + 0x00360014 AFFINITY_PATH @@ -10010,7 +10046,7 @@ FAPI_NAME - pmic:k0:n0:s0:p10 + pmic:k0:n0:s0:p20 FAPI_I2C_CONTROL_INFO @@ -10025,11 +10061,11 @@ ORDINAL_ID - 10 + 20 PHYS_PATH - physical:sys-0/node-0/pmic-0 + physical:sys-0/node-0/pmic-20 REL_POS @@ -10038,11 +10074,11 @@ - sys0node0pmic11 + sys0node0pmic21 pmic HUID - 0x0036000B + 0x00360015 AFFINITY_PATH @@ -10050,7 +10086,7 @@ FAPI_NAME - pmic:k0:n0:s0:p11 + pmic:k0:n0:s0:p21 FAPI_I2C_CONTROL_INFO @@ -10065,11 +10101,11 @@ ORDINAL_ID - 11 + 21 PHYS_PATH - physical:sys-0/node-0/pmic-1 + physical:sys-0/node-0/pmic-21 REL_POS @@ -10078,11 +10114,11 @@ - sys0node0pmic12 + sys0node0pmic24 pmic HUID - 0x0036000C + 0x00360018 AFFINITY_PATH @@ -10090,7 +10126,11 @@ FAPI_NAME - pmic:k0:n0:s0:p12 + pmic:k0:n0:s0:p24 + + + FAPI_POS + 24 FAPI_I2C_CONTROL_INFO @@ -10105,11 +10145,11 @@ ORDINAL_ID - 12 + 24 PHYS_PATH - physical:sys-0/node-0/pmic-0 + physical:sys-0/node-0/pmic-24 REL_POS @@ -10118,11 +10158,11 @@ - sys0node0pmic13 + sys0node0pmic25 pmic HUID - 0x0036000D + 0x00360019 AFFINITY_PATH @@ -10130,7 +10170,7 @@ FAPI_NAME - pmic:k0:n0:s0:p13 + pmic:k0:n0:s0:p25 FAPI_I2C_CONTROL_INFO @@ -10145,11 +10185,11 @@ ORDINAL_ID - 13 + 25 PHYS_PATH - physical:sys-0/node-0/pmic-1 + physical:sys-0/node-0/pmic-25 REL_POS @@ -10158,11 +10198,11 @@ - sys0node0pmic14 + sys0node0pmic28 pmic HUID - 0x0036000E + 0x0036001C AFFINITY_PATH @@ -10170,7 +10210,11 @@ FAPI_NAME - pmic:k0:n0:s0:p14 + pmic:k0:n0:s0:p28 + + + FAPI_POS + 28 FAPI_I2C_CONTROL_INFO @@ -10185,11 +10229,11 @@ ORDINAL_ID - 14 + 28 PHYS_PATH - physical:sys-0/node-0/pmic-0 + physical:sys-0/node-0/pmic-28 REL_POS @@ -10198,11 +10242,11 @@ - sys0node0pmic15 + sys0node0pmic29 pmic HUID - 0x0036000F + 0x0036001D AFFINITY_PATH @@ -10210,7 +10254,7 @@ FAPI_NAME - pmic:k0:n0:s0:p15 + pmic:k0:n0:s0:p29 FAPI_I2C_CONTROL_INFO @@ -10225,11 +10269,11 @@ ORDINAL_ID - 15 + 29 PHYS_PATH - physical:sys-0/node-0/pmic-1 + physical:sys-0/node-0/pmic-29 REL_POS @@ -10238,11 +10282,11 @@ - sys0node0pmic16 + sys0node0pmic32 pmic HUID - 0x00360010 + 0x00360020 AFFINITY_PATH @@ -10250,7 +10294,11 @@ FAPI_NAME - pmic:k0:n0:s0:p16 + pmic:k0:n0:s0:p32 + + + FAPI_POS + 32 FAPI_I2C_CONTROL_INFO @@ -10265,11 +10313,11 @@ ORDINAL_ID - 16 + 32 PHYS_PATH - physical:sys-0/node-0/pmic-0 + physical:sys-0/node-0/pmic-32 REL_POS @@ -10278,11 +10326,11 @@ - sys0node0pmic17 + sys0node0pmic33 pmic HUID - 0x00360011 + 0x00360021 AFFINITY_PATH @@ -10290,7 +10338,11 @@ FAPI_NAME - pmic:k0:n0:s0:p17 + pmic:k0:n0:s0:p33 + + + FAPI_POS + 33 FAPI_I2C_CONTROL_INFO @@ -10305,11 +10357,11 @@ ORDINAL_ID - 17 + 33 PHYS_PATH - physical:sys-0/node-0/pmic-1 + physical:sys-0/node-0/pmic-33 REL_POS diff --git a/src/usr/targeting/xmltohb/fapi_utils.pl b/src/usr/targeting/xmltohb/fapi_utils.pl index 9253fa9eb..f1e7bd124 100644 --- a/src/usr/targeting/xmltohb/fapi_utils.pl +++ b/src/usr/targeting/xmltohb/fapi_utils.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2019 # [+] International Business Machines Corp. # # @@ -282,7 +282,8 @@ sub createTargetExtensionFromFapi(\%,\%) TARGET_TYPE_OMIC => "unit-omic-power9", TARGET_TYPE_MCC => "unit-mcc-power9", TARGET_TYPE_OCMB_CHIP => "chip-ocmb", - TARGET_TYPE_MEM_PORT => "unit-mem_port" + TARGET_TYPE_MEM_PORT => "unit-mem_port", + TARGET_TYPE_PMIC => "pmic", }; # Loop through all of the targets that this attribute @@ -293,7 +294,7 @@ sub createTargetExtensionFromFapi(\%,\%) my $foundmatch = 0; $type =~ s/\s//g; my $targtype = $fapi2targ->{$type}; - #print "type = $type -> $targtype\n"; + # print "type = $type -> $targtype\n"; my $attrid = $fapiattr->{id}; $attrid =~ s/ATTR_//; -- cgit v1.2.1