diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2014-12-08 15:27:36 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-01-09 16:27:06 -0600 |
commit | 031ea19e048867f5e25ec4bdfe38b64830eaf4fe (patch) | |
tree | c282456b3c6ff043352b569d9f52617c33113a62 /src/usr/targeting | |
parent | 162d892ecec8dc8d7b45a6ee2ab2517adc56b594 (diff) | |
download | talos-hostboot-031ea19e048867f5e25ec4bdfe38b64830eaf4fe.tar.gz talos-hostboot-031ea19e048867f5e25ec4bdfe38b64830eaf4fe.zip |
Create interface for the OCC_active sensor
add code to manipulate the Occ_Active sensor
for use by htmgt and others.
Change-Id: I4013a0999138d4c3901f8cb42f121589226e0bf3
RTC:119073
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14783
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/targeting')
-rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 82 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 15 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 5 |
3 files changed, 70 insertions, 32 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 4f3529252..54902b7bf 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2013,2014 +# Contributors Listed Below - COPYRIGHT 2013,2015 # [+] International Business Machines Corp. # # @@ -2075,15 +2075,15 @@ sub generate_sys <attribute> <id>IPMI_SENSORS</id> <default> - 0x0700,0x07, - 0x0800,0x04, - 0x0900,0x05, - 0x0a00,0x08, - 0x0b00,0x09, - 0x0c00,0x06, - 0x0d00,0x00, - 0x0e00,0xFF, - 0x0F00,0xFF, + 0x0700,0x07, <!-- OS_Boot --> + 0x0800,0x04, <!-- Host_Status --> + 0x0900,0x05, <!-- FW_Boot_Progress --> + 0x0b00,0x09, <!-- Power_Cap --> + 0x0c00,0x06, <!-- PCI --> + 0x0d00,0x00, <!-- Boot_watchdog --> + 0x0e00,0xFF, <!-- Reboot_Count --> + 0x1000,0xFF, <!-- System_Event --> + 0x1010,0xFF, <!-- APSS Fault --> 0xFFFF,0xFF, 0xFFFF,0xFF, 0xFFFF,0xFF, @@ -2522,10 +2522,10 @@ sub generate_system_node <attribute> <id>IPMI_SENSORS</id> <default> - 0x1017,0x14, - 0x101A,0x15, - 0x101B,0x16, - 0xFFFF,0xFF, + 0x1000,0x80, <!-- Backplane fault sensor --> + 0x1017,0x14, <!-- TOD clock fault sensor --> + 0x101A,0x15, <!-- REF clock fault sensor --> + 0x101B,0x16, <!-- PCI clock fault sensor --> 0xFFFF,0xFF, 0xFFFF,0xFF, 0xFFFF,0xFF, @@ -3093,8 +3093,8 @@ sub generate_proc <attribute> <id>IPMI_SENSORS</id> <default> - 0x0100, 0x12, - 0x0500, 0x03, + 0x0100, 0x12, <!-- Temperature sensor --> + 0x0500, 0x03, <!-- State sensor --> 0xFFFF, 0xFF, 0xFFFF, 0xFF, 0xFFFF, 0xFF, @@ -3198,8 +3198,8 @@ sub generate_ex_core <attribute> <id>IPMI_SENSORS</id> <default> - 0x0100, 0x13, - 0x0500, 0x02, + 0x0100, 0x13, <!-- Temperature sensor --> + 0x0500, 0x02, <!-- State sensor --> 0xFFFF, 0xFF, 0xFFFF, 0xFF, 0xFFFF, 0xFF, @@ -4012,8 +4012,8 @@ sub generate_centaur <attribute> <id>IPMI_SENSORS</id> <default> - 0x0100, 0xFF, - 0x0500, 0xFF, + 0x0100, 0xFF, <!-- Temperature sensor --> + 0x0500, 0xFF, <!-- State sensor --> 0xFFFF, 0xFF, 0xFFFF, 0xFF, 0xFFFF, 0xFF, @@ -4289,8 +4289,8 @@ sub generate_is_dimm <attribute> <id>IPMI_SENSORS</id> <default> - 0x0100, 0xFF, - 0x0500, 0x01, + 0x0100, 0xFF, <!-- Temperature sensor --> + 0x0500, 0x01, <!-- State sensor --> 0xFFFF, 0xFF, 0xFFFF, 0xFF, 0xFFFF, 0xFF, @@ -4459,8 +4459,8 @@ sub generate_dimm <attribute> <id>IPMI_SENSORS</id> <default> - 0x0100, 0xFF, - 0x0500, 0x01, + 0x0100, 0xFF, <!-- Temperature sensor --> + 0x0500, 0x01, <!-- State sensor --> 0xFFFF, 0xFF, 0xFFFF, 0xFF, 0xFFFF, 0xFF, @@ -4672,8 +4672,38 @@ sub generate_occ <attribute> <id>OCC_MASTER_CAPABLE</id> <default>$mastercapable</default> - </attribute> -</targetInstance>\n"; + </attribute>\n"; + + # $TODO RTC:110399 + # hardcode for now both palmetto and habenaro are + # currently the same - this will change though + # + if( $haveFSPs == 0 ) + { + print "\n<!-- IPMI sensor numbers --> + <attribute> + <id>IPMI_SENSORS</id> + <default> + 0x0a00, 0x08, <!-- Occ_active --> + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF, + 0xFFFF, 0xFF + </default> + </attribute>\n"; + } +print "</targetInstance>\n"; } diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 297c8b64b..76b9e8046 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2012,2014 --> +<!-- Contributors Listed Below - COPYRIGHT 2012,2015 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -407,14 +407,14 @@ <value>0x0e00</value> </enumerator> <enumerator> - <name>POWER</name> - <value>0x0f00</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> @@ -426,6 +426,11 @@ <name>PCI_CLOCK_FAULT</name> <value>0x101B</value> </enumerator> + <enumerator> + <name>APSS_CHANNEL</name> <!-- Power sensors --> + <value>0x1100</value> <!-- 16 channels --> + </enumerator> + </enumerationType> <enumerationType> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 46ac33acb..5f73d87d5 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2012,2014 --> +<!-- Contributors Listed Below - COPYRIGHT 2012,2015 --> <!-- [+] Google Inc. --> <!-- [+] International Business Machines Corp. --> <!-- --> @@ -1682,6 +1682,9 @@ <attribute> <id>OCC_MASTER_CAPABLE</id> </attribute> + <attribute> + <id>IPMI_SENSORS</id> + </attribute> </targetType> </attributes> |