diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/usr/ipmi/ipmisensor.H | 11 | ||||
| -rw-r--r-- | src/usr/ipmi/ipmisensor.C | 18 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/include/usr/ipmi/ipmisensor.H b/src/include/usr/ipmi/ipmisensor.H index 23dc594da..9f57d4ded 100644 --- a/src/include/usr/ipmi/ipmisensor.H +++ b/src/include/usr/ipmi/ipmisensor.H @@ -196,8 +196,17 @@ namespace SENSOR // the event deassertion bits, zeros are ignored. // [0:1] 01b - write the given value to the sensor reading byte. // + // Note: Per AMI implementation bits 0:1 will force the assertion + // mask value as sent to be the new sensor value, all other bits + // are ignored. + // // default operation = 1010 1001 - static const uint8_t DEFAULT_OPERATION = 0xA9; // see IPMI Spec. "Set + static const uint8_t DEFAULT_OPERATION = 0xA8; // see IPMI Spec. "Set + + // use this value for sensors which use assertion fields for sensor values + // eg. Reboot count + static const uint8_t SET_SENSOR_VALUE_OPERATION = 0x01; + // Sensor Reading and Event // Status command" for // details on this byte. diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C index 69a58dd95..4aa1c9f4b 100644 --- a/src/usr/ipmi/ipmisensor.C +++ b/src/usr/ipmi/ipmisensor.C @@ -546,6 +546,7 @@ namespace SENSOR :SensorBase(TARGETING::SENSOR_NAME_REBOOT_COUNT, NULL) { // message buffer created and initialized in base object. + } // @@ -558,6 +559,9 @@ namespace SENSOR // errlHndl_t RebootCountSensor::setRebootCount( uint16_t i_count ) { + // adjust the operation to overwrite the sensor reading + // to the value we send. + iv_msg->iv_operation = SET_SENSOR_VALUE_OPERATION; // the Reboot_count sensor is defined as a discrete sensor // but the assertion bytes are being used to transfer the count @@ -659,8 +663,9 @@ namespace SENSOR case NOT_PRESENT: // turn off the present bit iv_msg->iv_deassertion_mask = pres_mask; - // turn on the disabled bit - iv_msg->iv_assertion_mask = func_mask; + + // turn off the disabled bit in case it was on + iv_msg->iv_deassertion_mask |= func_mask; break; case PRESENT: @@ -795,6 +800,14 @@ namespace SENSOR // assert the specified state iv_msg->iv_assertion_mask = setMask(i_state); + // there are two offsets used with this sensor, when + // asserting one, we need to deassert the other as only + // one state is valid at any given time. + OccStateEnum other_state = + (i_state == OCC_ACTIVE) ? OCC_NOT_ACTIVE : OCC_ACTIVE; + + iv_msg->iv_deassertion_mask = setMask( other_state ); + l_err = writeSensorData(); return l_err; @@ -858,6 +871,7 @@ namespace SENSOR // errlHndl_t HostStatusSensor::updateHostStatus( hostStatus status ) { + iv_msg->iv_operation = SET_SENSOR_VALUE_OPERATION; iv_msg->iv_assertion_mask = setMask((uint8_t)status); return writeSensorData(); |
