From 7de45b93c898a691cd86010faff78a550a4ec783 Mon Sep 17 00:00:00 2001 From: Mike Baiocchi Date: Tue, 16 Dec 2014 09:43:36 -0600 Subject: These changes fix the parsing of the Processor PCIE busses Specifically, the PROC_PCIE_LANE_MASK_NON_BIFURCATED attribute, and related attributes, are now being handled properly. --- OPNPWR_VENICE.xml | 3 +- turismo_scm.xml | 178 ++++++++++++++++++++++++++++-------------------------- 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_IOP000 PCIE_IOP0_108 - PCIE_IOP110 + PCIE_IOP110 + PCIE_IOP1_118 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 @@ - + turismo_scm scm-module @@ -14,10 +14,10 @@ U0OPNPWR_VENICE0yesDD1IBM Power8 - U2MOD_SEEPROM_5120PRIMARY_SBE_VPD225651224c512 - U1MOD_SEEPROM_5121PRIMARY_FRU_AND_MODULE_VPD225651224c512 - U3MOD_SEEPROM_5122REDUNDANT_FRU_AND_MODULE_VPD225651224c512 - U4MOD_SEEPROM_5123REDUNDANT_SBE_VPD225651224c512 + U2MOD_SEEPROM_5120PRIMARY_SBE_VPD225624c512512 + U1MOD_SEEPROM_5121PRIMARY_FRU_AND_MODULE_VPD225624c512512 + U3MOD_SEEPROM_5122REDUNDANT_FRU_AND_MODULE_VPD225624c512512 + U4MOD_SEEPROM_5123REDUNDANT_SBE_VPD225624c512512 JBSMTURISMO_SOCKET0 @@ -29,16 +29,16 @@ U0DMI_M0D JBSMDMI_M0D - - dmi17 - U0DMI_M1C - JBSMDMI_M1C - dmi8 U0DMI_M0C JBSMDMI_M0C + + dmi17 + U0DMI_M1C + JBSMDMI_M1C + dmi14 U0DMI_M1D @@ -51,16 +51,16 @@ U0OSC0_PCIE_REFCLK JBSMOSC0_PCIE_REFCLK - - clock2 - U0OSC0_CHIP_REFCLK - JBSMLPC_CLK - clock20 U0OSC0_TOD_REFCLK JBSMOSC0_TOD_REFCLK + + clock2 + U0OSC0_CHIP_REFCLK + JBSMLPC_CLK + @@ -84,23 +84,43 @@ + + pcie5 + U0PCIE_IOP1 + JBSMPCIE1 + pcie2 U0PCIE_IOP0 JBSMPCIE0 + + + pcie6 + U0PCIE_IOP1_1 + JBSMPCIE11 - pcie5 - U0PCIE_IOP1 - JBSMPCIE1 + pcie7 + U0PCIE_IOP0_1 + JBSMPCIE01 + + power143 + U0AVDD + JBSMAVDD + power146 U0VPCI JBSMVPCI + + power152 + U0VCS0 + JBSMVCS + power155 U0VDD0 @@ -111,23 +131,13 @@ U0VIO JBSMVIO - - power143 - U0AVDD - JBSMAVDD - - - power152 - U0VCS0 - JBSMVCS - - i2c2 + i2c3 No - 400
0xA0
+ 400 U1I2C U0I2CM_PROC_PROM
@@ -136,86 +146,81 @@ U0I2CM_HOTPLUG JBSMI2C_HOTPLUG - - i2c129 - U0I2CM_VPD - JBSMI2C_VPD - - i2c11 + i2c5 No - 400
A0
+ 400 U0I2CM_PROC_PROM1 U3I2C
- i2c8 + i2c2 + U0I2CM_LIGHTPATH + JBSMI2C LIGHTPATH + + + i2c3 + U0I2CM_VPD + JBSMI2C_VPD + + + i2c6 No - 400
A2
+ 400 U0I2CM_PROC_PROM1 U4I2C
- i2c5 + i2c125 + U0I2C0 + JBSMI2C_0 + + + i2c4 No - 400
A2
+ 400 U0I2CM_PROC_PROM U2I2C
- - i2c2 - U0I2CM_LIGHTPATH - JBSMI2C LIGHTPATH - - - i2c125 - U0I2C0 - JBSMI2C_0 -
- fsi2 - U0MFSI3 - JBSMMFSI3 + fsi62 + U0FSI_CASCADE2 + JBSMFSI0_CENT2 + + + fsi113 + U0MFSI2 + JBSMMFSI2 fsi77 U0FSI_CASCADE7 JBSMFSI0_CENT7 - - fsi59 - U0FSI_CASCADE1 - JBSMFSI0_CENT1 - fsi65 U0FSI_CASCADE3 JBSMFSI0_CENT3 - - fsi113 - U0MFSI2 - JBSMMFSI2 - - - fsi62 - U0FSI_CASCADE2 - JBSMFSI0_CENT2 - fsi56 U0FSI_CASCADE0 JBSMFSI0_CENT0 - fsi116 - U0FSI_SLAVE0 - JBSMFSI_A + fsi74 + U0FSI_CASCADE6 + JBSMFSI0_CENT6 + + + fsi59 + U0FSI_CASCADE1 + JBSMFSI0_CENT1 fsi110 @@ -223,41 +228,46 @@ JBSMMFSI1 - fsi74 - U0FSI_CASCADE6 - JBSMFSI0_CENT6 + fsi2 + U0MFSI3 + JBSMMFSI3 + + + fsi116 + U0FSI_SLAVE0 + JBSMFSI_A - powerbus50 + powerbus47 No 0x00000000 No 2 0x00000000 - U0A1 - JBSMA1 + U0A2 + JBSMA2 - powerbus53 + powerbus50 No 0x00000000 No 2 0x00000000 - U0A0 - JBSMA0 + U0A1 + JBSMA1 - powerbus47 + powerbus53 No 0x00000000 No 2 0x00000000 - U0A2 - JBSMA2 + U0A0 + JBSMA0 -- cgit v1.2.1