Mark sensor failed if non-functional

Use functional interface as well to determine if a
sensor has failed.

Tested: Saw fans boost when ME sensors failed by putting
ME in recovery mode

Change-Id: I

Mark sensor failed if non-functional

Use functional interface as well to determine if a
sensor has failed.

Tested: Saw fans boost when ME sensors failed by putting
ME in recovery mode

Change-Id: I4939d29d10c668c12464dadf40afe6669da8f051
Signed-off-by: James Feist <james.feist@linux.intel.com>

show more ...

Fix unit test

Now that scale is gone, reading should match the value
written.

Change-Id: I63a3ec0dc50ee5eacc08b23d0669fa065961abd2
Signed-off-by: James Feist <james.feist@linux.intel.com>

Allow building with double value interface

Sensor interface using double looks about ready to go in,
it was found this repo doesn't build. Fix it.

Change-Id: I48b943e5e8e77506d1b978d2b9a56db1387624

Allow building with double value interface

Sensor interface using double looks about ready to go in,
it was found this repo doesn't build. Fix it.

Change-Id: I48b943e5e8e77506d1b978d2b9a56db13876248e
Signed-off-by: James Feist <james.feist@linux.intel.com>

show more ...

Fix swampd path

Fixed swampd path in service file as this file is a part of repo so
bindir was not converting to /usr/bin in build.

Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Change-Id: Ia70e

Fix swampd path

Fixed swampd path in service file as this file is a part of repo so
bindir was not converting to /usr/bin in build.

Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Change-Id: Ia70ed2e023a16668b09175486816029f6b13b8bc
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

Fix regex pattern for finding sensors

In case if there are sensors have a single digit and multi digit
index, findSensors() searches a sensor incorrectly. For an example,
if there are 'PWM_1' and 'P

Fix regex pattern for finding sensors

In case if there are sensors have a single digit and multi digit
index, findSensors() searches a sensor incorrectly. For an example,
if there are 'PWM_1' and 'PWM_16' in sensor list and it searches
'PWM_1', 'PWM_16' is returned as a matched result which is
incorrect. To fix the issue, this commit fixes regex pattern to
search sensors properly.

Tested: Tested it on a system which has multi-digit PWM sensor
index and checked that swampd initialized fan-PWM pairs
correctly.

Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Change-Id: I05e8d87996e83b681f0726fa5ba02b01c08cd942

show more ...

Rename sdbusplus::message::variant -> std::variant

This was removed from sdbusplus and now breaks the build without
conversion.

Change-Id: I084ede89ca200d3f9bc38d451e54d511418f7cda
Signed-off-by: W

Rename sdbusplus::message::variant -> std::variant

This was removed from sdbusplus and now breaks the build without
conversion.

Change-Id: I084ede89ca200d3f9bc38d451e54d511418f7cda
Signed-off-by: William A. Kennington III <wak@google.com>

show more ...

add needed include for numeric_limits

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I3dd819833048c1c5787814df064511913397ae78

ensure proper data type for variant

gcc10 is more strict on variant usage

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I906d1710312cad907ed5db5c04d9b1aec101fca4

catch the execption during buildSensors

If there any sensor is being created or deleted,
the buildSenosrs will throw exceptions and the application will crash.
Add a retry logic to catch such except

catch the execption during buildSensors

If there any sensor is being created or deleted,
the buildSenosrs will throw exceptions and the application will crash.
Add a retry logic to catch such exception and try again,
will quit the process finally if failed more than 5 times.

Tested:
Changing the PSU sensor threshold using ipmi commands,
no pid service crash log.

Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
Change-Id: Icf96bfb01bce4a3b5c22095f0bef0d793fd8430d

show more ...

Set ignoreDbusMinMax for Stepwise

Temperature readings should not be in percent. Add
ignoreDbusMinMax as inheritFromDbus was removed.

Tested: modified fan floor by changing stepwise controller

Cha

Set ignoreDbusMinMax for Stepwise

Temperature readings should not be in percent. Add
ignoreDbusMinMax as inheritFromDbus was removed.

Tested: modified fan floor by changing stepwise controller

Change-Id: I1bf4e15ca78bc894dc82dd68e787fd6fbd3d0aef
Signed-off-by: James Feist <james.feist@linux.intel.com>

show more ...

Add ignoreDbusMinMax to temp configurations

