diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2015-02-02 22:18:55 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-23 13:16:41 -0600 |
commit | bda72dea7a63230c618efe32e3ee46fb3be6442c (patch) | |
tree | 2fd20b837043208fd0b9a483679b3961b7b097d4 /src/usr | |
parent | d7483b4854d52b67183ff5e937c910a3f0022dd5 (diff) | |
download | blackbird-hostboot-bda72dea7a63230c618efe32e3ee46fb3be6442c.tar.gz blackbird-hostboot-bda72dea7a63230c618efe32e3ee46fb3be6442c.zip |
Move IPMI_SENSORS to hb-only target
-Move IPMI_SENSORS from common to hb only attribute file
-Update attribute types to include new enitiy Id
and sensor types for serverwiz2 support
-Add attribute for ADC channel sensors to sys target
Change-Id: Iff0bff8c798ebd72569d0b04a47864162dc8afde
RTC:121129
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15533
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 278 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_hb.xml | 288 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 15 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_hb.xml | 21 |
4 files changed, 308 insertions, 294 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index d5781b858..11ea981e5 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -301,284 +301,6 @@ </enumerator> <default>NO_MASTER</default> </enumerationType> -<enumerationType> - <id>ENTITY_ID</id> - <description>Enumeration indicating the IPMI entity ID, these values are - defined in the IPMI specification. These values will be used in place - of target type when events are sent to the BMC.</description> - <enumerator> - <name>NA</name> - <value>0</value> - </enumerator> - <enumerator> - <name>OTHER</name> - <value>0x01</value> - </enumerator> - <enumerator> - <name>PROCESSOR</name> - <value>0x03</value> - </enumerator> - <enumerator> - <name>SYSTEM_BOARD</name> - <value>0x07</value> - </enumerator> - <enumerator> - <name>POWER_MGMT</name> - <value>0x15</value> - </enumerator> - <enumerator> - <name>CHASSIS</name> - <value>0x17</value> - </enumerator> - <enumerator> - <name>MEMORY_DEVICE</name> - <value>0x20</value> - </enumerator> - <enumerator> - <name>BIOS</name> - <value>0x22</value> - </enumerator> - <enumerator> - <name>OS</name> - <value>0x23</value> - </enumerator> - <enumerator> - <name>CORE</name> - <value>0xD0</value> - </enumerator> - <enumerator> - <name>MEMBUF</name> - <value>0xD1</value> - </enumerator> - <enumerator> - <name>OCC</name> - <value>0xD2</value> - </enumerator> - <enumerator> - <name>REF_CLOCK</name> - <value>0xD4</value> - </enumerator> - <enumerator> - <name>PCI_CLOCK</name> - <value>0xD5</value> - </enumerator> - <enumerator> - <name>TOD_CLOCK</name> - <value>0xD6</value> - </enumerator> - <enumerator> - <name>APSS</name> - <value>0xD7</value> - </enumerator> -</enumerationType> - -<enumerationType> - <id>SENSOR_NAME</id> - <description>Enumeration indicating the IPMI sensor name, which will - be used by hostboot when determining the sensor number to return. - The name is unique per hostboot sensor type, actual IPMI sensor - types have been overloaded to map our needs. The sensor name consists - of one byte of sensor type plus one byte of sub-type, to differentiate - similar sensors under the same target</description> - <enumerator> - <name>TEMPERATURE</name> - <value>0x0100</value> - </enumerator> - <enumerator> - <name>VOLTAGE</name> - <value>0x0200</value> - </enumerator> - <enumerator> - <name>CURRENT</name> - <value>0x0300</value> - </enumerator> - <enumerator> - <name>INTRUSION</name> - <value>0x0400</value> - </enumerator> - <enumerator> - <name>STATE</name> - <value>0x0500</value> - </enumerator> - <enumerator> - <name>POWER_UNIT</name> - <value>0x0600</value> - </enumerator> - <enumerator> - <name>OS_BOOT</name> - <value>0x0700</value> - </enumerator> - <enumerator> - <name>HOST_STATUS</name> - <value>0x0800</value> - </enumerator> - <enumerator> - <name>FW_BOOT_PROGRESS</name> - <value>0x0900</value> - </enumerator> - <enumerator> - <name>OCC_ACTIVE</name> - <value>0x0A00</value> - </enumerator> - <enumerator> - <name>SYSTEM_POWER_CAP</name> - <value>0x0b00</value> - </enumerator> - <enumerator> - <name>PCI_ACTIVE</name> - <value>0x0c00</value> - </enumerator> - <enumerator> - <name>BOOT_WATCHDOG</name> - <value>0x0d00</value> - </enumerator> - <enumerator> - <name>REBOOT_COUNT</name> - <value>0x0e00</value> - </enumerator> - <enumerator> - <name>FAULT</name> - <value>0x1000</value> - </enumerator> - <enumerator> - <name>APSS_FAULT</name> <!-- APSS Fault --> - <value>0x1010</value> - </enumerator> - <enumerator> - <name>TOD_CLOCK_FAULT</name> - <value>0x1017</value> - </enumerator> - <enumerator> - <name>REF_CLOCK_FAULT</name> - <value>0x101A</value> - </enumerator> - <enumerator> - <name>PCI_CLOCK_FAULT</name> - <value>0x101B</value> - </enumerator> - <enumerator> - <name>APSS_CHANNEL</name> <!-- Power sensors --> - <value>0x1100</value> <!-- 16 channels --> - </enumerator> - <enumerator> - <name>FREQUENCY</name> - <value>0xC100</value> - </enumerator> -</enumerationType> - -<enumerationType> - <id>SENSOR_TYPE</id> - <description>Enumeration indicating the IPMI sensor type, these values - are defined in the IPMI specification. These values will be used when - sending sensor reading events to the BMC.</description> - <enumerator> - <name>NA</name> - <value>0</value> - </enumerator> - <enumerator> - <name>TEMPERATURE</name> - <value>0x01</value> - </enumerator> - <enumerator> - <name>VOLTAGE</name> - <value>0x02</value> - </enumerator> - <enumerator> - <name>CURRENT</name> - <value>0x03</value> - </enumerator> - <enumerator> - <name>PHYSICAL_SECURITY</name> - <value>0x05</value> - </enumerator> - <enumerator> - <name>PROCESSOR</name> - <value>0x07</value> - </enumerator> - <enumerator> - <name>MEMORY</name> - <value>0x0c</value> - </enumerator> - <enumerator> - <name>POWER_UNIT</name> - <value>0x09</value> - </enumerator> - <enumerator> - <name>SYS_FW_PROGRESS</name> - <value>0x0F</value> - </enumerator> - <enumerator> - <name>SYS_EVENT</name> - <value>0x12</value> - </enumerator> - <enumerator> - <name>OS_BOOT</name> - <value>0x1F</value> - </enumerator> - <enumerator> - <name>APCI_POWER_STATE</name> - <value>0x22</value> - </enumerator> - <enumerator> - <name>FREQ</name> - <value>0xC1</value> - </enumerator> - <enumerator> - <name>POWER</name> - <value>0xC2</value> - </enumerator> - <enumerator> - <name>BOOT_COUNT</name> - <value>0xC3</value> - </enumerator> - <enumerator> - <name>PCI_LINK_PRES</name> - <value>0xC4</value> - </enumerator> - <enumerator> - <name>PWR_LIMIT_ACTIVE</name> - <value>0xC4</value> - </enumerator> - <enumerator> - <name>FAULT</name> - <value>0xC7</value> - </enumerator> -</enumerationType> - -<!-- IPMI Sensor numbers are defined in the IPMI spec as 8 bit values. However -in the hostboot code they will be defined as a uint16_t to allow us to add -additonal information. An example relates to error logs returned by the OCC, -we might want to pass the Entity ID in the upper byte of the sensor ID, this -would allow hostboot to search only the target type identifed by the Entity -ID for the sensor number returned with the elog. --> - -<!-- attribute to hold 16 pairs of sensor type, sensor number values --> -<attribute> - <id>IPMI_SENSORS</id> - <description>Attribute to hold 16 pairs of sensor name, sensor number - pairs. A sensor name consists of one byte of general sensor type - and one byte of sub-type</description> - <simpleType> - <uint16_t></uint16_t> - <array>16,2</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<enumerationType> - <id>IPMI_SENSOR_ARRAY</id> - <description>Enumeration defining the offsets into the - IPMI_SENSORS array.</description> - <enumerator> - <name>NAME_OFFSET</name> - <value>0x00</value> - </enumerator> - <enumerator> - <name>NUMBER_OFFSET</name> - <value>0x01</value> - </enumerator> -</enumerationType> - <attribute> <id>CLASS</id> <description>Attribute indicating the target's class</description> diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index 75b19c795..4437a0a52 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -570,7 +570,16 @@ <persistency>non-volatile</persistency> <readable/> </attribute> - +<attribute> + <id>ADC_CHANNEL_SENSOR_NUMBERS</id> + <description>ADC Channel IPMI sensor numbers. 16 channels.</description> + <simpleType> + <uint8_t></uint8_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> <attribute> <id>ADC_CHANNEL_GNDS</id> <description>ADC Channel ground. 16 channels.</description> @@ -813,5 +822,282 @@ <writeable/> <hbOnly/> </attribute> +<enumerationType> + <id>ENTITY_ID</id> + <description>Enumeration indicating the IPMI entity ID, these values are + defined in the IPMI specification. These values will be used in place + of target type when events are sent to the BMC.</description> + <enumerator> + <name>NA</name> + <value>0</value> + </enumerator> + <enumerator> + <name>OTHER</name> + <value>0x01</value> + </enumerator> + <enumerator> + <name>PROCESSOR</name> + <value>0x03</value> + </enumerator> + <enumerator> + <name>SYSTEM_BOARD</name> + <value>0x07</value> + </enumerator> + <enumerator> + <name>POWER_MGMT</name> + <value>0x15</value> + </enumerator> + <enumerator> + <name>CHASSIS</name> + <value>0x17</value> + </enumerator> + <enumerator> + <name>MEMORY_DEVICE</name> + <value>0x20</value> + </enumerator> + <enumerator> + <name>BIOS</name> + <value>0x22</value> + </enumerator> + <enumerator> + <name>OS</name> + <value>0x23</value> + </enumerator> + <enumerator> + <name>CORE</name> + <value>0xD0</value> + </enumerator> + <enumerator> + <name>MEMBUF</name> + <value>0xD1</value> + </enumerator> + <enumerator> + <name>OCC</name> + <value>0xD2</value> + </enumerator> + <enumerator> + <name>REF_CLOCK</name> + <value>0xD4</value> + </enumerator> + <enumerator> + <name>PCI_CLOCK</name> + <value>0xD5</value> + </enumerator> + <enumerator> + <name>TOD_CLOCK</name> + <value>0xD6</value> + </enumerator> + <enumerator> + <name>APSS</name> + <value>0xD7</value> + </enumerator> +</enumerationType> + +<enumerationType> + <id>SENSOR_NAME</id> + <description>Enumeration indicating the IPMI sensor name, which will + be used by hostboot when determining the sensor number to return. + The name is unique per hostboot sensor type, actual IPMI sensor + types have been overloaded to map our needs. The sensor name consists + of one byte of sensor type plus one byte of sub-type, to differentiate + similar sensors under the same target</description> + <enumerator> + <name>TEMPERATURE</name> + <value>0x0100</value> + </enumerator> + <enumerator> + <name>VOLTAGE</name> + <value>0x0200</value> + </enumerator> + <enumerator> + <name>CURRENT</name> + <value>0x0300</value> + </enumerator> + <enumerator> + <name>INTRUSION</name> + <value>0x0400</value> + </enumerator> + <enumerator> + <name>STATE</name> + <value>0x0500</value> + </enumerator> + <enumerator> + <name>POWER_UNIT</name> + <value>0x0600</value> + </enumerator> + <enumerator> + <name>OS_BOOT</name> + <value>0x0700</value> + </enumerator> + <enumerator> + <name>HOST_STATUS</name> + <value>0x0800</value> + </enumerator> + <enumerator> + <name>FW_BOOT_PROGRESS</name> + <value>0x0900</value> + </enumerator> + <enumerator> + <name>OCC_ACTIVE</name> + <value>0x0A00</value> + </enumerator> + <enumerator> + <name>SYSTEM_POWER_CAP</name> + <value>0x0b00</value> + </enumerator> + <enumerator> + <name>PCI_ACTIVE</name> + <value>0x0c00</value> + </enumerator> + <enumerator> + <name>BOOT_WATCHDOG</name> + <value>0x0d00</value> + </enumerator> + <enumerator> + <name>REBOOT_COUNT</name> + <value>0x0e00</value> + </enumerator> + <enumerator> + <name>FAULT</name> + <value>0x1000</value> + </enumerator> + <enumerator> + <name>APSS_FAULT</name> <!-- APSS Fault --> + <value>0x1010</value> + </enumerator> + <enumerator> + <name>TOD_CLOCK_FAULT</name> + <value>0x1017</value> + </enumerator> + <enumerator> + <name>REF_CLOCK_FAULT</name> + <value>0x101A</value> + </enumerator> + <enumerator> + <name>PCI_CLOCK_FAULT</name> + <value>0x101B</value> + </enumerator> + <enumerator> + <name>APSS_CHANNEL</name> <!-- Power sensors --> + <value>0x1100</value> <!-- 16 channels --> + </enumerator> + <enumerator> + <name>FREQUENCY</name> <!-- Power sensors --> + <value>0xC100</value> <!-- 16 channels --> + </enumerator> +</enumerationType> + +<enumerationType> + <id>SENSOR_TYPE</id> + <description>Enumeration indicating the IPMI sensor type, these values + are defined in the IPMI specification. These values will be used when + sending sensor reading events to the BMC.</description> + <enumerator> + <name>NA</name> + <value>0</value> + </enumerator> + <enumerator> + <name>TEMPERATURE</name> + <value>0x01</value> + </enumerator> + <enumerator> + <name>VOLTAGE</name> + <value>0x02</value> + </enumerator> + <enumerator> + <name>CURRENT</name> + <value>0x03</value> + </enumerator> + <enumerator> + <name>PHYSICAL_SECURITY</name> + <value>0x05</value> + </enumerator> + <enumerator> + <name>PROCESSOR</name> + <value>0x07</value> + </enumerator> + <enumerator> + <name>MEMORY</name> + <value>0x0c</value> + </enumerator> + <enumerator> + <name>POWER_UNIT</name> + <value>0x09</value> + </enumerator> + <enumerator> + <name>SYS_FW_PROGRESS</name> + <value>0x0F</value> + </enumerator> + <enumerator> + <name>SYS_EVENT</name> + <value>0x12</value> + </enumerator> + <enumerator> + <name>OS_BOOT</name> + <value>0x1F</value> + </enumerator> + <enumerator> + <name>APCI_POWER_STATE</name> + <value>0x22</value> + </enumerator> + <enumerator> + <name>FREQ</name> + <value>0xC1</value> + </enumerator> + <enumerator> + <name>POWER</name> + <value>0xC2</value> + </enumerator> + <enumerator> + <name>BOOT_COUNT</name> + <value>0xC3</value> + </enumerator> + <enumerator> + <name>PCI_LINK_PRES</name> + <value>0xC4</value> + </enumerator> + <enumerator> + <name>PWR_LIMIT_ACTIVE</name> + <value>0xC4</value> + </enumerator> + <enumerator> + <name>FAULT</name> + <value>0xC7</value> + </enumerator> +</enumerationType> + +<!-- IPMI Sensor numbers are defined in the IPMI spec as 8 bit values. However +in the hostboot code they will be defined as a uint16_t to allow us to add +additonal information. An example relates to error logs returned by the OCC, +we might want to pass the Entity ID in the upper byte of the sensor ID, this +would allow hostboot to search only the target type identifed by the Entity +ID for the sensor number returned with the elog. --> + +<!-- attribute to hold 16 pairs of sensor type, sensor number values --> +<attribute> + <id>IPMI_SENSORS</id> + <description>Attribute to hold 16 pairs of sensor name, sensor number + pairs. A sensor name consists of one byte of general sensor type + and one byte of sub-type</description> + <simpleType> + <uint16_t></uint16_t> + <array>16,2</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> +<enumerationType> + <id>IPMI_SENSOR_ARRAY</id> + <description>Enumeration defining the offsets into the + IPMI_SENSORS array.</description> + <enumerator> + <name>NAME_OFFSET</name> + <value>0x00</value> + </enumerator> + <enumerator> + <name>NUMBER_OFFSET</name> + <value>0x01</value> + </enumerator> +</enumerationType> </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 9c6c43e73..8d006cc9a 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -286,8 +286,6 @@ <attribute><id>RECONFIG_LOOP_TESTS_ENABLE</id></attribute> <attribute><id>ISTEP_PAUSE_ENABLE</id></attribute> <attribute><id>ISTEP_PAUSE_CONFIG</id></attribute> - <!-- IPMI Sensor numbers for reporting system status and info to the BMC --> - <attribute><id>IPMI_SENSORS</id></attribute> <!-- Manufacturing threshold Attributes of PRD --> <attribute><id>MNFG_TH_P8EX_L2_CACHE_CES</id></attribute> <attribute><id>MNFG_TH_P8EX_L2_DIR_CES</id></attribute> @@ -526,9 +524,6 @@ </attribute> <attribute><id>PROC_PCIE_LANE_EQUALIZATION</id></attribute> <attribute><id>CDM_DOMAIN</id><default>FABRIC</default></attribute> - <!-- IPMI Sensor numbers for reporting processor status and info to - the BMC --> - <attribute><id>IPMI_SENSORS</id></attribute> </targetType> <targetType> @@ -781,8 +776,6 @@ <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> <default>0x00000000</default> </attribute> - <!-- IPMI Sensor numbers for reporting CORE status and info to the BMC --> - <attribute><id>IPMI_SENSORS</id></attribute> </targetType> <targetType> @@ -874,7 +867,6 @@ <default>0x00000009</default> <!-- HOSTSVC_HBEL and GARD --> </attribute> <attribute><id>CDM_DOMAIN</id><default>NODE</default></attribute> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>EEPROM_VPD_FRU_INFO</id></attribute> </targetType> @@ -1444,8 +1436,6 @@ </default> </attribute> <attribute><id>CDM_DOMAIN</id><default>MEM</default></attribute> - <!-- IPMI Sensor numbers for reporting Centaur status to the BMC --> - <attribute><id>IPMI_SENSORS</id></attribute> </targetType> <!-- Centaur L4 --> @@ -1522,8 +1512,6 @@ <attribute><id>MSS_EFF_VPD_VERSION</id></attribute> <attribute><id>CDM_DOMAIN</id><default>DIMM</default></attribute> - <!-- IPMI Sensor numbers for reporting DIMM status and info to the BMC --> - <attribute><id>IPMI_SENSORS</id></attribute> </targetType> <targetType> @@ -1702,9 +1690,6 @@ <attribute> <id>OCC_MASTER_CAPABLE</id> </attribute> - <attribute> - <id>IPMI_SENSORS</id> - </attribute> </targetType> </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index f4544f592..39a032fd3 100644 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -39,6 +39,7 @@ <attribute><id>HB_MUTEX_TEST_LOCK</id></attribute> <attribute><id>HB_EXISTING_IMAGE</id></attribute> <attribute><id>ADC_CHANNEL_FUNC_IDS</id></attribute> + <attribute><id>ADC_CHANNEL_SENSOR_NUMBERS</id></attribute> <attribute><id>ADC_CHANNEL_GNDS</id></attribute> <attribute><id>ADC_CHANNEL_GAINS</id></attribute> <attribute><id>ADC_CHANNEL_OFFSETS</id></attribute> @@ -64,6 +65,12 @@ <attribute><id>OCC_CONTROL_DATA</id></attribute> <attribute><id>OPAL_MODEL</id></attribute> <attribute><id>HTMGT_SAFEMODE</id></attribute> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>enc-node-power8</id> + <attribute><id>IPMI_SENSORS</id></attribute> </targetTypeExtension> <targetTypeExtension> @@ -110,8 +117,12 @@ <attribute> <id>XSCOM_VIRTUAL_ADDR</id> </attribute> + <attribute><id>IPMI_SENSORS</id></attribute> </targetTypeExtension> + + + <!-- Centaur chip/DMI --> <targetTypeExtension> @@ -144,6 +155,12 @@ <attribute> <id>ISDIMM_MBVPD_INDEX</id> </attribute> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>unit-core-power8</id> + <attribute><id>IPMI_SENSORS</id></attribute> </targetTypeExtension> <targetTypeExtension> @@ -156,6 +173,7 @@ <targetTypeExtension> <id>lcard-dimm</id> <attribute><id>VPD_SWITCHES</id></attribute> + <attribute><id>IPMI_SENSORS</id></attribute> </targetTypeExtension> <targetTypeExtension> @@ -163,6 +181,9 @@ <attribute> <id>PSTATE_TABLE</id> </attribute> + <attribute> + <id>IPMI_SENSORS</id> + </attribute> </targetTypeExtension> <targetTypeExtension> |