diff options
author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-27 00:39:03 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-12 17:02:04 +0300 |
commit | b871cc8930b5be4be1d7b5a45816df29bf5cc631 (patch) | |
tree | b6e331764c9ec43ae3a83bd4dac563a146676b40 /meta-openbmc-machines | |
parent | dfc2bb717a73fb926e2bdad34aa0d8dc01c590e3 (diff) | |
download | openbmc-b871cc8930b5be4be1d7b5a45816df29bf5cc631.tar.xz |
Add in OCC hwmon config file
OCC hwmon sensor support is more complicated then other hwmon
sensors. It requires that software look at the label and
include that in the generated dbus sensor. A separate
commit in phosphor-hwmon will handle this new function.
The hwmon conf file indicates this new functionial requirement
to hwmon by including a new MODE_*=label for each sensor
that requires this function.
Resolves openbmc/openbmc#1183
Change-Id: I55bff27d3eab478559ae42e290dfe74e2f627e12
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
3 files changed, 136 insertions, 2 deletions
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 635fbcde3..6ee00c0e1 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 @@ -8,10 +8,16 @@ WSPOON_CHIPS = " \ i2c@1e78a000/i2c-bus@180/ir35221@70 \ i2c@1e78a000/i2c-bus@180/ir35221@71 \ " - WSPOON_ITEMSFMT = "ahb/apb/{0}.conf" - WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}" +WSPOON_OCCS = " \ + cfam@0,0/sbefifo@2400/occ@1 \ + cfam@0,0/sbefifo@82400/occ@2 \ + " +WSPOON_OCCSFMT = "base/gpio-fsi/{0}.conf" +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')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf new file mode 100644 index 000000000..51d91576b --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf @@ -0,0 +1,64 @@ +MODE_temp1_input = "label" +MODE_temp2_input = "label" +MODE_temp3_input = "label" +MODE_temp4_input = "label" +MODE_temp5_input = "label" +MODE_temp6_input = "label" +MODE_temp7_input = "label" +MODE_temp8_input = "label" +MODE_temp9_input = "label" +MODE_temp10_input = "label" +MODE_temp11_input = "label" +MODE_temp12_input = "label" +MODE_temp13_input = "label" +MODE_temp14_input = "label" +MODE_temp15_input = "label" +MODE_temp16_input = "label" +MODE_temp17_input = "label" +MODE_temp18_input = "label" +MODE_temp19_input = "label" +MODE_temp20_input = "label" +MODE_temp21_input = "label" +MODE_temp22_input = "label" +MODE_temp23_input = "label" +MODE_temp24_input = "label" +MODE_temp25_input = "label" +MODE_temp26_input = "label" +MODE_temp27_input = "label" +MODE_temp28_input = "label" +MODE_temp29_input = "label" +MODE_temp30_input = "label" +MODE_temp31_input = "label" +MODE_temp32_input = "label" +LABEL_temp17 = "p0_core0_temp" +LABEL_temp20 = "p0_core1_temp" +LABEL_temp23 = "p0_core2_temp" +LABEL_temp26 = "p0_core3_temp" +LABEL_temp29 = "p0_core4_temp" +LABEL_temp32 = "p0_core5_temp" +LABEL_temp35 = "p0_core6_temp" +LABEL_temp38 = "p0_core7_temp" +LABEL_temp41 = "p0_core8_temp" +LABEL_temp44 = "p0_core9_temp" +LABEL_temp47 = "p0_core10_temp" +LABEL_temp50 = "p0_core11_temp" +LABEL_temp53 = "p0_core12_temp" +LABEL_temp56 = "p0_core13_temp" +LABEL_temp59 = "p0_core14_temp" +LABEL_temp62 = "p0_core15_temp" +LABEL_temp65 = "p0_core16_temp" +LABEL_temp68 = "p0_core17_temp" +LABEL_temp71 = "p0_core18_temp" +LABEL_temp74 = "p0_core19_temp" +LABEL_temp77 = "p0_core20_temp" +LABEL_temp80 = "p0_core21_temp" +LABEL_temp83 = "p0_core22_temp" +LABEL_temp86 = "p0_core23_temp" +LABEL_temp165 = "dimm0_temp" +LABEL_temp167 = "dimm1_temp" +LABEL_temp169 = "dimm2_temp" +LABEL_temp171 = "dimm3_temp" +LABEL_temp173 = "dimm4_temp" +LABEL_temp175 = "dimm5_temp" +LABEL_temp177 = "dimm6_temp" +LABEL_temp179 = "dimm7_temp" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf new file mode 100644 index 000000000..b94b83fc7 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf @@ -0,0 +1,64 @@ +MODE_temp1_input = "label" +MODE_temp2_input = "label" +MODE_temp3_input = "label" +MODE_temp4_input = "label" +MODE_temp5_input = "label" +MODE_temp6_input = "label" +MODE_temp7_input = "label" +MODE_temp8_input = "label" +MODE_temp9_input = "label" +MODE_temp10_input = "label" +MODE_temp11_input = "label" +MODE_temp12_input = "label" +MODE_temp13_input = "label" +MODE_temp14_input = "label" +MODE_temp15_input = "label" +MODE_temp16_input = "label" +MODE_temp17_input = "label" +MODE_temp18_input = "label" +MODE_temp19_input = "label" +MODE_temp20_input = "label" +MODE_temp21_input = "label" +MODE_temp22_input = "label" +MODE_temp23_input = "label" +MODE_temp24_input = "label" +MODE_temp25_input = "label" +MODE_temp26_input = "label" +MODE_temp27_input = "label" +MODE_temp28_input = "label" +MODE_temp29_input = "label" +MODE_temp30_input = "label" +MODE_temp31_input = "label" +MODE_temp32_input = "label" +LABEL_temp91 = "p1_core0_temp" +LABEL_temp94 = "p1_core1_temp" +LABEL_temp97 = "p1_core2_temp" +LABEL_temp100 = "p1_core3_temp" +LABEL_temp103 = "p1_core4_temp" +LABEL_temp106 = "p1_core5_temp" +LABEL_temp109 = "p1_core6_temp" +LABEL_temp112 = "p1_core7_temp" +LABEL_temp115 = "p1_core8_temp" +LABEL_temp118 = "p1_core9_temp" +LABEL_temp121 = "p1_core10_temp" +LABEL_temp124 = "p1_core11_temp" +LABEL_temp127 = "p1_core12_temp" +LABEL_temp130 = "p1_core13_temp" +LABEL_temp133 = "p1_core14_temp" +LABEL_temp136 = "p1_core15_temp" +LABEL_temp139 = "p1_core16_temp" +LABEL_temp142 = "p1_core17_temp" +LABEL_temp145 = "p1_core18_temp" +LABEL_temp148 = "p1_core19_temp" +LABEL_temp151 = "p1_core20_temp" +LABEL_temp154 = "p1_core21_temp" +LABEL_temp157 = "p1_core22_temp" +LABEL_temp160 = "p1_core23_temp" +LABEL_temp181 = "dimm8_temp" +LABEL_temp183 = "dimm9_temp" +LABEL_temp185 = "dimm10_temp" +LABEL_temp187 = "dimm11_temp" +LABEL_temp189 = "dimm12_temp" +LABEL_temp191 = "dimm13_temp" +LABEL_temp193 = "dimm14_temp" +LABEL_temp195 = "dimm15_temp" |