Originally 'inheritFromDBus' was only set for fan
configurations. This was removed, so now everything
was inheriting from Dbus. Set the inverse of
'inheri

Add ignoreDbusMinMax to temp configurations

Originally 'inheritFromDBus' was only set for fan
configurations. This was removed, so now everything
was inheriting from Dbus. Set the inverse of
'inheritFromDBus' of ignoreDbusMinMax to temp configurations
so that they get the correct reading.

Tested: Used sensor override in a loop on a sensor and
saw the reading in the pid be correct

Change-Id: I29dab298921f9c5204d29341555f2c5d2d011aa2
Signed-off-by: James Feist <james.feist@linux.intel.com>

show more ...

Start phoshphor-pid-control after fansensor

Occasionally, phosphor-pid-control fails to start logging:

swampd[2688]: terminate called after throwing an instance of 'std::runtime_error'
swam

Start phoshphor-pid-control after fansensor

Occasionally, phosphor-pid-control fails to start logging:

swampd[2688]: terminate called after throwing an instance of 'std::runtime_error'
swampd[2688]: what(): ObjectMapper Call Failure

This happens multiple times:

systemd[1]: phosphor-pid-control.service: Main process exited, code=killed, status=6/ABRT
systemd[1]: phosphor-pid-control.service: Failed with result 'signal'.
systemd[1]: phosphor-pid-control.service: Service RestartSec=1s expired, scheduling restart.
systemd[1]: phosphor-pid-control.service: Scheduled restart job, restart counter is at 2.
systemd[1]: Stopped Swampd Margin-based Fan Control Daemon.
systemd[1]: phosphor-pid-control.service: Start request repeated too quickly.
systemd[1]: phosphor-pid-control.service: Failed with result 'signal'.
systemd[1]: Failed to start Swampd Margin-based Fan Control Daemon.

and systemd gives up and stops trying to restart the service.

$ systemctl --no-page status phosphor-pid-control.service
* phosphor-pid-control.service - Swampd Margin-based Fan Control Daemon
Loaded: loaded (/lib/systemd/system/phosphor-pid-control.service; enabled; vendor preset: enabled)
Active: failed (Result: signal) since Thu 2019-10-31 18:05:11 UTC; 1min 56s ago
Process: 2738 ExecStart=/usr/bin/swampd (code=killed, signal=ABRT)
Main PID: 2738 (code=killed, signal=ABRT)

xyz.openbmc_project.fansensor.service is the service from dbus-sensors
that phosphor-pid-control uses to interact with the fans and pwms.
phosphor-pid-control should not start until after fansensor.

Tested:
swampd comes up reliably on a system using
xyz.openbmc_project.fansensor.service. I have not tried a system that
isn't using dbus-sensors.
Signed-off-by: Peter Lundgren <peterlundgren@google.com>
Change-Id: Iec019bfabcc77279c7dfe8d4899ac07c1c41a428

show more ...

conf: add ignoreDbusMinMax option

Add an optional field to the sensor configuration, s.t. it'll tell a
dbus passive sensor to ignore the MinValue and MaxValue properties from
dbus.

Signed-off-by: P

conf: add ignoreDbusMinMax option

Add an optional field to the sensor configuration, s.t. it'll tell a
dbus passive sensor to ignore the MinValue and MaxValue properties from
dbus.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ia6a8c802c2dc5bf41e5e860b21d7764cc09e6b6b

show more ...

build: drop flto option to workaround gcc issue

main.o swampd-util.o ./.libs/libswampd.a -lstdc++fs -lphosphor_logging
-lsdbusplus -lsystemd -lphosphor_dbus
00:59:59 | lto1: internal compiler error

build: drop flto option to workaround gcc issue

main.o swampd-util.o ./.libs/libswampd.a -lstdc++fs -lphosphor_logging
-lsdbusplus -lsystemd -lphosphor_dbus
00:59:59 | lto1: internal compiler error: in add_symbol_to_partition_1,
at lto/lto-partition.c:154

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I387d1530ff7daaa217dce980e357ea612f7ddfdb

show more ...

sensors: buildjson: only load min/max if type fan

The min/max value in the json configuration only provide meaning in the
context of a fan sensor. This patch only loads the configuration
options in

sensors: buildjson: only load min/max if type fan

