From 9f019036c83c9071831be180925088ce267106d6 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Wed, 16 May 2018 00:52:55 -0500 Subject: Use OpenPower variable for PS derating factor The openpower-occ-control code needs to know the power supply derating factor, but will default to a value if one isn't supplied externally in do_configure. Since other will also need to use that same value, use a common variable for it defined in openpower.inc, and now pass it into the configure step. This derating factor is an OpenPower concept used by the Power processor's OCC thermal control subsystem. Tested: Check that the derating factor variable in config.h in the openenpower-occ-control repo follows the variable in openpower.inc. Change-Id: I259b6086ebe70b2ac6eccdd244e43a7d36a28a77 Signed-off-by: Matt Spinler --- .../common/recipes-phosphor/occ/openpower-occ-control.bb | 5 ++++- .../meta-openpower/conf/machine/include/openpower.inc | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb index f9527f123..a113045b7 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb @@ -42,7 +42,10 @@ RDEPENDS_${PN} += " \ phosphor-dbus-interfaces \ " -EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" +EXTRA_OECONF = " \ + YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN} \ + PS_DERATING_FACTOR=${POWER_SUPPLY_DERATING_FACTOR} \ + " EXTRA_OECONF_append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' --enable-i2c-occ', '', d)}" OCC_ENABLE = "enable" diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index cbabdbe74..43a9d203c 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -35,3 +35,6 @@ PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= \ # the openpower-occ-control build process in the native sysroot. PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native ?= \ "${@cf_enabled(d, 'obmc-mrw', 'openpower-occ-control-config-mrw-native', 'openpower-occ-control-config-example-native')}" + +#Default value for power supply output power efficiency. +POWER_SUPPLY_DERATING_FACTOR = "90" -- cgit v1.2.1