summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <williamspatrick@gmail.com>2014-12-16 09:55:14 -0600
committerPatrick Williams <williamspatrick@gmail.com>2014-12-16 09:55:14 -0600
commitdc15d115bffca490e96a440195fca2c90920b3ca (patch)
tree962324fba15f60ceb201e75ff676a4f7138acd67
parente02b6f6ddd5f225ddb70c286a10685df5b9267db (diff)
parent7de45b93c898a691cd86010faff78a550a4ec783 (diff)
downloadcommon-op-xml-master.zip
common-op-xml-master.tar.gz
Merge pull request #4 from mabaiocchi/masterHEADmaster
These changes fix the parsing of the Processor PCIE busses
-rw-r--r--OPNPWR_VENICE.xml3
-rw-r--r--turismo_scm.xml178
2 files changed, 96 insertions, 85 deletions
diff --git a/OPNPWR_VENICE.xml b/OPNPWR_VENICE.xml
index 659d32a..597763e 100644
--- a/OPNPWR_VENICE.xml
+++ b/OPNPWR_VENICE.xml
@@ -157,7 +157,8 @@
<pcie-root-units>
<pcie-root-unit><id>PCIE_IOP0</id><iop>0</iop><starting-lane>0</starting-lane></pcie-root-unit> <!-- IOP 0 is x16, or 2 x8s -->
<pcie-root-unit><id>PCIE_IOP0_1</id><iop>0</iop><starting-lane>8</starting-lane></pcie-root-unit> <!-- if IOP 0 is bifucated into 2 x8s, use this -->
- <pcie-root-unit><id>PCIE_IOP1</id><iop>1</iop><starting-lane>0</starting-lane></pcie-root-unit> <!-- IOP 1 is x8 -->
+ <pcie-root-unit><id>PCIE_IOP1</id><iop>1</iop><starting-lane>0</starting-lane></pcie-root-unit> <!-- IOP 1 is x16, or 2 x8s -->
+ <pcie-root-unit><id>PCIE_IOP1_1</id><iop>1</iop><starting-lane>8</starting-lane></pcie-root-unit> <!-- if IOP 1 is bifucated into 2 x8s, use this -->
</pcie-root-units>
diff --git a/turismo_scm.xml b/turismo_scm.xml
index 357551c..b08392a 100644
--- a/turismo_scm.xml
+++ b/turismo_scm.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /afs/awd.austin.ibm.com/proj/p9/eclipz/KnowledgeBase/.cvsroot/eclipz/systems/pegasus/xml/working/common/turismo_scm.xml,v 1.7 2014/09/26 22:30:09 mashak Exp $ --><card xmlns:mrw="http://w3.ibm.com/stg/power-firmware/schema/mrw" xmlns="http://w3.ibm.com/stg/power-firmware/schema/mrw">
+<!-- $Header: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/systems/pegasus/mrwb/serverwiz/com.ibm.njames.serverwiz/src/com/ibm/njames/serverwiz/designer/model/LogicDiagram.java,v 1.54 2013/06/06 10:00:03 kpachar Exp $ --><card xmlns:mrw="http://w3.ibm.com/stg/power-firmware/schema/mrw" xmlns="http://w3.ibm.com/stg/power-firmware/schema/mrw">
<id>turismo_scm</id>
<card-type>scm-module</card-type>
@@ -14,10 +14,10 @@
</connectors-used>
<part-instances>
<part-instance><id>U0</id><part-id>OPNPWR_VENICE</part-id><position>0</position><ecmd>yes</ecmd><ec-level>DD1</ec-level><processor-family>IBM Power8</processor-family></part-instance>
- <part-instance><id>U2</id><part-id>MOD_SEEPROM_512</part-id><position>0</position><content-type>PRIMARY_SBE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><seeprom-memory-size>512</seeprom-memory-size><vpd-size>24c512</vpd-size></part-instance>
- <part-instance><id>U1</id><part-id>MOD_SEEPROM_512</part-id><position>1</position><content-type>PRIMARY_FRU_AND_MODULE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><seeprom-memory-size>512</seeprom-memory-size><vpd-size>24c512</vpd-size></part-instance>
- <part-instance><id>U3</id><part-id>MOD_SEEPROM_512</part-id><position>2</position><content-type>REDUNDANT_FRU_AND_MODULE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><seeprom-memory-size>512</seeprom-memory-size><vpd-size>24c512</vpd-size></part-instance>
- <part-instance><id>U4</id><part-id>MOD_SEEPROM_512</part-id><position>3</position><content-type>REDUNDANT_SBE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><seeprom-memory-size>512</seeprom-memory-size><vpd-size>24c512</vpd-size></part-instance>
+ <part-instance><id>U2</id><part-id>MOD_SEEPROM_512</part-id><position>0</position><content-type>PRIMARY_SBE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><vpd-size>24c512</vpd-size><seeprom-memory-size>512</seeprom-memory-size></part-instance>
+ <part-instance><id>U1</id><part-id>MOD_SEEPROM_512</part-id><position>1</position><content-type>PRIMARY_FRU_AND_MODULE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><vpd-size>24c512</vpd-size><seeprom-memory-size>512</seeprom-memory-size></part-instance>
+ <part-instance><id>U3</id><part-id>MOD_SEEPROM_512</part-id><position>2</position><content-type>REDUNDANT_FRU_AND_MODULE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><vpd-size>24c512</vpd-size><seeprom-memory-size>512</seeprom-memory-size></part-instance>
+ <part-instance><id>U4</id><part-id>MOD_SEEPROM_512</part-id><position>3</position><content-type>REDUNDANT_SBE_VPD</content-type><seeprom-byte-address-offset>2</seeprom-byte-address-offset><seeprom-write-page-boundary>256</seeprom-write-page-boundary><vpd-size>24c512</vpd-size><seeprom-memory-size>512</seeprom-memory-size></part-instance>
</part-instances>
<connector-instances>
<connector-instance><id>JBSM</id><connector-id>TURISMO_SOCKET</connector-id><position>0</position></connector-instance>
@@ -30,16 +30,16 @@
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>DMI_M0D</pin-name></endpoint>
</dmi>
<dmi>
- <id>dmi17</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>DMI_M1C</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>DMI_M1C</pin-name></endpoint>
- </dmi>
- <dmi>
<id>dmi8</id>
<source><part-instance-id>U0</part-instance-id><unit-name>DMI_M0C</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>DMI_M0C</pin-name></endpoint>
</dmi>
<dmi>
+ <id>dmi17</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>DMI_M1C</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>DMI_M1C</pin-name></endpoint>
+ </dmi>
+ <dmi>
<id>dmi14</id>
<source><part-instance-id>U0</part-instance-id><unit-name>DMI_M1D</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>DMI_M1D</pin-name></endpoint>
@@ -52,15 +52,15 @@
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>OSC0_PCIE_REFCLK</pin-name></endpoint>
</clock>
<clock>
- <id>clock2</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>OSC0_CHIP_REFCLK</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>LPC_CLK</pin-name></endpoint>
- </clock>
- <clock>
<id>clock20</id>
<source><part-instance-id>U0</part-instance-id><unit-name>OSC0_TOD_REFCLK</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>OSC0_TOD_REFCLK</pin-name></endpoint>
</clock>
+ <clock>
+ <id>clock2</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>OSC0_CHIP_REFCLK</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>LPC_CLK</pin-name></endpoint>
+ </clock>
</clocks>
<psis>
<psi>
@@ -85,23 +85,43 @@
</lpcs>
<pcies>
<pcie>
+ <id>pcie5</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>PCIE_IOP1</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>PCIE1</pin-name></endpoint>
+ </pcie>
+ <pcie>
<id>pcie2</id>
<source><part-instance-id>U0</part-instance-id><unit-name>PCIE_IOP0</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>PCIE0</pin-name></endpoint>
+ </pcie>
+ <pcie>
+ <id>pcie6</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>PCIE_IOP1_1</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>PCIE11</pin-name></endpoint>
</pcie>
<pcie>
- <id>pcie5</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>PCIE_IOP1</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>PCIE1</pin-name></endpoint>
+ <id>pcie7</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>PCIE_IOP0_1</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>PCIE01</pin-name></endpoint>
</pcie>
</pcies>
<powers>
<power>
+ <id>power143</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>AVDD</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>AVDD</pin-name></endpoint>
+ </power>
+ <power>
<id>power146</id>
<source><part-instance-id>U0</part-instance-id><unit-name>VPCI</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>VPCI</pin-name></endpoint>
</power>
<power>
+ <id>power152</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>VCS0</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>VCS</pin-name></endpoint>
+ </power>
+ <power>
<id>power155</id>
<source><part-instance-id>U0</part-instance-id><unit-name>VDD0</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>VDD</pin-name></endpoint>
@@ -111,23 +131,13 @@
<source><part-instance-id>U0</part-instance-id><unit-name>VIO</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>VIO</pin-name></endpoint>
</power>
- <power>
- <id>power143</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>AVDD</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>AVDD</pin-name></endpoint>
- </power>
- <power>
- <id>power152</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>VCS0</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>VCS</pin-name></endpoint>
- </power>
</powers>
<i2cs>
<i2c>
- <id>i2c2</id>
+ <id>i2c3</id>
<use-for-presence-detect>No</use-for-presence-detect>
- <speed>400</speed>
<address>0xA0</address>
+ <speed>400</speed>
<source><part-instance-id>U1</part-instance-id><unit-name>I2C</unit-name></source>
<endpoint><part-instance-id>U0</part-instance-id><unit-name>I2CM_PROC_PROM</unit-name></endpoint>
</i2c>
@@ -136,51 +146,56 @@
<source><part-instance-id>U0</part-instance-id><unit-name>I2CM_HOTPLUG</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C_HOTPLUG</pin-name></endpoint>
</i2c>
- <i2c>
- <id>i2c129</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>I2CM_VPD</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C_VPD</pin-name></endpoint>
- </i2c>
<i2c>
- <id>i2c11</id>
+ <id>i2c5</id>
<use-for-presence-detect>No</use-for-presence-detect>
- <speed>400</speed>
<address>A0</address>
+ <speed>400</speed>
<source><part-instance-id>U0</part-instance-id><unit-name>I2CM_PROC_PROM1</unit-name></source>
<endpoint><part-instance-id>U3</part-instance-id><unit-name>I2C</unit-name></endpoint>
</i2c>
<i2c>
- <id>i2c8</id>
+ <id>i2c2</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>I2CM_LIGHTPATH</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C LIGHTPATH</pin-name></endpoint>
+ </i2c>
+ <i2c>
+ <id>i2c3</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>I2CM_VPD</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C_VPD</pin-name></endpoint>
+ </i2c>
+ <i2c>
+ <id>i2c6</id>
<use-for-presence-detect>No</use-for-presence-detect>
- <speed>400</speed>
<address>A2</address>
+ <speed>400</speed>
<source><part-instance-id>U0</part-instance-id><unit-name>I2CM_PROC_PROM1</unit-name></source>
<endpoint><part-instance-id>U4</part-instance-id><unit-name>I2C</unit-name></endpoint>
</i2c>
<i2c>
- <id>i2c5</id>
+ <id>i2c125</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>I2C0</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C_0</pin-name></endpoint>
+ </i2c>
+ <i2c>
+ <id>i2c4</id>
<use-for-presence-detect>No</use-for-presence-detect>
- <speed>400</speed>
<address>A2</address>
+ <speed>400</speed>
<source><part-instance-id>U0</part-instance-id><unit-name>I2CM_PROC_PROM</unit-name></source>
<endpoint><part-instance-id>U2</part-instance-id><unit-name>I2C</unit-name></endpoint>
</i2c>
- <i2c>
- <id>i2c2</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>I2CM_LIGHTPATH</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C LIGHTPATH</pin-name></endpoint>
- </i2c>
- <i2c>
- <id>i2c125</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>I2C0</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>I2C_0</pin-name></endpoint>
- </i2c>
</i2cs>
<fsis>
<fsi>
- <id>fsi2</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>MFSI3</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>MFSI3</pin-name></endpoint>
+ <id>fsi62</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE2</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT2</pin-name></endpoint>
+ </fsi>
+ <fsi>
+ <id>fsi113</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>MFSI2</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>MFSI2</pin-name></endpoint>
</fsi>
<fsi>
<id>fsi77</id>
@@ -188,34 +203,24 @@
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT7</pin-name></endpoint>
</fsi>
<fsi>
- <id>fsi59</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE1</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT1</pin-name></endpoint>
- </fsi>
- <fsi>
<id>fsi65</id>
<source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE3</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT3</pin-name></endpoint>
</fsi>
<fsi>
- <id>fsi113</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>MFSI2</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>MFSI2</pin-name></endpoint>
- </fsi>
- <fsi>
- <id>fsi62</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE2</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT2</pin-name></endpoint>
- </fsi>
- <fsi>
<id>fsi56</id>
<source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE0</unit-name></source>
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT0</pin-name></endpoint>
</fsi>
<fsi>
- <id>fsi116</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>FSI_SLAVE0</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI_A</pin-name></endpoint>
+ <id>fsi74</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE6</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT6</pin-name></endpoint>
+ </fsi>
+ <fsi>
+ <id>fsi59</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE1</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT1</pin-name></endpoint>
</fsi>
<fsi>
<id>fsi110</id>
@@ -223,41 +228,46 @@
<endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>MFSI1</pin-name></endpoint>
</fsi>
<fsi>
- <id>fsi74</id>
- <source><part-instance-id>U0</part-instance-id><unit-name>FSI_CASCADE6</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI0_CENT6</pin-name></endpoint>
+ <id>fsi2</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>MFSI3</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>MFSI3</pin-name></endpoint>
+ </fsi>
+ <fsi>
+ <id>fsi116</id>
+ <source><part-instance-id>U0</part-instance-id><unit-name>FSI_SLAVE0</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>FSI_A</pin-name></endpoint>
</fsi>
</fsis>
<powerbusses>
<powerbus>
- <id>powerbus50</id>
+ <id>powerbus47</id>
<rx-msb-lsb-swap>No</rx-msb-lsb-swap>
<downstream_n_p_lane_swap_mask>0x00000000</downstream_n_p_lane_swap_mask>
<tx-msb-lsb-swap>No</tx-msb-lsb-swap>
<bus-width>2</bus-width>
<upstream_n_p_lane_swap_mask>0x00000000</upstream_n_p_lane_swap_mask>
- <source><part-instance-id>U0</part-instance-id><unit-name>A1</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A1</pin-name></endpoint>
+ <source><part-instance-id>U0</part-instance-id><unit-name>A2</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A2</pin-name></endpoint>
</powerbus>
<powerbus>
- <id>powerbus53</id>
+ <id>powerbus50</id>
<rx-msb-lsb-swap>No</rx-msb-lsb-swap>
<downstream_n_p_lane_swap_mask>0x00000000</downstream_n_p_lane_swap_mask>
<tx-msb-lsb-swap>No</tx-msb-lsb-swap>
<bus-width>2</bus-width>
<upstream_n_p_lane_swap_mask>0x00000000</upstream_n_p_lane_swap_mask>
- <source><part-instance-id>U0</part-instance-id><unit-name>A0</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A0</pin-name></endpoint>
+ <source><part-instance-id>U0</part-instance-id><unit-name>A1</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A1</pin-name></endpoint>
</powerbus>
<powerbus>
- <id>powerbus47</id>
+ <id>powerbus53</id>
<rx-msb-lsb-swap>No</rx-msb-lsb-swap>
<downstream_n_p_lane_swap_mask>0x00000000</downstream_n_p_lane_swap_mask>
<tx-msb-lsb-swap>No</tx-msb-lsb-swap>
<bus-width>2</bus-width>
<upstream_n_p_lane_swap_mask>0x00000000</upstream_n_p_lane_swap_mask>
- <source><part-instance-id>U0</part-instance-id><unit-name>A2</unit-name></source>
- <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A2</pin-name></endpoint>
+ <source><part-instance-id>U0</part-instance-id><unit-name>A0</unit-name></source>
+ <endpoint><connector-instance-id>JBSM</connector-instance-id><pin-name>A0</pin-name></endpoint>
</powerbus>
</powerbusses>
</busses>
OpenPOWER on IntegriCloud