The min/max value in the json configuration only provide meaning in the
context of a fan sensor. This patch only loads the configuration
options in that case, and reports a warning if otherwise detected.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I20898ab3c87f4e9c6005683420a30c6685944c96

show more ...

sensors: buildjson: minor min/max cleanup

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I9d01753a40f1146d49e1a03a18dbea704f3fff84

s/swampd.service/phosphor-pid-control.service/g

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ia1f08915f5541142cb3e10aa68043d3d2cad0167

rename away from RPM

The SetPoint output from a thermal PID is likely RPM, and that value is
then fed into a fan controller PID as the set-point (unit: RPM). This
does not have to be RPM, however.

rename away from RPM

The SetPoint output from a thermal PID is likely RPM, and that value is
then fed into a fan controller PID as the set-point (unit: RPM). This
does not have to be RPM, however. Continue renaming variables and
methods to remove the explicit unit-naming.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I570dee0c688338f9a458cac7123314717bee2b42

show more ...

rename RPMSetPoint to SetPoint

The PIDs were originally focused on collecting RPM set points from
thermal PIDs and then having fan PIDs use the highest value collected,
it doesn't need to be strictl

rename RPMSetPoint to SetPoint

The PIDs were originally focused on collecting RPM set points from
thermal PIDs and then having fan PIDs use the highest value collected,
it doesn't need to be strictly an RPM set point.

It does however need to be one type of value.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I1d589cf4b2688d7e86030c10496d737dc5bbdadf

show more ...

gitignore: add service file

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ib144b0759ce3b5db92e16c8801df365fb07e1a7c

bugfix: writePath is the dbus object path for the sensor

For the sensor, if writePath is used for dbus active, it is always
FanPwm (presently) and needs to be the object path.

Tested: Not tested, o

bugfix: writePath is the dbus object path for the sensor

For the sensor, if writePath is used for dbus active, it is always
FanPwm (presently) and needs to be the object path.

Tested: Not tested, only code inspected.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I4eafaff4316aac9dab9a2c9e1bd61093a670b023

show more ...

Allow setting setpoint based on dynamic thresholds

As we allow dynamic thresholds in dbus-sensors to track
the t-control of dimms etc, we want to be able to set a
setpoint based on a offset from a t

Allow setting setpoint based on dynamic thresholds

As we allow dynamic thresholds in dbus-sensors to track
the t-control of dimms etc, we want to be able to set a
setpoint based on a offset from a threshold. This adds
the ability to create a "SetPointOffset" that is a
threshold of the given sensor. For instance a "SetPointOffset"
of "WarningHigh" would get the sensors "WarningHigh" value
then add the "SetPoint" value to it (commonly negative for
WarningHigh/CriticalHigh).

Tested: Turned on debug print and saw correct setpoint being
loaded into config

Change-Id: Idb9760ea5a66347f24573fb26937f8f278834a19
Signed-off-by: James Feist <james.feist@linux.intel.com>

show more ...

sensors: ignore min/max in json for D-Bus passive sensor read

min/max values were meant to scale write to be PWM, but were
overloaded in commit 75eb769d351434547899186f73ff70ae00d7934a
to scale sens

sensors: ignore min/max in json for D-Bus passive sensor read

min/max values were meant to scale write to be PWM, but were
overloaded in commit 75eb769d351434547899186f73ff70ae00d7934a
to scale sensor read to percent as well. However currently the D-Bus sensors
built from JSON can only specify one pair of min/max values,so they
cannot be used for both read/write interfaces.

Fix the behavior by ignoring min/max in settings when building D-Bus passive
read interface and only read them from D-Bus.

Tested:
D-Bus passive sensor value is no longer scaled if there is no
MinValue/MaxValue specified.

Resolves: openbmc/phosphor-pid-control#14

Signed-off-by: Kun Yi <kunyi731@gmail.com>
Change-Id: I206bbe75c77e79f765eca76cfa015321dcba4aa7

show more ...

util: Avoid division by invalid value

Check for max > min before dividing by difference

Signed-off-by: Kun Yi <kunyi731@gmail.com>
Change-Id: Ic2a983bb6f7c04f1deafcab228b76ff60012f011

dbuspassive: Fix typo in variable check

When setting min, should check for min instead of max.

Signed-off-by: Kun Yi <kunyi731@gmail.com>
Change-Id: I0097bb329408f807fea6d68ca0055c5d8215aba3