From bda72dea7a63230c618efe32e3ee46fb3be6442c Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Mon, 2 Feb 2015 22:18:55 -0600 Subject: 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 Reviewed-by: A. Patrick Williams III --- .../targeting/common/xmltohb/attribute_types.xml | 278 -------------------- .../common/xmltohb/attribute_types_hb.xml | 288 ++++++++++++++++++++- src/usr/targeting/common/xmltohb/target_types.xml | 15 -- .../targeting/common/xmltohb/target_types_hb.xml | 21 ++ 4 files changed, 308 insertions(+), 294 deletions(-) (limited to 'src') 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 @@ NO_MASTER - - ENTITY_ID - 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. - - NA - 0 - - - OTHER - 0x01 - - - PROCESSOR - 0x03 - - - SYSTEM_BOARD - 0x07 - - - POWER_MGMT - 0x15 - - - CHASSIS - 0x17 - - - MEMORY_DEVICE - 0x20 - - - BIOS - 0x22 - - - OS - 0x23 - - - CORE - 0xD0 - - - MEMBUF - 0xD1 - - - OCC - 0xD2 - - - REF_CLOCK - 0xD4 - - - PCI_CLOCK - 0xD5 - - - TOD_CLOCK - 0xD6 - - - APSS - 0xD7 - - - - - SENSOR_NAME - 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 - - TEMPERATURE - 0x0100 - - - VOLTAGE - 0x0200 - - - CURRENT - 0x0300 - - - INTRUSION - 0x0400 - - - STATE - 0x0500 - - - POWER_UNIT - 0x0600 - - - OS_BOOT - 0x0700 - - - HOST_STATUS - 0x0800 - - - FW_BOOT_PROGRESS - 0x0900 - - - OCC_ACTIVE - 0x0A00 - - - SYSTEM_POWER_CAP - 0x0b00 - - - PCI_ACTIVE - 0x0c00 - - - BOOT_WATCHDOG - 0x0d00 - - - REBOOT_COUNT - 0x0e00 - - - FAULT - 0x1000 - - - APSS_FAULT - 0x1010 - - - TOD_CLOCK_FAULT - 0x1017 - - - REF_CLOCK_FAULT - 0x101A - - - PCI_CLOCK_FAULT - 0x101B - - - APSS_CHANNEL - 0x1100 - - - FREQUENCY - 0xC100 - - - - - SENSOR_TYPE - 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. - - NA - 0 - - - TEMPERATURE - 0x01 - - - VOLTAGE - 0x02 - - - CURRENT - 0x03 - - - PHYSICAL_SECURITY - 0x05 - - - PROCESSOR - 0x07 - - - MEMORY - 0x0c - - - POWER_UNIT - 0x09 - - - SYS_FW_PROGRESS - 0x0F - - - SYS_EVENT - 0x12 - - - OS_BOOT - 0x1F - - - APCI_POWER_STATE - 0x22 - - - FREQ - 0xC1 - - - POWER - 0xC2 - - - BOOT_COUNT - 0xC3 - - - PCI_LINK_PRES - 0xC4 - - - PWR_LIMIT_ACTIVE - 0xC4 - - - FAULT - 0xC7 - - - - - - - - IPMI_SENSORS - 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 - - - 16,2 - - non-volatile - - - - IPMI_SENSOR_ARRAY - Enumeration defining the offsets into the - IPMI_SENSORS array. - - NAME_OFFSET - 0x00 - - - NUMBER_OFFSET - 0x01 - - - CLASS Attribute indicating the target's class 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 @@ non-volatile - + + ADC_CHANNEL_SENSOR_NUMBERS + ADC Channel IPMI sensor numbers. 16 channels. + + + 16 + + non-volatile + + ADC_CHANNEL_GNDS ADC Channel ground. 16 channels. @@ -813,5 +822,282 @@ + + ENTITY_ID + 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. + + NA + 0 + + + OTHER + 0x01 + + + PROCESSOR + 0x03 + + + SYSTEM_BOARD + 0x07 + + + POWER_MGMT + 0x15 + + + CHASSIS + 0x17 + + + MEMORY_DEVICE + 0x20 + + + BIOS + 0x22 + + + OS + 0x23 + + + CORE + 0xD0 + + + MEMBUF + 0xD1 + + + OCC + 0xD2 + + + REF_CLOCK + 0xD4 + + + PCI_CLOCK + 0xD5 + + + TOD_CLOCK + 0xD6 + + + APSS + 0xD7 + + + + + SENSOR_NAME + 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 + + TEMPERATURE + 0x0100 + + + VOLTAGE + 0x0200 + + + CURRENT + 0x0300 + + + INTRUSION + 0x0400 + + + STATE + 0x0500 + + + POWER_UNIT + 0x0600 + + + OS_BOOT + 0x0700 + + + HOST_STATUS + 0x0800 + + + FW_BOOT_PROGRESS + 0x0900 + + + OCC_ACTIVE + 0x0A00 + + + SYSTEM_POWER_CAP + 0x0b00 + + + PCI_ACTIVE + 0x0c00 + + + BOOT_WATCHDOG + 0x0d00 + + + REBOOT_COUNT + 0x0e00 + + + FAULT + 0x1000 + + + APSS_FAULT + 0x1010 + + + TOD_CLOCK_FAULT + 0x1017 + + + REF_CLOCK_FAULT + 0x101A + + + PCI_CLOCK_FAULT + 0x101B + + + APSS_CHANNEL + 0x1100 + + + FREQUENCY + 0xC100 + + + + + SENSOR_TYPE + 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. + + NA + 0 + + + TEMPERATURE + 0x01 + + + VOLTAGE + 0x02 + + + CURRENT + 0x03 + + + PHYSICAL_SECURITY + 0x05 + + + PROCESSOR + 0x07 + + + MEMORY + 0x0c + + + POWER_UNIT + 0x09 + + + SYS_FW_PROGRESS + 0x0F + + + SYS_EVENT + 0x12 + + + OS_BOOT + 0x1F + + + APCI_POWER_STATE + 0x22 + + + FREQ + 0xC1 + + + POWER + 0xC2 + + + BOOT_COUNT + 0xC3 + + + PCI_LINK_PRES + 0xC4 + + + PWR_LIMIT_ACTIVE + 0xC4 + + + FAULT + 0xC7 + + + + + + + + IPMI_SENSORS + 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 + + + 16,2 + + non-volatile + + + + IPMI_SENSOR_ARRAY + Enumeration defining the offsets into the + IPMI_SENSORS array. + + NAME_OFFSET + 0x00 + + + NUMBER_OFFSET + 0x01 + + 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 @@ RECONFIG_LOOP_TESTS_ENABLE ISTEP_PAUSE_ENABLE ISTEP_PAUSE_CONFIG - - IPMI_SENSORS MNFG_TH_P8EX_L2_CACHE_CES MNFG_TH_P8EX_L2_DIR_CES @@ -526,9 +524,6 @@ PROC_PCIE_LANE_EQUALIZATION CDM_DOMAINFABRIC - - IPMI_SENSORS @@ -781,8 +776,6 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK 0x00000000 - - IPMI_SENSORS @@ -874,7 +867,6 @@ 0x00000009 CDM_DOMAINNODE - IPMI_SENSORS EEPROM_VPD_FRU_INFO @@ -1444,8 +1436,6 @@ CDM_DOMAINMEM - - IPMI_SENSORS @@ -1522,8 +1512,6 @@ MSS_EFF_VPD_VERSION CDM_DOMAINDIMM - - IPMI_SENSORS @@ -1702,9 +1690,6 @@ OCC_MASTER_CAPABLE - - IPMI_SENSORS - 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 @@ HB_MUTEX_TEST_LOCK HB_EXISTING_IMAGE ADC_CHANNEL_FUNC_IDS + ADC_CHANNEL_SENSOR_NUMBERS ADC_CHANNEL_GNDS ADC_CHANNEL_GAINS ADC_CHANNEL_OFFSETS @@ -64,6 +65,12 @@ OCC_CONTROL_DATA OPAL_MODEL HTMGT_SAFEMODE + IPMI_SENSORS + + + + enc-node-power8 + IPMI_SENSORS @@ -110,8 +117,12 @@ XSCOM_VIRTUAL_ADDR + IPMI_SENSORS + + + @@ -144,6 +155,12 @@ ISDIMM_MBVPD_INDEX + IPMI_SENSORS + + + + unit-core-power8 + IPMI_SENSORS @@ -156,6 +173,7 @@ lcard-dimm VPD_SWITCHES + IPMI_SENSORS @@ -163,6 +181,9 @@ PSTATE_TABLE + + IPMI_SENSORS + -- cgit v1.2.3