summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-08-22 03:10:29 +0300
committerPatrick Williams <patrick@stwcx.xyz>2017-08-24 14:31:19 +0300
commit26f8fbfaeee1e7e7a0a057594b3e7b1c5dbb89d1 (patch)
tree3c0e4db4a65f4b8ba8dc01c957c0cb38e5d4f0c0
parent4ce57190dabd779b0d6dbb07f855d41dd83505a0 (diff)
downloadopenbmc-26f8fbfaeee1e7e7a0a057594b3e7b1c5dbb89d1.tar.xz
wspoon: Run max31785 firmware revision checker
Run the MAX31785 firmware revision checking MSL (minimum ship level) script on Witherspoon systems. MSL can be used to prevent downlevel fan cards escapes from manufacturing environments. The script is configured to run on the way to BMC standby and sets the MSL interfacee property on the configured fan inventory items. Validation of the fan MSL interface is beyond the scope of this commit. On Witherspoon, MSL enforcement is enabled by default. For information on disabling the MSL consult: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml Change-Id: Iaf5dbf8fc29bd497c9b2e610ba23ee98ee749d24 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend3
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf3
3 files changed, 7 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
index aa57bbfe6..85c284372 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"
+OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index ebdcac807..0f16ec512 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -24,3 +24,6 @@ WSPOON_OCCITEMS = "${@compose_list(d, 'WSPOON_OCCSFMT', 'WSPOON_OCCS')}"
ENVS = "obmc/hwmon/{0}"
SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_ITEMS')}"
SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}"
+
+SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf"
+SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@wspoon.service"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf
new file mode 100644
index 000000000..409a75f0b
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf
@@ -0,0 +1,3 @@
+BUS=3
+PATHS="/system/chassis/motherboard/fan0 /system/chassis/motherboard/fan1 /system/chassis/motherboard/fan2 /system/chassis/motherboard/fan3"
+REVISION=0x3040