diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/errl/errlentry.C | 5 | ||||
| -rw-r--r-- | src/usr/errl/errlmanager_common.C | 2 | ||||
| -rw-r--r-- | src/usr/hwas/hwasPlatCallout.C | 3 | ||||
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 7 | ||||
| -rw-r--r-- | src/usr/isteps/istep06/host_discover_targets.C | 3 | ||||
| -rw-r--r-- | src/usr/makefile | 4 | ||||
| -rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 2 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_hb.xml | 1091 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_openpower.xml | 625 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types_hb.xml | 46 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_openpower.xml | 68 |
11 files changed, 868 insertions, 988 deletions
diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index 9192ff83a..7c46edff4 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -605,6 +605,7 @@ void ErrlEntry::checkHiddenLogsEnable( ) /////////////////////////////////////////////////////////////////////////////// // Called by addHwCallout to get the part and serial numbers from the current // target so that it can be appended to the error log +#ifdef CONFIG_BMC_IPMI void ErrlEntry::addPartAndSerialNumbersToErrLog (const TARGETING::Target * i_target) { @@ -668,7 +669,7 @@ void ErrlEntry::checkHiddenLogsEnable( ) TRACDCOMP(g_trac_errl, EXIT_MRK"ErrlEntry::addPartAndSerialNumbersToErrLog()"); } - +#endif /////////////////////////////////////////////////////////////////////////////// // for use by ErrlManager @@ -724,7 +725,9 @@ void ErrlEntry::commit( compId_t i_committerComponent ) this); if(!l_err) { +#ifdef CONFIG_BMC_IPMI addPartAndSerialNumbersToErrLog( l_target ); +#endif } else { diff --git a/src/usr/errl/errlmanager_common.C b/src/usr/errl/errlmanager_common.C index 264b631d3..385042748 100644 --- a/src/usr/errl/errlmanager_common.C +++ b/src/usr/errl/errlmanager_common.C @@ -26,8 +26,10 @@ #include <config.h> #include <hwas/common/hwasCallout.H> #include <errl/errlreasoncodes.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmisel.H> #include <ipmi/ipmisensor.H> +#endif #include <errl/errlentry.H> #include <sys/mm.h> #include <pnor/pnorif.H> diff --git a/src/usr/hwas/hwasPlatCallout.C b/src/usr/hwas/hwasPlatCallout.C index 7d7182e87..2385434cc 100644 --- a/src/usr/hwas/hwasPlatCallout.C +++ b/src/usr/hwas/hwasPlatCallout.C @@ -34,8 +34,9 @@ #include <hwas/common/deconfigGard.H> #include <hwas/hwasPlat.H> #include <initservice/initserviceif.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmisensor.H> - +#endif namespace HWAS { diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index 98e68ac20..3ce73e8c5 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -64,13 +64,15 @@ #include <console/consoleif.H> #include <isteps/hwpisteperror.H> #include <pnor/pnorif.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmiwatchdog.H> //IPMI watchdog timer #include <ipmi/ipmipowerstate.H> //IPMI System ACPI Power State #include <ipmi/ipmichassiscontrol.H> -#include <config.h> #include <ipmi/ipmisensor.H> #include <ipmi/ipmiif.H> +#endif +#include <config.h> #include <initservice/bootconfigif.H> #include <trace/trace.H> #include <util/utilmbox_scratch.H> @@ -248,8 +250,11 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl) // Get tracelite setting from top level target attributes TARGETING::Target* l_pSys = NULL; TARGETING::targetService().getTopLevelTarget(l_pSys); + +#ifdef CONFIG_INCLUDE_XML_OPENPOWER uint8_t l_tlEnabled = l_pSys->getAttr<TARGETING::ATTR_OP_TRACE_LITE>(); TRACE::setTraceLite(l_tlEnabled); +#endif if(iv_mailboxEnabled) { diff --git a/src/usr/isteps/istep06/host_discover_targets.C b/src/usr/isteps/istep06/host_discover_targets.C index 4e0870089..0ac877f30 100644 --- a/src/usr/isteps/istep06/host_discover_targets.C +++ b/src/usr/isteps/istep06/host_discover_targets.C @@ -48,9 +48,10 @@ #include <hwas/hwasPlat.H> #include <vpd/vpd_if.H> #include <console/consoleif.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmifruinv.H> #include <ipmi/ipmisensor.H> - +#endif #include <fapi2/plat_hwp_invoker.H> #include <fapi2/target.H> diff --git a/src/usr/makefile b/src/usr/makefile index 17b0283b1..c07030fb9 100644 --- a/src/usr/makefile +++ b/src/usr/makefile @@ -62,8 +62,8 @@ SUBDIRS += gpio.d SUBDIRS += lpc.d SUBDIRS += console.d SUBDIRS += errldisplay.d -SUBDIRS += ipmi.d -SUBDIRS += htmgt.d +SUBDIRS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmi.d) +SUBDIRS += $(if $(CONFIG_HTMGT),htmgt.d) SUBDIRS += diag.d SUBDIRS += xz.d SUBDIRS += $(if $(CONFIG_ENABLE_HDAT_IN_HOSTBOOT),hdat.d,) diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index d9b6b5cb7..83db64a86 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -46,7 +46,9 @@ #include <sys/mmio.h> #include <sys/task.h> #include <initservice/initserviceif.H> +#ifdef CONFIG_BMC_IPMI #include <ipmi/ipmisensor.H> +#endif #include <config.h> #include <devicefw/driverif.H> #include <i2c/tpmddif.H> diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index 255851800..aac5b3cf2 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -31,21 +31,6 @@ Contains the definition of hostboot attributes which should not be synced to/from FSP ================================================================= --> -<attribute> - <id>OP_TRACE_LITE</id> - <description> - Enable Trace lite on openpower. - </description> - <simpleType> - <uint8_t> - <default></default> - </uint8_t> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> - <hbOnly/> -</attribute> <attribute> <id>HIDDEN_ERRLOGS_ENABLE</id> @@ -366,52 +351,6 @@ <hbOnly/> </attribute> -<attribute> - <id>GPIO_INFO</id> - <description>Information needed to address GPIO device</description> - <complexType> - <description>Structure to define the addessing for an I2C - slave device.</description> - <field> - <name>i2cMasterPath</name> - <description>Entity path to the chip that contains the I2C - master</description> - <type>EntityPath</type> - <default>physical:sys-0</default> - </field> - <field> - <name>port</name> - <description>Port from the I2C Master device. This is a 6-bit - value.</description> - <type>uint8_t</type> - <default>0</default> - </field> - <field> - <name>devAddr</name> - <description>Device address on the I2C bus. This is a 7-bit value, - but then shifted 1 bit left.</description> - <type>uint8_t</type> - <default>0</default> - </field> - <field> - <name>engine</name> - <description>I2C master engine. This is a 2-bit - value.</description> - <type>uint8_t</type> - <default>0</default> - </field> - <field> - <name>vddrPin</name> - <description> - Logical GPIO pin number used to enabled/disable VDDR - </description> - <type>uint8_t</type> - <default>0</default> - </field> - </complexType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> <attribute> <id>HB_TARGET_SCOMABLE</id> @@ -483,6 +422,137 @@ <hbOnly/> </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> + +<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. + he sensor name consists of one byte of sensor type plus one byte of + sub-type, to differentiate similar sensors under the same target. + Our implementaion uses the IPMI defined entity ID as the sub-type. + </description> + <enumerator> + <name>PROC_TEMP</name> + <value>0x0103</value> + </enumerator> + <enumerator> + <name>DIMM_TEMP</name> + <value>0x0120</value> + </enumerator> + <enumerator> + <name>CORE_TEMP</name> + <value>0x01D0</value> + </enumerator> + <enumerator> + <name>STATE</name> + <value>0x0500</value> + </enumerator> + <enumerator> + <name>MEMBUF_TEMP</name> + <value>0x01D1</value> + </enumerator> + <enumerator> + <name>PROC_STATE</name> + <value>0x0703</value> + </enumerator> + <enumerator> + <name>CORE_STATE</name> + <value>0x07D0</value> + </enumerator> + <enumerator> + <name>DIMM_STATE</name> + <value>0x0C20</value> + </enumerator> + <enumerator> + <name>MEMBUF_STATE</name> + <value>0x0CD1</value> + </enumerator> + <enumerator> + <name>FW_BOOT_PROGRESS</name> + <value>0x0F22</value> + </enumerator> + <enumerator> + <name>SYSTEM_EVENT</name> + <value>0x1201</value> + </enumerator> + <enumerator> + <name>OS_BOOT</name> + <value>0x1F23</value> + </enumerator> + <enumerator> + <name>HOST_STATUS</name> + <value>0x2223</value> + </enumerator> + <enumerator> + <name>OCC_ACTIVE</name> + <value>0x07D2</value> + </enumerator> + <enumerator> + <name>CORE_FREQ</name> + <value>0xC1D0</value> + </enumerator> + <enumerator> + <name>APSS_CHANNEL</name> + <value>0xC2D7</value> + </enumerator> + <enumerator> + <name>PCI_ACTIVE</name> + <value>0xC423</value> + </enumerator> + <enumerator> + <name>REBOOT_COUNT</name> + <value>0xC322</value> + </enumerator> + <enumerator> + <name>FAULT</name> + <value>0xC700</value> + </enumerator> + <enumerator> + <name>BACKPLANE_FAULT</name> + <value>0xC707</value> + </enumerator> + <enumerator> + <name>REF_CLOCK_FAULT</name> + <value>0xC7D4</value> + </enumerator> + <enumerator> + <name>PCI_CLOCK_FAULT</name> + <value>0xC7D5</value> + </enumerator> + <enumerator> + <name>TOD_CLOCK_FAULT</name> + <value>0xC7D6</value> + </enumerator> + <enumerator> + <name>APSS_FAULT</name> + <value>0xC7D7</value> + </enumerator> + <enumerator> + <name>DERATING_FACTOR</name> + <value>0xC815</value> + </enumerator> + <enumerator> + <name>REDUNDANT_PS_POLICY</name> + <value>0xCA22</value> + </enumerator> + <enumerator> + <name>TPM_REQUIRED</name> + <value>0xFFFF</value> + </enumerator> +</enumerationType> <attribute> <id>SBE_FFDC_ADDR</id> <description> @@ -514,337 +584,40 @@ </attribute> <attribute> - <id>OPEN_POWER_DIMM_THROTTLE_TEMP_DEG_C</id> - <description> - DIMM temperature threshold where throttling will - occur in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_DIMM_ERROR_TEMP_DEG_C</id> - <description> - DIMM temperature where an error will be generated - in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_MEMCTRL_THROTTLE_TEMP_DEG_C</id> - <description> - Memory controller temperature threshold - where throttling will occur in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>OPEN_POWER_PROC_WEIGHT</id> - <description> - Weight factor (in 1/10ths) for each core DTS to calculate a core - temperature. - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_QUAD_WEIGHT</id> - <description> - Weight factor (in 1/10ths) for each quad (cache) DTS to calculate a core - temperature. - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - - - -<attribute> - <id>OPEN_POWER_PROC_DVFS_TEMP_DEG_C</id> - <description> - Processor temperature where DVFS will occur in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_MEMCTRL_ERROR_TEMP_DEG_C</id> - <description> - Memory controller temperature where an error will occur - in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_N_BULK_POWER_LIMIT_WATTS</id> - <description> - N mode bulk power supply limit in Watts - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_N_MAX_MEM_POWER_WATTS</id> - <description> - Maximum power allocated to DIMMs in Watts - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_MEMCTRL_READ_TIMEOUT_SEC</id> - <description> - Memory controller read timeout in seconds - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_DIMM_READ_TIMEOUT_SEC</id> - <description> - DIMM read timeout in seconds - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_PROC_ERROR_TEMP_DEG_C</id> - <description> - Processor temperature error threshold in degrees C - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_MIN_MEM_UTILIZATION_THROTTLING</id> - <description> - Minimum memory utilization for memory throttling - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_PROC_READ_TIMEOUT_SEC</id> - <description> - Processor read timeout in seconds - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_REGULATOR_EFFICIENCY_FACTOR</id> - <description> - Regulator efficiency factor - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>OPEN_POWER_MIN_POWER_CAP_WATTS</id> - <description> - Minimum hard power cap in Watts - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>OPEN_POWER_SOFT_MIN_PCAP_WATTS</id> - <description> - Minimum soft power cap in Watts - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS</id> - <description> - N+1 bulk power limit in Watts for systems running - with redundant power supplies (default) - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>OPEN_POWER_N_PLUS_ONE_HPC_BULK_POWER_LIMIT_WATTS</id> - <description> - N+1 bulk power limit in Watts for High Performance Computing - systems running with a non-redundant power supply policy - </description> - <simpleType> - <uint64_t> - <default>0</default> - </uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_N_PLUS_ONE_MAX_MEM_POWER_WATTS</id> - <description> - N+1 max memory power in Watts - </description> - <simpleType> - <uint64_t></uint64_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> -<attribute> - <id>OPEN_POWER_TURBO_MODE_SUPPORTED</id> - <description> - If this system supports Turbo frequency mode. - 0x00 = no - 0x01 = yes - </description> - <simpleType> - <uint8_t></uint8_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ADC_CHANNEL_FUNC_IDS</id> - <description>ADC Channel function id. 16 channels.</description> - <simpleType> - <uint8_t></uint8_t> - <array>16</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ADC_CHANNEL_SENSOR_NUMBERS</id> - <description>ADC Channel IPMI sensor numbers. 16 channels.</description> - <simpleType> - <uint32_t></uint32_t> - <array>16</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ADC_CHANNEL_GNDS</id> - <description>ADC Channel ground. 16 channels.</description> - <simpleType> - <uint8_t></uint8_t> - <array>16</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ADC_CHANNEL_GAINS</id> - <description>ADC channel gain * 1000. 16 channels.</description> - <simpleType> - <uint32_t></uint32_t> - <array>16</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ADC_CHANNEL_OFFSETS</id> - <description>ADC channel offset * 1000. 16 channels</description> - <simpleType> - <uint32_t></uint32_t> - <array>16</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>APSS_GPIO_PORT_MODES</id> - <description>APSS GPIO PORT MODES</description> + <id>SERIAL_NUMBER</id> + <description>The serial number for a particular FRU target</description> <simpleType> - <uint8_t></uint8_t> - <array>2</array> + <uint8_t> + </uint8_t> + <array>18</array> </simpleType> - <persistency>non-volatile</persistency> + <persistency>volatile-zeroed</persistency> <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_SERIAL_NUMBER</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> + <hbOnly/> </attribute> <attribute> - <id>APSS_GPIO_PORT_PINS</id> - <description>APSS GPIO PORT PINS - Port0 pin 0-7 - Port1 pin 8-15 - </description> + <id>PART_NUMBER</id> + <description>The part number for a particular FRU target</description> <simpleType> - <uint8_t></uint8_t> - <array>16</array> + <uint8_t> + </uint8_t> + <array>20</array> </simpleType> - <persistency>non-volatile</persistency> + <persistency>volatile-zeroed</persistency> <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_PART_NUMBER</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> + <hbOnly/> </attribute> - <attribute> <id>PSTATE_TABLE</id> <description>HTMGT PSTATE data</description> @@ -1024,43 +797,6 @@ </attribute> <attribute> - <id>OPAL_MODEL</id> - <description> - Specifies the compatible model name for Opal to key off of. - This is sourced from the MRW and should be of the format - 'vendor,model', e.g. 'tyan,palmetto'. - </description> - <simpleType> - <string> - <default>ibm,miscopenpower</default> - <sizeInclNull>32</sizeInclNull> - </string> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</attribute> - -<attribute> - <id>ISDIMM_MBVPD_INDEX</id> - <description> - Multiple centaurs can sometimes have their VPD located in one - physical SEEPROM. This is the index into the memory buffer VPD - for this centaur. - </description> - <simpleType> - <uint8_t> - <default>0</default> - </uint8_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_ISDIMM_MBVPD_INDEX</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> <id>HTMGT_SAFEMODE</id> <description>1 = in safemode. 0 = in normal mode.</description> <simpleType> @@ -1091,355 +827,6 @@ </attribute> <attribute> - <id>IPMI_INSTANCE</id> - <description>Holds the IPMI instance number for this entity.</description> - <simpleType> - <uint32_t> - </uint32_t> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> -</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. - he sensor name consists of one byte of sensor type plus one byte of - sub-type, to differentiate similar sensors under the same target. - Our implementaion uses the IPMI defined entity ID as the sub-type. - </description> - <enumerator> - <name>PROC_TEMP</name> - <value>0x0103</value> - </enumerator> - <enumerator> - <name>DIMM_TEMP</name> - <value>0x0120</value> - </enumerator> - <enumerator> - <name>CORE_TEMP</name> - <value>0x01D0</value> - </enumerator> - <enumerator> - <name>STATE</name> - <value>0x0500</value> - </enumerator> - <enumerator> - <name>MEMBUF_TEMP</name> - <value>0x01D1</value> - </enumerator> - <enumerator> - <name>PROC_STATE</name> - <value>0x0703</value> - </enumerator> - <enumerator> - <name>CORE_STATE</name> - <value>0x07D0</value> - </enumerator> - <enumerator> - <name>DIMM_STATE</name> - <value>0x0C20</value> - </enumerator> - <enumerator> - <name>MEMBUF_STATE</name> - <value>0x0CD1</value> - </enumerator> - <enumerator> - <name>FW_BOOT_PROGRESS</name> - <value>0x0F22</value> - </enumerator> - <enumerator> - <name>SYSTEM_EVENT</name> - <value>0x1201</value> - </enumerator> - <enumerator> - <name>OS_BOOT</name> - <value>0x1F23</value> - </enumerator> - <enumerator> - <name>HOST_STATUS</name> - <value>0x2223</value> - </enumerator> - <enumerator> - <name>OCC_ACTIVE</name> - <value>0x07D2</value> - </enumerator> - <enumerator> - <name>CORE_FREQ</name> - <value>0xC1D0</value> - </enumerator> - <enumerator> - <name>APSS_CHANNEL</name> - <value>0xC2D7</value> - </enumerator> - <enumerator> - <name>PCI_ACTIVE</name> - <value>0xC423</value> - </enumerator> - <enumerator> - <name>REBOOT_COUNT</name> - <value>0xC322</value> - </enumerator> - <enumerator> - <name>FAULT</name> - <value>0xC700</value> - </enumerator> - <enumerator> - <name>BACKPLANE_FAULT</name> - <value>0xC707</value> - </enumerator> - <enumerator> - <name>REF_CLOCK_FAULT</name> - <value>0xC7D4</value> - </enumerator> - <enumerator> - <name>PCI_CLOCK_FAULT</name> - <value>0xC7D5</value> - </enumerator> - <enumerator> - <name>TOD_CLOCK_FAULT</name> - <value>0xC7D6</value> - </enumerator> - <enumerator> - <name>APSS_FAULT</name> - <value>0xC7D7</value> - </enumerator> - <enumerator> - <name>DERATING_FACTOR</name> - <value>0xC815</value> - </enumerator> - <enumerator> - <name>REDUNDANT_PS_POLICY</name> - <value>0xCA22</value> - </enumerator> - <enumerator> - <name>TPM_REQUIRED</name> - <value>0xCC03</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>PROCESSOR</name> - <value>0x07</value> - </enumerator> - <enumerator> - <name>MEMORY</name> - <value>0x0c</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> - <enumerator> - <name>TPM_REQUIRED</name> - <value>0xCC</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>IPMI_MAX_BUFFER_SIZE</id> - <description>max buffer size to use for ipmi messages</description> - <simpleType> - <uint32_t> - </uint32_t> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> - <hbOnly/> -</attribute> - -<attribute> - <id>SERIAL_NUMBER</id> - <description>The serial number for a particular FRU target</description> - <simpleType> - <uint8_t> - </uint8_t> - <array>18</array> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> - <hwpfToHbAttrMap> - <id>ATTR_SERIAL_NUMBER</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> - <hbOnly/> -</attribute> - -<attribute> - <id>PART_NUMBER</id> - <description>The part number for a particular FRU target</description> - <simpleType> - <uint8_t> - </uint8_t> - <array>20</array> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> - <hwpfToHbAttrMap> - <id>ATTR_PART_NUMBER</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> - <hbOnly/> -</attribute> - -<attribute> <id>MSS_VOLT_VPP_SLOPE_EFF_CONFIG</id> <description>Units: uV/DRAM </description> @@ -1576,148 +963,6 @@ ID for the sensor number returned with the elog. --> </attribute> <attribute> - <id>WOF_PROC_SORT</id> - <description> - creator: platform (MRW) - Look up table by active cores and nominal frequency to find WOF table - index. First column is number of active cores, Second is nominal - frequency, and third is the WOF table index (1,2,3,4). - </description> - <simpleType> - <uint16_t> - <default> - 0,0,0, - 0,0,0, - 0,0,0, - 0,0,0, - </default> - </uint16_t> - <array>4,3</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_WOF_PROC_SORT</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> - <id>WOF_FREQUENCY_UPLIFT</id> - <description> - creator: platform (MRW) - WOF frequency uplift table. The columns will be the # of active cores. - The rows will be the AC reduction %, or the amount of current difference - from the TDP current. The percentage value is encoded into a integer with - a fixed floating point of 2. (35.8% --> 3580). - </description> - <simpleType> - <uint16_t> - <default> - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0 - </default> - </uint16_t> - <array>4,22,13</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_WOF_FREQUENCY_UPLIFT</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> <id>WOF_FREQUENCY_UPLIFT_SELECTED</id> <description> The selected WOF frequency uplift table. @@ -1754,32 +999,6 @@ ID for the sensor number returned with the elog. --> </attribute> <attribute> - <id>WOF_REGULATOR_EFFICIENCIES</id> - <description> - creator: platform (MRW) - WOF regulator efficiencies. The rows are the output voltage setting and - the columns are the output current. The data in the table is percentages - converted into two byte integers. - </description> - <simpleType> - <uint16_t> - <default> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0 - </default> - </uint16_t> - <array>3,14</array> - </simpleType> - <persistency>non-volatile</persistency> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_WOF_REGULATOR_EFFICIENCIES</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> <id>IS_DRTM_MPIPL_HB</id> <description> Indicates if this is a DRTM MPIPL flow or not. diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml index c3ad96b54..841d3d21d 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml @@ -33,6 +33,133 @@ --> <attribute> + <id>ADC_CHANNEL_FUNC_IDS</id> + <description>ADC Channel function id. 16 channels.</description> + <simpleType> + <uint8_t></uint8_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>ADC_CHANNEL_SENSOR_NUMBERS</id> + <description>ADC Channel IPMI sensor numbers. 16 channels.</description> + <simpleType> + <uint32_t></uint32_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>ADC_CHANNEL_GNDS</id> + <description>ADC Channel ground. 16 channels.</description> + <simpleType> + <uint8_t></uint8_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>ADC_CHANNEL_GAINS</id> + <description>ADC channel gain * 1000. 16 channels.</description> + <simpleType> + <uint32_t></uint32_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>ADC_CHANNEL_OFFSETS</id> + <description>ADC channel offset * 1000. 16 channels</description> + <simpleType> + <uint32_t></uint32_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>APSS_GPIO_PORT_MODES</id> + <description>APSS GPIO PORT MODES</description> + <simpleType> + <uint8_t></uint8_t> + <array>2</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>APSS_GPIO_PORT_PINS</id> + <description>APSS GPIO PORT PINS + Port0 pin 0-7 + Port1 pin 8-15 + </description> + <simpleType> + <uint8_t></uint8_t> + <array>16</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>GPIO_INFO</id> + <description>Information needed to address GPIO device</description> + <complexType> + <description>Structure to define the addessing for an I2C + slave device.</description> + <field> + <name>i2cMasterPath</name> + <description>Entity path to the chip that contains the I2C + master</description> + <type>EntityPath</type> + <default>physical:sys-0</default> + </field> + <field> + <name>port</name> + <description>Port from the I2C Master device. This is a 6-bit + value.</description> + <type>uint8_t</type> + <default>0</default> + </field> + <field> + <name>devAddr</name> + <description>Device address on the I2C bus. This is a 7-bit value, + but then shifted 1 bit left.</description> + <type>uint8_t</type> + <default>0</default> + </field> + <field> + <name>engine</name> + <description>I2C master engine. This is a 2-bit + value.</description> + <type>uint8_t</type> + <default>0</default> + </field> + <field> + <name>vddrPin</name> + <description> + Logical GPIO pin number used to enabled/disable VDDR + </description> + <type>uint8_t</type> + <default>0</default> + </field> + </complexType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> <id>HDAT_I2C_ENGINE</id> <description> This attribute holds the values of the I2C Engine from the i2c device @@ -157,4 +284,502 @@ <writeable/> </attribute> +<attribute> + <id>ISDIMM_MBVPD_INDEX</id> + <description> + Multiple centaurs can sometimes have their VPD located in one + physical SEEPROM. This is the index into the memory buffer VPD + for this centaur. + </description> + <simpleType> + <uint8_t> + <default>0</default> + </uint8_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_ISDIMM_MBVPD_INDEX</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>IPMI_INSTANCE</id> + <description>Holds the IPMI instance number for this entity.</description> + <simpleType> + <uint32_t> + </uint32_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<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> + +<attribute> + <id>OP_TRACE_LITE</id> + <description> + Enable Trace lite on openpower. + </description> + <simpleType> + <uint8_t> + <default></default> + </uint8_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <writeable/> + <hbOnly/> +</attribute> + +<attribute> + <id>OPEN_POWER_DIMM_THROTTLE_TEMP_DEG_C</id> + <description> + DIMM temperature threshold where throttling will + occur in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_DIMM_ERROR_TEMP_DEG_C</id> + <description> + DIMM temperature where an error will be generated + in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_MEMCTRL_THROTTLE_TEMP_DEG_C</id> + <description> + Memory controller temperature threshold + where throttling will occur in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_PROC_WEIGHT</id> + <description> + Weight factor (in 1/10ths) for each core DTS to calculate a core + temperature. + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_QUAD_WEIGHT</id> + <description> + Weight factor (in 1/10ths) for each quad (cache) DTS to calculate a core + temperature. + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_PROC_DVFS_TEMP_DEG_C</id> + <description> + Processor temperature where DVFS will occur in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_MEMCTRL_ERROR_TEMP_DEG_C</id> + <description> + Memory controller temperature where an error will occur + in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_N_BULK_POWER_LIMIT_WATTS</id> + <description> + N mode bulk power supply limit in Watts + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_N_MAX_MEM_POWER_WATTS</id> + <description> + Maximum power allocated to DIMMs in Watts + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_MEMCTRL_READ_TIMEOUT_SEC</id> + <description> + Memory controller read timeout in seconds + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_DIMM_READ_TIMEOUT_SEC</id> + <description> + DIMM read timeout in seconds + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_PROC_ERROR_TEMP_DEG_C</id> + <description> + Processor temperature error threshold in degrees C + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_MIN_MEM_UTILIZATION_THROTTLING</id> + <description> + Minimum memory utilization for memory throttling + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_PROC_READ_TIMEOUT_SEC</id> + <description> + Processor read timeout in seconds + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_REGULATOR_EFFICIENCY_FACTOR</id> + <description> + Regulator efficiency factor + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_MIN_POWER_CAP_WATTS</id> + <description> + Minimum hard power cap in Watts + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_SOFT_MIN_PCAP_WATTS</id> + <description> + Minimum soft power cap in Watts + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS</id> + <description> + N+1 bulk power limit in Watts for systems running + with redundant power supplies (default) + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_N_PLUS_ONE_HPC_BULK_POWER_LIMIT_WATTS</id> + <description> + N+1 bulk power limit in Watts for High Performance Computing + systems running with a non-redundant power supply policy + </description> + <simpleType> + <uint64_t> + <default>0</default> + </uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_N_PLUS_ONE_MAX_MEM_POWER_WATTS</id> + <description> + N+1 max memory power in Watts + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPEN_POWER_TURBO_MODE_SUPPORTED</id> + <description> + If this system supports Turbo frequency mode. + 0x00 = no + 0x01 = yes + </description> + <simpleType> + <uint8_t></uint8_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + +<attribute> + <id>OPAL_MODEL</id> + <description> + Specifies the compatible model name for Opal to key off of. + This is sourced from the MRW and should be of the format + 'vendor,model', e.g. 'tyan,palmetto'. + </description> + <simpleType> + <string> + <default>ibm,miscopenpower</default> + <sizeInclNull>32</sizeInclNull> + </string> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</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_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>PROCESSOR</name> + <value>0x07</value> + </enumerator> + <enumerator> + <name>MEMORY</name> + <value>0x0c</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_MAX_BUFFER_SIZE</id> + <description>max buffer size to use for ipmi messages</description> + <simpleType> + <uint32_t> + </uint32_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <writeable/> + <hbOnly/> +</attribute> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index b45a0bc79..43414ed06 100755 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -31,55 +31,15 @@ Contains the definition of the different types of Hostboot targets and target type extensions to add attributes to common target types ================================================================= --> - -<targetTypeExtension> - <id>base</id> - <attribute> - <id>IPMI_INSTANCE</id> - <default>0xFF</default> - </attribute> -</targetTypeExtension> - <targetTypeExtension> <id>sys-sys-power9</id> - <attribute><id>OP_TRACE_LITE</id></attribute> <attribute><id>IS_MPIPL_HB</id></attribute> <attribute><id>IBSCOM_ENABLE_OVERRIDE</id></attribute> <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> - <attribute><id>APSS_GPIO_PORT_MODES</id></attribute> - <attribute><id>APSS_GPIO_PORT_PINS</id></attribute> - <attribute><id>OPEN_POWER_DIMM_THROTTLE_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_DIMM_ERROR_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_MEMCTRL_THROTTLE_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_PROC_WEIGHT</id></attribute> - <attribute><id>OPEN_POWER_QUAD_WEIGHT</id></attribute> - <attribute><id>OPEN_POWER_PROC_DVFS_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_MEMCTRL_ERROR_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_N_BULK_POWER_LIMIT_WATTS</id></attribute> - <attribute><id>OPEN_POWER_N_MAX_MEM_POWER_WATTS</id></attribute> - <attribute><id>OPEN_POWER_MEMCTRL_READ_TIMEOUT_SEC</id></attribute> - <attribute><id>OPEN_POWER_DIMM_READ_TIMEOUT_SEC</id></attribute> - <attribute><id>OPEN_POWER_PROC_ERROR_TEMP_DEG_C</id></attribute> - <attribute><id>OPEN_POWER_MIN_MEM_UTILIZATION_THROTTLING</id></attribute> - <attribute><id>OPEN_POWER_PROC_READ_TIMEOUT_SEC</id></attribute> - <attribute><id>OPEN_POWER_REGULATOR_EFFICIENCY_FACTOR</id></attribute> - <attribute><id>OPEN_POWER_MIN_POWER_CAP_WATTS</id></attribute> - <attribute><id>OPEN_POWER_SOFT_MIN_PCAP_WATTS</id></attribute> - <attribute><id>OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS</id></attribute> - <attribute><id>OPEN_POWER_N_PLUS_ONE_MAX_MEM_POWER_WATTS</id></attribute> - <attribute><id>OPEN_POWER_TURBO_MODE_SUPPORTED</id></attribute> <attribute><id>OCC_CONTROL_DATA</id></attribute> <attribute><id>HTMGT_INTERNAL_FLAGS</id></attribute> - <attribute><id>OPAL_MODEL</id></attribute> <attribute><id>HTMGT_SAFEMODE</id></attribute> - <attribute><id>IPMI_SENSORS</id></attribute> - <attribute><id>IPMI_MAX_BUFFER_SIZE</id></attribute> <attribute><id>CLEAR_DIMM_SPD_ENABLE</id></attribute> <attribute><id>OCC_COMMON_AREA_PHYS_ADDR</id> </attribute> <attribute><id>ATTN_CHK_ALL_PROCS</id> </attribute> @@ -93,7 +53,6 @@ <targetTypeExtension> <id>enc-node-power9</id> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>PART_NUMBER</id></attribute> <attribute><id>SERIAL_NUMBER</id></attribute> <attribute><id>VPD_SWITCHES</id></attribute> @@ -178,7 +137,6 @@ <attribute> <id>XSCOM_VIRTUAL_ADDR</id> </attribute> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>HB_TARGET_SCOMABLE</id></attribute> </targetTypeExtension> @@ -226,7 +184,6 @@ <attribute> <id>ISDIMM_MBVPD_INDEX</id> </attribute> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>PART_NUMBER</id></attribute> <attribute><id>SERIAL_NUMBER</id></attribute> <attribute> @@ -236,7 +193,6 @@ <targetTypeExtension> <id>unit-core-power9</id> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>HB_TARGET_SCOMABLE</id></attribute> <attribute> <id>HBRT_HYP_ID</id> @@ -261,7 +217,6 @@ <targetTypeExtension> <id>lcard-dimm</id> <attribute><id>VPD_SWITCHES</id></attribute> - <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>PART_NUMBER</id></attribute> <attribute><id>SERIAL_NUMBER</id></attribute> </targetTypeExtension> @@ -285,7 +240,6 @@ <attribute> <id>PSTATE_TABLE_MFG</id> </attribute> - <attribute><id>IPMI_SENSORS</id></attribute> </targetTypeExtension> <targetTypeExtension> diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml index 4601d2dbd..548c5594a 100644 --- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml @@ -41,6 +41,74 @@ <attribute><id>HDAT_I2C_BUS_FREQ</id></attribute> <attribute><id>HDAT_I2C_DEV_PURPOSE</id></attribute> <attribute><id>HDAT_I2C_ELEMENTS</id></attribute> + <attribute> + <id>IPMI_INSTANCE</id> + <default>0xFF</default> + </attribute> </targetTypeExtension> +<targetTypeExtension> + <id>sys-sys-power9</id> + <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> + <attribute><id>APSS_GPIO_PORT_MODES</id></attribute> + <attribute><id>APSS_GPIO_PORT_PINS</id></attribute> + <attribute><id>IPMI_SENSORS</id></attribute> + <attribute><id>IPMI_MAX_BUFFER_SIZE</id></attribute> + <attribute><id>OP_TRACE_LITE</id></attribute> + <attribute><id>OPEN_POWER_DIMM_THROTTLE_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_DIMM_ERROR_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_MEMCTRL_THROTTLE_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_PROC_WEIGHT</id></attribute> + <attribute><id>OPEN_POWER_QUAD_WEIGHT</id></attribute> + <attribute><id>OPEN_POWER_PROC_DVFS_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_MEMCTRL_ERROR_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_N_BULK_POWER_LIMIT_WATTS</id></attribute> + <attribute><id>OPEN_POWER_N_MAX_MEM_POWER_WATTS</id></attribute> + <attribute><id>OPEN_POWER_MEMCTRL_READ_TIMEOUT_SEC</id></attribute> + <attribute><id>OPEN_POWER_DIMM_READ_TIMEOUT_SEC</id></attribute> + <attribute><id>OPEN_POWER_PROC_ERROR_TEMP_DEG_C</id></attribute> + <attribute><id>OPEN_POWER_MIN_MEM_UTILIZATION_THROTTLING</id></attribute> + <attribute><id>OPEN_POWER_PROC_READ_TIMEOUT_SEC</id></attribute> + <attribute><id>OPEN_POWER_REGULATOR_EFFICIENCY_FACTOR</id></attribute> + <attribute><id>OPEN_POWER_MIN_POWER_CAP_WATTS</id></attribute> + <attribute><id>OPEN_POWER_SOFT_MIN_PCAP_WATTS</id></attribute> + <attribute><id>OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS</id></attribute> + <attribute><id>OPEN_POWER_N_PLUS_ONE_MAX_MEM_POWER_WATTS</id></attribute> + <attribute><id>OPEN_POWER_TURBO_MODE_SUPPORTED</id></attribute> + <attribute><id>OPAL_MODEL</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>enc-node-power9</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>chip-processor-power9</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>chip-membuf-centaur</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>lcard-dimm</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>occ</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> + +<targetTypeExtension> + <id>unit-core-power9</id> + <attribute><id>IPMI_SENSORS</id></attribute> +</targetTypeExtension> </attributes> |
