summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2017-08-29 12:53:46 -0500
committerWilliam G. Hoffa <wghoffa@us.ibm.com>2017-09-12 12:04:15 -0400
commit77261b637bebb53bf9855acdd5f5b7f2ff30d891 (patch)
treeacf0b078d958ae3fef4a40d36ce4b4899669379f /src
parent8feb62b8d22be7881355e8cf44de0f11e9b28fae (diff)
downloadtalos-hostboot-77261b637bebb53bf9855acdd5f5b7f2ff30d891.tar.gz
talos-hostboot-77261b637bebb53bf9855acdd5f5b7f2ff30d891.zip
Add sensor name to IPMI sensor error logs
Change-Id: I5a71cb466d683d9a77a6c905ac33fa21a1d5d348 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45315 Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/usr/ipmi/ipmisensor.C17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C
index 4ee831fa8..5be1dc1af 100644
--- a/src/usr/ipmi/ipmisensor.C
+++ b/src/usr/ipmi/ipmisensor.C
@@ -93,7 +93,8 @@ namespace SENSOR
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SENSOR_NOT_SETTABLE
* @userdata1 BMC IPMI Completion code.
- * @userdata2 bytes [0-3]sensor number
+ * @userdata2 bytes [0-1]sensor name
+ * bytes [2-3]sensor number
* bytes [4-7]HUID of target.
* @devdesc Set sensor reading command failed.
*/
@@ -129,7 +130,8 @@ namespace SENSOR
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_INVALID_SENSOR_CMD
* @userdata1 BMC IPMI Completion code.
- * @userdata2 bytes [0-3]sensor number
+ * @userdata2 bytes [0-1]sensor name
+ * bytes [2-3]sensor number
* bytes [4-7]HUID of target.
* @devdesc Command not valid for this sensor.
*/
@@ -145,7 +147,8 @@ namespace SENSOR
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SENSOR_NOT_PRESENT
* @userdata1 BMC IPMI Completion code.
- * @userdata2 bytes [0-3]sensor number
+ * @userdata2 bytes [0-1]sensor name
+ * bytes [2-3]sensor number
* bytes [4-7]HUID of target.
* @devdesc Requested sensor is not present.
*/
@@ -163,7 +166,8 @@ namespace SENSOR
* @moduleid IPMI::MOD_IPMISENSOR
* @reasoncode IPMI::RC_SET_SENSOR_FAILURE
* @userdata1 BMC IPMI Completion code.
- * @userdata2 bytes [0-3]sensor number
+ * @userdata2 bytes [0-1]sensor name
+ * bytes [2-3]sensor number
* bytes [4-7]HUID of target.
* @devdesc Set sensor reading command failed.
*/
@@ -185,7 +189,10 @@ namespace SENSOR
IPMI::MOD_IPMISENSOR,
l_reasonCode,
i_rc,
- TWO_UINT32_TO_UINT64( sensor_number, huid ),
+ TWO_UINT32_TO_UINT64(
+ TWO_UINT16_TO_UINT32(iv_name,
+ sensor_number),
+ huid ),
true);
l_err->collectTrace(IPMI_COMP_NAME);
OpenPOWER on IntegriCloud