Skip to content

Commit

Permalink
Fill in remaining dimms for simics_AXONE.system.xml
Browse files Browse the repository at this point in the history
Initial DIMM xmls was taken from cumulus where we skipped
dimms due to memory pair testing. In axone it makes more sense to
have use dimms 0-8 instead of 0,2,4,..14

Change-Id: I9d3c85e96415c0a7908c859697891da703ea8e9d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69902
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
  • Loading branch information
crgeddes committed Dec 18, 2018
1 parent 6620644 commit 36673e6
Showing 1 changed file with 247 additions and 7 deletions.
254 changes: 247 additions & 7 deletions src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9415,6 +9415,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm1</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x00030001</default></attribute>
<attribute><id>POSITION</id><default>1</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p01</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-1</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>1</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>1</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm2</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9433,7 +9463,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9445,6 +9475,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm3</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x00030003</default></attribute>
<attribute><id>POSITION</id><default>3</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p03</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-3</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>3</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>3</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>3</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm4</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9463,7 +9523,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9475,6 +9535,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm5</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x00030005</default></attribute>
<attribute><id>POSITION</id><default>5</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p05</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-5</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>5</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>5</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>5</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm6</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9493,7 +9583,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9505,6 +9595,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm7</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x00030007</default></attribute>
<attribute><id>POSITION</id><default>7</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p07</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-7</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>7</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>7</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>7</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm8</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9523,7 +9643,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9535,6 +9655,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm9</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x00030009</default></attribute>
<attribute><id>POSITION</id><default>9</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p09</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-9</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>9</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>9</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>9</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm10</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9553,7 +9703,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9565,6 +9715,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm11</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x0003000B</default></attribute>
<attribute><id>POSITION</id><default>11</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p11</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-11</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>11</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>11</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>11</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm12</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9583,7 +9763,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-0/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9595,6 +9775,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm13</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x0003000D</default></attribute>
<attribute><id>POSITION</id><default>13</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p13</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-13</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>13</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-0/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>13</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>13</default>
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm14</id>
<type>lcard-dimm-jedec</type>
Expand All @@ -9613,7 +9823,7 @@
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-1/omi-0/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
Expand All @@ -9625,6 +9835,36 @@
</attribute>
</targetInstance>

<targetInstance>
<id>sys0node0dimm15</id>
<type>lcard-dimm-jedec</type>
<attribute><id>HUID</id><default>0x0003000F</default></attribute>
<attribute><id>POSITION</id><default>15</default></attribute>
<attribute>
<id>FAPI_NAME</id><default>dimm:k0:n0:s0:p15</default>
</attribute>
<attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0/node-0/dimm-15</default>
</attribute>
<attribute>
<id>ORDINAL_ID</id>
<default>15</default>
</attribute>
<attribute>
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-1/omi-1/ocmb_chip-0/mem_port-0/dimm-0</default>
</attribute>
<attribute>
<id>FAPI_POS</id>
<default>15</default>
</attribute>
<attribute>
<id>VPD_REC_NUM</id>
<default>15</default>
</attribute>
</targetInstance>

<!-- ===================================================================== -->
<!-- OMIC Units -->
<!-- ===================================================================== -->
Expand Down

0 comments on commit 36673e6

Please sign in to comment.