diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/htmgt/htmgt_cfgdata.C | 16 | ||||
| -rwxr-xr-x | src/usr/targeting/common/processMrw.pl | 4 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_openpower.xml | 16 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_openpower.xml | 3 |
4 files changed, 37 insertions, 2 deletions
diff --git a/src/usr/htmgt/htmgt_cfgdata.C b/src/usr/htmgt/htmgt_cfgdata.C index 80d5d7cab..de636d153 100644 --- a/src/usr/htmgt/htmgt_cfgdata.C +++ b/src/usr/htmgt/htmgt_cfgdata.C @@ -1008,6 +1008,7 @@ void getAVSBusConfigMessageData( const TargetHandle_t i_occ, uint64_t & o_size ) { uint64_t index = 0; + o_size = 0; assert( o_data != nullptr ); @@ -1024,8 +1025,19 @@ void getAVSBusConfigMessageData( const TargetHandle_t i_occ, o_data[index++] = 0xFF; //reserved o_data[index++] = l_proc->getAttr<ATTR_VDN_AVSBUS_BUSNUM>();//Vdn Bus o_data[index++] = l_proc->getAttr<ATTR_VDN_AVSBUS_RAIL>(); //Vdn Rail sel - o_data[index++] = 0xFF; //reserved - o_data[index++] = 0xFF; //reserved + + ATTR_NO_APSS_PROC_POWER_VCS_VIO_WATTS_type PowerAdder = 0; + if ( l_proc->tryGetAttr //if attr exists populate Proc Power Adder. + <ATTR_NO_APSS_PROC_POWER_VCS_VIO_WATTS>(PowerAdder)) + { + o_data[index++] = ((PowerAdder>>8)&0xFF); + o_data[index++] = ((PowerAdder)&0xFF); + } + else //else attr not def. set to 0x0000. + { + o_data[index++] = 0x00; + o_data[index++] = 0x00; + } o_size = index; } diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl index 8051d1793..033e921c7 100755 --- a/src/usr/targeting/common/processMrw.pl +++ b/src/usr/targeting/common/processMrw.pl @@ -735,6 +735,10 @@ sub processProcessor { $targetObj->copyAttribute($socket_target,$target,$attr); } + elsif ($attr =~/NO_APSS_PROC_POWER_VCS_VIO_WATTS/) + { + $targetObj->copyAttribute($socket_target,$target,$attr); + } } # Both for FSP and BMC based systems, it's good enough diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml index f5df8c942..4e3042907 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml @@ -1248,6 +1248,22 @@ ID for the sensor number returned with the elog. --> <writeable/> </attribute> +<attribute> + <id>NO_APSS_PROC_POWER_VCS_VIO_WATTS</id> + <description> + A constant power (in watts) that the OCC is to add onto Vdd and Vdn + power to represent any processor part that is not measured(i.e.Vcs,Vio) + This is used by the OCC to calculate a total processor socket power. + </description> + <simpleType> + <uint16_t> + <default>0</default> + </uint16_t> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> +</attribute> + <!-- end HTMGT attributes --> <attribute> diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml index 39c935a26..1b7aaf77c 100644 --- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml +++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml @@ -104,6 +104,8 @@ <targetTypeExtension> <id>chip-processor-power9</id> <attribute><id>IPMI_SENSORS</id></attribute> + + <attribute><id>NO_APSS_PROC_POWER_VCS_VIO_WATTS</id></attribute> </targetTypeExtension> <targetTypeExtension> @@ -134,6 +136,7 @@ <targetTypeExtension> <id>unit-core-power9</id> <attribute><id>IPMI_SENSORS</id></attribute> + </targetTypeExtension> <targetTypeExtension> |
