diff options
author | Matt Derksen <mderkse1@us.ibm.com> | 2019-04-18 15:00:08 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-04-24 13:56:52 -0500 |
commit | 7e2a874589b1714f395f27a55b69127c76312e01 (patch) | |
tree | 0982b52c8c27b89c0d0b9710619e9054dc7832eb /src/usr | |
parent | a1f8b3160946b44d37ac947de70430f4a49b28cd (diff) | |
download | talos-hostboot-7e2a874589b1714f395f27a55b69127c76312e01.tar.gz talos-hostboot-7e2a874589b1714f395f27a55b69127c76312e01.zip |
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 <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_AXONE.system.xml | 214 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/fapi_utils.pl | 7 |
2 files changed, 137 insertions, 84 deletions
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)) @@ -9613,6 +9613,10 @@ <default>pmic:k0:n0:s0:p00</default> </attribute> <attribute> + <id>FAPI_POS</id> + <default>0</default> + </attribute> + <attribute> <id>FAPI_I2C_CONTROL_INFO</id> <default> <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> @@ -9653,6 +9657,10 @@ <default>pmic:k0:n0:s0:p01</default> </attribute> <attribute> + <id>FAPI_POS</id> + <default>1</default> + </attribute> + <attribute> <id>FAPI_I2C_CONTROL_INFO</id> <default> <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field> @@ -9678,11 +9686,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic2</id> + <id>sys0node0pmic4</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360002</default> + <default>0x00360004</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9690,7 +9698,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p02</default> + <default>pmic:k0:n0:s0:p04</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>4</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9705,11 +9717,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>2</default> + <default>4</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-2</default> + <default>physical:sys-0/node-0/pmic-4</default> </attribute> <attribute> <id>REL_POS</id> @@ -9718,11 +9730,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic3</id> + <id>sys0node0pmic5</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360003</default> + <default>0x00360005</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9730,7 +9742,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p03</default> + <default>pmic:k0:n0:s0:p05</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>5</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9745,11 +9761,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>3</default> + <default>5</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-3</default> + <default>physical:sys-0/node-0/pmic-5</default> </attribute> <attribute> <id>REL_POS</id> @@ -9758,11 +9774,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic4</id> + <id>sys0node0pmic8</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360004</default> + <default>0x00360008</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9770,7 +9786,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p04</default> + <default>pmic:k0:n0:s0:p08</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>8</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9785,11 +9805,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>4</default> + <default>8</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-4</default> + <default>physical:sys-0/node-0/pmic-8</default> </attribute> <attribute> <id>REL_POS</id> @@ -9798,11 +9818,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic5</id> + <id>sys0node0pmic9</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360005</default> + <default>0x00360009</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9810,7 +9830,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p05</default> + <default>pmic:k0:n0:s0:p09</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>9</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9825,11 +9849,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>5</default> + <default>9</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-5</default> + <default>physical:sys-0/node-0/pmic-9</default> </attribute> <attribute> <id>REL_POS</id> @@ -9838,11 +9862,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic6</id> + <id>sys0node0pmic12</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360006</default> + <default>0x0036000C</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9850,7 +9874,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p06</default> + <default>pmic:k0:n0:s0:p12</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>12</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9865,11 +9893,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>6</default> + <default>12</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-6</default> + <default>physical:sys-0/node-0/pmic-12</default> </attribute> <attribute> <id>REL_POS</id> @@ -9878,11 +9906,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic7</id> + <id>sys0node0pmic13</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360007</default> + <default>0x0036000D</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9890,7 +9918,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p07</default> + <default>pmic:k0:n0:s0:p13</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>13</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9905,11 +9937,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>7</default> + <default>13</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-7</default> + <default>physical:sys-0/node-0/pmic-13</default> </attribute> <attribute> <id>REL_POS</id> @@ -9918,11 +9950,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic8</id> + <id>sys0node0pmic16</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360008</default> + <default>0x00360010</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9930,7 +9962,7 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p08</default> + <default>pmic:k0:n0:s0:p16</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9945,11 +9977,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>8</default> + <default>16</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-8</default> + <default>physical:sys-0/node-0/pmic-16</default> </attribute> <attribute> <id>REL_POS</id> @@ -9958,11 +9990,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic9</id> + <id>sys0node0pmic17</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360009</default> + <default>0x00360011</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -9970,7 +10002,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p09</default> + <default>pmic:k0:n0:s0:p17</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>17</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -9985,11 +10021,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>9</default> + <default>17</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-9</default> + <default>physical:sys-0/node-0/pmic-17</default> </attribute> <attribute> <id>REL_POS</id> @@ -9998,11 +10034,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic10</id> + <id>sys0node0pmic20</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000A</default> + <default>0x00360014</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10010,7 +10046,7 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p10</default> + <default>pmic:k0:n0:s0:p20</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10025,11 +10061,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>10</default> + <default>20</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-0</default> + <default>physical:sys-0/node-0/pmic-20</default> </attribute> <attribute> <id>REL_POS</id> @@ -10038,11 +10074,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic11</id> + <id>sys0node0pmic21</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000B</default> + <default>0x00360015</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10050,7 +10086,7 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p11</default> + <default>pmic:k0:n0:s0:p21</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10065,11 +10101,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>11</default> + <default>21</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-1</default> + <default>physical:sys-0/node-0/pmic-21</default> </attribute> <attribute> <id>REL_POS</id> @@ -10078,11 +10114,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic12</id> + <id>sys0node0pmic24</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000C</default> + <default>0x00360018</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10090,7 +10126,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p12</default> + <default>pmic:k0:n0:s0:p24</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>24</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10105,11 +10145,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>12</default> + <default>24</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-0</default> + <default>physical:sys-0/node-0/pmic-24</default> </attribute> <attribute> <id>REL_POS</id> @@ -10118,11 +10158,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic13</id> + <id>sys0node0pmic25</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000D</default> + <default>0x00360019</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10130,7 +10170,7 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p13</default> + <default>pmic:k0:n0:s0:p25</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10145,11 +10185,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>13</default> + <default>25</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-1</default> + <default>physical:sys-0/node-0/pmic-25</default> </attribute> <attribute> <id>REL_POS</id> @@ -10158,11 +10198,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic14</id> + <id>sys0node0pmic28</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000E</default> + <default>0x0036001C</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10170,7 +10210,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p14</default> + <default>pmic:k0:n0:s0:p28</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>28</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10185,11 +10229,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>14</default> + <default>28</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-0</default> + <default>physical:sys-0/node-0/pmic-28</default> </attribute> <attribute> <id>REL_POS</id> @@ -10198,11 +10242,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic15</id> + <id>sys0node0pmic29</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x0036000F</default> + <default>0x0036001D</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10210,7 +10254,7 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p15</default> + <default>pmic:k0:n0:s0:p29</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10225,11 +10269,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>15</default> + <default>29</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-1</default> + <default>physical:sys-0/node-0/pmic-29</default> </attribute> <attribute> <id>REL_POS</id> @@ -10238,11 +10282,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic16</id> + <id>sys0node0pmic32</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360010</default> + <default>0x00360020</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10250,7 +10294,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p16</default> + <default>pmic:k0:n0:s0:p32</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>32</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10265,11 +10313,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>16</default> + <default>32</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-0</default> + <default>physical:sys-0/node-0/pmic-32</default> </attribute> <attribute> <id>REL_POS</id> @@ -10278,11 +10326,11 @@ </targetInstance> <targetInstance> - <id>sys0node0pmic17</id> + <id>sys0node0pmic33</id> <type>pmic</type> <attribute> <id>HUID</id> - <default>0x00360011</default> + <default>0x00360021</default> </attribute> <attribute> <id>AFFINITY_PATH</id> @@ -10290,7 +10338,11 @@ </attribute> <attribute> <id>FAPI_NAME</id> - <default>pmic:k0:n0:s0:p17</default> + <default>pmic:k0:n0:s0:p33</default> + </attribute> + <attribute> + <id>FAPI_POS</id> + <default>33</default> </attribute> <attribute> <id>FAPI_I2C_CONTROL_INFO</id> @@ -10305,11 +10357,11 @@ </attribute> <attribute> <id>ORDINAL_ID</id> - <default>17</default> + <default>33</default> </attribute> <attribute> <id>PHYS_PATH</id> - <default>physical:sys-0/node-0/pmic-1</default> + <default>physical:sys-0/node-0/pmic-33</default> </attribute> <attribute> <id>REL_POS</id> 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_//; |